diff options
author | Max Filippov <jcmvbkbc@gmail.com> | 2019-01-01 22:41:55 -0500 |
---|---|---|
committer | Max Filippov <jcmvbkbc@gmail.com> | 2019-05-06 20:48:55 -0400 |
commit | 8f8d5745bb520c76b81abef4a2cb3023d0313bfd (patch) | |
tree | cc287760f536fc980b7277e0a3459f9a6c6a94d3 | |
parent | 8e65986dcae8c49501c1920064dc192e704248bb (diff) |
xtensa: replace variant/core.h with asm/core.h
Introduce the header arch/xtensa/include/asm/core.h that provides
definitions for XCHAL macros missing in older xtensa releases. Use this
header instead of variant/core.h
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
-rw-r--r-- | arch/xtensa/boot/boot-redboot/bootstrap.S | 2 | ||||
-rw-r--r-- | arch/xtensa/include/asm/asmmacro.h | 2 | ||||
-rw-r--r-- | arch/xtensa/include/asm/cache.h | 2 | ||||
-rw-r--r-- | arch/xtensa/include/asm/checksum.h | 2 | ||||
-rw-r--r-- | arch/xtensa/include/asm/coprocessor.h | 2 | ||||
-rw-r--r-- | arch/xtensa/include/asm/core.h | 13 | ||||
-rw-r--r-- | arch/xtensa/include/asm/initialize_mmu.h | 4 | ||||
-rw-r--r-- | arch/xtensa/include/asm/irq.h | 2 | ||||
-rw-r--r-- | arch/xtensa/include/asm/processor.h | 2 | ||||
-rw-r--r-- | arch/xtensa/include/asm/ptrace.h | 2 | ||||
-rw-r--r-- | arch/xtensa/include/asm/vectors.h | 2 | ||||
-rw-r--r-- | arch/xtensa/kernel/hw_breakpoint.c | 2 | ||||
-rw-r--r-- | arch/xtensa/kernel/vmlinux.lds.S | 2 | ||||
-rw-r--r-- | arch/xtensa/lib/checksum.S | 2 | ||||
-rw-r--r-- | arch/xtensa/lib/memcopy.S | 2 | ||||
-rw-r--r-- | arch/xtensa/lib/memset.S | 2 | ||||
-rw-r--r-- | arch/xtensa/lib/strncpy_user.S | 2 | ||||
-rw-r--r-- | arch/xtensa/lib/strnlen_user.S | 2 | ||||
-rw-r--r-- | arch/xtensa/lib/usercopy.S | 2 | ||||
-rw-r--r-- | arch/xtensa/platforms/xt2000/include/platform/hardware.h | 2 | ||||
-rw-r--r-- | arch/xtensa/platforms/xt2000/include/platform/serial.h | 2 |
21 files changed, 32 insertions, 23 deletions
diff --git a/arch/xtensa/boot/boot-redboot/bootstrap.S b/arch/xtensa/boot/boot-redboot/bootstrap.S index bbf3b4b080cd..48ba5a232d94 100644 --- a/arch/xtensa/boot/boot-redboot/bootstrap.S +++ b/arch/xtensa/boot/boot-redboot/bootstrap.S | |||
@@ -1,5 +1,5 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | 1 | /* SPDX-License-Identifier: GPL-2.0 */ |
2 | #include <variant/core.h> | 2 | #include <asm/core.h> |
3 | #include <asm/regs.h> | 3 | #include <asm/regs.h> |
4 | #include <asm/asmmacro.h> | 4 | #include <asm/asmmacro.h> |
5 | #include <asm/cacheasm.h> | 5 | #include <asm/cacheasm.h> |
diff --git a/arch/xtensa/include/asm/asmmacro.h b/arch/xtensa/include/asm/asmmacro.h index 7f2ae5872151..8308a9c3abb2 100644 --- a/arch/xtensa/include/asm/asmmacro.h +++ b/arch/xtensa/include/asm/asmmacro.h | |||
@@ -11,7 +11,7 @@ | |||
11 | #ifndef _XTENSA_ASMMACRO_H | 11 | #ifndef _XTENSA_ASMMACRO_H |
12 | #define _XTENSA_ASMMACRO_H | 12 | #define _XTENSA_ASMMACRO_H |
13 | 13 | ||
14 | #include <variant/core.h> | 14 | #include <asm/core.h> |
15 | 15 | ||
16 | /* | 16 | /* |
17 | * Some little helpers for loops. Use zero-overhead-loops | 17 | * Some little helpers for loops. Use zero-overhead-loops |
diff --git a/arch/xtensa/include/asm/cache.h b/arch/xtensa/include/asm/cache.h index d2fd932fdb4d..b21fd133ff62 100644 --- a/arch/xtensa/include/asm/cache.h +++ b/arch/xtensa/include/asm/cache.h | |||
@@ -11,7 +11,7 @@ | |||
11 | #ifndef _XTENSA_CACHE_H | 11 | #ifndef _XTENSA_CACHE_H |
12 | #define _XTENSA_CACHE_H | 12 | #define _XTENSA_CACHE_H |
13 | 13 | ||
14 | #include <variant/core.h> | 14 | #include <asm/core.h> |
15 | 15 | ||
16 | #define L1_CACHE_SHIFT XCHAL_DCACHE_LINEWIDTH | 16 | #define L1_CACHE_SHIFT XCHAL_DCACHE_LINEWIDTH |
17 | #define L1_CACHE_BYTES XCHAL_DCACHE_LINESIZE | 17 | #define L1_CACHE_BYTES XCHAL_DCACHE_LINESIZE |
diff --git a/arch/xtensa/include/asm/checksum.h b/arch/xtensa/include/asm/checksum.h index f302ef57973a..8b687176ad72 100644 --- a/arch/xtensa/include/asm/checksum.h +++ b/arch/xtensa/include/asm/checksum.h | |||
@@ -13,7 +13,7 @@ | |||
13 | 13 | ||
14 | #include <linux/in6.h> | 14 | #include <linux/in6.h> |
15 | #include <linux/uaccess.h> | 15 | #include <linux/uaccess.h> |
16 | #include <variant/core.h> | 16 | #include <asm/core.h> |
17 | 17 | ||
18 | /* | 18 | /* |
19 | * computes the checksum of a memory block at buff, length len, | 19 | * computes the checksum of a memory block at buff, length len, |
diff --git a/arch/xtensa/include/asm/coprocessor.h b/arch/xtensa/include/asm/coprocessor.h index 6712929a27c9..0fbe2a740b8d 100644 --- a/arch/xtensa/include/asm/coprocessor.h +++ b/arch/xtensa/include/asm/coprocessor.h | |||
@@ -12,8 +12,8 @@ | |||
12 | #ifndef _XTENSA_COPROCESSOR_H | 12 | #ifndef _XTENSA_COPROCESSOR_H |
13 | #define _XTENSA_COPROCESSOR_H | 13 | #define _XTENSA_COPROCESSOR_H |
14 | 14 | ||
15 | #include <variant/core.h> | ||
16 | #include <variant/tie.h> | 15 | #include <variant/tie.h> |
16 | #include <asm/core.h> | ||
17 | #include <asm/types.h> | 17 | #include <asm/types.h> |
18 | 18 | ||
19 | #ifdef __ASSEMBLY__ | 19 | #ifdef __ASSEMBLY__ |
diff --git a/arch/xtensa/include/asm/core.h b/arch/xtensa/include/asm/core.h new file mode 100644 index 000000000000..b1f57519df49 --- /dev/null +++ b/arch/xtensa/include/asm/core.h | |||
@@ -0,0 +1,13 @@ | |||
1 | /* SPDX-License-Identifier: GPL-2.0 */ | ||
2 | /* Copyright (C) 2019 Cadence Design Systems Inc. */ | ||
3 | |||
4 | #ifndef _ASM_XTENSA_CORE_H | ||
5 | #define _ASM_XTENSA_CORE_H | ||
6 | |||
7 | #include <variant/core.h> | ||
8 | |||
9 | #ifndef XCHAL_SPANNING_WAY | ||
10 | #define XCHAL_SPANNING_WAY 0 | ||
11 | #endif | ||
12 | |||
13 | #endif | ||
diff --git a/arch/xtensa/include/asm/initialize_mmu.h b/arch/xtensa/include/asm/initialize_mmu.h index 10e9852b2fb4..d719785e54f7 100644 --- a/arch/xtensa/include/asm/initialize_mmu.h +++ b/arch/xtensa/include/asm/initialize_mmu.h | |||
@@ -33,10 +33,6 @@ | |||
33 | #define CA_WRITEBACK (0x4) | 33 | #define CA_WRITEBACK (0x4) |
34 | #endif | 34 | #endif |
35 | 35 | ||
36 | #ifndef XCHAL_SPANNING_WAY | ||
37 | #define XCHAL_SPANNING_WAY 0 | ||
38 | #endif | ||
39 | |||
40 | #ifdef __ASSEMBLY__ | 36 | #ifdef __ASSEMBLY__ |
41 | 37 | ||
42 | #define XTENSA_HWVERSION_RC_2009_0 230000 | 38 | #define XTENSA_HWVERSION_RC_2009_0 230000 |
diff --git a/arch/xtensa/include/asm/irq.h b/arch/xtensa/include/asm/irq.h index 6c6ed23e0c79..0f71a51dab25 100644 --- a/arch/xtensa/include/asm/irq.h +++ b/arch/xtensa/include/asm/irq.h | |||
@@ -12,7 +12,7 @@ | |||
12 | #define _XTENSA_IRQ_H | 12 | #define _XTENSA_IRQ_H |
13 | 13 | ||
14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
15 | #include <variant/core.h> | 15 | #include <asm/core.h> |
16 | 16 | ||
17 | #ifdef CONFIG_PLATFORM_NR_IRQS | 17 | #ifdef CONFIG_PLATFORM_NR_IRQS |
18 | # define PLATFORM_NR_IRQS CONFIG_PLATFORM_NR_IRQS | 18 | # define PLATFORM_NR_IRQS CONFIG_PLATFORM_NR_IRQS |
diff --git a/arch/xtensa/include/asm/processor.h b/arch/xtensa/include/asm/processor.h index 0c14018d1c26..19f6b54e358b 100644 --- a/arch/xtensa/include/asm/processor.h +++ b/arch/xtensa/include/asm/processor.h | |||
@@ -10,7 +10,7 @@ | |||
10 | #ifndef _XTENSA_PROCESSOR_H | 10 | #ifndef _XTENSA_PROCESSOR_H |
11 | #define _XTENSA_PROCESSOR_H | 11 | #define _XTENSA_PROCESSOR_H |
12 | 12 | ||
13 | #include <variant/core.h> | 13 | #include <asm/core.h> |
14 | 14 | ||
15 | #include <linux/compiler.h> | 15 | #include <linux/compiler.h> |
16 | #include <linux/stringify.h> | 16 | #include <linux/stringify.h> |
diff --git a/arch/xtensa/include/asm/ptrace.h b/arch/xtensa/include/asm/ptrace.h index 62a58d2567e9..b109416dc07e 100644 --- a/arch/xtensa/include/asm/ptrace.h +++ b/arch/xtensa/include/asm/ptrace.h | |||
@@ -80,7 +80,7 @@ struct pt_regs { | |||
80 | unsigned long areg[16]; | 80 | unsigned long areg[16]; |
81 | }; | 81 | }; |
82 | 82 | ||
83 | #include <variant/core.h> | 83 | #include <asm/core.h> |
84 | 84 | ||
85 | # define arch_has_single_step() (1) | 85 | # define arch_has_single_step() (1) |
86 | # define task_pt_regs(tsk) ((struct pt_regs*) \ | 86 | # define task_pt_regs(tsk) ((struct pt_regs*) \ |
diff --git a/arch/xtensa/include/asm/vectors.h b/arch/xtensa/include/asm/vectors.h index 7111280c8842..79fe3007919e 100644 --- a/arch/xtensa/include/asm/vectors.h +++ b/arch/xtensa/include/asm/vectors.h | |||
@@ -18,7 +18,7 @@ | |||
18 | #ifndef _XTENSA_VECTORS_H | 18 | #ifndef _XTENSA_VECTORS_H |
19 | #define _XTENSA_VECTORS_H | 19 | #define _XTENSA_VECTORS_H |
20 | 20 | ||
21 | #include <variant/core.h> | 21 | #include <asm/core.h> |
22 | #include <asm/kmem_layout.h> | 22 | #include <asm/kmem_layout.h> |
23 | 23 | ||
24 | #if XCHAL_HAVE_PTP_MMU | 24 | #if XCHAL_HAVE_PTP_MMU |
diff --git a/arch/xtensa/kernel/hw_breakpoint.c b/arch/xtensa/kernel/hw_breakpoint.c index 4f20416061fb..285fb2942b06 100644 --- a/arch/xtensa/kernel/hw_breakpoint.c +++ b/arch/xtensa/kernel/hw_breakpoint.c | |||
@@ -12,7 +12,7 @@ | |||
12 | #include <linux/log2.h> | 12 | #include <linux/log2.h> |
13 | #include <linux/percpu.h> | 13 | #include <linux/percpu.h> |
14 | #include <linux/perf_event.h> | 14 | #include <linux/perf_event.h> |
15 | #include <variant/core.h> | 15 | #include <asm/core.h> |
16 | 16 | ||
17 | /* Breakpoint currently in use for each IBREAKA. */ | 17 | /* Breakpoint currently in use for each IBREAKA. */ |
18 | static DEFINE_PER_CPU(struct perf_event *, bp_on_reg[XCHAL_NUM_IBREAK]); | 18 | static DEFINE_PER_CPU(struct perf_event *, bp_on_reg[XCHAL_NUM_IBREAK]); |
diff --git a/arch/xtensa/kernel/vmlinux.lds.S b/arch/xtensa/kernel/vmlinux.lds.S index b80a430453b1..943f10639a93 100644 --- a/arch/xtensa/kernel/vmlinux.lds.S +++ b/arch/xtensa/kernel/vmlinux.lds.S | |||
@@ -18,8 +18,8 @@ | |||
18 | #include <asm/page.h> | 18 | #include <asm/page.h> |
19 | #include <asm/thread_info.h> | 19 | #include <asm/thread_info.h> |
20 | 20 | ||
21 | #include <asm/core.h> | ||
21 | #include <asm/vectors.h> | 22 | #include <asm/vectors.h> |
22 | #include <variant/core.h> | ||
23 | 23 | ||
24 | OUTPUT_ARCH(xtensa) | 24 | OUTPUT_ARCH(xtensa) |
25 | ENTRY(_start) | 25 | ENTRY(_start) |
diff --git a/arch/xtensa/lib/checksum.S b/arch/xtensa/lib/checksum.S index 528fe0dd9339..d82c20c1fb7a 100644 --- a/arch/xtensa/lib/checksum.S +++ b/arch/xtensa/lib/checksum.S | |||
@@ -16,8 +16,8 @@ | |||
16 | 16 | ||
17 | #include <linux/errno.h> | 17 | #include <linux/errno.h> |
18 | #include <linux/linkage.h> | 18 | #include <linux/linkage.h> |
19 | #include <variant/core.h> | ||
20 | #include <asm/asmmacro.h> | 19 | #include <asm/asmmacro.h> |
20 | #include <asm/core.h> | ||
21 | 21 | ||
22 | /* | 22 | /* |
23 | * computes a partial checksum, e.g. for TCP/UDP fragments | 23 | * computes a partial checksum, e.g. for TCP/UDP fragments |
diff --git a/arch/xtensa/lib/memcopy.S b/arch/xtensa/lib/memcopy.S index c0f6981719d6..efecfd7ed8cc 100644 --- a/arch/xtensa/lib/memcopy.S +++ b/arch/xtensa/lib/memcopy.S | |||
@@ -10,8 +10,8 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include <linux/linkage.h> | 12 | #include <linux/linkage.h> |
13 | #include <variant/core.h> | ||
14 | #include <asm/asmmacro.h> | 13 | #include <asm/asmmacro.h> |
14 | #include <asm/core.h> | ||
15 | 15 | ||
16 | /* | 16 | /* |
17 | * void *memcpy(void *dst, const void *src, size_t len); | 17 | * void *memcpy(void *dst, const void *src, size_t len); |
diff --git a/arch/xtensa/lib/memset.S b/arch/xtensa/lib/memset.S index 276747dec300..8632eacbdc80 100644 --- a/arch/xtensa/lib/memset.S +++ b/arch/xtensa/lib/memset.S | |||
@@ -12,8 +12,8 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
15 | #include <variant/core.h> | ||
16 | #include <asm/asmmacro.h> | 15 | #include <asm/asmmacro.h> |
16 | #include <asm/core.h> | ||
17 | 17 | ||
18 | /* | 18 | /* |
19 | * void *memset(void *dst, int c, size_t length) | 19 | * void *memset(void *dst, int c, size_t length) |
diff --git a/arch/xtensa/lib/strncpy_user.S b/arch/xtensa/lib/strncpy_user.S index 5fce16b67dca..c4c6c8578d59 100644 --- a/arch/xtensa/lib/strncpy_user.S +++ b/arch/xtensa/lib/strncpy_user.S | |||
@@ -13,8 +13,8 @@ | |||
13 | 13 | ||
14 | #include <linux/errno.h> | 14 | #include <linux/errno.h> |
15 | #include <linux/linkage.h> | 15 | #include <linux/linkage.h> |
16 | #include <variant/core.h> | ||
17 | #include <asm/asmmacro.h> | 16 | #include <asm/asmmacro.h> |
17 | #include <asm/core.h> | ||
18 | 18 | ||
19 | /* | 19 | /* |
20 | * char *__strncpy_user(char *dst, const char *src, size_t len) | 20 | * char *__strncpy_user(char *dst, const char *src, size_t len) |
diff --git a/arch/xtensa/lib/strnlen_user.S b/arch/xtensa/lib/strnlen_user.S index 0b956ce7f386..1f2ca2bb2ab3 100644 --- a/arch/xtensa/lib/strnlen_user.S +++ b/arch/xtensa/lib/strnlen_user.S | |||
@@ -12,8 +12,8 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <linux/linkage.h> | 14 | #include <linux/linkage.h> |
15 | #include <variant/core.h> | ||
16 | #include <asm/asmmacro.h> | 15 | #include <asm/asmmacro.h> |
16 | #include <asm/core.h> | ||
17 | 17 | ||
18 | /* | 18 | /* |
19 | * size_t __strnlen_user(const char *s, size_t len) | 19 | * size_t __strnlen_user(const char *s, size_t len) |
diff --git a/arch/xtensa/lib/usercopy.S b/arch/xtensa/lib/usercopy.S index 64ab1971324f..228607e30bc2 100644 --- a/arch/xtensa/lib/usercopy.S +++ b/arch/xtensa/lib/usercopy.S | |||
@@ -54,8 +54,8 @@ | |||
54 | */ | 54 | */ |
55 | 55 | ||
56 | #include <linux/linkage.h> | 56 | #include <linux/linkage.h> |
57 | #include <variant/core.h> | ||
58 | #include <asm/asmmacro.h> | 57 | #include <asm/asmmacro.h> |
58 | #include <asm/core.h> | ||
59 | 59 | ||
60 | .text | 60 | .text |
61 | ENTRY(__xtensa_copy_user) | 61 | ENTRY(__xtensa_copy_user) |
diff --git a/arch/xtensa/platforms/xt2000/include/platform/hardware.h b/arch/xtensa/platforms/xt2000/include/platform/hardware.h index 8e5e0d6a81ec..9f213f573330 100644 --- a/arch/xtensa/platforms/xt2000/include/platform/hardware.h +++ b/arch/xtensa/platforms/xt2000/include/platform/hardware.h | |||
@@ -15,7 +15,7 @@ | |||
15 | #ifndef _XTENSA_XT2000_HARDWARE_H | 15 | #ifndef _XTENSA_XT2000_HARDWARE_H |
16 | #define _XTENSA_XT2000_HARDWARE_H | 16 | #define _XTENSA_XT2000_HARDWARE_H |
17 | 17 | ||
18 | #include <variant/core.h> | 18 | #include <asm/core.h> |
19 | 19 | ||
20 | /* | 20 | /* |
21 | * On-board components. | 21 | * On-board components. |
diff --git a/arch/xtensa/platforms/xt2000/include/platform/serial.h b/arch/xtensa/platforms/xt2000/include/platform/serial.h index 7226cf732b47..cde804827626 100644 --- a/arch/xtensa/platforms/xt2000/include/platform/serial.h +++ b/arch/xtensa/platforms/xt2000/include/platform/serial.h | |||
@@ -11,7 +11,7 @@ | |||
11 | #ifndef _XTENSA_XT2000_SERIAL_H | 11 | #ifndef _XTENSA_XT2000_SERIAL_H |
12 | #define _XTENSA_XT2000_SERIAL_H | 12 | #define _XTENSA_XT2000_SERIAL_H |
13 | 13 | ||
14 | #include <variant/core.h> | 14 | #include <asm/core.h> |
15 | #include <asm/io.h> | 15 | #include <asm/io.h> |
16 | 16 | ||
17 | /* National-Semi PC16552D DUART: */ | 17 | /* National-Semi PC16552D DUART: */ |