Commit 58659247 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull s390 updates from Heiko Carstens:

 - Add support for the hugetlb_cma command line option to allocate
   gigantic hugepages using CMA

 - Add arch_get_random_long() support.

 - Add ap bus userspace notifications.

 - Increase default size of vmalloc area to 512GB and otherwise let it
   increase dynamically by the size of physical memory. This should fix
   all occurrences where the vmalloc area was not large enough.

 - Completely get rid of set_fs() (aka select SET_FS) and rework address
   space handling while doing that; making address space handling much
   more simple.

 - Reimplement getcpu vdso syscall in C.

 - Add support for extended SCLP responses (> 4k). This allows e.g. to
   handle also potential large system configurations.

 - Simplify KASAN by removing 3-level page table support and only
   supporting 4-levels from now on.

 - Improve debug-ability of the kernel decompressor code, which now
   prints also stack traces and symbols in case of problems to the
   console.

 - Remove more power management leftovers.

 - Other various fixes and improvements all over the place.

* tag 's390-5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (62 commits)
  s390/mm: add support to allocate gigantic hugepages using CMA
  s390/crypto: add arch_get_random_long() support
  s390/smp: perform initial CPU reset also for SMT siblings
  s390/mm: use invalid asce for user space when switching to init_mm
  s390/idle: fix accounting with machine checks
  s390/idle: add missing mt_cycles calculation
  s390/boot: add build-id to decompressor
  s390/kexec_file: fix diag308 subcode when loading crash kernel
  s390/cio: fix use-after-free in ccw_device_destroy_console
  s390/cio: remove pm support from ccw bus driver
  s390/cio: remove pm support from css-bus driver
  s390/cio: remove pm support from IO subchannel drivers
  s390/cio: remove pm support from chsc subchannel driver
  s390/vmur: remove unused pm related functions
  s390/tape: remove unsupported PM functions
  s390/cio: remove pm support from eadm-sch drivers
  s390: remove pm support from console drivers
  s390/dasd: remove unused pm related functions
  s390/zfcp: remove pm support from zfcp driver
  s390/ap: let bus_register() add the AP bus sysfs attributes
  ...
parents 0b03befa 343dbdb7

arch/s390/Kconfig

+2 −4
Original line number Diff line number Diff line
@@ -53,8 +53,7 @@ config ARCH_SUPPORTS_UPROBES 
config KASAN_SHADOW_OFFSET

	hex

	depends on KASAN

	default 0x18000000000000 if KASAN_S390_4_LEVEL_PAGING

	default 0x30000000000

	default 0x18000000000000



config S390

	def_bool y
@@ -191,7 +190,6 @@ config S390 
	select PCI_DOMAINS		if PCI

	select PCI_MSI			if PCI

	select PCI_MSI_ARCH_FALLBACKS	if PCI_MSI

	select SET_FS

	select SPARSE_IRQ

	select SYSCTL_EXCEPTION_TRACE

	select THREAD_INFO_IN_TASK
@@ -714,7 +712,7 @@ if PCI 
config PCI_NR_FUNCTIONS

	int "Maximum number of PCI functions (1-4096)"

	range 1 4096

	default "128"

	default "512"

	help

	  This allows you to specify the maximum number of PCI functions which

	  this kernel will support.

arch/s390/Kconfig.debug

+8 −0
Original line number Diff line number Diff line
@@ -5,3 +5,11 @@ config TRACE_IRQFLAGS_SUPPORT 


config EARLY_PRINTK

	def_bool y



config DEBUG_USER_ASCE

	bool "Debug User ASCE"

	help

	  Check on exit to user space that address space control

	  elements are setup correctly.



	  If unsure, say N.

arch/s390/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ KBUILD_AFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -D__ASSEMBLY__ 
KBUILD_AFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),$(aflags_dwarf))

KBUILD_CFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -O2

KBUILD_CFLAGS_DECOMPRESSOR += -DDISABLE_BRANCH_PROFILING -D__NO_FORTIFY

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

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 += $(call cc-disable-warning, address-of-packed-member)

arch/s390/boot/boot.h

+15 −3
Original line number Diff line number Diff line
@@ -2,20 +2,32 @@ 
#ifndef BOOT_BOOT_H

#define BOOT_BOOT_H



#include <linux/types.h>



#define BOOT_STACK_OFFSET 0x8000



#ifndef __ASSEMBLY__



#include <linux/compiler.h>



void startup_kernel(void);

void detect_memory(void);

unsigned long detect_memory(void);

bool is_ipl_block_dump(void);

void store_ipl_parmblock(void);

void setup_boot_command_line(void);

void parse_boot_command_line(void);

void setup_memory_end(void);

void verify_facilities(void);

void print_missing_facilities(void);

void print_pgm_check_info(void);

unsigned long get_random_base(unsigned long safe_addr);

void __printf(1, 2) decompressor_printk(const char *fmt, ...);



extern int kaslr_enabled;

extern const char kernel_version[];

extern unsigned long memory_limit;

extern int vmalloc_size_set;

extern int kaslr_enabled;



unsigned long read_ipl_report(unsigned long safe_offset);



#endif /* __ASSEMBLY__ */

#endif /* BOOT_BOOT_H */

arch/s390/boot/compressed/.gitignore

+1 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

vmlinux

vmlinux.lds

vmlinux.syms