Commit 757f3e6d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 's390-5.16-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 fixes from Heiko Carstens:

 - Fix potential overlap of pseudo-MMIO addresses with MIO addresses

 - Fix stack unwinder test case inline assembly compile error that
   happens with LLVM's integrated assembler

 - Update defconfigs

* tag 's390-5.16-4' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390: update defconfigs
  s390/pci: move pseudo-MMIO to prevent MIO overlap
  s390/test_unwind: use raw opcode instead of invalid instruction
parents a2aeaeab 3c088b1e

arch/s390/configs/debug_defconfig

+8 −2
Original line number Diff line number Diff line
@@ -403,7 +403,6 @@ CONFIG_DEVTMPFS=y 
CONFIG_CONNECTOR=y

CONFIG_ZRAM=y

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y
@@ -476,6 +475,7 @@ CONFIG_MACVLAN=m 
CONFIG_MACVTAP=m

CONFIG_VXLAN=m

CONFIG_BAREUDP=m

CONFIG_AMT=m

CONFIG_TUN=m

CONFIG_VETH=m

CONFIG_VIRTIO_NET=m
@@ -489,6 +489,7 @@ CONFIG_NLMON=m 
# CONFIG_NET_VENDOR_AMD is not set

# CONFIG_NET_VENDOR_AQUANTIA is not set

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_VENDOR_ASIX is not set

# CONFIG_NET_VENDOR_ATHEROS is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_BROCADE is not set
@@ -571,6 +572,7 @@ CONFIG_WATCHDOG=y 
CONFIG_WATCHDOG_NOWAYOUT=y

CONFIG_SOFT_WATCHDOG=m

CONFIG_DIAG288_WATCHDOG=m

# CONFIG_DRM_DEBUG_MODESET_LOCK is not set

CONFIG_FB=y

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
@@ -775,12 +777,14 @@ CONFIG_CRC4=m 
CONFIG_CRC7=m

CONFIG_CRC8=m

CONFIG_RANDOM32_SELFTEST=y

CONFIG_XZ_DEC_MICROLZMA=y

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

CONFIG_HEADERS_INSTALL=y

CONFIG_DEBUG_SECTION_MISMATCH=y
@@ -807,6 +811,7 @@ CONFIG_DEBUG_MEMORY_INIT=y 
CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m

CONFIG_DEBUG_PER_CPU_MAPS=y

CONFIG_KFENCE=y

CONFIG_KFENCE_STATIC_KEYS=y

CONFIG_DEBUG_SHIRQ=y

CONFIG_PANIC_ON_OOPS=y

CONFIG_DETECT_HUNG_TASK=y
@@ -842,6 +847,7 @@ CONFIG_FTRACE_STARTUP_TEST=y 
CONFIG_SAMPLES=y

CONFIG_SAMPLE_TRACE_PRINTK=m

CONFIG_SAMPLE_FTRACE_DIRECT=m

CONFIG_SAMPLE_FTRACE_DIRECT_MULTI=m

CONFIG_DEBUG_ENTRY=y

CONFIG_CIO_INJECT=y

CONFIG_KUNIT=m
@@ -860,7 +866,7 @@ CONFIG_FAIL_FUNCTION=y 
CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y

CONFIG_LKDTM=m

CONFIG_TEST_MIN_HEAP=y

CONFIG_KPROBES_SANITY_TEST=y

CONFIG_KPROBES_SANITY_TEST=m

CONFIG_RBTREE_TEST=y

CONFIG_INTERVAL_TREE_TEST=m

CONFIG_PERCPU_TEST=m

arch/s390/configs/defconfig

+6 −1
Original line number Diff line number Diff line
@@ -394,7 +394,6 @@ CONFIG_DEVTMPFS=y 
CONFIG_CONNECTOR=y

CONFIG_ZRAM=y

CONFIG_BLK_DEV_LOOP=m

CONFIG_BLK_DEV_CRYPTOLOOP=m

CONFIG_BLK_DEV_DRBD=m

CONFIG_BLK_DEV_NBD=m

CONFIG_BLK_DEV_RAM=y
@@ -467,6 +466,7 @@ CONFIG_MACVLAN=m 
CONFIG_MACVTAP=m

CONFIG_VXLAN=m

CONFIG_BAREUDP=m

CONFIG_AMT=m

CONFIG_TUN=m

CONFIG_VETH=m

CONFIG_VIRTIO_NET=m
@@ -480,6 +480,7 @@ CONFIG_NLMON=m 
# CONFIG_NET_VENDOR_AMD is not set

# CONFIG_NET_VENDOR_AQUANTIA is not set

# CONFIG_NET_VENDOR_ARC is not set

# CONFIG_NET_VENDOR_ASIX is not set

# CONFIG_NET_VENDOR_ATHEROS is not set

# CONFIG_NET_VENDOR_BROADCOM is not set

# CONFIG_NET_VENDOR_BROCADE is not set
@@ -762,12 +763,14 @@ CONFIG_PRIME_NUMBERS=m 
CONFIG_CRC4=m

CONFIG_CRC7=m

CONFIG_CRC8=m

CONFIG_XZ_DEC_MICROLZMA=y

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

CONFIG_DEBUG_SECTION_MISMATCH=y

CONFIG_MAGIC_SYSRQ=y
@@ -792,9 +795,11 @@ CONFIG_HIST_TRIGGERS=y 
CONFIG_SAMPLES=y

CONFIG_SAMPLE_TRACE_PRINTK=m

CONFIG_SAMPLE_FTRACE_DIRECT=m

CONFIG_SAMPLE_FTRACE_DIRECT_MULTI=m

CONFIG_KUNIT=m

CONFIG_KUNIT_DEBUGFS=y

CONFIG_LKDTM=m

CONFIG_KPROBES_SANITY_TEST=m

CONFIG_PERCPU_TEST=m

CONFIG_ATOMIC64_SELFTEST=y

CONFIG_TEST_BPF=m

arch/s390/configs/zfcpdump_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -65,9 +65,11 @@ CONFIG_ZFCP=y 
# CONFIG_NETWORK_FILESYSTEMS is not set

CONFIG_LSM="yama,loadpin,safesetid,integrity"

# CONFIG_ZLIB_DFLTCC is not set

CONFIG_XZ_DEC_MICROLZMA=y

CONFIG_PRINTK_TIME=y

# CONFIG_SYMBOLIC_ERRNAME is not set

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_INFO_BTF=y

CONFIG_DEBUG_FS=y

CONFIG_DEBUG_KERNEL=y

CONFIG_PANIC_ON_OOPS=y

arch/s390/include/asm/pci_io.h

+4 −3
Original line number Diff line number Diff line
@@ -14,12 +14,13 @@ 


/* I/O Map */

#define ZPCI_IOMAP_SHIFT		48

#define ZPCI_IOMAP_ADDR_BASE		0x8000000000000000UL

#define ZPCI_IOMAP_ADDR_SHIFT		62

#define ZPCI_IOMAP_ADDR_BASE		(1UL << ZPCI_IOMAP_ADDR_SHIFT)

#define ZPCI_IOMAP_ADDR_OFF_MASK	((1UL << ZPCI_IOMAP_SHIFT) - 1)

#define ZPCI_IOMAP_MAX_ENTRIES							\

	((ULONG_MAX - ZPCI_IOMAP_ADDR_BASE + 1) / (1UL << ZPCI_IOMAP_SHIFT))

	(1UL << (ZPCI_IOMAP_ADDR_SHIFT - ZPCI_IOMAP_SHIFT))

#define ZPCI_IOMAP_ADDR_IDX_MASK						\

	(~ZPCI_IOMAP_ADDR_OFF_MASK - ZPCI_IOMAP_ADDR_BASE)

	((ZPCI_IOMAP_ADDR_BASE - 1) & ~ZPCI_IOMAP_ADDR_OFF_MASK)



struct zpci_iomap_entry {

	u32 fh;

arch/s390/lib/test_unwind.c

+3 −2
Original line number Diff line number Diff line
@@ -173,10 +173,11 @@ static noinline int unwindme_func4(struct unwindme *u) 
		}



		/*

		 * trigger specification exception

		 * Trigger operation exception; use insn notation to bypass

		 * llvm's integrated assembler sanity checks.

		 */

		asm volatile(

			"	mvcl	%%r1,%%r1\n"

			"	.insn	e,0x0000\n"	/* illegal opcode */

			"0:	nopr	%%r7\n"

			EX_TABLE(0b, 0b)

			:);