Commit 115acbb5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 's390-5.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 fixes from Heiko Carstens:

 - Convert current_stack_pointer to a register alias like it is assumed
   if ARCH_HAS_CURRENT_STACK_POINTER is selected. The existing
   implementation as a function breaks CONFIG_HARDENED_USERCOPY
   sanity-checks

 - Get rid of -Warray-bounds warning within kexec code

 - Add minimal IBM z16 support by reporting a proper elf platform, and
   adding compile options

 - Update defconfigs

* tag 's390-5.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: enable CONFIG_HARDENED_USERCOPY in debug_defconfig
  s390: current_stack_pointer shouldn't be a function
  s390: update defconfigs
  s390/kexec: silence -Warray-bounds warning
  s390: allow to compile with z16 optimizations
  s390: add z16 elf platform
parents d20339fa c68c6342

arch/s390/Kconfig

+19 −0
Original line number Diff line number Diff line
@@ -255,6 +255,10 @@ config HAVE_MARCH_Z15_FEATURES 
	def_bool n

	select HAVE_MARCH_Z14_FEATURES



config HAVE_MARCH_Z16_FEATURES

	def_bool n

	select HAVE_MARCH_Z15_FEATURES



choice

	prompt "Processor type"

	default MARCH_Z196
@@ -312,6 +316,14 @@ config MARCH_Z15 
	  and 8561 series). The kernel will be slightly faster but will not

	  work on older machines.



config MARCH_Z16

	bool "IBM z16"

	select HAVE_MARCH_Z16_FEATURES

	depends on $(cc-option,-march=z16)

	help

	  Select this to enable optimizations for IBM z16 (3931 and

	  3932 series).



endchoice



config MARCH_Z10_TUNE
@@ -332,6 +344,9 @@ config MARCH_Z14_TUNE 
config MARCH_Z15_TUNE

	def_bool TUNE_Z15 || MARCH_Z15 && TUNE_DEFAULT



config MARCH_Z16_TUNE

	def_bool TUNE_Z16 || MARCH_Z16 && TUNE_DEFAULT



choice

	prompt "Tune code generation"

	default TUNE_DEFAULT
@@ -372,6 +387,10 @@ config TUNE_Z15 
	bool "IBM z15"

	depends on $(cc-option,-mtune=z15)



config TUNE_Z16

	bool "IBM z16"

	depends on $(cc-option,-mtune=z16)



endchoice



config 64BIT

arch/s390/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ mflags-$(CONFIG_MARCH_ZEC12) := -march=zEC12 
mflags-$(CONFIG_MARCH_Z13)    := -march=z13

mflags-$(CONFIG_MARCH_Z14)    := -march=z14

mflags-$(CONFIG_MARCH_Z15)    := -march=z15

mflags-$(CONFIG_MARCH_Z16)    := -march=z16



export CC_FLAGS_MARCH := $(mflags-y)
@@ -54,6 +55,7 @@ cflags-$(CONFIG_MARCH_ZEC12_TUNE) += -mtune=zEC12 
cflags-$(CONFIG_MARCH_Z13_TUNE)		+= -mtune=z13

cflags-$(CONFIG_MARCH_Z14_TUNE)		+= -mtune=z14

cflags-$(CONFIG_MARCH_Z15_TUNE)		+= -mtune=z15

cflags-$(CONFIG_MARCH_Z16_TUNE)		+= -mtune=z16



cflags-y += -Wa,-I$(srctree)/arch/$(ARCH)/include

arch/s390/configs/debug_defconfig

+6 −2
Original line number Diff line number Diff line
@@ -499,11 +499,13 @@ CONFIG_NLMON=m 
# CONFIG_NET_VENDOR_CHELSIO is not set

# CONFIG_NET_VENDOR_CISCO is not set

# CONFIG_NET_VENDOR_CORTINA is not set

# CONFIG_NET_VENDOR_DAVICOM is not set

# CONFIG_NET_VENDOR_DEC is not set

# CONFIG_NET_VENDOR_DLINK is not set

# CONFIG_NET_VENDOR_EMULEX is not set

# CONFIG_NET_VENDOR_ENGLEDER is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

# CONFIG_NET_VENDOR_FUNGIBLE is not set

# CONFIG_NET_VENDOR_GOOGLE is not set

# CONFIG_NET_VENDOR_HUAWEI is not set

# CONFIG_NET_VENDOR_INTEL is not set
@@ -588,13 +590,13 @@ CONFIG_MLX5_INFINIBAND=m 
CONFIG_SYNC_FILE=y

CONFIG_VFIO=m

CONFIG_VFIO_PCI=m

CONFIG_MLX5_VFIO_PCI=m

CONFIG_VFIO_MDEV=m

CONFIG_VIRTIO_PCI=m

CONFIG_VIRTIO_BALLOON=m

CONFIG_VIRTIO_INPUT=y

CONFIG_VHOST_NET=m

CONFIG_VHOST_VSOCK=m

# CONFIG_SURFACE_PLATFORMS is not set

CONFIG_S390_CCW_IOMMU=y

CONFIG_S390_AP_IOMMU=y

CONFIG_EXT4_FS=y
@@ -690,6 +692,7 @@ CONFIG_ENCRYPTED_KEYS=m 
CONFIG_KEY_NOTIFICATIONS=y

CONFIG_SECURITY=y

CONFIG_SECURITY_NETWORK=y

CONFIG_HARDENED_USERCOPY=y

CONFIG_FORTIFY_SOURCE=y

CONFIG_SECURITY_SELINUX=y

CONFIG_SECURITY_SELINUX_BOOTPARAM=y
@@ -733,6 +736,7 @@ CONFIG_CRYPTO_MD5=y 
CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES_TI=m

CONFIG_CRYPTO_ANUBIS=m
@@ -786,7 +790,6 @@ CONFIG_DMA_CMA=y 
CONFIG_CMA_SIZE_MBYTES=0

CONFIG_PRINTK_TIME=y

CONFIG_DYNAMIC_DEBUG=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_INFO_DWARF4=y

CONFIG_DEBUG_INFO_BTF=y

CONFIG_GDB_SCRIPTS=y
@@ -814,6 +817,7 @@ CONFIG_DEBUG_MEMORY_INIT=y 
CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m

CONFIG_DEBUG_PER_CPU_MAPS=y

CONFIG_KFENCE=y

CONFIG_KFENCE_DEFERRABLE=y

CONFIG_KFENCE_STATIC_KEYS=y

CONFIG_DEBUG_SHIRQ=y

CONFIG_PANIC_ON_OOPS=y

arch/s390/configs/defconfig

+4 −2
Original line number Diff line number Diff line
@@ -490,11 +490,13 @@ CONFIG_NLMON=m 
# CONFIG_NET_VENDOR_CHELSIO is not set

# CONFIG_NET_VENDOR_CISCO is not set

# CONFIG_NET_VENDOR_CORTINA is not set

# CONFIG_NET_VENDOR_DAVICOM is not set

# CONFIG_NET_VENDOR_DEC is not set

# CONFIG_NET_VENDOR_DLINK is not set

# CONFIG_NET_VENDOR_EMULEX is not set

# CONFIG_NET_VENDOR_ENGLEDER is not set

# CONFIG_NET_VENDOR_EZCHIP is not set

# CONFIG_NET_VENDOR_FUNGIBLE is not set

# CONFIG_NET_VENDOR_GOOGLE is not set

# CONFIG_NET_VENDOR_HUAWEI is not set

# CONFIG_NET_VENDOR_INTEL is not set
@@ -578,13 +580,13 @@ CONFIG_MLX5_INFINIBAND=m 
CONFIG_SYNC_FILE=y

CONFIG_VFIO=m

CONFIG_VFIO_PCI=m

CONFIG_MLX5_VFIO_PCI=m

CONFIG_VFIO_MDEV=m

CONFIG_VIRTIO_PCI=m

CONFIG_VIRTIO_BALLOON=m

CONFIG_VIRTIO_INPUT=y

CONFIG_VHOST_NET=m

CONFIG_VHOST_VSOCK=m

# CONFIG_SURFACE_PLATFORMS is not set

CONFIG_S390_CCW_IOMMU=y

CONFIG_S390_AP_IOMMU=y

CONFIG_EXT4_FS=y
@@ -720,6 +722,7 @@ CONFIG_CRYPTO_MD5=y 
CONFIG_CRYPTO_MICHAEL_MIC=m

CONFIG_CRYPTO_RMD160=m

CONFIG_CRYPTO_SHA3=m

CONFIG_CRYPTO_SM3=m

CONFIG_CRYPTO_WP512=m

CONFIG_CRYPTO_AES_TI=m

CONFIG_CRYPTO_ANUBIS=m
@@ -772,7 +775,6 @@ CONFIG_DMA_CMA=y 
CONFIG_CMA_SIZE_MBYTES=0

CONFIG_PRINTK_TIME=y

CONFIG_DYNAMIC_DEBUG=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_INFO_DWARF4=y

CONFIG_DEBUG_INFO_BTF=y

CONFIG_GDB_SCRIPTS=y

arch/s390/configs/zfcpdump_defconfig

+3 −3
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ CONFIG_CRASH_DUMP=y 
# CONFIG_S390_GUEST is not set

# CONFIG_SECCOMP is not set

# CONFIG_GCC_PLUGINS is not set

# CONFIG_BLOCK_LEGACY_AUTOLOAD is not set

CONFIG_PARTITION_ADVANCED=y

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

# CONFIG_COMPACTION is not set
@@ -60,7 +61,6 @@ CONFIG_ZFCP=y 
# CONFIG_HID is not set

# CONFIG_VIRTIO_MENU is not set

# CONFIG_VHOST_MENU is not set

# CONFIG_SURFACE_PLATFORMS is not set

# CONFIG_IOMMU_SUPPORT is not set

# CONFIG_DNOTIFY is not set

# CONFIG_INOTIFY_USER is not set
@@ -71,10 +71,10 @@ CONFIG_LSM="yama,loadpin,safesetid,integrity" 
CONFIG_XZ_DEC_MICROLZMA=y

CONFIG_PRINTK_TIME=y

# CONFIG_SYMBOLIC_ERRNAME is not set

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_KERNEL=y

CONFIG_DEBUG_INFO_DWARF4=y

CONFIG_DEBUG_INFO_BTF=y

CONFIG_DEBUG_FS=y

CONFIG_DEBUG_KERNEL=y

CONFIG_PANIC_ON_OOPS=y

# CONFIG_SCHED_DEBUG is not set

CONFIG_RCU_CPU_STALL_TIMEOUT=60