tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

Max Filippov 8f8d5745 8e65986d

+32 -23
+1 -1
arch/xtensa/boot/boot-redboot/bootstrap.S
··· 1 1 /* SPDX-License-Identifier: GPL-2.0 */ 2 - #include <variant/core.h> 2 + #include <asm/core.h> 3 3 #include <asm/regs.h> 4 4 #include <asm/asmmacro.h> 5 5 #include <asm/cacheasm.h>
+1 -1
arch/xtensa/include/asm/asmmacro.h
··· 11 11 #ifndef _XTENSA_ASMMACRO_H 12 12 #define _XTENSA_ASMMACRO_H 13 13 14 - #include <variant/core.h> 14 + #include <asm/core.h> 15 15 16 16 /* 17 17 * Some little helpers for loops. Use zero-overhead-loops
+1 -1
arch/xtensa/include/asm/cache.h
··· 11 11 #ifndef _XTENSA_CACHE_H 12 12 #define _XTENSA_CACHE_H 13 13 14 - #include <variant/core.h> 14 + #include <asm/core.h> 15 15 16 16 #define L1_CACHE_SHIFT XCHAL_DCACHE_LINEWIDTH 17 17 #define L1_CACHE_BYTES XCHAL_DCACHE_LINESIZE
+1 -1
arch/xtensa/include/asm/checksum.h
··· 13 13 14 14 #include <linux/in6.h> 15 15 #include <linux/uaccess.h> 16 - #include <variant/core.h> 16 + #include <asm/core.h> 17 17 18 18 /* 19 19 * computes the checksum of a memory block at buff, length len,
+1 -1
arch/xtensa/include/asm/coprocessor.h
··· 12 12 #ifndef _XTENSA_COPROCESSOR_H 13 13 #define _XTENSA_COPROCESSOR_H 14 14 15 - #include <variant/core.h> 16 15 #include <variant/tie.h> 16 + #include <asm/core.h> 17 17 #include <asm/types.h> 18 18 19 19 #ifdef __ASSEMBLY__
+13
arch/xtensa/include/asm/core.h
··· 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
-4
arch/xtensa/include/asm/initialize_mmu.h
··· 33 33 #define CA_WRITEBACK (0x4) 34 34 #endif 35 35 36 - #ifndef XCHAL_SPANNING_WAY 37 - #define XCHAL_SPANNING_WAY 0 38 - #endif 39 - 40 36 #ifdef __ASSEMBLY__ 41 37 42 38 #define XTENSA_HWVERSION_RC_2009_0 230000
+1 -1
arch/xtensa/include/asm/irq.h
··· 12 12 #define _XTENSA_IRQ_H 13 13 14 14 #include <linux/init.h> 15 - #include <variant/core.h> 15 + #include <asm/core.h> 16 16 17 17 #ifdef CONFIG_PLATFORM_NR_IRQS 18 18 # define PLATFORM_NR_IRQS CONFIG_PLATFORM_NR_IRQS
+1 -1
arch/xtensa/include/asm/processor.h
··· 10 10 #ifndef _XTENSA_PROCESSOR_H 11 11 #define _XTENSA_PROCESSOR_H 12 12 13 - #include <variant/core.h> 13 + #include <asm/core.h> 14 14 15 15 #include <linux/compiler.h> 16 16 #include <linux/stringify.h>
+1 -1
arch/xtensa/include/asm/ptrace.h
··· 80 80 unsigned long areg[16]; 81 81 }; 82 82 83 - #include <variant/core.h> 83 + #include <asm/core.h> 84 84 85 85 # define arch_has_single_step() (1) 86 86 # define task_pt_regs(tsk) ((struct pt_regs*) \
+1 -1
arch/xtensa/include/asm/vectors.h
··· 18 18 #ifndef _XTENSA_VECTORS_H 19 19 #define _XTENSA_VECTORS_H 20 20 21 - #include <variant/core.h> 21 + #include <asm/core.h> 22 22 #include <asm/kmem_layout.h> 23 23 24 24 #if XCHAL_HAVE_PTP_MMU
+1 -1
arch/xtensa/kernel/hw_breakpoint.c
··· 12 12 #include <linux/log2.h> 13 13 #include <linux/percpu.h> 14 14 #include <linux/perf_event.h> 15 - #include <variant/core.h> 15 + #include <asm/core.h> 16 16 17 17 /* Breakpoint currently in use for each IBREAKA. */ 18 18 static DEFINE_PER_CPU(struct perf_event *, bp_on_reg[XCHAL_NUM_IBREAK]);
+1 -1
arch/xtensa/kernel/vmlinux.lds.S
··· 18 18 #include <asm/page.h> 19 19 #include <asm/thread_info.h> 20 20 21 + #include <asm/core.h> 21 22 #include <asm/vectors.h> 22 - #include <variant/core.h> 23 23 24 24 OUTPUT_ARCH(xtensa) 25 25 ENTRY(_start)
+1 -1
arch/xtensa/lib/checksum.S
··· 16 16 17 17 #include <linux/errno.h> 18 18 #include <linux/linkage.h> 19 - #include <variant/core.h> 20 19 #include <asm/asmmacro.h> 20 + #include <asm/core.h> 21 21 22 22 /* 23 23 * computes a partial checksum, e.g. for TCP/UDP fragments
+1 -1
arch/xtensa/lib/memcopy.S
··· 10 10 */ 11 11 12 12 #include <linux/linkage.h> 13 - #include <variant/core.h> 14 13 #include <asm/asmmacro.h> 14 + #include <asm/core.h> 15 15 16 16 /* 17 17 * void *memcpy(void *dst, const void *src, size_t len);
+1 -1
arch/xtensa/lib/memset.S
··· 12 12 */ 13 13 14 14 #include <linux/linkage.h> 15 - #include <variant/core.h> 16 15 #include <asm/asmmacro.h> 16 + #include <asm/core.h> 17 17 18 18 /* 19 19 * void *memset(void *dst, int c, size_t length)
+1 -1
arch/xtensa/lib/strncpy_user.S
··· 13 13 14 14 #include <linux/errno.h> 15 15 #include <linux/linkage.h> 16 - #include <variant/core.h> 17 16 #include <asm/asmmacro.h> 17 + #include <asm/core.h> 18 18 19 19 /* 20 20 * char *__strncpy_user(char *dst, const char *src, size_t len)
+1 -1
arch/xtensa/lib/strnlen_user.S
··· 12 12 */ 13 13 14 14 #include <linux/linkage.h> 15 - #include <variant/core.h> 16 15 #include <asm/asmmacro.h> 16 + #include <asm/core.h> 17 17 18 18 /* 19 19 * size_t __strnlen_user(const char *s, size_t len)
+1 -1
arch/xtensa/lib/usercopy.S
··· 54 54 */ 55 55 56 56 #include <linux/linkage.h> 57 - #include <variant/core.h> 58 57 #include <asm/asmmacro.h> 58 + #include <asm/core.h> 59 59 60 60 .text 61 61 ENTRY(__xtensa_copy_user)
+1 -1
arch/xtensa/platforms/xt2000/include/platform/hardware.h
··· 15 15 #ifndef _XTENSA_XT2000_HARDWARE_H 16 16 #define _XTENSA_XT2000_HARDWARE_H 17 17 18 - #include <variant/core.h> 18 + #include <asm/core.h> 19 19 20 20 /* 21 21 * On-board components.
+1 -1
arch/xtensa/platforms/xt2000/include/platform/serial.h
··· 11 11 #ifndef _XTENSA_XT2000_SERIAL_H 12 12 #define _XTENSA_XT2000_SERIAL_H 13 13 14 - #include <variant/core.h> 14 + #include <asm/core.h> 15 15 #include <asm/io.h> 16 16 17 17 /* National-Semi PC16552D DUART: */