Commit 5bbec3cf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'sh-for-5.9' of git://git.libc.org/linux-sh 

Pull arch/sh updates from Rich Felker:
 "Cleanup, SECCOMP_FILTER support, message printing fixes, and other
  changes to arch/sh"

* tag 'sh-for-5.9' of git://git.libc.org/linux-sh: (34 commits)
  sh: landisk: Add missing initialization of sh_io_port_base
  sh: bring syscall_set_return_value in line with other architectures
  sh: Add SECCOMP_FILTER
  sh: Rearrange blocks in entry-common.S
  sh: switch to copy_thread_tls()
  sh: use the generic dma coherent remap allocator
  sh: don't allow non-coherent DMA for NOMMU
  dma-mapping: consolidate the NO_DMA definition in kernel/dma/Kconfig
  sh: unexport register_trapped_io and match_trapped_io_handler
  sh: don't include <asm/io_trapped.h> in <asm/io.h>
  sh: move the ioremap implementation out of line
  sh: move ioremap_fixed details out of <asm/io.h>
  sh: remove __KERNEL__ ifdefs from non-UAPI headers
  sh: sort the selects for SUPERH alphabetically
  sh: remove -Werror from Makefiles
  sh: Replace HTTP links with HTTPS ones
  arch/sh/configs: remove obsolete CONFIG_SOC_CAMERA*
  sh: stacktrace: Remove stacktrace_ops.stack()
  sh: machvec: Modernize printing of kernel messages
  sh: pci: Modernize printing of kernel messages
  ...
parents 713eee84 0c64a0dc

arch/m68k/Kconfig

+1 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ config M68K 
	select HAVE_DEBUG_BUGVERBOSE

	select GENERIC_IRQ_SHOW

	select GENERIC_ATOMIC64

	select NO_DMA if !MMU && !COLDFIRE

	select HAVE_UID16

	select VIRT_TO_BUS

	select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS
@@ -59,9 +60,6 @@ config TIME_LOW_RES 
config NO_IOPORT_MAP

	def_bool y



config NO_DMA

	def_bool (MMU && SUN3) || (!MMU && !COLDFIRE)



config ZONE_DMA

	bool

	default y

arch/m68k/Kconfig.machine

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ config SUN3 
	depends on MMU

	depends on !MMU_MOTOROLA

	select MMU_SUN3 if MMU

	select NO_DMA

	select M68020

	help

	  This option enables support for the Sun 3 series of workstations

arch/sh/Kconfig

+56 −53
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

config SUPERH

	def_bool y

	select ARCH_32BIT_OFF_T

	select ARCH_HAVE_CUSTOM_GPIO_H

	select ARCH_HAVE_NMI_SAFE_CMPXCHG if (GUSA_RB || CPU_SH4A)

	select ARCH_HAS_BINFMT_FLAT if !MMU

	select ARCH_HAS_GIGANTIC_PAGE

	select ARCH_HAS_GCOV_PROFILE_ALL

	select ARCH_HAS_PTE_SPECIAL

	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_HIBERNATION_POSSIBLE if MMU

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select HAVE_PATA_PLATFORM

	select ARCH_WANT_IPC_PARSE_VERSION

	select CLKDEV_LOOKUP

	select CPU_NO_EFFICIENT_FFS

	select DMA_DECLARE_COHERENT

	select HAVE_IDE if HAS_IOPORT_MAP

	select HAVE_OPROFILE

	select GENERIC_ATOMIC64

	select GENERIC_CLOCKEVENTS

	select GENERIC_CMOS_UPDATE if SH_SH03 || SH_DREAMCAST

	select GENERIC_IDLE_POLL_SETUP

	select GENERIC_IRQ_SHOW

	select GENERIC_PCI_IOMAP if PCI

	select GENERIC_SCHED_CLOCK

	select GENERIC_STRNCPY_FROM_USER

	select GENERIC_STRNLEN_USER

	select GENERIC_SMP_IDLE_THREAD

	select GUP_GET_PTE_LOW_HIGH if X2TLB

	select HAVE_ARCH_AUDITSYSCALL

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_SECCOMP_FILTER

	select HAVE_ARCH_TRACEHOOK

	select HAVE_PERF_EVENTS

	select HAVE_COPY_THREAD_TLS

	select HAVE_DEBUG_BUGVERBOSE

	select HAVE_FAST_GUP if MMU

	select ARCH_HAVE_CUSTOM_GPIO_H

	select ARCH_HAVE_NMI_SAFE_CMPXCHG if (GUSA_RB || CPU_SH4A)

	select ARCH_HAS_GCOV_PROFILE_ALL

	select PERF_USE_VMALLOC

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_KERNEL_GZIP

	select CPU_NO_EFFICIENT_FFS

	select HAVE_DYNAMIC_FTRACE

	select HAVE_FAST_GUP if MMU

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_TRACER

	select HAVE_FUTEX_CMPXCHG if FUTEX

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_HW_BREAKPOINT

	select HAVE_IDE if HAS_IOPORT_MAP

	select HAVE_IOREMAP_PROT if MMU && !X2TLB

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_GZIP

	select HAVE_KERNEL_LZMA

	select HAVE_KERNEL_XZ

	select HAVE_KERNEL_LZO

	select HAVE_KERNEL_XZ

	select HAVE_KPROBES

	select HAVE_KRETPROBES

	select HAVE_MIXED_BREAKPOINTS_REGS

	select HAVE_MOD_ARCH_SPECIFIC if DWARF_UNWINDER

	select HAVE_NMI

	select HAVE_OPROFILE

	select HAVE_PATA_PLATFORM

	select HAVE_PERF_EVENTS

	select HAVE_REGS_AND_STACK_ACCESS_API

	select HAVE_UID16

	select ARCH_WANT_IPC_PARSE_VERSION

	select HAVE_STACKPROTECTOR

	select HAVE_SYSCALL_TRACEPOINTS

	select HAVE_REGS_AND_STACK_ACCESS_API

	select MAY_HAVE_SPARSE_IRQ

	select IRQ_FORCED_THREADING

	select RTC_LIB

	select GENERIC_ATOMIC64

	select GENERIC_IRQ_SHOW

	select GENERIC_SMP_IDLE_THREAD

	select GENERIC_IDLE_POLL_SETUP

	select GENERIC_CLOCKEVENTS

	select GENERIC_CMOS_UPDATE if SH_SH03 || SH_DREAMCAST

	select GENERIC_PCI_IOMAP if PCI

	select GENERIC_SCHED_CLOCK

	select GENERIC_STRNCPY_FROM_USER

	select GENERIC_STRNLEN_USER

	select HAVE_MOD_ARCH_SPECIFIC if DWARF_UNWINDER

	select MAY_HAVE_SPARSE_IRQ

	select MODULES_USE_ELF_RELA

	select NEED_SG_DMA_LENGTH

	select NO_DMA if !MMU && !DMA_COHERENT

	select NO_GENERIC_PCI_IOPORT_MAP if PCI

	select OLD_SIGSUSPEND

	select OLD_SIGACTION

	select OLD_SIGSUSPEND

	select PCI_DOMAINS if PCI

	select HAVE_ARCH_AUDITSYSCALL

	select HAVE_FUTEX_CMPXCHG if FUTEX

	select HAVE_NMI

	select NEED_SG_DMA_LENGTH

	select ARCH_HAS_GIGANTIC_PAGE

	select ARCH_32BIT_OFF_T

	select GUP_GET_PTE_LOW_HIGH if X2TLB

	select HAVE_KPROBES

	select HAVE_KRETPROBES

	select HAVE_IOREMAP_PROT if MMU && !X2TLB

	select HAVE_FUNCTION_TRACER

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_DYNAMIC_FTRACE

	select ARCH_WANT_IPC_PARSE_VERSION

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_ARCH_KGDB

	select HAVE_HW_BREAKPOINT

	select HAVE_MIXED_BREAKPOINTS_REGS

	select PERF_EVENTS

	select ARCH_HIBERNATION_POSSIBLE if MMU

	select PERF_USE_VMALLOC

	select RTC_LIB

	select SPARSE_IRQ

	select HAVE_STACKPROTECTOR

	help

	  The SuperH is a RISC processor targeted for use in embedded systems

	  and consumer electronics; it was also used in the Sega Dreamcast
@@ -123,8 +125,8 @@ config ARCH_HAS_ILOG2_U64 


config NO_IOPORT_MAP

	def_bool !PCI

	depends on !SH_CAYMAN && !SH_SH4202_MICRODEV && !SH_SHMIN && \

		   !SH_HP6XX && !SH_SOLUTION_ENGINE

	depends on !SH_SH4202_MICRODEV && !SH_SHMIN && !SH_HP6XX && \

		   !SH_SOLUTION_ENGINE



config IO_TRAPPED

	bool
@@ -136,8 +138,10 @@ config DMA_COHERENT 
	bool



config DMA_NONCOHERENT

	def_bool !DMA_COHERENT

	def_bool !NO_DMA && !DMA_COHERENT

	select ARCH_HAS_DMA_PREP_COHERENT

	select ARCH_HAS_SYNC_DMA_FOR_DEVICE

	select DMA_DIRECT_REMAP



config PGTABLE_LEVELS

	default 3 if X2TLB
@@ -630,7 +634,7 @@ config SMP 
	  Y to "Enhanced Real Time Clock Support", below.



	  See also <file:Documentation/admin-guide/lockup-watchdogs.rst> and the SMP-HOWTO

	  available at <http://www.tldp.org/docs.html#howto>.

	  available at <https://www.tldp.org/docs.html#howto>.



	  If you don't know what to do here, say N.
@@ -726,7 +730,6 @@ config ZERO_PAGE_OFFSET 
config BOOT_LINK_OFFSET

	hex

	default "0x00210000" if SH_SHMIN

	default "0x00400000" if SH_CAYMAN

	default "0x00810000" if SH_7780_SOLUTION_ENGINE

	default "0x009e0000" if SH_TITAN

	default "0x01800000" if SH_SDK7780

arch/sh/Makefile

+0 −5
Original line number Diff line number Diff line
@@ -15,11 +15,7 @@ ifneq ($(SUBARCH),$(ARCH)) 
  endif

endif



ifeq ($(ARCH),sh)

KBUILD_DEFCONFIG	:= shx3_defconfig

else

KBUILD_DEFCONFIG	:= cayman_defconfig

endif



isa-y					:= any

isa-$(CONFIG_SH_DSP)			:= sh
@@ -143,7 +139,6 @@ machdir-$(CONFIG_SH_SH7763RDP) += mach-sh7763rdp 
machdir-$(CONFIG_SH_SH4202_MICRODEV)		+= mach-microdev

machdir-$(CONFIG_SH_LANDISK)			+= mach-landisk

machdir-$(CONFIG_SH_LBOX_RE2)			+= mach-lboxre2

machdir-$(CONFIG_SH_CAYMAN)			+= mach-cayman

machdir-$(CONFIG_SH_RSK)			+= mach-rsk



ifneq ($(machdir-y),)

arch/sh/boards/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -340,12 +340,6 @@ config SH_MAGIC_PANEL_R2 
	help

	  Select Magic Panel R2 if configuring for Magic Panel R2.



config SH_CAYMAN

	bool "Hitachi Cayman"

	depends on CPU_SUBTYPE_SH5_101 || CPU_SUBTYPE_SH5_103

	select HAVE_PCI

	select ARCH_MIGHT_HAVE_PC_SERIO



config SH_POLARIS

	bool "SMSC Polaris"

	select CPU_HAS_IPR_IRQ

CRA Git | Maintained and supported by SUSTech CRA and CCSE