sh: remove sh5 support
Subsystems (7)
PATCH 1/2 sh: remove sh5 support
sh5 never became a product and has probably never really worked.
Remove it by recursively deleting all associated Kconfig options and all corresponding files.
For review purposes, this leaves out the files that can now be removed, in particular
arch/sh/drivers/pci/*-sh5.c
arch/sh/include/asm/*_64.h
arch/sh/include/uapi/asm/*_64.h
arch/sh/include/cpu-sh5/*
arch/sh/kernel/cpu/sh5/*
arch/sh/lib64/*
arch/sh/mm/*-sh5.c
--- arch/sh/Kconfig | 50 +++------------------- arch/sh/Kconfig.cpu | 9 ---- arch/sh/Kconfig.debug | 13 ++---- arch/sh/Makefile | 24 +++-------- arch/sh/boot/compressed/Makefile | 5 +-- arch/sh/boot/compressed/misc.c | 8 ---- arch/sh/drivers/pci/Makefile | 1 - arch/sh/include/asm/barrier.h | 4 +- arch/sh/include/asm/bitops.h | 26 ------------ arch/sh/include/asm/bugs.h | 4 -- arch/sh/include/asm/extable.h | 4 -- arch/sh/include/asm/fixmap.h | 4 -- arch/sh/include/asm/io.h | 4 -- arch/sh/include/asm/irq.h | 3 -- arch/sh/include/asm/mmu_context.h | 12 ------ arch/sh/include/asm/module.h | 4 -- arch/sh/include/asm/page.h | 21 +-------- arch/sh/include/asm/pgtable.h | 17 -------- arch/sh/include/asm/posix_types.h | 6 +-- arch/sh/include/asm/processor.h | 14 +----- arch/sh/include/asm/string.h | 6 +-- arch/sh/include/asm/switch_to.h | 11 +---- arch/sh/include/asm/syscall.h | 6 +-- arch/sh/include/asm/syscalls.h | 9 +--- arch/sh/include/asm/thread_info.h | 4 +- arch/sh/include/asm/tlb.h | 6 +-- arch/sh/include/asm/traps.h | 4 -- arch/sh/include/asm/types.h | 5 --- arch/sh/include/asm/uaccess.h | 4 -- arch/sh/include/asm/unistd.h | 6 +-- arch/sh/include/asm/user.h | 7 --- arch/sh/include/asm/vmlinux.lds.h | 6 --- arch/sh/include/uapi/asm/ptrace.h | 5 --- arch/sh/include/uapi/asm/sigcontext.h | 13 ------ arch/sh/include/uapi/asm/stat.h | 61 --------------------------- arch/sh/kernel/Makefile | 16 +++---- arch/sh/kernel/cpu/Makefile | 1 - arch/sh/kernel/cpu/init.c | 2 +- arch/sh/kernel/cpu/irq/Makefile | 3 +- arch/sh/kernel/cpu/proc.c | 1 - arch/sh/kernel/module.c | 9 ---- arch/sh/kernel/process.c | 2 - arch/sh/kernel/reboot.c | 6 --- arch/sh/kernel/vmlinux.lds.S | 18 +++----- arch/sh/mm/Kconfig | 16 +++---- arch/sh/mm/Makefile | 2 - arch/sh/mm/cache.c | 6 --- drivers/rtc/Kconfig | 2 +- fs/Kconfig.binfmt | 2 +- scripts/headers_install.sh | 3 -- 50 files changed, 51 insertions(+), 424 deletions(-)
arch/sh/Kconfig +6 -44
@@ -62,7 +62,7 @@ config SUPERH <http://www.linux-sh.org/>. config SUPERH32 - def_bool "$(ARCH)" = "sh" + def_bool y select ARCH_32BIT_OFF_T select GUP_GET_PTE_LOW_HIGH if X2TLB select HAVE_KPROBES
@@ -82,18 +82,9 @@ config SUPERH32 select SPARSE_IRQ select HAVE_STACKPROTECTOR -config SUPERH64 - def_bool "$(ARCH)" = "sh64" - select HAVE_EXIT_THREAD - select KALLSYMS - config GENERIC_BUG def_bool y - depends on BUG && SUPERH32 - -config GENERIC_CSUM - def_bool y - depends on SUPERH64 + depends on BUG config GENERIC_HWEIGHT def_bool y
@@ -203,12 +194,6 @@ config CPU_SH4AL_DSP select CPU_SH4A select CPU_HAS_DSP -config CPU_SH5 - bool - select CPU_HAS_FPU - select SYS_SUPPORTS_SH_TMU - select SYS_SUPPORTS_HUGETLBFS if MMU - config CPU_SHX2 bool
@@ -228,8 +213,6 @@ config CPU_HAS_PMU default y bool -if SUPERH32 - choice prompt "Processor sub-type selection"
@@ -518,27 +501,6 @@ config CPU_SUBTYPE_SH7366 endchoice -endif - -if SUPERH64 - -choice - prompt "Processor sub-type selection" - -# SH-5 Processor Support - -config CPU_SUBTYPE_SH5_101 - bool "Support SH5-101 processor" - select CPU_SH5 - -config CPU_SUBTYPE_SH5_103 - bool "Support SH5-103 processor" - select CPU_SH5 - -endchoice - -endif - source "arch/sh/mm/Kconfig" source "arch/sh/Kconfig.cpu"
@@ -592,7 +554,7 @@ source "kernel/Kconfig.hz" config KEXEC bool "kexec system call (EXPERIMENTAL)" - depends on SUPERH32 && MMU + depends on MMU select KEXEC_CORE help kexec is a system call that implements the ability to shutdown your
@@ -610,7 +572,7 @@ config KEXEC config CRASH_DUMP bool "kernel crash dumps (EXPERIMENTAL)" - depends on SUPERH32 && BROKEN_ON_SMP + depends on BROKEN_ON_SMP help Generate crash dump after being started by kexec. This should be normally only set in special crash dump kernels
@@ -624,7 +586,7 @@ config CRASH_DUMP config KEXEC_JUMP bool "kexec jump (EXPERIMENTAL)" - depends on SUPERH32 && KEXEC && HIBERNATION + depends on KEXEC && HIBERNATION help Jump between original kernel and kexeced kernel and invoke code via KEXEC
@@ -701,7 +663,7 @@ config HOTPLUG_CPU config GUSA def_bool y - depends on !SMP && SUPERH32 + depends on !SMP help This enables support for gUSA (general UserSpace Atomicity). This is the default implementation for both UP and non-ll/sc
arch/sh/Kconfig.cpu +0 -9
@@ -13,7 +13,6 @@ config CPU_LITTLE_ENDIAN config CPU_BIG_ENDIAN bool "Big Endian" - depends on !CPU_SH5 endchoice
@@ -27,10 +26,6 @@ config SH_FPU This option must be set in order to enable the FPU. -config SH64_FPU_DENORM_FLUSH - bool "Flush floating point denorms to zero" - depends on SH_FPU && SUPERH64 - config SH_FPU_EMU def_bool n prompt "FPU emulation support"
@@ -77,10 +72,6 @@ config SPECULATIVE_EXECUTION If unsure, say N. -config SH64_ID2815_WORKAROUND - bool "Include workaround for SH5-101 cut2 silicon defect ID2815" - depends on CPU_SUBTYPE_SH5_101 - config CPU_HAS_INTEVT bool
arch/sh/Kconfig.debug +3 -10
@@ -5,7 +5,6 @@ config TRACE_IRQFLAGS_SUPPORT config SH_STANDARD_BIOS bool "Use LinuxSH standard BIOS" - depends on SUPERH32 help Say Y here if your target has the gdb-sh-stub package from www.m17n.org (or any conforming standard LinuxSH BIOS)
@@ -19,7 +18,7 @@ config SH_STANDARD_BIOS config STACK_DEBUG bool "Check for stack overflows" - depends on DEBUG_KERNEL && SUPERH32 + depends on DEBUG_KERNEL help This option will cause messages to be printed if free stack space drops below a certain limit. Saying Y here will add overhead to
@@ -38,7 +37,7 @@ config 4KSTACKS config IRQSTACKS bool "Use separate kernel stacks when processing interrupts" - depends on DEBUG_KERNEL && SUPERH32 && BROKEN + depends on DEBUG_KERNEL && BROKEN help If you say Y here the kernel will use separate kernel stacks for handling hard and soft interrupts. This can help avoid
@@ -46,7 +45,7 @@ config IRQSTACKS config DUMP_CODE bool "Show disassembly of nearby code in register dumps" - depends on DEBUG_KERNEL && SUPERH32 + depends on DEBUG_KERNEL default y if DEBUG_BUGVERBOSE default n help
@@ -59,7 +58,6 @@ config DUMP_CODE config DWARF_UNWINDER bool "Enable the DWARF unwinder for stacktraces" select FRAME_POINTER - depends on SUPERH32 default n help Enabling this option will make stacktraces more accurate, at
@@ -77,11 +75,6 @@ config SH_NO_BSS_INIT For all other cases, say N. If this option seems perplexing, or you aren't sure, say N. -config SH64_SR_WATCH - bool "Debug: set SR.WATCH to enable hardware watchpoints and trace" - depends on SUPERH64 - config MCOUNT def_bool y - depends on SUPERH32 depends on STACK_DEBUG || FUNCTION_TRACER
arch/sh/Makefile +5 -19
@@ -11,7 +11,7 @@ # ifneq ($(SUBARCH),$(ARCH)) ifeq ($(CROSS_COMPILE),) - CROSS_COMPILE := $(call cc-cross-prefix, $(UTS_MACHINE)-linux- $(UTS_MACHINE)-linux-gnu- $(UTS_MACHINE)-unknown-linux-gnu-) + CROSS_COMPILE := $(call cc-cross-prefix, sh-linux- sh-linux-gnu- sh-unknown-linux-gnu-) endif endif
@@ -29,12 +29,9 @@ isa-$(CONFIG_CPU_SH3) := sh3 isa-$(CONFIG_CPU_SH4) := sh4 isa-$(CONFIG_CPU_SH4A) := sh4a isa-$(CONFIG_CPU_SH4AL_DSP) := sh4al -isa-$(CONFIG_CPU_SH5) := shmedia -ifeq ($(CONFIG_SUPERH32),y) isa-$(CONFIG_SH_DSP) := $(isa-y)-dsp isa-y := $(isa-y)-up -endif cflags-$(CONFIG_CPU_SH2) := $(call cc-option,-m2,) cflags-$(CONFIG_CPU_J2) += $(call cc-option,-mj2,)
@@ -47,7 +44,6 @@ cflags-$(CONFIG_CPU_SH4) := $(call cc-option,-m4,) \ cflags-$(CONFIG_CPU_SH4A) += $(call cc-option,-m4a,) \ $(call cc-option,-m4a-nofpu,) cflags-$(CONFIG_CPU_SH4AL_DSP) += $(call cc-option,-m4al,) -cflags-$(CONFIG_CPU_SH5) := $(call cc-option,-m5-32media-nofpu,) ifeq ($(cflags-y),) #
@@ -88,7 +84,7 @@ OBJCOPYFLAGS := -O binary -R .note -R .note.gnu.build-id -R .comment \ -R .stab -R .stabstr -S # Give the various platforms the opportunity to set default image types -defaultimage-$(CONFIG_SUPERH32) := zImage +defaultimage-y := zImage defaultimage-$(CONFIG_SH_SH7785LCR) := uImage defaultimage-$(CONFIG_SH_RSK) := uImage defaultimage-$(CONFIG_SH_URQUELL) := uImage
@@ -107,24 +103,16 @@ KBUILD_IMAGE := $(boot)/$(defaultimage-y) # Choosing incompatible machines durings configuration will result in # error messages during linking. # -ifdef CONFIG_SUPERH32 UTS_MACHINE := sh BITS := 32 LDFLAGS_vmlinux += -e _stext -else -UTS_MACHINE := sh64 -BITS := 64 -LDFLAGS_vmlinux += --defsym phys_stext=_stext-$(CONFIG_PAGE_OFFSET) \ - --defsym phys_stext_shmedia=phys_stext+1 \ - -e phys_stext_shmedia -endif ifdef CONFIG_CPU_LITTLE_ENDIAN -ld-bfd := elf32-$(UTS_MACHINE)-linux +ld-bfd := elf32-sh-linux LDFLAGS_vmlinux += --defsym jiffies=jiffies_64 --oformat $(ld-bfd) KBUILD_LDFLAGS += -EL else -ld-bfd := elf32-$(UTS_MACHINE)big-linux +ld-bfd := elf32-shbig-linux LDFLAGS_vmlinux += --defsym jiffies=jiffies_64+4 --oformat $(ld-bfd) KBUILD_LDFLAGS += -EB endif
@@ -185,7 +173,6 @@ cpuincdir-$(CONFIG_CPU_SH2) += cpu-sh2 cpuincdir-$(CONFIG_CPU_SH3) += cpu-sh3 cpuincdir-$(CONFIG_CPU_SH4A) += cpu-sh4a cpuincdir-$(CONFIG_CPU_SH4) += cpu-sh4 -cpuincdir-$(CONFIG_CPU_SH5) += cpu-sh5 cpuincdir-y += cpu-common # Must be last drivers-y += arch/sh/drivers/
@@ -206,8 +193,7 @@ ifeq ($(CONFIG_DWARF_UNWINDER),y) KBUILD_CFLAGS += -fasynchronous-unwind-tables endif -libs-$(CONFIG_SUPERH32) := arch/sh/lib/ $(libs-y) -libs-$(CONFIG_SUPERH64) := arch/sh/lib64/ $(libs-y) +libs-y := arch/sh/lib/ $(libs-y) BOOT_TARGETS = uImage uImage.bz2 uImage.gz uImage.lzma uImage.xz uImage.lzo \ uImage.srec uImage.bin zImage vmlinux.bin vmlinux.srec \
arch/sh/boot/compressed/Makefile +2 -3
@@ -39,9 +39,8 @@ LDFLAGS_vmlinux := --oformat $(ld-bfd) -Ttext $(IMAGE_OFFSET) -e startup \ # # Pull in the necessary libgcc bits from the in-kernel implementation. # -lib1funcs-$(CONFIG_SUPERH32) := ashiftrt.S ashldi3.c ashrsi3.S ashlsi3.S \ - lshrsi3.S -lib1funcs-obj := \ +lib1funcs-y := ashiftrt.S ashldi3.c ashrsi3.S ashlsi3.S lshrsi3.S +lib1funcs-obj := \ $(addsuffix .o, $(basename $(addprefix $(obj)/, $(lib1funcs-y)))) lib1funcs-dir := $(srctree)/arch/$(SRCARCH)/lib
arch/sh/boot/compressed/misc.c +0 -8
@@ -116,11 +116,7 @@ void ftrace_stub(void) { } -#ifdef CONFIG_SUPERH64 -#define stackalign 8 -#else #define stackalign 4 -#endif #define STACK_SIZE (4096)long __attribute__ ((aligned (stackalign))) user_stack[STACK_SIZE ];
@@ -130,13 +126,9 @@ void decompress_kernel(void) {unsigned long output_addr; -#ifdef CONFIG_SUPERH64 - output_addr = (CONFIG_MEMORY_START +0x2000 ); -#else output_addr =__pa ((unsigned long )&_text+PAGE_SIZE );#if defined(CONFIG_29BIT ) output_addr |=P2SEG ; -#endif #endif output = (unsigned char *)output_addr;
arch/sh/drivers/pci/Makefile +0 -1
@@ -10,7 +10,6 @@ obj-$(CONFIG_CPU_SUBTYPE_SH7763) += pci-sh7780.o ops-sh4.o obj-$(CONFIG_CPU_SUBTYPE_SH7780) += pci-sh7780.o ops-sh4.o obj-$(CONFIG_CPU_SUBTYPE_SH7785) += pci-sh7780.o ops-sh4.o obj-$(CONFIG_CPU_SUBTYPE_SH7786) += pcie-sh7786.o ops-sh7786.o -obj-$(CONFIG_CPU_SH5) += pci-sh5.o ops-sh5.o obj-$(CONFIG_SH_DREAMCAST) += ops-dreamcast.o fixups-dreamcast.o \ pci-dreamcast.o
arch/sh/include/asm/barrier.h +2 -2
@@ -6,7 +6,7 @@#ifndef __ASM_SH_BARRIER_H#define __ASM_SH_BARRIER_H -#if defined(CONFIG_CPU_SH4A ) || defined(CONFIG_CPU_SH5 ) +#if defined(CONFIG_CPU_SH4A )#include <asm/cache_insns.h> #endif
@@ -24,7 +24,7 @@* Historically we have only done this type of barrier for the MMUCR, but * it's also necessary for the CCR, so we make it generic here instead. */ -#if defined(CONFIG_CPU_SH4A ) || defined(CONFIG_CPU_SH5 ) +#if defined(CONFIG_CPU_SH4A )#define mb () __asm__ __volatile__ ("synco": : :"memory")#define rmb () mb()#define wmb () mb()
arch/sh/include/asm/bitops.h +0 -26
@@ -26,7 +26,6 @@#include <asm-generic/bitops/non-atomic.h> #endif -#ifdef CONFIG_SUPERH32 static inline unsigned long ffz (unsigned long word) {unsigned long result;
@@ -60,31 +59,6 @@ static inline unsigned long __ffs(unsigned long word) : "t");return result; } -#else -static inline unsigned long ffz (unsigned long word) -{ -unsigned long result, __d2, __d3; - - __asm__("gettr tr0, %2\n\t" -"pta $+32, tr0\n\t" -"andi %1, 1, %3\n\t" -"beq %3, r63, tr0\n\t" -"pta $+4, tr0\n" -"0:\n\t" -"shlri.l %1, 1, %1\n\t" -"addi %0, 1, %0\n\t" -"andi %1, 1, %3\n\t" -"beqi %3, 1, tr0\n" -"1:\n\t" -"ptabs %2, tr0\n\t" - :"=r" (result),"=r" (word),"=r" (__d2),"=r" (__d3) - :"0" (0L ),"1" (word)); - -return result; -} - -#include <asm-generic/bitops/__ffs.h> -#endif #include <asm-generic/bitops/find.h> #include <asm-generic/bitops/ffs.h>
arch/sh/include/asm/bugs.h +0 -4
@@ -53,10 +53,6 @@ static void __init check_bugs(void) *p++ ='s' ; *p++ ='p' ;break ; -case CPU_FAMILY_SH5 : - *p++ ='6' ; - *p++ ='4' ; -break ;case CPU_FAMILY_UNKNOWN :/* * Specifically use CPU_FAMILY_UNKNOWN rather than
arch/sh/include/asm/extable.h +0 -4
@@ -4,8 +4,4 @@#include <asm-generic/extable.h> -#if defined(CONFIG_SUPERH64 ) && defined(CONFIG_MMU ) -#define ARCH_HAS_SEARCH_EXTABLE -#endif -#endif
arch/sh/include/asm/fixmap.h +0 -4
@@ -83,11 +83,7 @@ extern void __clear_fixmap(enum fixed_addresses idx, pgprot_t flags);* the start of the fixmap, and leave one page empty * at the top of mem.. */ -#ifdef CONFIG_SUPERH32 #define FIXADDR_TOP (P4SEG - PAGE_SIZE) -#else -#define FIXADDR_TOP ((unsigned long)(-PAGE_SIZE)) -#endif #define FIXADDR_SIZE (__end_of_fixed_addresses << PAGE_SHIFT)#define FIXADDR_START (FIXADDR_TOP - FIXADDR_SIZE)
arch/sh/include/asm/io.h +0 -4
@@ -115,12 +115,8 @@ static inline void pfx##reads##bwlq(volatile void __iomem *mem, \ __BUILD_MEMORY_STRING(__raw_, b, u8) __BUILD_MEMORY_STRING(__raw_, w, u16) -#ifdef CONFIG_SUPERH32 void __raw_writesl (void __iomem *addr,const void *data,int longlen);void __raw_readsl (const void __iomem *addr,void *data,int longlen); -#else -__BUILD_MEMORY_STRING(__raw_, l, u32) -#endif __BUILD_MEMORY_STRING (__raw_, q, u64)
arch/sh/include/asm/irq.h +0 -3
@@ -66,8 +66,5 @@ extern void irq_finish(unsigned int irq);#endif #include <asm-generic/irq.h> -#ifdef CONFIG_CPU_SH5 -#include <cpu/irq.h> -#endif #endif /* __ASM_SH_IRQ_H */
arch/sh/include/asm/mmu_context.h +0 -12
@@ -48,11 +48,7 @@*/ #define MMU_VPN_MASK 0xfffff000 -#if defined(CONFIG_SUPERH32 )#include <asm/mmu_context_32.h> -#else -#include <asm/mmu_context_64.h> -#endif /* * Get MMU context if needed.
@@ -74,14 +70,6 @@ static inline void get_mmu_context(struct mm_struct *mm, unsigned int cpu)*/ local_flush_tlb_all (); -#ifdef CONFIG_SUPERH64 -/* -* The SH-5 cache uses the ASIDs, requiring both the I and D -* cache to be flushed when the ASID is exhausted. Weak. -*/ -flush_cache_all (); -#endif -/* * Fix version; Note that we avoid version #0 * to distinguish NO_CONTEXT.
arch/sh/include/asm/module.h +0 -4
@@ -18,8 +18,6 @@ struct mod_arch_specific {# define MODULE_PROC_FAMILY "SH3LE "# elif definedCONFIG_CPU_SH4 # define MODULE_PROC_FAMILY "SH4LE " -# elif definedCONFIG_CPU_SH5 -# define MODULE_PROC_FAMILY "SH5LE "# else # error unknown processor family# endif
@@ -30,8 +28,6 @@ struct mod_arch_specific {# define MODULE_PROC_FAMILY "SH3BE "# elif definedCONFIG_CPU_SH4 # define MODULE_PROC_FAMILY "SH4BE " -# elif definedCONFIG_CPU_SH5 -# define MODULE_PROC_FAMILY "SH5BE "# else # error unknown processor family# endif
arch/sh/include/asm/page.h +1 -20
@@ -35,8 +35,6 @@#define HPAGE_SHIFT 22#elif defined(CONFIG_HUGETLB_PAGE_SIZE_64MB )#define HPAGE_SHIFT 26 -#elif defined(CONFIG_HUGETLB_PAGE_SIZE_512MB ) -#define HPAGE_SHIFT 29#endif #ifdef CONFIG_HUGETLB_PAGE
@@ -82,18 +80,12 @@ typedef struct { unsigned long long pgd; } pgd_t; ((x).pte_low | ((unsigned long long)(x).pte_high << 32))#define __pte (x) \ ({ pte_t __pte = {(x), ((unsigned long long)(x)) >> 32}; __pte; }) -#elif defined(CONFIG_SUPERH32 ) +#else typedef struct {unsigned long pte_low; }pte_t ;typedef struct {unsigned long pgprot; }pgprot_t ;typedef struct {unsigned long pgd; }pgd_t ;#define pte_val (x) ((x).pte_low)#define __pte (x) ((pte_t) { (x) } ) -#else -typedef struct {unsigned long long pte_low; }pte_t ; -typedef struct {unsigned long long pgprot; }pgprot_t ; -typedef struct {unsigned long pgd; }pgd_t ; -#define pte_val (x) ((x).pte_low) -#define __pte (x) ((pte_t) { (x) } )#endif #define pgd_val (x) ((x).pgd)
@@ -191,15 +183,4 @@ typedef struct page *pgtable_t;*/ #define ARCH_DMA_MINALIGN L1_CACHE_BYTES -#ifdef CONFIG_SUPERH64 -/* -* While BYTES_PER_WORD = 4 on the current sh64 ABI, GCC will still -* happily generate {ld/st}.q pairs, requiring us to have 8-byte -* alignment to avoid traps. The kmalloc alignment is guaranteed by -* virtue of L1_CACHE_BYTES, requiring this to only be special cased -* for slab caches. -*/ -#define ARCH_SLAB_MINALIGN 8 -#endif -#endif /* __ASM_SH_PAGE_H */
arch/sh/include/asm/pgtable.h +0 -17
@@ -76,18 +76,10 @@ static inline unsigned long phys_addr_mask(void)#define PTE_PHYS_MASK (phys_addr_mask() & PAGE_MASK)#define PTE_FLAGS_MASK (~(PTE_PHYS_MASK) << PAGE_SHIFT) -#ifdef CONFIG_SUPERH32 #define VMALLOC_START (P3SEG) -#else -#define VMALLOC_START (0xf0000000) -#endif #define VMALLOC_END (FIXADDR_START-2*PAGE_SIZE) -#if defined(CONFIG_SUPERH32 )#include <asm/pgtable_32.h> -#else -#include <asm/pgtable_64.h> -#endif /* * SH-X and lower (legacy) SuperH parts (SH-3, SH-4, some SH-4A) can't do page
@@ -159,15 +151,6 @@ static inline bool pte_access_permitted(pte_t pte, bool write) prot |=_PAGE_EXT (_PAGE_EXT_KERN_WRITE | _PAGE_EXT_USER_WRITE); return __pte_access_permitted(pte, prot); } -#elif defined(CONFIG_SUPERH64) -static inline bool pte_access_permitted (pte_t pte,bool write) -{ -u64 prot = _PAGE_PRESENT | _PAGE_USER | _PAGE_READ; - -if (write) - prot |= _PAGE_WRITE; -return __pte_access_permitted (pte, prot); -}#else static inline bool pte_access_permitted (pte_t pte,bool write) {
arch/sh/include/asm/posix_types.h +1 -5
@@ -1,6 +1,2 @@/* SPDX-License-Identifier: GPL-2.0 */ -# ifdef CONFIG_SUPERH32 -# include <asm/posix_types_32.h> -# else -# include <asm/posix_types_64.h> -# endif +#include <asm/posix_types_32.h>
arch/sh/include/asm/processor.h +2 -12
@@ -39,9 +39,6 @@ enum cpu_type {/* SH4AL-DSP types */ CPU_SH7343 ,CPU_SH7722 ,CPU_SH7366 ,CPU_SH7372 , -/* SH-5 types */ -CPU_SH5_101 ,CPU_SH5_103 , -/* Unknown subtype */ CPU_SH_NONE };
@@ -53,7 +50,6 @@ enum cpu_family {CPU_FAMILY_SH4 ,CPU_FAMILY_SH4A ,CPU_FAMILY_SH4AL_DSP , -CPU_FAMILY_SH5 , CPU_FAMILY_UNKNOWN, };
@@ -167,18 +163,12 @@ int vsyscall_init(void);*/ #ifdef CONFIG_CPU_SH2A extern unsigned int instruction_size (unsigned int insn); -#elif defined(CONFIG_SUPERH32 ) -#define instruction_size (insn) (2)#else -#define instruction_size (insn) (4) +#define instruction_size (insn) (2)#endif #endif /* __ASSEMBLY__ */ -#ifdef CONFIG_SUPERH32 -# include <asm/processor_32.h> -#else -# include <asm/processor_64.h> -#endif +#include <asm/processor_32.h> #endif /* __ASM_SH_PROCESSOR_H */
arch/sh/include/asm/string.h +1 -5
@@ -1,6 +1,2 @@/* SPDX-License-Identifier: GPL-2.0 */ -#ifdef CONFIG_SUPERH32 -# include <asm/string_32.h> -#else -# include <asm/string_64.h> -#endif +#include <asm/string_32.h>
arch/sh/include/asm/switch_to.h +1 -10
@@ -4,13 +4,4 @@* Copyright (C) 2003 Paul Mundt * Copyright (C) 2004 Richard Curnow */ -#ifndef __ASM_SH_SWITCH_TO_H -#define __ASM_SH_SWITCH_TO_H - -#ifdef CONFIG_SUPERH32 -# include <asm/switch_to_32.h> -#else -# include <asm/switch_to_64.h> -#endif - -#endif /* __ASM_SH_SWITCH_TO_H */ +#include <asm/switch_to_32.h>
arch/sh/include/asm/syscall.h +1 -5
@@ -4,10 +4,6 @@extern const unsigned long sys_call_table[]; -#ifdef CONFIG_SUPERH32 -# include <asm/syscall_32.h> -#else -# include <asm/syscall_64.h> -#endif +#include <asm/syscall_32.h> #endif /* __ASM_SH_SYSCALL_H */
arch/sh/include/asm/syscalls.h +1 -8
@@ -2,8 +2,6 @@#ifndef __ASM_SH_SYSCALLS_H#define __ASM_SH_SYSCALLS_H -#ifdef __KERNEL__ - asmlinkage int old_mmap(unsigned long addr, unsigned long len,unsigned long prot,unsigned long flags,int fd,unsigned long off);
@@ -11,11 +9,6 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags, unsigned long fd, unsigned long pgoff); -#ifdef CONFIG_SUPERH32 -# include <asm/syscalls_32.h> -#else -# include <asm/syscalls_64.h> -#endif +#include <asm/syscalls_32.h> -#endif /* __KERNEL__ */ #endif /* __ASM_SH_SYSCALLS_H */
arch/sh/include/asm/thread_info.h +1 -3
@@ -70,9 +70,7 @@ register unsigned long current_stack_pointer asm("r15") __used;static inline struct thread_info *current_thread_info (void ) {struct thread_info *ti; -#if defined(CONFIG_SUPERH64 ) - __asm__ __volatile__ ("getcon cr17, %0" :"=r" (ti)); -#elif defined(CONFIG_CPU_HAS_SR_RB ) +#if defined(CONFIG_CPU_HAS_SR_RB ) __asm__ __volatile__ ("stc r7_bank, %0" :"=r" (ti));#else unsigned long __dummy;
arch/sh/include/asm/tlb.h +1 -5
@@ -2,10 +2,6 @@#ifndef __ASM_SH_TLB_H#define __ASM_SH_TLB_H -#ifdef CONFIG_SUPERH64 -# include <asm/tlb_64.h> -#endif -#ifndef __ASSEMBLY__#include <linux/pagemap.h>
@@ -14,7 +10,7 @@#include <asm-generic/tlb.h> -#if defined(CONFIG_CPU_SH4 ) || defined(CONFIG_SUPERH64 ) +#if defined(CONFIG_CPU_SH4 )extern void tlb_wire_entry (struct vm_area_struct *,unsigned long ,pte_t );extern void tlb_unwire_entry (void );#else
arch/sh/include/asm/traps.h +0 -4
@@ -4,11 +4,7 @@#include <linux/compiler.h> -#ifdef CONFIG_SUPERH32 # include <asm/traps_32.h> -#else -# include <asm/traps_64.h> -#endif BUILD_TRAP_HANDLER (address_error);BUILD_TRAP_HANDLER (debug);
arch/sh/include/asm/types.h +0 -5
@@ -9,13 +9,8 @@*/ #ifndef __ASSEMBLY__ -#ifdef CONFIG_SUPERH32 typedef u16 insn_size_t ;typedef u32 reg_size_t ; -#else -typedef u32 insn_size_t ; -typedef u64 reg_size_t ; -#endif #endif /* __ASSEMBLY__ */ #endif /* __ASM_SH_TYPES_H */
arch/sh/include/asm/uaccess.h +0 -4
@@ -96,11 +96,7 @@ struct __large_struct { unsigned long buf[100]; }; __pu_err; \ }) -#ifdef CONFIG_SUPERH32 # include <asm/uaccess_32.h> -#else -# include <asm/uaccess_64.h> -#endif extern long strncpy_from_user (char *dest,const char __user *src,long count);
arch/sh/include/asm/unistd.h +1 -5
@@ -1,9 +1,5 @@/* SPDX-License-Identifier: GPL-2.0 */ -# ifdef CONFIG_SUPERH32 -# include <asm/unistd_32.h> -# else -# include <asm/unistd_64.h> -# endif +#include <asm/unistd_32.h> #define NR_syscalls __NR_syscalls
arch/sh/include/asm/user.h +0 -7
@@ -28,19 +28,12 @@* to write an integer number of pages. */ -#if defined(__SH5__) || defined(CONFIG_CPU_SH5 ) -struct user_fpu_struct { -unsigned long fp_regs[32 ]; -unsigned int fpscr; -}; -#else struct user_fpu_struct {unsigned long fp_regs[16 ];unsigned long xfp_regs[16 ];unsigned long fpscr;unsigned long fpul; }; -#endif struct user {struct pt_regs regs;/* entire machine state */
arch/sh/include/asm/vmlinux.lds.h +0 -6
@@ -15,12 +15,6 @@#define DWARF_EH_FRAME #endif -#ifdef CONFIG_SUPERH64 -#define EXTRA_TEXT \ - *(.text64) \ - *(.text..SHmedia32) -#else #define EXTRA_TEXT -#endif #endif /* __ASM_SH_VMLINUX_LDS_H */
arch/sh/include/uapi/asm/ptrace.h +0 -5
@@ -25,11 +25,6 @@#define PT_DATA_ADDR 248/* &(struct user)->start_data */ #define PT_TEXT_LEN 252 -#if defined(__SH5__) || defined(CONFIG_CPU_SH5 ) -#include <asm/ptrace_64.h> -#else #include <asm/ptrace_32.h> -#endif -#endif /* _UAPI__ASM_SH_PTRACE_H */
arch/sh/include/uapi/asm/sigcontext.h +0 -13
@@ -5,18 +5,6 @@struct sigcontext {unsigned long oldmask; -#if defined(__SH5__) || defined(CONFIG_CPU_SH5 ) -/* CPU registers */ -unsigned long long sc_regs[63 ]; -unsigned long long sc_tregs[8 ]; -unsigned long long sc_pc; -unsigned long long sc_sr; - -/* FPU registers */ -unsigned long long sc_fpregs[32 ]; -unsigned int sc_fpscr; -unsigned int sc_fpvalid; -#else /* CPU registers */ unsigned long sc_regs[16 ];unsigned long sc_pc;
@@ -32,7 +20,6 @@ struct sigcontext {unsigned int sc_fpscr;unsigned int sc_fpul; unsigned int sc_ownedfp; -#endif };#endif /* __ASM_SH_SIGCONTEXT_H */
arch/sh/include/uapi/asm/stat.h +0 -61
72 lines not on this page · raw message
arch/sh/kernel/Makefile +8 -8
@@ -3,7 +3,7 @@ # Makefile for the Linux/SuperH kernel. # -extra-y := head_$(BITS).o vmlinux.lds +extra-y := head_32.o vmlinux.lds ifdef CONFIG_FUNCTION_TRACER # Do not profile debug and lowlevel utilities
@@ -13,26 +13,26 @@ endif CFLAGS_REMOVE_return_address.o = -pg obj-y := debugtraps.o dumpstack.o \ - idle.o io.o irq.o irq_$(BITS).o kdebugfs.o \ + idle.o io.o irq.o irq_32.o kdebugfs.o \ machvec.o nmi_debug.o process.o \ - process_$(BITS).o ptrace.o ptrace_$(BITS).o \ + process_32.o ptrace.o ptrace_32.o \ reboot.o return_address.o \ - setup.o signal_$(BITS).o sys_sh.o \ - syscalls_$(BITS).o time.o topology.o traps.o \ - traps_$(BITS).o unwinder.o + setup.o signal_32.o sys_sh.o \ + syscalls_32.o time.o topology.o traps.o \ + traps_32.o unwinder.o ifndef CONFIG_GENERIC_IOMAP obj-y += iomap.o obj-$(CONFIG_HAS_IOPORT_MAP) += ioport.o endif -obj-$(CONFIG_SUPERH32) += sys_sh32.o +obj-y += sys_sh32.o obj-y += cpu/ obj-$(CONFIG_VSYSCALL) += vsyscall/ obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_SH_STANDARD_BIOS) += sh_bios.o obj-$(CONFIG_KGDB) += kgdb.o -obj-$(CONFIG_MODULES) += sh_ksyms_$(BITS).o module.o +obj-$(CONFIG_MODULES) += sh_ksyms_32.o module.o obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o obj-$(CONFIG_CRASH_DUMP) += crash_dump.o obj-$(CONFIG_STACKTRACE) += stacktrace.o
arch/sh/kernel/cpu/Makefile +0 -1
@@ -7,7 +7,6 @@ obj-$(CONFIG_CPU_SH2) = sh2/ obj-$(CONFIG_CPU_SH2A) = sh2a/ obj-$(CONFIG_CPU_SH3) = sh3/ obj-$(CONFIG_CPU_SH4) = sh4/ -obj-$(CONFIG_CPU_SH5) = sh5/ # Special cases for family ancestry.
arch/sh/kernel/cpu/init.c +1 -1
@@ -103,7 +103,7 @@ void __attribute__ ((weak)) l2_cache_init(void)/* * Generic first-level cache init */ -#if defined(CONFIG_SUPERH32 ) && !defined(CONFIG_CPU_J2 ) +#if !defined(CONFIG_CPU_J2 )static void cache_init (void ) {unsigned long ccr, flags;
arch/sh/kernel/cpu/irq/Makefile +1 -2
@@ -2,6 +2,5 @@ # # Makefile for the Linux/SuperH CPU-specific IRQ handlers. # -obj-$(CONFIG_SUPERH32) += imask.o -obj-$(CONFIG_CPU_SH5) += intc-sh5.o +obj-y += imask.o obj-$(CONFIG_CPU_HAS_IPR_IRQ) += ipr.o
arch/sh/kernel/cpu/proc.c +0 -1
@@ -24,7 +24,6 @@ static const char *cpu_name[] = { [CPU_SH7343] = "SH7343", [CPU_SH7785] = "SH7785", [CPU_SH7786] = "SH7786", [CPU_SH7757] = "SH7757", [CPU_SH7722] = "SH7722", [CPU_SHX3] = "SH-X3", - [CPU_SH5_101] = "SH5-101", [CPU_SH5_103] = "SH5-103", [CPU_MXG] = "MX-G", [CPU_SH7723] = "SH7723", [CPU_SH7366] = "SH7366", [CPU_SH7724] = "SH7724", [CPU_SH7372] = "SH7372", [CPU_SH7734] = "SH7734",
arch/sh/kernel/module.c +0 -9
@@ -46,15 +46,6 @@ int apply_relocate_add(Elf32_Shdr *sechdrs, +ELF32_R_SYM (rel[i].r_info); relocation = sym->st_value + rel[i].r_addend; -#ifdef CONFIG_SUPERH64 -/* For text addresses, bit2 of the st_other field indicates -* whether the symbol is SHmedia (1) or SHcompact (0). If -* SHmedia, the LSB of the symbol needs to be asserted -* for the CPU to be in SHmedia mode when it starts executing -* the branch target. */ - relocation |= !!(sym->st_other &4 ); -#endif -switch (ELF32_R_TYPE (rel[i].r_info)) {case R_SH_NONE :break ;
arch/sh/kernel/process.c +0 -2
@@ -23,9 +23,7 @@ EXPORT_SYMBOL(__stack_chk_guard);*/ int arch_dup_task_struct (struct task_struct *dst,struct task_struct *src) { -#ifdef CONFIG_SUPERH32 unlazy_fpu (src,task_pt_regs (src)); -#endif *dst = *src;if (src->thread.xstate) {
arch/sh/kernel/reboot.c +0 -6
@@ -4,9 +4,7 @@#include <linux/kernel.h> #include <linux/reboot.h> #include <linux/module.h> -#ifdef CONFIG_SUPERH32 #include <asm/watchdog.h> -#endif #include <asm/addrspace.h> #include <asm/reboot.h> #include <asm/tlbflush.h>
@@ -15,13 +13,11 @@void (*pm_power_off)(void );EXPORT_SYMBOL (pm_power_off); -#ifdef CONFIG_SUPERH32 static void watchdog_trigger_immediate (void ) {sh_wdt_write_cnt (0xFF );sh_wdt_write_csr (0xC2 ); } -#endif static void native_machine_restart (char * __unused) {
@@ -33,10 +29,8 @@ static void native_machine_restart(char * __unused)/* Address error with SR.BL=1 first. */ trigger_address_error (); -#ifdef CONFIG_SUPERH32 /* If that fails or is unsupported, go for the watchdog next. */ watchdog_trigger_immediate (); -#endif /* * Give up and sleep.
arch/sh/kernel/vmlinux.lds.S +5 -13
@@ -3,14 +3,7 @@ * ld script to make SuperH Linux kernel * Written by Niibe Yutaka and Paul Mundt */ -#ifdef CONFIG_SUPERH64 -#define LOAD_OFFSET PAGE_OFFSET -OUTPUT_ARCH(sh:sh5) -#else -#define LOAD_OFFSET 0 OUTPUT_ARCH(sh) -#endif - #include <asm/thread_info.h> #include <asm/cache.h> #include <asm/vmlinux.lds.h>
@@ -28,14 +21,13 @@ SECTIONS _text = .; /* Text and read-only data */ - .empty_zero_page : AT(ADDR(.empty_zero_page) - LOAD_OFFSET) { + .empty_zero_page : AT(ADDR(.empty_zero_page)) { *(.empty_zero_page) } = 0 - .text : AT(ADDR(.text) - LOAD_OFFSET) { + .text : AT(ADDR(.text)) { HEAD_TEXT TEXT_TEXT - EXTRA_TEXT SCHED_TEXT CPUIDLE_TEXT LOCK_TEXT
@@ -62,7 +54,7 @@ SECTIONS INIT_DATA_SECTION(16) . = ALIGN(4); - .machvec.init : AT(ADDR(.machvec.init) - LOAD_OFFSET) { + .machvec.init : AT(ADDR(.machvec.init)) { __machvec_start = .; *(.machvec.init) __machvec_end = .;
@@ -74,8 +66,8 @@ SECTIONS * .exit.text is discarded at runtime, not link time, to deal with * references from __bug_table */ - .exit.text : AT(ADDR(.exit.text) - LOAD_OFFSET) { EXIT_TEXT } - .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) { EXIT_DATA } + .exit.text : AT(ADDR(.exit.text)) { EXIT_TEXT } + .exit.data : AT(ADDR(.exit.data)) { EXIT_DATA } . = ALIGN(PAGE_SIZE); __init_end = .;
arch/sh/mm/Kconfig +5 -11
@@ -15,8 +15,7 @@ config MMU config PAGE_OFFSET hex - default "0x80000000" if MMU && SUPERH32 - default "0x20000000" if MMU && SUPERH64 + default "0x80000000" if MMU default "0x00000000" config FORCE_MAX_ZONEORDER
@@ -72,12 +71,11 @@ config MEMORY_SIZE config 29BIT def_bool !32BIT - depends on SUPERH32 select UNCACHED_MAPPING config 32BIT bool - default y if CPU_SH5 || !MMU + default !MMU config PMB bool "Support 32-bit physical addressing through PMB"
@@ -152,7 +150,7 @@ config ARCH_MEMORY_PROBE config IOREMAP_FIXED def_bool y - depends on X2TLB || SUPERH64 + depends on X2TLB config UNCACHED_MAPPING bool
@@ -184,7 +182,7 @@ config PAGE_SIZE_16KB config PAGE_SIZE_64KB bool "64kB" - depends on !MMU || CPU_SH4 || CPU_SH5 + depends on !MMU || CPU_SH4 help This enables support for 64kB pages, possible on all SH-4 CPUs and later.
@@ -216,10 +214,6 @@ config HUGETLB_PAGE_SIZE_64MB bool "64MB" depends on X2TLB -config HUGETLB_PAGE_SIZE_512MB - bool "512MB" - depends on CPU_SH5 - endchoice config SCHED_MC
@@ -242,7 +236,7 @@ config SH7705_CACHE_32KB choice prompt "Cache mode" - default CACHE_WRITEBACK if CPU_SH2A || CPU_SH3 || CPU_SH4 || CPU_SH5 + default CACHE_WRITEBACK if CPU_SH2A || CPU_SH3 || CPU_SH4 default CACHE_WRITETHROUGH if (CPU_SH2 && !CPU_SH2A) config CACHE_WRITEBACK
arch/sh/mm/Makefile +0 -2
@@ -10,7 +10,6 @@ cacheops-$(CONFIG_CPU_SUBTYPE_SH7619) := cache-sh2.o cacheops-$(CONFIG_CPU_SH2A) := cache-sh2a.o cacheops-$(CONFIG_CPU_SH3) := cache-sh3.o cacheops-$(CONFIG_CPU_SH4) := cache-sh4.o flush-sh4.o -cacheops-$(CONFIG_CPU_SH5) := cache-sh5.o flush-sh4.o cacheops-$(CONFIG_SH7705_CACHE_32KB) += cache-sh7705.o cacheops-$(CONFIG_CPU_SHX3) += cache-shx3.o
@@ -31,7 +30,6 @@ ifdef CONFIG_MMU debugfs-$(CONFIG_CPU_SH4) += tlb-debugfs.o tlb-$(CONFIG_CPU_SH3) := tlb-sh3.o tlb-$(CONFIG_CPU_SH4) := tlb-sh4.o tlb-urb.o -tlb-$(CONFIG_CPU_SH5) := tlb-sh5.o tlb-$(CONFIG_CPU_HAS_PTEAEX) := tlb-pteaex.o tlb-urb.o obj-y += $(tlb-y) endif
arch/sh/mm/cache.c +0 -6
@@ -355,12 +355,6 @@ void __init cpu_cache_init(void) } } -if (boot_cpu_data.family =CPU_FAMILY_SH5 ) { -extern void __weak sh5_cache_init (void ); - -sh5_cache_init (); - } - skip:emit_cache_params (); }
drivers/rtc/Kconfig +1 -1
@@ -1516,7 +1516,7 @@ config RTC_DRV_GENERIC tristate "Generic RTC support" # Please consider writing a new RTC driver instead of using the generic # RTC abstraction - depends on PARISC || M68K || PPC || SUPERH32 || COMPILE_TEST + depends on PARISC || M68K || PPC || SUPERH || COMPILE_TEST help Say Y or M here to enable RTC support on systems using the generic RTC abstraction. If you do not know what you are doing, you should
fs/Kconfig.binfmt +1 -1
@@ -39,7 +39,7 @@ config ARCH_BINFMT_ELF_STATE config BINFMT_ELF_FDPIC bool "Kernel support for FDPIC ELF binaries" default y if !BINFMT_ELF - depends on (ARM || (SUPERH32 && !MMU) || C6X) + depends on (ARM || (SUPERH && !MMU) || C6X) select ELFCORE help ELF FDPIC binaries are based on ELF, but allow the individual load
scripts/headers_install.sh +0 -3
@@ -81,9 +81,6 @@ arch/ia64/include/uapi/asm/cmpxchg.h:CONFIG_IA64_DEBUG_CMPXCHG arch/m68k/include/uapi/asm/ptrace.h:CONFIG_COLDFIRE arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_NO arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_SUPPORT -arch/sh/include/uapi/asm/ptrace.h:CONFIG_CPU_SH5 -arch/sh/include/uapi/asm/sigcontext.h:CONFIG_CPU_SH5 -arch/sh/include/uapi/asm/stat.h:CONFIG_CPU_SH5 arch/x86/include/uapi/asm/auxvec.h:CONFIG_IA32_EMULATION arch/x86/include/uapi/asm/auxvec.h:CONFIG_X86_64 arch/x86/include/uapi/asm/mman.h:CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS
Signature · 1 line
2.26.0
PATCH 2/2 sh: remove unused sh5 files
None of these files are used now that sh5 has been disabled, so they can be completely removed.
--- arch/sh/drivers/pci/ops-sh5.c | 65 - arch/sh/drivers/pci/pci-sh5.c | 217 --- arch/sh/drivers/pci/pci-sh5.h | 108 -- arch/sh/include/asm/bl_bit_64.h | 37 - arch/sh/include/asm/cache_insns_64.h | 20 - arch/sh/include/asm/mmu_context_64.h | 75 - arch/sh/include/asm/pgtable_64.h | 307 ---- arch/sh/include/asm/processor_64.h | 212 --- arch/sh/include/asm/ptrace_64.h | 14 - arch/sh/include/asm/string_64.h | 21 - arch/sh/include/asm/switch_to_64.h | 32 - arch/sh/include/asm/syscall_64.h | 75 - arch/sh/include/asm/syscalls_64.h | 18 - arch/sh/include/asm/tlb_64.h | 68 - arch/sh/include/asm/traps_64.h | 35 - arch/sh/include/asm/uaccess_64.h | 85 - arch/sh/include/cpu-sh5/cpu/addrspace.h | 12 - arch/sh/include/cpu-sh5/cpu/cache.h | 94 - arch/sh/include/cpu-sh5/cpu/irq.h | 113 -- arch/sh/include/cpu-sh5/cpu/mmu_context.h | 22 - arch/sh/include/cpu-sh5/cpu/registers.h | 103 -- arch/sh/include/cpu-sh5/cpu/rtc.h | 9 - arch/sh/include/uapi/asm/posix_types_64.h | 29 - arch/sh/include/uapi/asm/ptrace_64.h | 15 - arch/sh/include/uapi/asm/unistd_64.h | 423 ----- arch/sh/kernel/cpu/irq/intc-sh5.c | 194 -- arch/sh/kernel/cpu/sh5/Makefile | 16 - arch/sh/kernel/cpu/sh5/clock-sh5.c | 76 - arch/sh/kernel/cpu/sh5/entry.S | 2000 --------------------- arch/sh/kernel/cpu/sh5/fpu.c | 106 -- arch/sh/kernel/cpu/sh5/probe.c | 72 - arch/sh/kernel/cpu/sh5/setup-sh5.c | 121 -- arch/sh/kernel/cpu/sh5/switchto.S | 195 -- arch/sh/kernel/cpu/sh5/unwind.c | 342 ---- arch/sh/kernel/head_64.S | 346 ---- arch/sh/kernel/irq_64.c | 48 - arch/sh/kernel/process_64.c | 461 ----- arch/sh/kernel/ptrace_64.c | 576 ------ arch/sh/kernel/sh_ksyms_64.c | 51 - arch/sh/kernel/signal_64.c | 567 ------ arch/sh/kernel/syscalls_64.S | 419 ----- arch/sh/kernel/traps_64.c | 814 --------- arch/sh/lib64/Makefile | 17 - arch/sh/lib64/copy_page.S | 89 - arch/sh/lib64/copy_user_memcpy.S | 218 --- arch/sh/lib64/memcpy.S | 202 --- arch/sh/lib64/memset.S | 92 - arch/sh/lib64/panic.c | 15 - arch/sh/lib64/sdivsi3.S | 136 -- arch/sh/lib64/strcpy.S | 98 - arch/sh/lib64/strlen.S | 34 - arch/sh/lib64/udelay.c | 49 - arch/sh/lib64/udivdi3.S | 121 -- arch/sh/lib64/udivsi3.S | 60 - arch/sh/mm/cache-sh5.c | 621 ------- arch/sh/mm/tlb-sh5.c | 224 --- 56 files changed, 10589 deletions(-) delete mode 100644 arch/sh/drivers/pci/ops-sh5.c delete mode 100644 arch/sh/drivers/pci/pci-sh5.c delete mode 100644 arch/sh/drivers/pci/pci-sh5.h delete mode 100644 arch/sh/include/asm/bl_bit_64.h delete mode 100644 arch/sh/include/asm/cache_insns_64.h delete mode 100644 arch/sh/include/asm/mmu_context_64.h delete mode 100644 arch/sh/include/asm/pgtable_64.h delete mode 100644 arch/sh/include/asm/processor_64.h delete mode 100644 arch/sh/include/asm/ptrace_64.h delete mode 100644 arch/sh/include/asm/string_64.h delete mode 100644 arch/sh/include/asm/switch_to_64.h delete mode 100644 arch/sh/include/asm/syscall_64.h delete mode 100644 arch/sh/include/asm/syscalls_64.h delete mode 100644 arch/sh/include/asm/tlb_64.h delete mode 100644 arch/sh/include/asm/traps_64.h delete mode 100644 arch/sh/include/asm/uaccess_64.h delete mode 100644 arch/sh/include/cpu-sh5/cpu/addrspace.h delete mode 100644 arch/sh/include/cpu-sh5/cpu/cache.h delete mode 100644 arch/sh/include/cpu-sh5/cpu/irq.h delete mode 100644 arch/sh/include/cpu-sh5/cpu/mmu_context.h delete mode 100644 arch/sh/include/cpu-sh5/cpu/registers.h delete mode 100644 arch/sh/include/cpu-sh5/cpu/rtc.h delete mode 100644 arch/sh/include/uapi/asm/posix_types_64.h delete mode 100644 arch/sh/include/uapi/asm/ptrace_64.h delete mode 100644 arch/sh/include/uapi/asm/unistd_64.h delete mode 100644 arch/sh/kernel/cpu/irq/intc-sh5.c delete mode 100644 arch/sh/kernel/cpu/sh5/Makefile delete mode 100644 arch/sh/kernel/cpu/sh5/clock-sh5.c delete mode 100644 arch/sh/kernel/cpu/sh5/entry.S delete mode 100644 arch/sh/kernel/cpu/sh5/fpu.c delete mode 100644 arch/sh/kernel/cpu/sh5/probe.c delete mode 100644 arch/sh/kernel/cpu/sh5/setup-sh5.c delete mode 100644 arch/sh/kernel/cpu/sh5/switchto.S delete mode 100644 arch/sh/kernel/cpu/sh5/unwind.c delete mode 100644 arch/sh/kernel/head_64.S delete mode 100644 arch/sh/kernel/irq_64.c delete mode 100644 arch/sh/kernel/process_64.c delete mode 100644 arch/sh/kernel/ptrace_64.c delete mode 100644 arch/sh/kernel/sh_ksyms_64.c delete mode 100644 arch/sh/kernel/signal_64.c delete mode 100644 arch/sh/kernel/syscalls_64.S delete mode 100644 arch/sh/kernel/traps_64.c delete mode 100644 arch/sh/lib64/Makefile delete mode 100644 arch/sh/lib64/copy_page.S delete mode 100644 arch/sh/lib64/copy_user_memcpy.S delete mode 100644 arch/sh/lib64/memcpy.S delete mode 100644 arch/sh/lib64/memset.S delete mode 100644 arch/sh/lib64/panic.c delete mode 100644 arch/sh/lib64/sdivsi3.S delete mode 100644 arch/sh/lib64/strcpy.S delete mode 100644 arch/sh/lib64/strlen.S delete mode 100644 arch/sh/lib64/udelay.c delete mode 100644 arch/sh/lib64/udivdi3.S delete mode 100644 arch/sh/lib64/udivsi3.S delete mode 100644 arch/sh/mm/cache-sh5.c delete mode 100644 arch/sh/mm/tlb-sh5.c
arch/sh/drivers/pci/ops-sh5.c deleted +0 -0
arch/sh/drivers/pci/pci-sh5.c deleted +0 -0
arch/sh/drivers/pci/pci-sh5.h deleted +0 -0
arch/sh/include/asm/bl_bit_64.h deleted +0 -0
arch/sh/include/asm/cache_insns_64.h deleted +0 -0
arch/sh/include/asm/mmu_context_64.h deleted +0 -0
arch/sh/include/asm/pgtable_64.h deleted +0 -0
arch/sh/include/asm/processor_64.h deleted +0 -0
arch/sh/include/asm/ptrace_64.h deleted +0 -0
arch/sh/include/asm/string_64.h deleted +0 -0
arch/sh/include/asm/switch_to_64.h deleted +0 -0
arch/sh/include/asm/syscall_64.h deleted +0 -0
arch/sh/include/asm/syscalls_64.h deleted +0 -0
arch/sh/include/asm/tlb_64.h deleted +0 -0
arch/sh/include/asm/traps_64.h deleted +0 -0
arch/sh/include/asm/uaccess_64.h deleted +0 -0
arch/sh/include/cpu-sh5/cpu/addrspace.h deleted +0 -0
arch/sh/include/cpu-sh5/cpu/cache.h deleted +0 -0
arch/sh/include/cpu-sh5/cpu/irq.h deleted +0 -0
arch/sh/include/cpu-sh5/cpu/mmu_context.h deleted +0 -0
arch/sh/include/cpu-sh5/cpu/registers.h deleted +0 -0
arch/sh/include/cpu-sh5/cpu/rtc.h deleted +0 -0
arch/sh/include/uapi/asm/posix_types_64.h deleted +0 -0
arch/sh/include/uapi/asm/ptrace_64.h deleted +0 -0
arch/sh/include/uapi/asm/unistd_64.h deleted +0 -0
arch/sh/kernel/cpu/irq/intc-sh5.c deleted +0 -0
arch/sh/kernel/cpu/sh5/Makefile deleted +0 -0
arch/sh/kernel/cpu/sh5/clock-sh5.c deleted +0 -0
arch/sh/kernel/cpu/sh5/entry.S deleted +0 -0
arch/sh/kernel/cpu/sh5/fpu.c deleted +0 -0
arch/sh/kernel/cpu/sh5/probe.c deleted +0 -0
arch/sh/kernel/cpu/sh5/setup-sh5.c deleted +0 -0
arch/sh/kernel/cpu/sh5/switchto.S deleted +0 -0
arch/sh/kernel/cpu/sh5/unwind.c deleted +0 -0
arch/sh/kernel/head_64.S deleted +0 -0
arch/sh/kernel/irq_64.c deleted +0 -0
arch/sh/kernel/process_64.c deleted +0 -0
arch/sh/kernel/ptrace_64.c deleted +0 -0
arch/sh/kernel/sh_ksyms_64.c deleted +0 -0
arch/sh/kernel/signal_64.c deleted +0 -0
arch/sh/kernel/syscalls_64.S deleted +0 -0
arch/sh/kernel/traps_64.c deleted +0 -0
arch/sh/lib64/Makefile deleted +0 -0
arch/sh/lib64/copy_page.S deleted +0 -0
arch/sh/lib64/copy_user_memcpy.S deleted +0 -0
arch/sh/lib64/memcpy.S deleted +0 -0
arch/sh/lib64/memset.S deleted +0 -0
arch/sh/lib64/panic.c deleted +0 -0
arch/sh/lib64/sdivsi3.S deleted +0 -0
arch/sh/lib64/strcpy.S deleted +0 -0
arch/sh/lib64/strlen.S deleted +0 -0
arch/sh/lib64/udelay.c deleted +0 -0
arch/sh/lib64/udivdi3.S deleted +0 -0
arch/sh/lib64/udivsi3.S deleted +0 -0
arch/sh/mm/cache-sh5.c deleted +0 -0
arch/sh/mm/tlb-sh5.c deleted +0 -0
Signature · 1 line
2.26.0
Re: [PATCH 2/2] sh: remove unused sh5 files
Hi Arnd,
Quoted 2 lines · Arnd Bergmann
None of these files are used now that sh5 has been disabled, so they can be completely removed.
Thanks a lot!
Quoted 1 line
Signed-off-by Arnd Bergmann <[email protected]>
The following can be removed, too:
arch/sh/boot/compressed/head_64.S
arch/sh/mm/extable_64.c
arch/sh/mm/tlbex_64.c
arch/sh/mm/tlbflush_64.cGr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Re: [PATCH 2/2] sh: remove unused sh5 files
Quoted 11 lines · Geert Uytterhoeven
Hi Arnd,
Quoted 2 lines · Arnd Bergmann
None of these files are used now that sh5 has been disabled, so they can be completely removed.
Thanks a lot!
Quoted 1 line
Signed-off-by Arnd Bergmann <[email protected]>
Quoted 7 lines
Reviewed-by Geert Uytterhoeven <[email protected]>The following can be removed, too:
arch/sh/boot/compressed/head_64.S arch/sh/mm/extable_64.c arch/sh/mm/tlbex_64.c arch/sh/mm/tlbflush_64.c
Thanks, added this to the patch now, along with the corresponding Makefile changes I missed as well. I left the definition of $(BITS) in the Makefile, but removed all uses of it.
Arnd
Hi Arnd,
Quoted 4 lines · Arnd Bergmann
sh5 never became a product and has probably never really worked.
Remove it by recursively deleting all associated
Kconfigoptions and all corresponding files.
Thanks a lot!
Quoted 11 lines
For review purposes, this leaves out the files that can now be removed, in particular
arch/sh/drivers/pci/*-sh5.c
arch/sh/include/asm/*_64.h
arch/sh/include/uapi/asm/*_64.h
arch/sh/include/cpu-sh5/*
arch/sh/kernel/cpu/sh5/*
arch/sh/lib64/*
arch/sh/mm/*-sh5.c
Quoted 1 line
Signed-off-by Arnd Bergmann <[email protected]>
A few nits below...
arch/sh/Kconfig config SUPERH · line 64
Quoted 6 lines
arch/sh/Kconfig +0
-0@@ -62,7 +62,7 @@ config SUPERH <http://www.linux-sh.org/>. config SUPERH32
Why keep the SUPERH32 symbol?
Because you forgot to clean a few files?
arch/sh/include/asm/bl_bit.h:#ifdef CONFIG_SUPERH32 arch/sh/include/asm/cache_insns.h:#ifdef CONFIG_SUPERH32 arch/sh/include/asm/checksum.h:#ifdef CONFIG_SUPERH32
arch/sh/include/asm/syscalls.h line 5
Quoted 13 lines
arch/sh/Kconfig +1
-1- def_bool "$(ARCH)" = "sh" + def_bool y select ARCH_32BIT_OFF_T select GUP_GET_PTE_LOW_HIGH if X2TLB select HAVE_KPROBESarch/sh/include/asm/syscalls.h +0
-1@@ -2,8 +2,6 @@#ifndef __ASM_SH_SYSCALLS_H#define __ASM_SH_SYSCALLS_H -#ifdef __KERNEL__
Unrelated change, but I guess it doesn't hurt ;-)
Quoted 21 lines
arch/sh/include/asm/syscalls.h +1
-7- asmlinkage int old_mmap(unsigned long addr, unsigned long len,unsigned long prot,unsigned long flags,int fd,unsigned long off);@@ -11,11 +9,6 @@ asmlinkage long sys_mmap2(unsigned long addr, unsigned long len, unsigned long prot, unsigned long flags, unsigned long fd, unsigned long pgoff); -#ifdef CONFIG_SUPERH32 -# include <asm/syscalls_32.h> -#else -# include <asm/syscalls_64.h> -#endif +#include <asm/syscalls_32.h> -#endif /* __KERNEL__ */ #endif /* __ASM_SH_SYSCALLS_H */
arch/sh/include/asm/vmlinux.lds.h line 24
Quoted 10 lines
arch/sh/include/asm/vmlinux.lds.h +0
-6@@ -15,12 +15,6 @@#define DWARF_EH_FRAME #endif -#ifdef CONFIG_SUPERH64 -#define EXTRA_TEXT \ - *(.text64) \ - *(.text..SHmedia32) -#else #define EXTRA_TEXT -#endif
You might remove the empty definition, too, as you removed the sole user...
Quoted 7 lines
arch/sh/kernel/vmlinux.lds.S +0
-0@@ -28,14 +21,13 @@ SECTIONS _text = .; /* Text and read-only data */
arch/sh/kernel/vmlinux.lds.S SECTIONS · line 38
Quoted 10 lines
arch/sh/kernel/vmlinux.lds.S +2
-3- .empty_zero_page : AT(ADDR(.empty_zero_page) - LOAD_OFFSET) { + .empty_zero_page : AT(ADDR(.empty_zero_page)) { *(.empty_zero_page) } = 0 - .text : AT(ADDR(.text) - LOAD_OFFSET) { + .text : AT(ADDR(.text)) { HEAD_TEXT TEXT_TEXT - EXTRA_TEXT
... here.
arch/sh/kernel/vmlinux.lds.S SECTIONS · line 33
Quoted 3 lines
arch/sh/kernel/vmlinux.lds.S +0
-0SCHED_TEXT CPUIDLE_TEXT LOCK_TEXT
I think at least some of the following should be cleant, too:
arch/sh/include/asm/elf.h:#ifdef __SH5__ arch/sh/include/uapi/asm/posix_types.h:# ifdef __SH5__ arch/sh/include/uapi/asm/swab.h:#ifdef __SH5__ arch/sh/include/uapi/asm/swab.h:#ifdef __SH5__ arch/sh/include/uapi/asm/unistd.h:# ifdef __SH5__ tools/arch/sh/include/asm/barrier.h:#if defined(__SH4A__) || defined(__SH5__)
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Hi Arnd,
Quoted 19 lines · Geert Uytterhoeven
Quoted 4 lines · Arnd Bergmann
sh5 never became a product and has probably never really worked.
Remove it by recursively deleting all associated
Kconfigoptions and all corresponding files.Thanks a lot!
Quoted 11 lines
For review purposes, this leaves out the files that can now be removed, in particular
arch/sh/drivers/pci/*-sh5.c
arch/sh/include/asm/*_64.h
arch/sh/include/uapi/asm/*_64.h
arch/sh/include/cpu-sh5/*
arch/sh/kernel/cpu/sh5/*
arch/sh/lib64/*
arch/sh/mm/*-sh5.c
Quoted 5 lines
Quoted 1 line
Signed-off-by Arnd Bergmann <[email protected]>Reviewed-by Geert Uytterhoeven <[email protected]>A few nits below...
And you forgot to remove the tlbex_64 stuff from arch/sh/mm/Makefile.
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Hi Arnd,
Quoted 6 lines · Geert Uytterhoeven
Quoted 5 lines · Geert Uytterhoeven
Quoted 4 lines · Arnd Bergmann
sh5 never became a product and has probably never really worked.
Remove it by recursively deleting all associated
Kconfigoptions and all corresponding files.
And all the remaining BITS stuff:
arch/sh/Makefile:BITS := 32
arch/sh/Makefile:export ld-bfd BITS arch/sh/Makefile:head-y := arch/sh/kernel/head_$(BITS).oarch/sh/boot/compressed/Makefile: head_$(BITS).o misc.o piggy.o
arch/sh/boot/compressed/Makefile:OBJECTS = $(obj)/head_$(BITS).o $(obj)/misc.o $(obj)/cache.o arch/sh/boot/compressed/Makefile:ifeq ($(BITS),64)arch/sh/boot/compressed/Makefile: lib1funcs-dir := $(addsuffix
$(BITS), $(lib1funcs-dir))
arch/sh/mm/Makefile:mmu-$(CONFIG_MMU) := extable_$(BITS).o fault.o
ioremap.o kmap.o \arch/sh/mm/Makefile: pgtable.o tlbex_$(BITS).o
tlbflush_$(BITS).o
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Quoted 33 lines · Geert Uytterhoeven
Hi Arnd,
Quoted 4 lines · Arnd Bergmann
sh5 never became a product and has probably never really worked.
Remove it by recursively deleting all associated
Kconfigoptions and all corresponding files.Thanks a lot!
Quoted 11 lines
For review purposes, this leaves out the files that can now be removed, in particular
arch/sh/drivers/pci/*-sh5.c
arch/sh/include/asm/*_64.h
arch/sh/include/uapi/asm/*_64.h
arch/sh/include/cpu-sh5/*
arch/sh/kernel/cpu/sh5/*
arch/sh/lib64/*
arch/sh/mm/*-sh5.cQuoted 1 line
Signed-off-by Arnd Bergmann <[email protected]>Reviewed-by Geert Uytterhoeven <[email protected]>A few nits below...
Quoted 5 lines
arch/sh/Kconfig +0
-0@@ -62,7 +62,7 @@ config SUPERH <http://www.linux-sh.org/>.
Quoted 4 lines
arch/sh/Kconfig config SUPERH · line 64
Quoted 1 line
arch/sh/Kconfig +0
-0config SUPERH32Why keep the SUPERH32 symbol?
Because you forgot to clean a few files?
It seemed simpler this way, but I can remove it as well.
Quoted 3 lines
arch/sh/include/asm/bl_bit.h:#ifdef
CONFIG_SUPERH32arch/sh/include/asm/cache_insns.h:#ifdefCONFIG_SUPERH32arch/sh/include/asm/checksum.h:#ifdefCONFIG_SUPERH32
Ah, I had removed these at first when I renamed the *_32.h over those files, but then decided to not do that, to keep the patch easier to review.
Quoted 6 lines
Quoted 6 lines
arch/sh/include/asm/vmlinux.lds.h +0
-0@@ -15,12 +15,6 @@#define DWARF_EH_FRAME #endif
Quoted 9 lines
arch/sh/include/asm/vmlinux.lds.h line 24
Quoted 7 lines
arch/sh/include/asm/vmlinux.lds.h +0
-6-#ifdef CONFIG_SUPERH64 -#define EXTRA_TEXT \ - *(.text64) \ - *(.text..SHmedia32) -#else #define EXTRA_TEXT -#endif You might remove the empty definition, too, as you removed the sole user...
Right, I planned to remove that one and forgot.
Quoted 24 lines
Quoted 7 lines
arch/sh/kernel/vmlinux.lds.S +0
-0@@ -28,14 +21,13 @@ SECTIONS _text = .; /* Text and read-only data */arch/sh/kernel/vmlinux.lds.S SECTIONS · line 38
Quoted 10 lines
arch/sh/kernel/vmlinux.lds.S +2
-3- .empty_zero_page : AT(ADDR(.empty_zero_page) - LOAD_OFFSET) { + .empty_zero_page : AT(ADDR(.empty_zero_page)) { *(.empty_zero_page) } = 0 - .text : AT(ADDR(.text) - LOAD_OFFSET) { + .text : AT(ADDR(.text)) { HEAD_TEXT TEXT_TEXT - EXTRA_TEXT... here.
arch/sh/kernel/vmlinux.lds.S SECTIONS · line 33
Quoted 3 lines
arch/sh/kernel/vmlinux.lds.S +0
-0SCHED_TEXT CPUIDLE_TEXT LOCK_TEXT
Quoted 8 lines
I think at least some of the following should be cleant, too:
arch/sh/include/asm/elf.h:#ifdef
__SH5__arch/sh/include/uapi/asm/posix_types.h:# ifdef__SH5__arch/sh/include/uapi/asm/swab.h:#ifdef__SH5__arch/sh/include/uapi/asm/swab.h:#ifdef__SH5__arch/sh/include/uapi/asm/unistd.h:# ifdef__SH5__tools/arch/sh/include/asm/barrier.h:#ifdefined(__SH4A__)||defined(__SH5__)
Good catch, thanks!
Arnd
Rich Felker
maintainerQuoted 7 lines · Arnd Bergmann
sh5 never became a product and has probably never really worked.
Remove it by recursively deleting all associated
Kconfigoptions and all corresponding files.For review purposes, this leaves out the files that can now be removed, in particular
Thank you! I haven't reviewed this yet, but if others do before I get to it I'm happy to go with their opinions. I've been wanting to get this removed for a long time because cleaning out stuff that's not used/useful makes it easier to see what needs to be done for sh2/3/4 (rest of DT conversion, mmu support for j-core).
Rich
Quoted 16 lines · Arnd Bergmann
sh5 never became a product and has probably never really worked.
Remove it by recursively deleting all associated
Kconfigoptions and all corresponding files.For review purposes, this leaves out the files that can now be removed, in particular
arch/sh/drivers/pci/*-sh5.c
arch/sh/include/asm/*_64.h
arch/sh/include/uapi/asm/*_64.h
arch/sh/include/cpu-sh5/*
arch/sh/kernel/cpu/sh5/*
arch/sh/lib64/*
arch/sh/mm/*-sh5.c
Quoted 1 line
Signed-off-by Arnd Bergmann <[email protected]>
Acked in principle, I'll try to test that it doesn't break any of my configs this weekend.
(There are plans for 64 bit j-core that have nothing to do with SH5, and we can submit brand new infrastructure for j64 when we get there.)
Rob