sh: remove sh5 support
Subsystems (8)
Arnd Bergmann
maintainerThe following changes since commitae83d0b416db002fe95601e7f97f64b59514d936:
Linux 5.7-rc2 (2020-04-19 14:35:30 -0700)
are available in the Git repository at:
git://git.kernel.org:/pub/scm/linux/kernel/git/arnd/playground.git
tags/sh5-remove
for you to fetch changes up to 29e36fbee3be4c13ff6881a275c86d5f68acfa23:
sh: remove sh5 support (2020-04-24 22:20:55 +0200)
----------------------------------------------------------------
sh: remove sh5 support
At long last, this is the removal of the 64-bit sh5 port that never went into production.
----------------------------------------------------------------
v2: I should have fixed all the missing changes that Geert pointed out,
this time sending it as a pull request as the removal patch is too big for the mailing lists, and a 'git format-patch -D' patch is unreliable
Arnd Bergmann (1):
sh: remove sh5 support
arch/sh/Kconfig | 62 +- arch/sh/Kconfig.cpu | 9 - arch/sh/Kconfig.debug | 13 +- arch/sh/Makefile | 29 +- arch/sh/boot/compressed/Makefile | 12 +- arch/sh/boot/compressed/misc.c | 8 - arch/sh/drivers/pci/Makefile | 1 - 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/barrier.h | 4 +- arch/sh/include/asm/bitops.h | 26 - arch/sh/include/asm/bl_bit.h | 11 +- arch/sh/include/asm/bl_bit_64.h | 37 - arch/sh/include/asm/bugs.h | 4 - arch/sh/include/asm/cache_insns.h | 12 +- arch/sh/include/asm/cache_insns_64.h | 20 - arch/sh/include/asm/checksum.h | 6 +- arch/sh/include/asm/elf.h | 23 - 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/mmu_context_64.h | 75 - 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/pgtable_64.h | 307 ---- arch/sh/include/asm/posix_types.h | 6 +- arch/sh/include/asm/processor.h | 14 +- arch/sh/include/asm/processor_64.h | 212 --- arch/sh/include/asm/ptrace_64.h | 14 - arch/sh/include/asm/string.h | 6 +- arch/sh/include/asm/string_64.h | 21 - arch/sh/include/asm/switch_to.h | 11 +- arch/sh/include/asm/switch_to_64.h | 32 - arch/sh/include/asm/syscall.h | 6 +- arch/sh/include/asm/syscall_64.h | 75 - arch/sh/include/asm/syscalls.h | 9 +- arch/sh/include/asm/syscalls_64.h | 18 - arch/sh/include/asm/thread_info.h | 4 +- arch/sh/include/asm/tlb.h | 6 +- arch/sh/include/asm/tlb_64.h | 68 - arch/sh/include/asm/traps.h | 4 - arch/sh/include/asm/traps_64.h | 35 - arch/sh/include/asm/types.h | 5 - arch/sh/include/asm/uaccess.h | 4 - arch/sh/include/asm/uaccess_64.h | 85 - arch/sh/include/asm/unistd.h | 6 +- arch/sh/include/asm/user.h | 7 - arch/sh/include/asm/vmlinux.lds.h | 8 - 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.h | 8 +- arch/sh/include/uapi/asm/posix_types_64.h | 29 - arch/sh/include/uapi/asm/ptrace.h | 5 - arch/sh/include/uapi/asm/ptrace_64.h | 15 - arch/sh/include/uapi/asm/sigcontext.h | 13 - arch/sh/include/uapi/asm/stat.h | 61 - arch/sh/include/uapi/asm/swab.h | 10 - arch/sh/include/uapi/asm/unistd.h | 8 +- arch/sh/include/uapi/asm/unistd_64.h | 423 ----- 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/irq/intc-sh5.c | 194 -- arch/sh/kernel/cpu/proc.c | 1 - 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/module.c | 9 - arch/sh/kernel/process.c | 2 - arch/sh/kernel/process_64.c | 461 ----- arch/sh/kernel/ptrace_64.c | 576 ------ arch/sh/kernel/reboot.c | 6 - 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/kernel/vmlinux.lds.S | 18 +- 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/Kconfig | 16 +- arch/sh/mm/Makefile | 31 +- arch/sh/mm/cache-sh5.c | 621 ------- arch/sh/mm/cache.c | 6 - arch/sh/mm/extable_64.c | 84 - arch/sh/mm/tlb-sh5.c | 224 --- arch/sh/mm/tlbex_64.c | 166 -- arch/sh/mm/tlbflush_64.c | 172 -- drivers/rtc/Kconfig | 2 +- fs/Kconfig.binfmt | 2 +- scripts/headers_install.sh | 3 - tools/arch/sh/include/asm/barrier.h | 2 +- 117 files changed, 67 insertions(+), 11554 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/extable_64.c delete mode 100644 arch/sh/mm/tlb-sh5.c delete mode 100644 arch/sh/mm/tlbex_64.c delete mode 100644 arch/sh/mm/tlbflush_64.c
Signature · 1 line
2.26.0
Arnd Bergmann
maintainerPATCH 1/1 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.
--- arch/sh/Kconfig | 62 +- arch/sh/Kconfig.cpu | 9 - arch/sh/Kconfig.debug | 13 +- arch/sh/Makefile | 29 +- arch/sh/boot/compressed/Makefile | 12 +- arch/sh/boot/compressed/misc.c | 8 - arch/sh/drivers/pci/Makefile | 1 - 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/barrier.h | 4 +- arch/sh/include/asm/bitops.h | 26 - arch/sh/include/asm/bl_bit.h | 11 +- arch/sh/include/asm/bl_bit_64.h | 37 - arch/sh/include/asm/bugs.h | 4 - arch/sh/include/asm/cache_insns.h | 12 +- arch/sh/include/asm/cache_insns_64.h | 20 - arch/sh/include/asm/checksum.h | 6 +- arch/sh/include/asm/elf.h | 23 - 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/mmu_context_64.h | 75 - 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/pgtable_64.h | 307 ---- arch/sh/include/asm/posix_types.h | 6 +- arch/sh/include/asm/processor.h | 14 +- arch/sh/include/asm/processor_64.h | 212 --- arch/sh/include/asm/ptrace_64.h | 14 - arch/sh/include/asm/string.h | 6 +- arch/sh/include/asm/string_64.h | 21 - arch/sh/include/asm/switch_to.h | 11 +- arch/sh/include/asm/switch_to_64.h | 32 - arch/sh/include/asm/syscall.h | 6 +- arch/sh/include/asm/syscall_64.h | 75 - arch/sh/include/asm/syscalls.h | 9 +- arch/sh/include/asm/syscalls_64.h | 18 - arch/sh/include/asm/thread_info.h | 4 +- arch/sh/include/asm/tlb.h | 6 +- arch/sh/include/asm/tlb_64.h | 68 - arch/sh/include/asm/traps.h | 4 - arch/sh/include/asm/traps_64.h | 35 - arch/sh/include/asm/types.h | 5 - arch/sh/include/asm/uaccess.h | 4 - arch/sh/include/asm/uaccess_64.h | 85 - arch/sh/include/asm/unistd.h | 6 +- arch/sh/include/asm/user.h | 7 - arch/sh/include/asm/vmlinux.lds.h | 8 - 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.h | 8 +- arch/sh/include/uapi/asm/posix_types_64.h | 29 - arch/sh/include/uapi/asm/ptrace.h | 5 - arch/sh/include/uapi/asm/ptrace_64.h | 15 - arch/sh/include/uapi/asm/sigcontext.h | 13 - arch/sh/include/uapi/asm/stat.h | 61 - arch/sh/include/uapi/asm/swab.h | 10 - arch/sh/include/uapi/asm/unistd.h | 8 +- arch/sh/include/uapi/asm/unistd_64.h | 423 ----- 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/irq/intc-sh5.c | 194 -- arch/sh/kernel/cpu/proc.c | 1 - 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/module.c | 9 - arch/sh/kernel/process.c | 2 - arch/sh/kernel/process_64.c | 461 ----- arch/sh/kernel/ptrace_64.c | 576 ------ arch/sh/kernel/reboot.c | 6 - 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/kernel/vmlinux.lds.S | 18 +- 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/Kconfig | 16 +- arch/sh/mm/Makefile | 31 +- arch/sh/mm/cache-sh5.c | 621 ------- arch/sh/mm/cache.c | 6 - arch/sh/mm/extable_64.c | 84 - arch/sh/mm/tlb-sh5.c | 224 --- arch/sh/mm/tlbex_64.c | 166 -- arch/sh/mm/tlbflush_64.c | 172 -- drivers/rtc/Kconfig | 2 +- fs/Kconfig.binfmt | 2 +- scripts/headers_install.sh | 3 - tools/arch/sh/include/asm/barrier.h | 2 +- 117 files changed, 67 insertions(+), 11554 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/extable_64.c delete mode 100644 arch/sh/mm/tlb-sh5.c delete mode 100644 arch/sh/mm/tlbex_64.c delete mode 100644 arch/sh/mm/tlbflush_64.c
arch/sh/Kconfig +10 -52
@@ -54,15 +54,6 @@ config SUPERH select HAVE_NMI select NEED_SG_DMA_LENGTH select ARCH_HAS_GIGANTIC_PAGE - - help - The SuperH is a RISC processor targeted for use in embedded systems - and consumer electronics; it was also used in the Sega Dreamcast - gaming console. The SuperH port has a home page at - <http://www.linux-sh.org/>. - -config SUPERH32 - def_bool "$(ARCH)" = "sh" select ARCH_32BIT_OFF_T select GUP_GET_PTE_LOW_HIGH if X2TLB select HAVE_KPROBES
@@ -81,19 +72,15 @@ config SUPERH32 select ARCH_HIBERNATION_POSSIBLE if MMU select SPARSE_IRQ select HAVE_STACKPROTECTOR - -config SUPERH64 - def_bool "$(ARCH)" = "sh64" - select HAVE_EXIT_THREAD - select KALLSYMS + help + The SuperH is a RISC processor targeted for use in embedded systems + and consumer electronics; it was also used in the Sega Dreamcast + gaming console. The SuperH port has a home page at + <http://www.linux-sh.org/>. 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 +190,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 +209,6 @@ config CPU_HAS_PMU default y bool -if SUPERH32 - choice prompt "Processor sub-type selection"
@@ -518,27 +497,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 +550,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 +568,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 +582,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 +659,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 +7 -22
@@ -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,31 +103,22 @@ 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 -export ld-bfd BITS +export ld-bfd -head-y := arch/sh/kernel/head_$(BITS).o +head-y := arch/sh/kernel/head_32.o core-y += arch/sh/kernel/ arch/sh/mm/ arch/sh/boards/ core-$(CONFIG_SH_FPU_EMU) += arch/sh/math-emu/
@@ -185,7 +172,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 +192,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 +4 -8
@@ -8,9 +8,9 @@ targets := vmlinux vmlinux.bin vmlinux.bin.gz \ vmlinux.bin.bz2 vmlinux.bin.lzma \ vmlinux.bin.xz vmlinux.bin.lzo \ - head_$(BITS).o misc.o piggy.o + head_32.o misc.o piggy.o -OBJECTS = $(obj)/head_$(BITS).o $(obj)/misc.o $(obj)/cache.o +OBJECTS = $(obj)/head_32.o $(obj)/misc.o $(obj)/cache.o GCOV_PROFILE := n
@@ -39,15 +39,11 @@ 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 -ifeq ($(BITS),64) - lib1funcs-dir := $(addsuffix $(BITS), $(lib1funcs-dir)) -endif KBUILD_CFLAGS += -I$(lib1funcs-dir) -DDISABLE_BRANCH_PROFILING
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/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/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/bl_bit.h +1 -10
@@ -1,11 +1,2 @@/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __ASM_SH_BL_BIT_H -#define __ASM_SH_BL_BIT_H - -#ifdef CONFIG_SUPERH32 -# include <asm/bl_bit_32.h> -#else -# include <asm/bl_bit_64.h> -#endif - -#endif /* __ASM_SH_BL_BIT_H */ +#include <asm/bl_bit_32.h>
arch/sh/include/asm/bl_bit_64.h deleted +0 -0
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/cache_insns.h +1 -11
@@ -1,12 +1,2 @@/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __ASM_SH_CACHE_INSNS_H -#define __ASM_SH_CACHE_INSNS_H - - -#ifdef CONFIG_SUPERH32 -# include <asm/cache_insns_32.h> -#else -# include <asm/cache_insns_64.h> -#endif - -#endif /* __ASM_SH_CACHE_INSNS_H */ +#include <asm/cache_insns_32.h>
arch/sh/include/asm/cache_insns_64.h deleted +0 -0
arch/sh/include/asm/checksum.h +1 -5
@@ -1,6 +1,2 @@/* SPDX-License-Identifier: GPL-2.0 */ -#ifdef CONFIG_SUPERH32 -# include <asm/checksum_32.h> -#else -# include <asm-generic/checksum.h> -#endif +#include <asm/checksum_32.h>
arch/sh/include/asm/elf.h +0 -23
@@ -133,28 +133,6 @@ typedef struct user_fpu_struct elf_fpregset_t;#define ELF_PLATFORM (utsname()->machine) -#ifdef __SH5__ -#define ELF_PLAT_INIT (_r, load_addr) \ - do { _r->regs[0]=0; _r->regs[1]=0; _r->regs[2]=0; _r->regs[3]=0; \ - _r->regs[4]=0; _r->regs[5]=0; _r->regs[6]=0; _r->regs[7]=0; \ - _r->regs[8]=0; _r->regs[9]=0; _r->regs[10]=0; _r->regs[11]=0; \ - _r->regs[12]=0; _r->regs[13]=0; _r->regs[14]=0; _r->regs[15]=0; \ - _r->regs[16]=0; _r->regs[17]=0; _r->regs[18]=0; _r->regs[19]=0; \ - _r->regs[20]=0; _r->regs[21]=0; _r->regs[22]=0; _r->regs[23]=0; \ - _r->regs[24]=0; _r->regs[25]=0; _r->regs[26]=0; _r->regs[27]=0; \ - _r->regs[28]=0; _r->regs[29]=0; _r->regs[30]=0; _r->regs[31]=0; \ - _r->regs[32]=0; _r->regs[33]=0; _r->regs[34]=0; _r->regs[35]=0; \ - _r->regs[36]=0; _r->regs[37]=0; _r->regs[38]=0; _r->regs[39]=0; \ - _r->regs[40]=0; _r->regs[41]=0; _r->regs[42]=0; _r->regs[43]=0; \ - _r->regs[44]=0; _r->regs[45]=0; _r->regs[46]=0; _r->regs[47]=0; \ - _r->regs[48]=0; _r->regs[49]=0; _r->regs[50]=0; _r->regs[51]=0; \ - _r->regs[52]=0; _r->regs[53]=0; _r->regs[54]=0; _r->regs[55]=0; \ - _r->regs[56]=0; _r->regs[57]=0; _r->regs[58]=0; _r->regs[59]=0; \ - _r->regs[60]=0; _r->regs[61]=0; _r->regs[62]=0; \ - _r->tregs[0]=0; _r->tregs[1]=0; _r->tregs[2]=0; _r->tregs[3]=0; \ - _r->tregs[4]=0; _r->tregs[5]=0; _r->tregs[6]=0; _r->tregs[7]=0; \ - _r->sr = SR_FD | SR_MMU; } while (0) -#else #define ELF_PLAT_INIT (_r, load_addr) \ do { _r->regs[0]=0; _r->regs[1]=0; _r->regs[2]=0; _r->regs[3]=0; \ _r->regs[4]=0; _r->regs[5]=0; _r->regs[6]=0; _r->regs[7]=0; \
@@ -182,7 +160,6 @@ do { \ _r->regs[14 ] =0 ; \ _r->sr =SR_FD ; \ } while (0) -#endif#define SET_PERSONALITY (ex) \ set_personality(PER_LINUX_32BIT | (current->personality & (~PER_MASK)))
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/mmu_context_64.h deleted +0 -0
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/pgtable_64.h deleted +0 -0
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/processor_64.h deleted +0 -0
arch/sh/include/asm/ptrace_64.h deleted +0 -0
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/string_64.h deleted +0 -0
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/switch_to_64.h deleted +0 -0
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/syscall_64.h deleted +0 -0
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/syscalls_64.h deleted +0 -0
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/tlb_64.h deleted +0 -0
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/traps_64.h deleted +0 -0
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/uaccess_64.h deleted +0 -0
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 -8
@@ -15,12 +15,4 @@#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/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.h +1 -7
@@ -1,8 +1,2 @@/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#ifndef __KERNEL__ -# ifdef __SH5__ -# include <asm/posix_types_64.h> -# else -# include <asm/posix_types_32.h> -# endif -#endif /* __KERNEL__ */ +#include <asm/posix_types_32.h>
arch/sh/include/uapi/asm/posix_types_64.h deleted +0 -0
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/ptrace_64.h deleted +0 -0
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/include/uapi/asm/swab.h +0 -10
@@ -13,14 +13,9 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 x) { __asm__( -#ifdef __SH5__ - "byterev %1, %0\n\t" - "shari %0, 32, %0" -#else"swap.b %1, %0\n\t" "swap.w %0, %0\n\t" "swap.b %0, %0" -#endif :"=r" (x) :"r" (x));
@@ -31,12 +26,7 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 x) static inline __attribute_const__ __u16 __arch_swab16(__u16 x) { __asm__( -#ifdef __SH5__ - "byterev %1, %0\n\t" - "shari %0, 32, %0" -#else"swap.b %1, %0" -#endif :"=r" (x) :"r" (x));
arch/sh/include/uapi/asm/unistd.h +1 -7
@@ -1,8 +1,2 @@/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ -#ifndef __KERNEL__ -# ifdef __SH5__ -# include <asm/unistd_64.h> -# else -# include <asm/unistd_32.h> -# endif -#endif +#include <asm/unistd_32.h>
arch/sh/include/uapi/asm/unistd_64.h deleted +0 -0
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/irq/intc-sh5.c deleted +0 -0
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/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/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/process_64.c deleted +0 -0
arch/sh/kernel/ptrace_64.c deleted +0 -0
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/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/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/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/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 +2 -29
@@ -10,15 +10,14 @@ 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 obj-y += $(cacheops-y) mmu-y := nommu.o extable_32.o -mmu-$(CONFIG_MMU) := extable_$(BITS).o fault.o ioremap.o kmap.o \ - pgtable.o tlbex_$(BITS).o tlbflush_$(BITS).o +mmu-$(CONFIG_MMU) := extable_32.o fault.o ioremap.o kmap.o \ + pgtable.o tlbex_32.o tlbflush_32.o obj-y += $(mmu-y)
@@ -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
@@ -46,29 +44,4 @@ obj-$(CONFIG_HAVE_SRAM_POOL) += sram.o GCOV_PROFILE_pmb.o := n -# Special flags for tlbex_64.o. This puts restrictions on the number of -# caller-save registers that the compiler can target when building this file. -# This is required because the code is called from a context in entry.S where -# very few registers have been saved in the exception handler (for speed -# reasons). -# The caller save registers that have been saved and which can be used are -# r2,r3,r4,r5 : argument passing -# r15, r18 : SP and LINK -# tr0-4 : allow all caller-save TR's. The compiler seems to be able to make -# use of them, so it's probably beneficial to performance to save them -# and have them available for it. -# -# The resources not listed below are callee save, i.e. the compiler is free to -# use any of them and will spill them to the stack itself. - -CFLAGS_tlbex_64.o += -ffixed-r7 \ - -ffixed-r8 -ffixed-r9 -ffixed-r10 -ffixed-r11 -ffixed-r12 \ - -ffixed-r13 -ffixed-r14 -ffixed-r16 -ffixed-r17 -ffixed-r19 \ - -ffixed-r20 -ffixed-r21 -ffixed-r22 -ffixed-r23 \ - -ffixed-r24 -ffixed-r25 -ffixed-r26 -ffixed-r27 \ - -ffixed-r36 -ffixed-r37 -ffixed-r38 -ffixed-r39 -ffixed-r40 \ - -ffixed-r41 -ffixed-r42 -ffixed-r43 \ - -ffixed-r60 -ffixed-r61 -ffixed-r62 \ - -fomit-frame-pointer - ccflags-y := -Werror
arch/sh/mm/cache-sh5.c deleted +0 -0
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 (); }
arch/sh/mm/extable_64.c deleted +0 -0
arch/sh/mm/tlb-sh5.c deleted +0 -0
arch/sh/mm/tlbex_64.c deleted +0 -0
arch/sh/mm/tlbflush_64.c deleted +0 -0
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
tools/arch/sh/include/asm/barrier.h +1 -1
@@ -22,7 +22,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(__SH4A__) || defined(__SH5__) +#if defined(__SH4A__)#define mb () __asm__ __volatile__ ("synco": : :"memory")#define rmb () mb()#define wmb () mb()
Signature · 1 line
2.26.0
Any progress on this? I plan to resend the sh dma-mapping I've been trying to get upstream for a year again, and they would conflict, so I could look into rebasing them first.
Quoted 201 lines · Arnd Bergmann
The following changes since commit
ae83d0b416db002fe95601e7f97f64b59514d936:Linux 5.7-rc2 (2020-04-19 14:35:30 -0700)
are available in the Git repository at:
git://git.kernel.org:/pub/scm/linux/kernel/git/arnd/playground.git
tags/sh5-removefor you to fetch changes up to
29e36fbee3be4c13ff6881a275c86d5f68acfa23:sh: remove sh5 support (2020-04-24 22:20:55 +0200)
----------------------------------------------------------------
sh: remove sh5 supportAt long last, this is the removal of the 64-bit sh5 port that never went into production.
Signed-off-by Arnd Bergmann <[email protected]>----------------------------------------------------------------
v2: I should have fixed all the missing changes that Geert pointed out,
this time sending it as a pull request as the removal patch is too big for the mailing lists, and a 'git format-patch -D' patch is unreliableArnd Bergmann (1):
sh: remove sh5 supportarch/sh/Kconfig | 62 +- arch/sh/Kconfig.cpu | 9 - arch/sh/Kconfig.debug | 13 +- arch/sh/Makefile | 29 +- arch/sh/boot/compressed/Makefile | 12 +- arch/sh/boot/compressed/misc.c | 8 - arch/sh/drivers/pci/Makefile | 1 - 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/barrier.h | 4 +- arch/sh/include/asm/bitops.h | 26 - arch/sh/include/asm/bl_bit.h | 11 +- arch/sh/include/asm/bl_bit_64.h | 37 - arch/sh/include/asm/bugs.h | 4 - arch/sh/include/asm/cache_insns.h | 12 +- arch/sh/include/asm/cache_insns_64.h | 20 - arch/sh/include/asm/checksum.h | 6 +- arch/sh/include/asm/elf.h | 23 - 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/mmu_context_64.h | 75 - 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/pgtable_64.h | 307 ---- arch/sh/include/asm/posix_types.h | 6 +- arch/sh/include/asm/processor.h | 14 +- arch/sh/include/asm/processor_64.h | 212 --- arch/sh/include/asm/ptrace_64.h | 14 - arch/sh/include/asm/string.h | 6 +- arch/sh/include/asm/string_64.h | 21 - arch/sh/include/asm/switch_to.h | 11 +- arch/sh/include/asm/switch_to_64.h | 32 - arch/sh/include/asm/syscall.h | 6 +- arch/sh/include/asm/syscall_64.h | 75 - arch/sh/include/asm/syscalls.h | 9 +- arch/sh/include/asm/syscalls_64.h | 18 - arch/sh/include/asm/thread_info.h | 4 +- arch/sh/include/asm/tlb.h | 6 +- arch/sh/include/asm/tlb_64.h | 68 - arch/sh/include/asm/traps.h | 4 - arch/sh/include/asm/traps_64.h | 35 - arch/sh/include/asm/types.h | 5 - arch/sh/include/asm/uaccess.h | 4 - arch/sh/include/asm/uaccess_64.h | 85 - arch/sh/include/asm/unistd.h | 6 +- arch/sh/include/asm/user.h | 7 - arch/sh/include/asm/vmlinux.lds.h | 8 - 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.h | 8 +- arch/sh/include/uapi/asm/posix_types_64.h | 29 - arch/sh/include/uapi/asm/ptrace.h | 5 - arch/sh/include/uapi/asm/ptrace_64.h | 15 - arch/sh/include/uapi/asm/sigcontext.h | 13 - arch/sh/include/uapi/asm/stat.h | 61 - arch/sh/include/uapi/asm/swab.h | 10 - arch/sh/include/uapi/asm/unistd.h | 8 +- arch/sh/include/uapi/asm/unistd_64.h | 423 ----- 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/irq/intc-sh5.c | 194 -- arch/sh/kernel/cpu/proc.c | 1 - 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/module.c | 9 - arch/sh/kernel/process.c | 2 - arch/sh/kernel/process_64.c | 461 ----- arch/sh/kernel/ptrace_64.c | 576 ------ arch/sh/kernel/reboot.c | 6 - 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/kernel/vmlinux.lds.S | 18 +- 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/Kconfig | 16 +- arch/sh/mm/Makefile | 31 +- arch/sh/mm/cache-sh5.c | 621 ------- arch/sh/mm/cache.c | 6 - arch/sh/mm/extable_64.c | 84 - arch/sh/mm/tlb-sh5.c | 224 --- arch/sh/mm/tlbex_64.c | 166 -- arch/sh/mm/tlbflush_64.c | 172 -- drivers/rtc/Kconfig | 2 +- fs/Kconfig.binfmt | 2 +- scripts/headers_install.sh | 3 - tools/arch/sh/include/asm/barrier.h | 2 +- 117 files changed, 67 insertions(+), 11554 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
Quoted 12 lines
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/extable_64.c delete mode 100644 arch/sh/mm/tlb-sh5.c delete mode 100644 arch/sh/mm/tlbex_64.c delete mode 100644 arch/sh/mm/tlbflush_64.cSignature · 1 line
2.26.0
---end quoted text---
[adding Linus]
Quoted 3 lines · Christoph Hellwig
Any progress on this? I plan to resend the sh dma-mapping I've been trying to get upstream for a year again, and they would conflict, so I could look into rebasing them first.
So for years now it has been close to and in the end impossible to provoke sh maintainer action. At the same point hardware is pretty much long gone for the real commercial variants, and never took off for the open hardware nommu variant.
Linus, would you ok with a 5.8 pull request to just kill off arch/sh/?
Quoted 212 lines · Arnd Bergmann
Quoted 210 lines
The following changes since commit
ae83d0b416db002fe95601e7f97f64b59514d936:Linux 5.7-rc2 (2020-04-19 14:35:30 -0700)
are available in the Git repository at:
git://git.kernel.org:/pub/scm/linux/kernel/git/arnd/playground.git
tags/sh5-removefor you to fetch changes up to
29e36fbee3be4c13ff6881a275c86d5f68acfa23:sh: remove sh5 support (2020-04-24 22:20:55 +0200)
----------------------------------------------------------------
sh: remove sh5 supportAt long last, this is the removal of the 64-bit sh5 port that never went into production.
Signed-off-by Arnd Bergmann <[email protected]>----------------------------------------------------------------
v2: I should have fixed all the missing changes that Geert pointed out,
this time sending it as a pull request as the removal patch is too big for the mailing lists, and a 'git format-patch -D' patch is unreliableArnd Bergmann (1):
sh: remove sh5 supportarch/sh/Kconfig | 62 +- arch/sh/Kconfig.cpu | 9 - arch/sh/Kconfig.debug | 13 +- arch/sh/Makefile | 29 +- arch/sh/boot/compressed/Makefile | 12 +- arch/sh/boot/compressed/misc.c | 8 - arch/sh/drivers/pci/Makefile | 1 - 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/barrier.h | 4 +- arch/sh/include/asm/bitops.h | 26 - arch/sh/include/asm/bl_bit.h | 11 +- arch/sh/include/asm/bl_bit_64.h | 37 - arch/sh/include/asm/bugs.h | 4 - arch/sh/include/asm/cache_insns.h | 12 +- arch/sh/include/asm/cache_insns_64.h | 20 - arch/sh/include/asm/checksum.h | 6 +- arch/sh/include/asm/elf.h | 23 - 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/mmu_context_64.h | 75 - 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/pgtable_64.h | 307 ---- arch/sh/include/asm/posix_types.h | 6 +- arch/sh/include/asm/processor.h | 14 +- arch/sh/include/asm/processor_64.h | 212 --- arch/sh/include/asm/ptrace_64.h | 14 - arch/sh/include/asm/string.h | 6 +- arch/sh/include/asm/string_64.h | 21 - arch/sh/include/asm/switch_to.h | 11 +- arch/sh/include/asm/switch_to_64.h | 32 - arch/sh/include/asm/syscall.h | 6 +- arch/sh/include/asm/syscall_64.h | 75 - arch/sh/include/asm/syscalls.h | 9 +- arch/sh/include/asm/syscalls_64.h | 18 - arch/sh/include/asm/thread_info.h | 4 +- arch/sh/include/asm/tlb.h | 6 +- arch/sh/include/asm/tlb_64.h | 68 - arch/sh/include/asm/traps.h | 4 - arch/sh/include/asm/traps_64.h | 35 - arch/sh/include/asm/types.h | 5 - arch/sh/include/asm/uaccess.h | 4 - arch/sh/include/asm/uaccess_64.h | 85 - arch/sh/include/asm/unistd.h | 6 +- arch/sh/include/asm/user.h | 7 - arch/sh/include/asm/vmlinux.lds.h | 8 - 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.h | 8 +- arch/sh/include/uapi/asm/posix_types_64.h | 29 - arch/sh/include/uapi/asm/ptrace.h | 5 - arch/sh/include/uapi/asm/ptrace_64.h | 15 - arch/sh/include/uapi/asm/sigcontext.h | 13 - arch/sh/include/uapi/asm/stat.h | 61 - arch/sh/include/uapi/asm/swab.h | 10 - arch/sh/include/uapi/asm/unistd.h | 8 +- arch/sh/include/uapi/asm/unistd_64.h | 423 ----- 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/irq/intc-sh5.c | 194 -- arch/sh/kernel/cpu/proc.c | 1 - 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/module.c | 9 - arch/sh/kernel/process.c | 2 - arch/sh/kernel/process_64.c | 461 ----- arch/sh/kernel/ptrace_64.c | 576 ------ arch/sh/kernel/reboot.c | 6 - 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/kernel/vmlinux.lds.S | 18 +- 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/Kconfig | 16 +- arch/sh/mm/Makefile | 31 +- arch/sh/mm/cache-sh5.c | 621 ------- arch/sh/mm/cache.c | 6 - arch/sh/mm/extable_64.c | 84 - arch/sh/mm/tlb-sh5.c | 224 --- arch/sh/mm/tlbex_64.c | 166 -- arch/sh/mm/tlbflush_64.c | 172 -- drivers/rtc/Kconfig | 2 +- fs/Kconfig.binfmt | 2 +- scripts/headers_install.sh | 3 - tools/arch/sh/include/asm/barrier.h | 2 +- 117 files changed, 67 insertions(+), 11554 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/extable_64.c delete mode 100644 arch/sh/mm/tlb-sh5.c delete mode 100644 arch/sh/mm/tlbex_64.c delete mode 100644 arch/sh/mm/tlbflush_64.c
Quoted 4 lines
Quoted 3 lines
Signature · 1 line
2.26.0---end quoted text---
---end quoted text---
John Paul Adrian Glaubitz
maintainerQuoted 7 lines · Christoph Hellwig
[adding Linus]
Quoted 3 lines · Christoph Hellwig
Any progress on this? I plan to resend the sh dma-mapping I've been trying to get upstream for a year again, and they would conflict, so I could look into rebasing them first.
Quoted 6 lines
So for years now it has been close to and in the end impossible to provoke sh maintainer action. At the same point hardware is pretty much long gone for the real commercial variants, and never took off for the open hardware nommu variant.
Linus, would you ok with a 5.8 pull request to just kill off
arch/sh/?
We're maintaining SH in Debian so I'm interested in keeping arch/sh, but I'm also let down that SH maintainers aren't that active at the moment.
I do know that Yoshinori Sato has a tree where he takes patches and sends PRs from time to time, but I have no idea what is going on.
Adrian
Signature · 4 lines
.''`. John Paul Adrian Glaubitz : :' : Debian Developer - [email protected] `. `' Freie Universitaet Berlin - [email protected] `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
Quoted 13 lines · John Paul Adrian Glaubitz
Quoted 12 lines · Christoph Hellwig
[adding Linus]
Quoted 3 lines · Christoph Hellwig
Any progress on this? I plan to resend the sh dma-mapping I've been trying to get upstream for a year again, and they would conflict, so I could look into rebasing them first.
So for years now it has been close to and in the end impossible to provoke sh maintainer action. At the same point hardware is pretty much long gone for the real commercial variants, and never took off for the open hardware nommu variant.
Quoted 7 lines
Quoted 1 line
Linus, would you ok with a 5.8 pull request to just kill off
arch/sh/?We're maintaining SH in Debian so I'm interested in keeping
arch/sh, but I'm also let down that SH maintainers aren't that active at the moment.I do know that Yoshinori Sato has a tree where he takes patches and sends PRs from time to time, but I have no idea what is going on.
There are still people who care about the architecture and try to get fixes in:
https://www.spinics.net/lists/linux-sh/msg56844.html
Alas, I haven't had better luck getting Rich's attention, and I say that as someone who has his phone number.
It met Sato-san for lunch once years ago, but he lives in Tokyo and english is not his first language. I was under the impression he became co-maintainer to show Rich the ropes of maintainership and to answer obscure architectural questions, not because he was volunteering for significantly more work. Rich was supposed to be load bearing.
I don't really have the domain expertise to do it myself... :(
Rob
Rich Felker
maintainerQuoted 7 lines · Christoph Hellwig
[adding Linus]
Quoted 3 lines · Christoph Hellwig
Any progress on this? I plan to resend the sh dma-mapping I've been trying to get upstream for a year again, and they would conflict, so I could look into rebasing them first.
Quoted 6 lines
So for years now it has been close to and in the end impossible to provoke sh maintainer action. At the same point hardware is pretty much long gone for the real commercial variants, and never took off for the open hardware nommu variant.
Linus, would you ok with a 5.8 pull request to just kill off
arch/sh/?
It is in active use. Please do not act on such a request. I would be much quicker to ack things that actually need ack if I weren't CC'd on hundreds of random non-arch-specific changes that don't need it, but I understand that's how the kernel process works. If there are things that need ack please feel free to ping.
Note that I specifically acked and requested the sh5 removal.
Rich
Rich Felker
maintainerQuoted 15 lines · Rich Felker
Quoted 7 lines · Christoph Hellwig
[adding Linus]
Quoted 3 lines · Christoph Hellwig
Any progress on this? I plan to resend the sh dma-mapping I've been trying to get upstream for a year again, and they would conflict, so I could look into rebasing them first.
Quoted 6 lines
So for years now it has been close to and in the end impossible to provoke sh maintainer action. At the same point hardware is pretty much long gone for the real commercial variants, and never took off for the open hardware nommu variant.
Linus, would you ok with a 5.8 pull request to just kill off
arch/sh/?
Quoted 7 lines
It is in active use. Please do not act on such a request. I would be much quicker to ack things that actually need ack if I weren't CC'd on hundreds of random non-arch-specific changes that don't need it, but I understand that's how the kernel process works. If there are things that need ack please feel free to ping.
Note that I specifically acked and requested the sh5 removal.
To follow up, I see that there was a patch series of yours (3/24) I missed ack'ing fairly recently. At first glance it looks good. It happened to arrive while I was getting over being horribly sick with what I thought was covid19. If there's further action needed on it I'll address it asap now that I'm aware of it.
In general, most of the patches I see are things that the linux-sh list and myself end up cc'd on that are only tangentially related to arch/sh or even not related at all. In that case I normally trust other maintainers familiar with the cross-arch changes being made that the small arch/sh part of the change is ok if the broader change is abstractly ok.
Part of why I really disliked the "just kill it all" response to this thread is that the sh5 removal is specifically for the sake of making the arch more maintainable. That, along with forward-porting Sato's SH4 device tree patches (I've tried this but ran into problems, and need some help with it), has long been on my agenda for the arch, to reduce (and ultimately eliminate) the amount of legacy "only on arch/sh" stuff left so that it's not a burden on other maintainers and contributors. Seeing sentiment along the lines of "why don't you just remove it all while you're at it?" as a response is disheartening and also dismissive of Arnd's work making the sh5 removal happen.
Aside from that, the open source & open hardware J-core models are still active and in development, with the latest release having been made this month, and the J32 with MMU nearly complete and pending release, contingent mostly on integration and testing with Linux.
Quoted 4 lines · Rich Felker
Aside from that, the open source & open hardware J-core models are still active and in development, with the latest release having been made this month, and the J32 with MMU nearly complete and pending release, contingent mostly on integration and testing with Linux.
J-core's doing stuff:
https://www.reddit.com/r/IAmA/comments/gs7qpn/we_are_jeff_garzik_and_jeff_dionne_and_we_are/
And I note that I worked a year long contract in 2018 porting an existing sh4 Windows CE board to Linux (as a field upgrade to a widely deployed building control system with a big stock of parts to build replacement units), so conventional superh isn't exactly dead either.
Rob
John Paul Adrian Glaubitz
maintainerHello Rich!
Quoted 5 lines · Rich Felker
To follow up, I see that there was a patch series of yours (3/24) I missed ack'ing fairly recently. At first glance it looks good. It happened to arrive while I was getting over being horribly sick with what I thought was covid19. If there's further action needed on it I'll address it asap now that I'm aware of it.
Glad to hear from you again! I hope you have fully recovered!
Quoted 7 lines
In general, most of the patches I see are things that the linux-sh list and myself end up cc'd on that are only tangentially related to
arch/shor even not related at all. In that case I normally trust other maintainers familiar with the cross-arch changes being made that the smallarch/shpart of the change is ok if the broader change is abstractly ok.
Quoted 10 lines
Part of why I really disliked the "just kill it all" response to this thread is that the sh5 removal is specifically for the sake of making the arch more maintainable. That, along with forward-porting Sato's SH4 device tree patches (I've tried this but ran into problems, and need some help with it), has long been on my agenda for the arch, to reduce (and ultimately eliminate) the amount of legacy "only on
arch/sh" stuff left so that it's not a burden on other maintainers and contributors. Seeing sentiment along the lines of "why don't you just remove it all while you're at it?" as a response is disheartening and also dismissive of Arnd's work making the sh5 removal happen.
I agree. I have also poured endless hours into Debian's sh4 port fixing dozens of bugs myself and reporting them upstream whenever I couldn't fix them myself.
I would also like to add that getting device tree support into SH would be a huge leap forward and I would be happy to help with the efforts. I still have some LANDISK and NextVoD devices available if anyone needs hardware for testing and development, FWIW.
Would be great to also hear back from Sato-san, he is still active on his other Linux trees [1].
Quoted 4 lines
Aside from that, the open source & open hardware J-core models are still active and in development, with the latest release having been made this month, and the J32 with MMU nearly complete and pending release, contingent mostly on integration and testing with Linux.
And I'm still very much looking forward to these. I will certainly buy a bunch of J32 to use them as buildds for Debian's sh4 port!
Thanks,
Adrian
Quoted 1 line
[1] https://osdn.net/projects/uclinux-h8/scm/git/linux/branches
Signature · 4 lines
.''`. John Paul Adrian Glaubitz : :' : Debian Developer - [email protected] `. `' Freie Universitaet Berlin - [email protected] `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
Rich Felker
maintainerQuoted 10 lines · John Paul Adrian Glaubitz
Hello Rich!
Quoted 5 lines · Rich Felker
To follow up, I see that there was a patch series of yours (3/24) I missed ack'ing fairly recently. At first glance it looks good. It happened to arrive while I was getting over being horribly sick with what I thought was covid19. If there's further action needed on it I'll address it asap now that I'm aware of it.
Glad to hear from you again! I hope you have fully recovered!
Yes, but it took a good while to get fully better, and according to tests it wasn't even covid19. Certainly shaped my view on taking the pandemic seriously at an appropriate time, though!
Quoted 18 lines
Quoted 7 lines
In general, most of the patches I see are things that the linux-sh list and myself end up cc'd on that are only tangentially related to
arch/shor even not related at all. In that case I normally trust other maintainers familiar with the cross-arch changes being made that the smallarch/shpart of the change is ok if the broader change is abstractly ok.Quoted 10 lines
Part of why I really disliked the "just kill it all" response to this thread is that the sh5 removal is specifically for the sake of making the arch more maintainable. That, along with forward-porting Sato's SH4 device tree patches (I've tried this but ran into problems, and need some help with it), has long been on my agenda for the arch, to reduce (and ultimately eliminate) the amount of legacy "only on
arch/sh" stuff left so that it's not a burden on other maintainers and contributors. Seeing sentiment along the lines of "why don't you just remove it all while you're at it?" as a response is disheartening and also dismissive of Arnd's work making the sh5 removal happen.
Quoted 8 lines
I agree. I have also poured endless hours into Debian's sh4 port fixing dozens of bugs myself and reporting them upstream whenever I couldn't fix them myself.
I would also like to add that getting device tree support into SH would be a huge leap forward and I would be happy to help with the efforts. I still have some LANDISK and NextVoD devices available if anyone needs hardware for testing and development, FWIW.
And I still have the NextVoD and LANDISK. The NextVoD is ST-based, so not supported at all by upstream kernel, only the abandoned stlinux. I've long wanted to pull support for ST hardware back into mainline, and I think DT makes this viable rather than just a huge new mess on top of undermaintained code, but it'll need help to make it happen.
Quoted 2 lines
Would be great to also hear back from Sato-san, he is still active on his other Linux trees [1].
Yes.
Quoted 7 lines
Quoted 4 lines
Aside from that, the open source & open hardware J-core models are still active and in development, with the latest release having been made this month, and the J32 with MMU nearly complete and pending release, contingent mostly on integration and testing with Linux.
And I'm still very much looking forward to these. I will certainly buy a bunch of J32 to use them as buildds for Debian's sh4 port!
Great!
Rich
Quoted 2 lines · Rich Felker
To follow up, I see that there was a patch series of yours (3/24) I missed ack'ing fairly recently. At first glance it looks good.
Well, I need a formal ACK, or even better have the arch maintainer pick it up, as that is how development is normally supposed to work.
Quoted 6 lines
In general, most of the patches I see are things that the linux-sh list and myself end up cc'd on that are only tangentially related to
arch/shor even not related at all. In that case I normally trust other maintainers familiar with the cross-arch changes being made that the smallarch/shpart of the change is ok if the broader change is abstractly ok.
FYI, if you want to reduce the amount of crap you get Cced on, you can add yourself to .get_maintainer.ignore file in the kernel tree, as that at least removes a lot of the pass by cleanups found from git log.
Quoted 10 lines
Part of why I really disliked the "just kill it all" response to this thread is that the sh5 removal is specifically for the sake of making the arch more maintainable. That, along with forward-porting Sato's SH4 device tree patches (I've tried this but ran into problems, and need some help with it), has long been on my agenda for the arch, to reduce (and ultimately eliminate) the amount of legacy "only on
arch/sh" stuff left so that it's not a burden on other maintainers and contributors. Seeing sentiment along the lines of "why don't you just remove it all while you're at it?" as a response is disheartening and also dismissive of Arnd's work making the sh5 removal happen.
We had the discussion before and things like the sh5 removal and device tree switch came out of it. But since then exactly nothing has happened - the arch code is still pretty much unmaintained and impossible to get a review for. No one expects super quick responses for a legacy architecture, but if there is no way to get feedback or patches queued up while the code keeps on bitrotting the architecture is effectively dead. I have no personal problem with the sh hardware, but if we want a Linux port to survive it will need at least a minimum amount of active maintainance.
Quoted 7 lines · Rich Felker
It is in active use. Please do not act on such a request. I would be much quicker to ack things that actually need ack if I weren't CC'd on hundreds of random non-arch-specific changes that don't need it, but I understand that's how the kernel process works. If there are things that need ack please feel free to ping.
Note that I specifically acked and requested the sh5 removal.
But you did not actually pick it up - because of that it still isn't in linux-next and thus most likely will miss Linux 5.8.
Rich Felker
maintainerQuoted 11 lines · Christoph Hellwig
Quoted 7 lines · Rich Felker
It is in active use. Please do not act on such a request. I would be much quicker to ack things that actually need ack if I weren't CC'd on hundreds of random non-arch-specific changes that don't need it, but I understand that's how the kernel process works. If there are things that need ack please feel free to ping.
Note that I specifically acked and requested the sh5 removal.
But you did not actually pick it up - because of that it still isn't in linux-next and thus most likely will miss Linux 5.8.
Arnd sent the pull request for this and I expected it to be pulled from his tree, since he already had my approval for the change. Maybe Linus was expecting it to come through me. This seems to have been a miscommunication.
Frustratingly, I _still_ don't have an official tree on kernel.org for the purpose of being the canonical place for linux-next to pull from, due to policies around pgp keys and nobody following up on signing mine. This is all really silly since there are ridiculously many independent channels I could cryptographically validate identity through with vanishing probability that they're all compromised. For the time being I'll reactivate my repo on git.musl-libc.org.
Rich
Quoted 7 lines · Rich Felker
Frustratingly, I _still_ don't have an official tree on kernel.org for the purpose of being the canonical place for linux-next to pull from, due to policies around pgp keys and nobody following up on signing mine. This is all really silly since there are ridiculously many independent channels I could cryptographically validate identity through with vanishing probability that they're all compromised. For the time being I'll reactivate my repo on git.musl-libc.org.
You don't need a kernel.org tree. None of the trees I maintain are hosted on kernel.org. Just make sure you sign your tags.
John Paul Adrian Glaubitz
maintainerQuoted 7 lines · Rich Felker
Frustratingly, I _still_ don't have an official tree on kernel.org for the purpose of being the canonical place for linux-next to pull from, due to policies around pgp keys and nobody following up on signing mine. This is all really silly since there are ridiculously many independent channels I could cryptographically validate identity through with vanishing probability that they're all compromised. For the time being I'll reactivate my repo on git.musl-libc.org.
May I suggest to pick up these patches, for example? There might be more I missed, but getting these merged should already help a lot with the clean-up of arch/sh.
Quoted 44 lines
[RESEND PATCH v2] sh: sh4a: Bring back
tmu3_deviceearly device
https://marc.info/?l=linux-sh&m9061283109675&w=2[PATCH] sh: Drop
CONFIG_MTD_M25P80insh7757lcr_defconfig
https://marc.info/?l=linux-sh&m8839364811658&w=2[PATCH v2] sh: Replace
CONFIG_MTD_M25P80withCONFIG_MTD_SPI_NORinsh7757lcr_defconfig
https://marc.info/?l=linux-sh&m8841749817761&w=2[PATCH 1/1] sh: remove sh5 support
https://marc.info/?l=linux-sh&m8776683125080&w=2sh/mm: Fix a build failure via adding a missing bracket
https://marc.info/?l=linux-sh&m8736532105299&w=2[PATCH 1/2]
arch/sh: vmlinux.scr
https://marc.info/?l=linux-sh&m8429470120959&w=2[PATCH] sh: configs: Cleanup old
KconfigIO scheduler options
https://marc.info/?l=linux-sh&m8195850120215&w=2[PATCH resend 0/3] SH: compile fixup patches
https://marc.info/?l=linux-renesas-soc&m7948330821790&w=2
https://marc.info/?l=linux-sh&m7852970316892&w=2
https://marc.info/?l=linux-sh&m7852984016938&w=2[PATCH][repost] sh: clkfwk: remove r8/r16/r32
https://marc.info/?l=linux-renesas-soc&m7852973916903&w=2[PATCH] sh: clk: Fix discarding const qualifier warning
https://marc.info/?l=linux-sh&m7839999010776&w=2[PATCH next] sh: remove call to memset after
dma_alloc_coherent
https://marc.info/?l=linux-sh&m7793031102356&w=2[PATCH] sh: use generic
strncpy()
https://marc.info/?l=linux-renesas-soc&m7664657013309&w=2[PATCH v2] SH: Convert ins[bwl]/outs[bwl] macros to inline functions
https://marc.info/?l=linux-sh&m7656907716201&w=2[PATCH v2] SH: Convert
iounmap()macros to inline functions
https://marc.info/?l=linux-sh&m7656903716172&w=2
Quoted 8 lines
[PATCH v2] sh: add missing
DECLARE_EXPORT()for__ashiftrt_r4_xx
https://marc.info/?l=linux-sh&m7619891030685&w=2[PATCH] sh: add missing
EXPORT_SYMBOL()for__delay
https://marc.info/?l=linux-kernel&m7611811927852&w=2[PATCH] sh: kgdb: Mark expected switch fall-throughs
https://marc.info/?l=linux-sh&m7241987926081&w=2
Adrian
Signature · 4 lines
.''`. John Paul Adrian Glaubitz : :' : Debian Developer - [email protected] `. `' Freie Universitaet Berlin - [email protected] `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
Quoted 9 lines · John Paul Adrian Glaubitz
Quoted 7 lines · Rich Felker
Frustratingly, I _still_ don't have an official tree on kernel.org for the purpose of being the canonical place for linux-next to pull from, due to policies around pgp keys and nobody following up on signing mine. This is all really silly since there are ridiculously many independent channels I could cryptographically validate identity through with vanishing probability that they're all compromised. For the time being I'll reactivate my repo on git.musl-libc.org.
Quoted 3 lines
May I suggest to pick up these patches, for example? There might be more I missed, but getting these merged should already help a lot with the clean-up of
arch/sh.
And https://marc.info/?l=linux-arch&m3337991312146&w=2
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 9 lines · John Paul Adrian Glaubitz
Quoted 7 lines · Rich Felker
Frustratingly, I _still_ don't have an official tree on kernel.org for the purpose of being the canonical place for linux-next to pull from, due to policies around pgp keys and nobody following up on signing mine. This is all really silly since there are ridiculously many independent channels I could cryptographically validate identity through with vanishing probability that they're all compromised. For the time being I'll reactivate my repo on git.musl-libc.org.
Quoted 3 lines
May I suggest to pick up these patches, for example? There might be more I missed, but getting these merged should already help a lot with the clean-up of
arch/sh.
Does that include the 2 fixes to build with current binutils I made puppy eyes about last -rc7 (in march)?
https://marc.info/?l=linux-sh&m8544749818664&w=2
Rob
John Paul Adrian Glaubitz
maintainerQuoted 10 lines · Rob Landley
Quoted 9 lines · John Paul Adrian Glaubitz
Quoted 7 lines · Rich Felker
Frustratingly, I _still_ don't have an official tree on kernel.org for the purpose of being the canonical place for linux-next to pull from, due to policies around pgp keys and nobody following up on signing mine. This is all really silly since there are ridiculously many independent channels I could cryptographically validate identity through with vanishing probability that they're all compromised. For the time being I'll reactivate my repo on git.musl-libc.org.
Quoted 8 lines
Quoted 3 lines
May I suggest to pick up these patches, for example? There might be more I missed, but getting these merged should already help a lot with the clean-up of
arch/sh.Does that include the 2 fixes to build with current binutils I made puppy eyes about last -rc7 (in march)?
Yes, listed as "[PATCH 1/2] arch/sh: vmlinux.scr".
@Rich: Do you think you can merge all those fixes in your local tree within
the next days and send a PR to Linus?
Otherwise, I can volunteer to become a third maintainer for arch/sh as I have the hardware for testing and can accept patches and send PRs.
We shouldn't let contributors to arch/sh wait for too long.
Adrian
Signature · 4 lines
.''`. John Paul Adrian Glaubitz : :' : Debian Developer - [email protected] `. `' Freie Universitaet Berlin - [email protected] `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
Rich Felker
maintainerQuoted 21 lines · John Paul Adrian Glaubitz
Quoted 10 lines · Rob Landley
Quoted 9 lines · John Paul Adrian Glaubitz
Quoted 7 lines · Rich Felker
Frustratingly, I _still_ don't have an official tree on kernel.org for the purpose of being the canonical place for linux-next to pull from, due to policies around pgp keys and nobody following up on signing mine. This is all really silly since there are ridiculously many independent channels I could cryptographically validate identity through with vanishing probability that they're all compromised. For the time being I'll reactivate my repo on git.musl-libc.org.
Quoted 8 lines
Quoted 3 lines
May I suggest to pick up these patches, for example? There might be more I missed, but getting these merged should already help a lot with the clean-up of
arch/sh.Does that include the 2 fixes to build with current binutils I made puppy eyes about last -rc7 (in march)?
Yes, listed as "[PATCH 1/2]
arch/sh: vmlinux.scr".
Quoted 7 lines
@Rich: Do you think you can merge all those fixes in your local tree within
the next days and send a PR to Linus?Otherwise, I can volunteer to become a third maintainer for
arch/shas I have the hardware for testing and can accept patches and send PRs.We shouldn't let contributors to
arch/shwait for too long.
Yes, I'll try to get my tree ready for next/PR use tomorrow.
Rich
John Paul Adrian Glaubitz
maintainerHi Rich!
Quoted 1 line · Rich Felker
Yes, I'll try to get my tree ready for next/PR use tomorrow.
Great, really looking forward.
Adrian
Signature · 4 lines
.''`. John Paul Adrian Glaubitz : :' : Debian Developer - [email protected] `. `' Freie Universitaet Berlin - [email protected] `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
Rich Felker
maintainerQuoted 9 lines · John Paul Adrian Glaubitz
Quoted 7 lines · Rich Felker
Frustratingly, I _still_ don't have an official tree on kernel.org for the purpose of being the canonical place for linux-next to pull from, due to policies around pgp keys and nobody following up on signing mine. This is all really silly since there are ridiculously many independent channels I could cryptographically validate identity through with vanishing probability that they're all compromised. For the time being I'll reactivate my repo on git.musl-libc.org.
Quoted 3 lines
May I suggest to pick up these patches, for example? There might be more I missed, but getting these merged should already help a lot with the clean-up of
arch/sh.
This was really helpful, but one thing that would make it easier if you have any more to list is including message-ids rather than (or in addition to) marc.info links. I had to go through and reverse them all to message-ids (or at least subjects) to find the patches from my mailbox to git-am.
Quoted 2 lines
Quoted 2 lines
[RESEND PATCH v2] sh: sh4a: Bring back
tmu3_deviceearly device
https://marc.info/?l=linux-sh&m9061283109675&w=2
OK.
Quoted 5 lines
Quoted 5 lines
[PATCH] sh: Drop
CONFIG_MTD_M25P80insh7757lcr_defconfig
https://marc.info/?l=linux-sh&m8839364811658&w=2[PATCH v2] sh: Replace
CONFIG_MTD_M25P80withCONFIG_MTD_SPI_NORinsh7757lcr_defconfig
https://marc.info/?l=linux-sh&m8841749817761&w=2
Doesn't the second one here replace the first?
Quoted 2 lines
Quoted 2 lines
[PATCH 1/1] sh: remove sh5 support
https://marc.info/?l=linux-sh&m8776683125080&w=2
I'm trying to figure out how to apply this since it was generated with -D and git-am maliciously rejects it for that reason with an arcane error message.
Quoted 2 lines
Quoted 2 lines
sh/mm: Fix a build failure via adding a missing bracket
https://marc.info/?l=linux-sh&m8736532105299&w=2
Already upstream.
Quoted 2 lines
Quoted 2 lines
[PATCH 1/2]
arch/sh: vmlinux.scr
https://marc.info/?l=linux-sh&m8429470120959&w=2
OK.
Quoted 2 lines
Quoted 2 lines
[PATCH] sh: configs: Cleanup old
KconfigIO scheduler options
https://marc.info/?l=linux-sh&m8195850120215&w=2
OK.
Quoted 4 lines
Quoted 4 lines
[PATCH resend 0/3] SH: compile fixup patches
https://marc.info/?l=linux-renesas-soc&m7948330821790&w=2
https://marc.info/?l=linux-sh&m7852970316892&w=2
https://marc.info/?l=linux-sh&m7852984016938&w=2
OK.
Quoted 2 lines
Quoted 2 lines
[PATCH][repost] sh: clkfwk: remove r8/r16/r32
https://marc.info/?l=linux-renesas-soc&m7852973916903&w=2
This one had objections by Geert that called for a v2, and was teplaced by:
Quoted 2 lines
Quoted 2 lines
[PATCH] sh: clk: Fix discarding const qualifier warning
https://marc.info/?l=linux-sh&m7839999010776&w=2
But this still had objections that the definitions on all archs should be fixed for const correctness. It looks like that patch series is still bouncing around; should I apply the SH part of it now?
Quoted 2 lines
Quoted 2 lines
[PATCH next] sh: remove call to memset after
dma_alloc_coherent
https://marc.info/?l=linux-sh&m7793031102356&w=2
Can anyone confirm that this is correct/safe?
Quoted 2 lines
Quoted 2 lines
[PATCH] sh: use generic
strncpy()
https://marc.info/?l=linux-renesas-soc&m7664657013309&w=2
Can you fill me in on the status of this? It looks like you were following it. The subject says "use generic strncpy" but it's updating the asm, and I think there are problems with the proposed asm.
Quoted 2 lines
Quoted 2 lines
[PATCH v2] SH: Convert ins[bwl]/outs[bwl] macros to inline functions
https://marc.info/?l=linux-sh&m7656907716201&w=2
OK.
Quoted 2 lines
Quoted 2 lines
[PATCH v2] SH: Convert
iounmap()macros to inline functions
https://marc.info/?l=linux-sh&m7656903716172&w=2
OK.
Quoted 2 lines
Quoted 2 lines
[PATCH v2] sh: add missing
DECLARE_EXPORT()for__ashiftrt_r4_xx
https://marc.info/?l=linux-sh&m7619891030685&w=2
OK.
Quoted 2 lines
Quoted 2 lines
[PATCH] sh: add missing
EXPORT_SYMBOL()for__delay
https://marc.info/?l=linux-kernel&m7611811927852&w=2
OK.
Quoted 2 lines
Quoted 2 lines
[PATCH] sh: kgdb: Mark expected switch fall-throughs
https://marc.info/?l=linux-sh&m7241987926081&w=2
This is already upstream.
Rich
Arnd Bergmann
maintainerQuoted 6 lines · Rich Felker
Quoted 3 lines · John Paul Adrian Glaubitz
Quoted 2 lines · Rich Felker
[PATCH next] sh: remove call to memset after
dma_alloc_coherent
https://marc.info/?l=linux-sh&m7793031102356&w=2Can anyone confirm that this is correct/safe?
Yes, this is safe, I checked both the API definition and the sh implementation in arch_dma_alloc(), which passes __GFP_ZERO.
Arnd
Rich Felker
maintainerQuoted 14 lines · Rich Felker
Quoted 9 lines · John Paul Adrian Glaubitz
Quoted 7 lines · Rich Felker
Frustratingly, I _still_ don't have an official tree on kernel.org for the purpose of being the canonical place for linux-next to pull from, due to policies around pgp keys and nobody following up on signing mine. This is all really silly since there are ridiculously many independent channels I could cryptographically validate identity through with vanishing probability that they're all compromised. For the time being I'll reactivate my repo on git.musl-libc.org.
Quoted 3 lines
May I suggest to pick up these patches, for example? There might be more I missed, but getting these merged should already help a lot with the clean-up of
arch/sh.
Quoted 5 lines
This was really helpful, but one thing that would make it easier if you have any more to list is including message-ids rather than (or in addition to) marc.info links. I had to go through and reverse them all to message-ids (or at least subjects) to find the patches from my mailbox to git-am.
Hmm, it looks like Andrew Morton just pulled most of these into -mm, apparently independently of me getting them in my for-next a few hours ago, since his versions lack my signed-off-by. That's ok though, as long as they go up. Some details since further action is needed on a few:
Quoted 4 lines
Quoted 2 lines
Quoted 2 lines
[RESEND PATCH v2] sh: sh4a: Bring back
tmu3_deviceearly device
https://marc.info/?l=linux-sh&m9061283109675&w=2OK.
In -mm.
Quoted 7 lines
Quoted 5 lines
Quoted 5 lines
[PATCH] sh: Drop
CONFIG_MTD_M25P80insh7757lcr_defconfig
https://marc.info/?l=linux-sh&m8839364811658&w=2[PATCH v2] sh: Replace
CONFIG_MTD_M25P80withCONFIG_MTD_SPI_NORinsh7757lcr_defconfig
https://marc.info/?l=linux-sh&m8841749817761&w=2Doesn't the second one here replace the first?
The first one was pulled and the second wasn't so I think the second needs to be rewritten on top of the first now.
Quoted 6 lines
Quoted 2 lines
Quoted 2 lines
[PATCH 1/1] sh: remove sh5 support
https://marc.info/?l=linux-sh&m8776683125080&w=2I'm trying to figure out how to apply this since it was generated with -D and git-am maliciously rejects it for that reason with an arcane error message.
Not included in -mm. I'll keep it in my for-next.
Quoted 4 lines
Quoted 2 lines
Quoted 2 lines
sh/mm: Fix a build failure via adding a missing bracket
https://marc.info/?l=linux-sh&m8736532105299&w=2Already upstream.
No action needed.
Quoted 4 lines
Quoted 2 lines
Quoted 2 lines
[PATCH 1/2]
arch/sh: vmlinux.scr
https://marc.info/?l=linux-sh&m8429470120959&w=2OK.
Included in -mm.
Quoted 4 lines
Quoted 2 lines
Quoted 2 lines
[PATCH] sh: configs: Cleanup old
KconfigIO scheduler options
https://marc.info/?l=linux-sh&m8195850120215&w=2OK.
Not included in -mm. I'll keep.
Quoted 13 lines
Quoted 4 lines
Quoted 4 lines
[PATCH resend 0/3] SH: compile fixup patches
https://marc.info/?l=linux-renesas-soc&m7948330821790&w=2
https://marc.info/?l=linux-sh&m7852970316892&w=2
https://marc.info/?l=linux-sh&m7852984016938&w=2OK.
Quoted 2 lines
Quoted 2 lines
[PATCH][repost] sh: clkfwk: remove r8/r16/r32
https://marc.info/?l=linux-renesas-soc&m7852973916903&w=2This one had objections by Geert that called for a v2, and was teplaced by:
Quoted 6 lines
Quoted 2 lines
Quoted 2 lines
[PATCH] sh: clk: Fix discarding const qualifier warning
https://marc.info/?l=linux-sh&m7839999010776&w=2But this still had objections that the definitions on all archs should be fixed for const correctness. It looks like that patch series is still bouncing around; should I apply the SH part of it now?
The first one here is now in -mm, so further cleanup action is needed but I think that will happen with the cross-arch patch series.
Quoted 4 lines
Quoted 2 lines
Quoted 2 lines
[PATCH next] sh: remove call to memset after
dma_alloc_coherent
https://marc.info/?l=linux-sh&m7793031102356&w=2Can anyone confirm that this is correct/safe?
Arnd confirmed it and it's in -mm now anyway.
Quoted 6 lines
Quoted 2 lines
Quoted 2 lines
[PATCH] sh: use generic
strncpy()
https://marc.info/?l=linux-renesas-soc&m7664657013309&w=2Can you fill me in on the status of this? It looks like you were following it. The subject says "use generic strncpy" but it's updating the asm, and I think there are problems with the proposed asm.
Actual generic-strncpy is in -mm now so I think this should be ok. If there's a desire to use the asm, it needs fixes. Latest proposed version is using named labels (not numbered ones) in an inline asm block so the compiler can in theory duplicate it and break assembly.
Quoted 4 lines
Quoted 2 lines
Quoted 2 lines
[PATCH v2] SH: Convert ins[bwl]/outs[bwl] macros to inline functions
https://marc.info/?l=linux-sh&m7656907716201&w=2OK.
In -mm, with followup style fix.
Quoted 4 lines
Quoted 2 lines
Quoted 2 lines
[PATCH v2] SH: Convert
iounmap()macros to inline functions
https://marc.info/?l=linux-sh&m7656903716172&w=2OK.
In -mm.
Quoted 4 lines
Quoted 2 lines
Quoted 2 lines
[PATCH v2] sh: add missing
DECLARE_EXPORT()for__ashiftrt_r4_xx
https://marc.info/?l=linux-sh&m7619891030685&w=2OK.
Missing from -mm so I'll keep it.
Quoted 4 lines
Quoted 2 lines
Quoted 2 lines
[PATCH] sh: add missing
EXPORT_SYMBOL()for__delay
https://marc.info/?l=linux-kernel&m7611811927852&w=2OK.
In -mm.
Quoted 4 lines
Quoted 2 lines
Quoted 2 lines
[PATCH] sh: kgdb: Mark expected switch fall-throughs
https://marc.info/?l=linux-sh&m7241987926081&w=2This is already upstream.
No action needed.
Rich
Andrew Morton
maintainerQuoted 5 lines · On Mon, 1 Jun 2020 21:33:32 -0400 Rich Felker <[email protected]> wrote:
Hmm, it looks like Andrew Morton just pulled most of these into -mm, apparently independently of me getting them in my for-next a few hours ago, since his versions lack my signed-off-by. That's ok though, as long as they go up. Some details since further action is needed on a few:
It would be better if these were to go via the sh tree. So please go ahead and merge them up - I'll drop my copies when they turn up in -next via the sh tree.
Rich Felker
maintainerQuoted 11 lines · Andrew Morton
Quoted 5 lines · On Mon, 1 Jun 2020 21:33:32 -0400 Rich Felker <[email protected]> wrote:
Hmm, it looks like Andrew Morton just pulled most of these into -mm, apparently independently of me getting them in my for-next a few hours ago, since his versions lack my signed-off-by. That's ok though, as long as they go up. Some details since further action is needed on a few:
It would be better if these were to go via the sh tree. So please go ahead and merge them up - I'll drop my copies when they turn up in -next via the sh tree.
OK. That simplifies things a bit. Thanks.
Rich
John Paul Adrian Glaubitz
maintainerHi Rich!
Quoted 5 lines · Rich Felker
Hmm, it looks like Andrew Morton just pulled most of these into -mm, apparently independently of me getting them in my for-next a few hours ago, since his versions lack my signed-off-by. That's ok though, as long as they go up. Some details since further action is needed on a few:
I thought Andrew dropped them again since he saw you become active.
I can't find them in his tree.
Adrian
Signature · 4 lines
.''`. John Paul Adrian Glaubitz : :' : Debian Developer - [email protected] `. `' Freie Universitaet Berlin - [email protected] `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
John Paul Adrian Glaubitz
maintainerQuoted 10 lines · John Paul Adrian Glaubitz
Quoted 5 lines · Rich Felker
Hmm, it looks like Andrew Morton just pulled most of these into -mm, apparently independently of me getting them in my for-next a few hours ago, since his versions lack my signed-off-by. That's ok though, as long as they go up. Some details since further action is needed on a few:
I thought Andrew dropped them again since he saw you become active.
I can't find them in his tree.
Ah, sorry. I missed Andrew's message here, sorry.
In any case, I suggest merging all the patches now which have been reviewed and acked and send a PR to Linus.
We can then go through the list of patches needing review and merge them later.
Adrian
Signature · 4 lines
.''`. John Paul Adrian Glaubitz : :' : Debian Developer - [email protected] `. `' Freie Universitaet Berlin - [email protected] `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
John Paul Adrian Glaubitz
maintainerHi Rich!
Quoted 6 lines · Rich Felker
Quoted 4 lines
Quoted 2 lines
Quoted 2 lines
[PATCH 1/2]
arch/sh: vmlinux.scr
https://marc.info/?l=linux-sh&m8429470120959&w=2OK.
Included in -mm.
I just had a look at your tree and it looks you forgot to merge the second patch of the series, see:
Quoted 1 line
Can you include the patch as well? And would it be okay to send a PR to Linus after that?
Thanks,
Adrian
Signature · 4 lines
.''`. John Paul Adrian Glaubitz : :' : Debian Developer - [email protected] `. `' Freie Universitaet Berlin - [email protected] `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
Rich Felker
maintainerQuoted 8 lines · John Paul Adrian Glaubitz
Hi Rich!
Quoted 5 lines · Rich Felker
Quoted 4 lines
Quoted 2 lines
Quoted 2 lines
[PATCH 1/2]
arch/sh: vmlinux.scr
https://marc.info/?l=linux-sh&m8429470120959&w=2OK.
Quoted 8 lines
Quoted 1 line
Included in -mm.
I just had a look at your tree and it looks you forgot to merge the second patch of the series, see:
Quoted 1 line
Can you include the patch as well?
This one is outside arch/sh and I'm not sure it's permissible to go up through my tree. I was also under the impression that only part 1 was needed to fix the immediate problem on sh and tha part 2 was for completeness and to make sure the same doesn't happen on other archs in the future, but maybe my understanding here is incorrect.
Quoted 2 lines
And would it be okay to send a PR to Linus
after that?
Sure, will do right away once we resolve what to do with the above, and provided you don't have anything else you want me to evaluate for inclusion.
Rich
John Paul Adrian Glaubitz
maintainerQuoted 7 lines · Rich Felker
Quoted 1 line
Can you include the patch as well?
This one is outside
arch/shand I'm not sure it's permissible to go up through my tree. I was also under the impression that only part 1 was needed to fix the immediate problem on sh and tha part 2 was for completeness and to make sure the same doesn't happen on other archs in the future, but maybe my understanding here is incorrect.
Ah, sorry, I missed that. You're right, it should probably go through someone else's tree then.
Quoted 6 lines
Quoted 2 lines
And would it be okay to send a PR to Linus
after that?Sure, will do right away once we resolve what to do with the above, and provided you don't have anything else you want me to evaluate for inclusion.
Since we haven't agreed on the __get_user_64() patch yet, I would be in favor of getting the changes pulled in that have already been reviewed and acknowledged. I rather don't want the other contributors to wait any longer. Arnd in particular has done a tremendous job to untangle all the SH-5 code and I think we should finally get this in :).
Thanks,
Adrian
Signature · 4 lines
.''`. John Paul Adrian Glaubitz : :' : Debian Developer - [email protected] `. `' Freie Universitaet Berlin - [email protected] `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
Rich Felker
maintainerQuoted 11 lines · John Paul Adrian Glaubitz
Quoted 7 lines · Rich Felker
Quoted 1 line
Can you include the patch as well?
This one is outside
arch/shand I'm not sure it's permissible to go up through my tree. I was also under the impression that only part 1 was needed to fix the immediate problem on sh and tha part 2 was for completeness and to make sure the same doesn't happen on other archs in the future, but maybe my understanding here is incorrect.Ah, sorry, I missed that. You're right, it should probably go through someone else's tree then.
Do you know if it's needed to un-break sh4? If so we should push to get whoever has jurisdiction over it to include it; otherwise I'm indifferent.
Quoted 7 lines
Quoted 6 lines
Quoted 2 lines
And would it be okay to send a PR to Linus
after that?Sure, will do right away once we resolve what to do with the above, and provided you don't have anything else you want me to evaluate for inclusion.
Quoted 6 lines
Since we haven't agreed on the
__get_user_64()patch yet, I would be in favor of getting the changes pulled in that have already been reviewed and acknowledged. I rather don't want the other contributors to wait any longer. Arnd in particular has done a tremendous job to untangle all the SH-5 code and I think we should finally get this in :).
Absolutely agreed.
Rich
John Paul Adrian Glaubitz
maintainerHi Rich!
Quoted 6 lines · Rich Felker
Quoted 2 lines
Ah, sorry, I missed that. You're right, it should probably go through someone else's tree then.
Do you know if it's needed to un-break sh4? If so we should push to get whoever has jurisdiction over it to include it; otherwise I'm indifferent.
No, the patch is only necessary when enabling Infiniband support with CONFIG_INFINIBAND_USER_ACCESS enabled.
However, according to Geert, every architecture is supposed to have 64-bit get_user() these days, therefore my patch is required anyways, but it's not an acute problem.
Adrian
Signature · 4 lines
.''`. John Paul Adrian Glaubitz : :' : Debian Developer - [email protected] `. `' Freie Universitaet Berlin - [email protected] `- GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913
Hi Adrian,
Quoted 7 lines · John Paul Adrian Glaubitz
Quoted 6 lines · Rich Felker
Quoted 2 lines
Ah, sorry, I missed that. You're right, it should probably go through someone else's tree then.
Do you know if it's needed to un-break sh4? If so we should push to get whoever has jurisdiction over it to include it; otherwise I'm indifferent.
I think the above is about the asm-generic/vmlinux.lds.h patch?
https://marc.info/?l=linux-sh&m8429470221261&w=2
That one falls under Arnd's jurisdiction.
And AFAIUC, it matters for recent binutils only? So Arnd should know.
Quoted 6 lines
No, the patch is only necessary when enabling Infiniband support with
CONFIG_INFINIBAND_USER_ACCESSenabled.However, according to Geert, every architecture is supposed to have 64-bit
get_user()these days, therefore my patch is required anyways, but it's not an acute problem.
This is about a different patch. Still a build failure, but who cares about Infiniband? (I still care more about SH ;-)
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
Andrew Morton
maintainerQuoted 12 lines · On Fri, 5 Jun 2020 20:23:07 +0200 Geert Uytterhoeven <[email protected]>…
Hi Adrian,
Quoted 7 lines · John Paul Adrian Glaubitz
Quoted 6 lines · Rich Felker
Quoted 2 lines
Ah, sorry, I missed that. You're right, it should probably go through someone else's tree then.
Do you know if it's needed to un-break sh4? If so we should push to get whoever has jurisdiction over it to include it; otherwise I'm indifferent.
Quoted 6 lines
I think the above is about the
asm-generic/vmlinux.lds.hpatch?
https://marc.info/?l=linux-sh&m8429470221261&w=2That one falls under Arnd's jurisdiction.
And AFAIUC, it matters for recent binutils only? So Arnd should know.
Aligning RO_AFTER_INIT_DATA is simply a no-brainer:
include/asm-generic/vmlinux.lds.h renamed from include/asm-generic/vmlinux.lds.h~include-asm-generic-vmlinuxldsh-align-ro_after_init +1 -0
@@ -374,6 +374,7 @@*/ #ifndef RO_AFTER_INIT_DATA #define RO_AFTER_INIT_DATA \ + . = ALIGN(8); \ __start_ro_after_init = .; \ *(.data..ro_after_init) \ JUMP_TABLE_DATA \
So I'll send this in to Linus for 5.8-rc1. And I think I'll add a cc:stable to it, so people can use older kernels with newer toolchains.
I still have a few other sh patches sitting here:
https://ozlabs.org/~akpm/mmotm/broken-out/sh-clkfwk-remove-r8-r16-r32.patch
https://ozlabs.org/~akpm/mmotm/broken-out/sh-remove-call-to-memset-after-dma_alloc_coherent.patch
https://ozlabs.org/~akpm/mmotm/broken-out/sh-use-generic-strncpy.patch
https://ozlabs.org/~akpm/mmotm/broken-out/sh-add-missing-export_symbol-for-__delay.patch
What should I do with those?