Commit 2bb919b6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 's390-5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 updates from Vasily Gorbik:

 - Rework inline asm to get rid of error prone "register asm"
   constructs, which are problematic especially when code
   instrumentation is enabled.

   In particular introduce and use register pair union to allocate
   even/odd register pairs. Unfortunately this breaks compatibility with
   older clang compilers and minimum clang version for s390 has been
   raised to 13.

     https://lore.kernel.org/linux-next/CAK7LNARuSmPCEy-ak0erPrPTgZdGVypBROFhtw+=3spoGoYsyw@mail.gmail.com/

 - Fix gcc 11 warnings, which triggered various minor reworks all over
   the code.

 - Add zstd kernel image compression support.

 - Rework boot CPU lowcore handling.

 - De-duplicate and move kernel memory layout setup logic earlier.

 - Few fixes in preparation for FORTIFY_SOURCE performing compile-time
   and run-time field bounds checking for mem functions.

 - Remove broken and unused power management support leftovers in s390
   drivers.

 - Disable stack-protector for decompressor and purgatory to fix
   buildroot build.

 - Fix vt220 sclp console name to match the char device name.

 - Enable HAVE_IOREMAP_PROT and add zpci_set_irq()/zpci_clear_irq() in
   zPCI code.

 - Remove some implausible WARN_ON_ONCEs and remove arch specific
   counter transaction call backs in favour of default transaction
   handling in perf code.

 - Extend/add new uevents for online/config/mode state changes of AP
   card / queue device in zcrypt.

 - Minor entry and ccwgroup code improvements.

 - Other small various fixes and improvements all over the code.

* tag 's390-5.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (91 commits)
  s390/dasd: use register pair instead of register asm
  s390/qdio: get rid of register asm
  s390/ioasm: use symbolic names for asm operands
  s390/ioasm: get rid of register asm
  s390/cmf: get rid of register asm
  s390/lib,string: get rid of register asm
  s390/lib,uaccess: get rid of register asm
  s390/string: get rid of register asm
  s390/cmpxchg: use register pair instead of register asm
  s390/mm,pages-states: get rid of register asm
  s390/lib,xor: get rid of register asm
  s390/timex: get rid of register asm
  s390/hypfs: use register pair instead of register asm
  s390/zcrypt: Switch to flexible array member
  s390/speculation: Use statically initialized const for instructions
  virtio/s390: get rid of open-coded kvm hypercall
  s390/pci: add zpci_set_irq()/zpci_clear_irq()
  scripts/min-tool-version.sh: Raise minimum clang version to 13.0.0 for s390
  s390/ipl: use register pair instead of register asm
  s390/mem_detect: fix tprot() program check new psw handling
  ...
parents 0d4d4c6f d4a01902

arch/s390/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -162,6 +162,7 @@ config S390 
	select HAVE_FUTEX_CMPXCHG if FUTEX

	select HAVE_GCC_PLUGINS

	select HAVE_GENERIC_VDSO

	select HAVE_IOREMAP_PROT if PCI

	select HAVE_IRQ_EXIT_ON_IRQ_STACK

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_GZIP
@@ -170,6 +171,7 @@ config S390 
	select HAVE_KERNEL_LZO

	select HAVE_KERNEL_UNCOMPRESSED

	select HAVE_KERNEL_XZ

	select HAVE_KERNEL_ZSTD

	select HAVE_KPROBES

	select HAVE_KPROBES_ON_FTRACE

	select HAVE_KRETPROBES
@@ -852,7 +854,7 @@ config CMM_IUCV 
config APPLDATA_BASE

	def_bool n

	prompt "Linux - VM Monitor Stream, base infrastructure"

	depends on PROC_FS

	depends on PROC_SYSCTL

	help

	  This provides a kernel interface for creating and updating z/VM APPLDATA

	  monitor records. The monitor records are updated at certain time

arch/s390/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ KBUILD_CFLAGS_DECOMPRESSOR += -DDISABLE_BRANCH_PROFILING -D__NO_FORTIFY 
KBUILD_CFLAGS_DECOMPRESSOR += -fno-delete-null-pointer-checks -msoft-float -mbackchain

KBUILD_CFLAGS_DECOMPRESSOR += -fno-asynchronous-unwind-tables

KBUILD_CFLAGS_DECOMPRESSOR += -ffreestanding

KBUILD_CFLAGS_DECOMPRESSOR += -fno-stack-protector

KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-disable-warning, address-of-packed-member)

KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),-g)

KBUILD_CFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO_DWARF4), $(call cc-option, -gdwarf-4,))

arch/s390/boot/als.c

+3 −3
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ void print_missing_facilities(void) 


	first = 1;

	for (i = 0; i < ARRAY_SIZE(als); i++) {

		val = ~S390_lowcore.stfle_fac_list[i] & als[i];

		val = ~stfle_fac_list[i] & als[i];

		for (j = 0; j < BITS_PER_LONG; j++) {

			if (!(val & (1UL << (BITS_PER_LONG - 1 - j))))

				continue;
@@ -106,9 +106,9 @@ void verify_facilities(void) 
{

	int i;



	__stfle(S390_lowcore.stfle_fac_list, ARRAY_SIZE(S390_lowcore.stfle_fac_list));

	__stfle(stfle_fac_list, ARRAY_SIZE(stfle_fac_list));

	for (i = 0; i < ARRAY_SIZE(als); i++) {

		if ((S390_lowcore.stfle_fac_list[i] & als[i]) != als[i])

		if ((stfle_fac_list[i] & als[i]) != als[i])

			facility_mismatch();

	}

}

arch/s390/boot/boot.h

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ void __printf(1, 2) decompressor_printk(const char *fmt, ...); 


extern const char kernel_version[];

extern unsigned long memory_limit;

extern unsigned long vmalloc_size;

extern int vmalloc_size_set;

extern int kaslr_enabled;

arch/s390/boot/compressed/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ obj-y := $(if $(CONFIG_KERNEL_UNCOMPRESSED),,decompressor.o) info.o 
obj-all := $(obj-y) piggy.o syms.o

targets	:= vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2

targets += vmlinux.bin.xz vmlinux.bin.lzma vmlinux.bin.lzo vmlinux.bin.lz4

targets += vmlinux.bin.zst

targets += info.bin syms.bin vmlinux.syms $(obj-all)



KBUILD_AFLAGS := $(KBUILD_AFLAGS_DECOMPRESSOR)
@@ -33,7 +34,7 @@ $(obj)/vmlinux.syms: $(obj)/vmlinux.lds $(objtree)/arch/s390/boot/startup.a $(OB 


quiet_cmd_dumpsyms = DUMPSYMS $<

define cmd_dumpsyms

	$(NM) -n -S --format=bsd "$<" | $(PERL) -ne '/(\w+)\s+(\w+)\s+[tT]\s+(\w+)/ and printf "%x %x %s\0",hex $$1,hex $$2,$$3' > "$@"

	$(NM) -n -S --format=bsd "$<" | sed -nE 's/^0*([0-9a-fA-F]+) 0*([0-9a-fA-F]+) [tT] ([^ ]*)$$/\1 \2 \3/p' | tr '\n' '\0' > "$@"

endef



$(obj)/syms.bin: $(obj)/vmlinux.syms FORCE
@@ -63,6 +64,7 @@ suffix-$(CONFIG_KERNEL_LZ4) := .lz4 
suffix-$(CONFIG_KERNEL_LZMA)  := .lzma

suffix-$(CONFIG_KERNEL_LZO)  := .lzo

suffix-$(CONFIG_KERNEL_XZ)  := .xz

suffix-$(CONFIG_KERNEL_ZSTD)  := .zst



$(obj)/vmlinux.bin.gz: $(vmlinux.bin.all-y) FORCE

	$(call if_changed,gzip)
@@ -76,6 +78,8 @@ $(obj)/vmlinux.bin.lzo: $(vmlinux.bin.all-y) FORCE 
	$(call if_changed,lzo)

$(obj)/vmlinux.bin.xz: $(vmlinux.bin.all-y) FORCE

	$(call if_changed,xzkern)

$(obj)/vmlinux.bin.zst: $(vmlinux.bin.all-y) FORCE

	$(call if_changed,zstd22)



OBJCOPYFLAGS_piggy.o := -I binary -O elf64-s390 -B s390:64-bit --rename-section .data=.vmlinux.bin.compressed

$(obj)/piggy.o: $(obj)/vmlinux.bin$(suffix-y) FORCE