Skip to content

Commit a8222fd

Browse files
torvaldstorvalds
committed
Merge tag 'microblaze-v5.7-rc1' of git://git.monstr.eu/linux-2.6-microblaze
Pull microblaze updates from Michal Simek: - convert license headers to SPDX - cleanup header handling and use asm-generic one - get rid of earlyprintk residues - define barriers and use it in the code - get rid of setup_irq() for timer - various small addons and fixes * tag 'microblaze-v5.7-rc1' of git://git.monstr.eu/linux-2.6-microblaze: microblaze: Replace setup_irq() by request_irq() microblaze: Stop printing the virtual memory layout microblaze: Use asm generic cmpxchg.h for !SMP case microblaze: Define percpu sestion in linker file microblaze: Remove unused boot_cpuid variable microblaze: Add missing irqflags.h header microblaze: Add sync to tlb operations microblaze: Define microblaze barrier microblaze: Remove empty headers microblaze: Remove early printk setup microblaze: Remove architecture tlb.h and use generic one microblaze: Convert headers to SPDX license microblaze: Fix _reset() function microblaze: Kernel parameters should be parsed earlier
2 parents cad18da + 9fd1a1c commit a8222fd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+67
-236
lines changed

‎arch/microblaze/include/asm/Kbuild

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# SPDX-License-Identifier: GPL-2.0
22
generated-y += syscall_table.h
3-
generic-y += barrier.h
43
generic-y += bitops.h
54
generic-y += bug.h
65
generic-y += bugs.h
@@ -13,6 +12,7 @@ generic-y += exec.h
1312
generic-y += extable.h
1413
generic-y += fb.h
1514
generic-y += hardirq.h
15+
generic-y += hw_irq.h
1616
generic-y += irq_regs.h
1717
generic-y += irq_work.h
1818
generic-y += kdebug.h
@@ -31,8 +31,10 @@ generic-y += preempt.h
3131
generic-y += serial.h
3232
generic-y += shmparam.h
3333
generic-y += syscalls.h
34+
generic-y += tlb.h
3435
generic-y += topology.h
3536
generic-y += trace_clock.h
37+
generic-y += user.h
3638
generic-y += vga.h
3739
generic-y += word-at-a-time.h
3840
generic-y += xor.h

‎arch/microblaze/include/asm/barrier.h

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
2+
/*
3+
* Copyright (c) 2015 - 2020 Xilinx, Inc. All rights reserved.
4+
*/
5+
6+
#ifndef _ASM_MICROBLAZE_BARRIER_H
7+
#define _ASM_MICROBLAZE_BARRIER_H
8+
9+
#define mb() __asm__ __volatile__ ("mbar 1" : : : "memory")
10+
11+
#include <asm-generic/barrier.h>
12+
13+
#endif /* _ASM_MICROBLAZE_BARRIER_H */

‎arch/microblaze/include/asm/cache.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
12
/*
23
* Cache operations
34
*
45
* Copyright (C) 2007-2009 Michal Simek <[email protected]>
56
* Copyright (C) 2007-2009 PetaLogix
67
* Copyright (C) 2003 John Williams <[email protected]>
7-
*
8-
* This file is subject to the terms and conditions of the GNU General
9-
* Public License. See the file COPYING in the main directory of this
10-
* archive for more details.
118
*/
129

1310
#ifndef _ASM_MICROBLAZE_CACHE_H

‎arch/microblaze/include/asm/cacheflush.h

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
12
/*
23
* Copyright (C) 2007-2009 Michal Simek <[email protected]>
34
* Copyright (C) 2007-2009 PetaLogix
45
* Copyright (C) 2007 John Williams <[email protected]>
56
* based on v850 version which was
67
* Copyright (C) 2001,02,03 NEC Electronics Corporation
78
* Copyright (C) 2001,02,03 Miles Bader <[email protected]>
8-
*
9-
* This file is subject to the terms and conditions of the GNU General
10-
* Public License. See the file COPYING in the main directory of this
11-
* archive for more details.
12-
*
139
*/
1410

1511
#ifndef _ASM_MICROBLAZE_CACHEFLUSH_H

‎arch/microblaze/include/asm/checksum.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
12
/*
23
* Copyright (C) 2008 Michal Simek <[email protected]>
34
* Copyright (C) 2006 Atmark Techno, Inc.
4-
*
5-
* This file is subject to the terms and conditions of the GNU General Public
6-
* License. See the file "COPYING" in the main directory of this archive
7-
* for more details.
85
*/
96

107
#ifndef _ASM_MICROBLAZE_CHECKSUM_H

‎arch/microblaze/include/asm/cmpxchg.h

Lines changed: 3 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -2,42 +2,8 @@
22
#ifndef _ASM_MICROBLAZE_CMPXCHG_H
33
#define _ASM_MICROBLAZE_CMPXCHG_H
44

5-
#include <linux/irqflags.h>
6-
7-
void __bad_xchg(volatile void *ptr, int size);
8-
9-
static inline unsigned long __xchg(unsigned long x, volatile void *ptr,
10-
int size)
11-
{
12-
unsigned long ret;
13-
unsigned long flags;
14-
15-
switch (size) {
16-
case 1:
17-
local_irq_save(flags);
18-
ret = *(volatile unsigned char *)ptr;
19-
*(volatile unsigned char *)ptr = x;
20-
local_irq_restore(flags);
21-
break;
22-
23-
case 4:
24-
local_irq_save(flags);
25-
ret = *(volatile unsigned long *)ptr;
26-
*(volatile unsigned long *)ptr = x;
27-
local_irq_restore(flags);
28-
break;
29-
default:
30-
__bad_xchg(ptr, size), ret = 0;
31-
break;
32-
}
33-
34-
return ret;
35-
}
36-
37-
#define xchg(ptr, x) \
38-
((__typeof__(*(ptr))) __xchg((unsigned long)(x), (ptr), sizeof(*(ptr))))
39-
40-
#include <asm-generic/cmpxchg.h>
41-
#include <asm-generic/cmpxchg-local.h>
5+
#ifndef CONFIG_SMP
6+
# include <asm-generic/cmpxchg.h>
7+
#endif
428

439
#endif /* _ASM_MICROBLAZE_CMPXCHG_H */

‎arch/microblaze/include/asm/cpuinfo.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
12
/*
23
* Generic support for queying CPU info
34
*
45
* Copyright (C) 2007-2009 Michal Simek <[email protected]>
56
* Copyright (C) 2007-2009 PetaLogix
67
* Copyright (C) 2007 John Williams <[email protected]>
7-
*
8-
* This file is subject to the terms and conditions of the GNU General
9-
* Public License. See the file COPYING in the main directory of this
10-
* archive for more details.
118
*/
129

1310
#ifndef _ASM_MICROBLAZE_CPUINFO_H

‎arch/microblaze/include/asm/cputable.h

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎arch/microblaze/include/asm/current.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
12
/*
23
* Copyright (C) 2008-2009 Michal Simek <[email protected]>
34
* Copyright (C) 2008-2009 PetaLogix
45
* Copyright (C) 2006 Atmark Techno, Inc.
5-
*
6-
* This file is subject to the terms and conditions of the GNU General Public
7-
* License. See the file "COPYING" in the main directory of this archive
8-
* for more details.
96
*/
107

118
#ifndef _ASM_MICROBLAZE_CURRENT_H

‎arch/microblaze/include/asm/delay.h

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1+
/* SPDX-License-Identifier: GPL-2.0 */
12
/*
2-
* include/asm-microblaze/delay.h
3-
*
4-
* This file is subject to the terms and conditions of the GNU General Public
5-
* License. See the file "COPYING" in the main directory of this archive
6-
* for more details.
7-
*
83
* Copyright (C) 2008 Michal Simek
94
* Copyright (C) 2007 John Williams
105
* Copyright (C) 2006 Atmark Techno, Inc.

0 commit comments

Comments
 (0)