Commit 95fbef17 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull s390 updates from Heiko Carstens:

 - Make use of the IBM z16 processor activity instrumentation facility
   to count cryptography operations: add a new PMU device driver so that
   perf can make use of this.

 - Add new IBM z16 extended counter set to cpumf support.

 - Add vdso randomization support.

 - Add missing KCSAN instrumentation to barriers and spinlocks, which
   should make s390's KCSAN support complete.

 - Add support for IPL-complete-control facility: notify the hypervisor
   that kexec finished work and the kernel starts.

 - Improve error logging for PCI.

 - Various small changes to workaround llvm's integrated assembler
   limitations, and one bug, to make it finally possible to compile the
   kernel with llvm's integrated assembler. This also requires to raise
   the minimum clang version to 14.0.0.

 - Various other small enhancements, bug fixes, and cleanups all over
   the place.

* tag 's390-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (48 commits)
  s390/head: get rid of 31 bit leftovers
  scripts/min-tool-version.sh: raise minimum clang version to 14.0.0 for s390
  s390/boot: do not emit debug info for assembly with llvm's IAS
  s390/boot: workaround llvm IAS bug
  s390/purgatory: workaround llvm's IAS limitations
  s390/entry: workaround llvm's IAS limitations
  s390/alternatives: remove padding generation code
  s390/alternatives: provide identical sized orginal/alternative sequences
  s390/cpumf: add new extended counter set for IBM z16
  s390/preempt: disable __preempt_count_add() optimization for PROFILE_ALL_BRANCHES
  s390/stp: clock_delta should be signed
  s390/stp: fix todoff size
  s390/pai: add support for cryptography counters
  entry: Rename arch_check_user_regs() to arch_enter_from_user_mode()
  s390/compat: cleanup compat_linux.h header file
  s390/entry: remove broken and not needed code
  s390/boot: convert parmarea to C
  s390/boot: convert initial lowcore to C
  s390/ptrace: move short psw definitions to ptrace header file
  s390/head: initialize all new psws
  ...
parents 67c642e0 94d34778

arch/s390/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -20,7 +20,9 @@ LDFLAGS_vmlinux := -pie 
endif

aflags_dwarf	:= -Wa,-gdwarf-2

KBUILD_AFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -D__ASSEMBLY__

ifndef CONFIG_AS_IS_LLVM

KBUILD_AFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),$(aflags_dwarf))

endif

KBUILD_CFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -O2 -mpacked-stack

KBUILD_CFLAGS_DECOMPRESSOR += -DDISABLE_BRANCH_PROFILING -D__NO_FORTIFY

KBUILD_CFLAGS_DECOMPRESSOR += -fno-delete-null-pointer-checks -msoft-float -mbackchain

arch/s390/boot/.gitignore

+3 −0
Original line number Diff line number Diff line
@@ -2,3 +2,6 @@ 
image

bzImage

section_cmp.*

vmlinux

vmlinux.lds

vmlinux.syms

arch/s390/boot/Makefile

+69 −9
Original line number Diff line number Diff line
@@ -37,14 +37,21 @@ CFLAGS_sclp_early_core.o += -I$(srctree)/drivers/s390/char 


obj-y	:= head.o als.o startup.o mem_detect.o ipl_parm.o ipl_report.o

obj-y	+= string.o ebcdic.o sclp_early_core.o mem.o ipl_vmparm.o cmdline.o

obj-y	+= version.o pgm_check_info.o ctype.o

obj-y	+= version.o pgm_check_info.o ctype.o ipl_data.o

obj-$(findstring y, $(CONFIG_PROTECTED_VIRTUALIZATION_GUEST) $(CONFIG_PGSTE))	+= uv.o

obj-$(CONFIG_RELOCATABLE)	+= machine_kexec_reloc.o

obj-$(CONFIG_RANDOMIZE_BASE)	+= kaslr.o

targets	:= bzImage startup.a section_cmp.boot.data section_cmp.boot.preserved.data $(obj-y)

subdir-	:= compressed

obj-y	+= $(if $(CONFIG_KERNEL_UNCOMPRESSED),,decompressor.o) info.o

obj-$(CONFIG_KERNEL_ZSTD) += clz_ctz.o

obj-all := $(obj-y) piggy.o syms.o



targets	:= bzImage section_cmp.boot.data section_cmp.boot.preserved.data $(obj-y)

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 info.bin syms.bin vmlinux.syms $(obj-all)



OBJECTS := $(addprefix $(obj)/,$(obj-y))

OBJECTS_ALL := $(addprefix $(obj)/,$(obj-all))



quiet_cmd_section_cmp = SECTCMP $*

define cmd_section_cmp
@@ -59,14 +66,67 @@ define cmd_section_cmp 
	touch $@

endef



$(obj)/bzImage: $(obj)/compressed/vmlinux $(obj)/section_cmp.boot.data $(obj)/section_cmp.boot.preserved.data FORCE

$(obj)/bzImage: $(obj)/vmlinux $(obj)/section_cmp.boot.data $(obj)/section_cmp.boot.preserved.data FORCE

	$(call if_changed,objcopy)



$(obj)/section_cmp%: vmlinux $(obj)/compressed/vmlinux FORCE

$(obj)/section_cmp%: vmlinux $(obj)/vmlinux FORCE

	$(call if_changed,section_cmp)



$(obj)/compressed/vmlinux: $(obj)/startup.a FORCE

	$(Q)$(MAKE) $(build)=$(obj)/compressed $@

LDFLAGS_vmlinux := --oformat $(LD_BFD) -e startup --build-id=sha1 -T

$(obj)/vmlinux: $(obj)/vmlinux.lds $(OBJECTS_ALL) FORCE

	$(call if_changed,ld)



LDFLAGS_vmlinux.syms := --oformat $(LD_BFD) -e startup -T

$(obj)/vmlinux.syms: $(obj)/vmlinux.lds $(OBJECTS) FORCE

	$(call if_changed,ld)



quiet_cmd_dumpsyms = DUMPSYMS $<

define cmd_dumpsyms

	$(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

	$(call if_changed,dumpsyms)



OBJCOPYFLAGS_syms.o := -I binary -O elf64-s390 -B s390:64-bit --rename-section .data=.decompressor.syms

$(obj)/syms.o: $(obj)/syms.bin FORCE

	$(call if_changed,objcopy)



OBJCOPYFLAGS_info.bin := -O binary --only-section=.vmlinux.info --set-section-flags .vmlinux.info=load

$(obj)/info.bin: vmlinux FORCE

	$(call if_changed,objcopy)



OBJCOPYFLAGS_info.o := -I binary -O elf64-s390 -B s390:64-bit --rename-section .data=.vmlinux.info

$(obj)/info.o: $(obj)/info.bin FORCE

	$(call if_changed,objcopy)



OBJCOPYFLAGS_vmlinux.bin := -O binary --remove-section=.comment --remove-section=.vmlinux.info -S

$(obj)/vmlinux.bin: vmlinux FORCE

	$(call if_changed,objcopy)



suffix-$(CONFIG_KERNEL_GZIP)  := .gz

suffix-$(CONFIG_KERNEL_BZIP2) := .bz2

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)/startup.a: $(OBJECTS) FORCE

	$(call if_changed,ar)
 
$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE

	$(call if_changed,gzip)

$(obj)/vmlinux.bin.bz2: $(obj)/vmlinux.bin FORCE

	$(call if_changed,bzip2_with_size)

$(obj)/vmlinux.bin.lz4: $(obj)/vmlinux.bin FORCE

	$(call if_changed,lz4_with_size)

$(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE

	$(call if_changed,lzma_with_size)

$(obj)/vmlinux.bin.lzo: $(obj)/vmlinux.bin FORCE

	$(call if_changed,lzo_with_size)

$(obj)/vmlinux.bin.xz: $(obj)/vmlinux.bin FORCE

	$(call if_changed,xzkern_with_size)

$(obj)/vmlinux.bin.zst: $(obj)/vmlinux.bin FORCE

	$(call if_changed,zstd22_with_size)



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

	$(call if_changed,objcopy)

arch/s390/boot/boot.h

+5 −1
Original line number Diff line number Diff line
@@ -2,9 +2,12 @@ 
#ifndef BOOT_BOOT_H

#define BOOT_BOOT_H



#include <asm/extable.h>

#include <linux/types.h>



#define IPL_START	0x200



#ifndef __ASSEMBLY__



void startup_kernel(void);

unsigned long detect_memory(void);

bool is_ipl_block_dump(void);
@@ -31,4 +34,5 @@ extern char _stack_start[], _stack_end[]; 


unsigned long read_ipl_report(unsigned long safe_offset);



#endif /* __ASSEMBLY__ */

#endif /* BOOT_BOOT_H */