Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 updates from Martin Schwidefsky:

 - New entropy generation for the pseudo random number generator.

 - Early boot printk output via sclp to help debug crashes on boot. This
   needs to be enabled with a kernel parameter.

 - Add proper no-execute support with a bit in the page table entry.

 - Bug fixes and cleanups.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (65 commits)
  s390/syscall: fix single stepped system calls
  s390/zcrypt: make ap_bus explicitly non-modular
  s390/zcrypt: Removed unneeded debug feature directory creation.
  s390: add missing "do {} while (0)" loop constructs to multiline macros
  s390/mm: add cond_resched call to kernel page table dumper
  s390: get rid of MACHINE_HAS_PFMF and MACHINE_HAS_HPAGE
  s390/mm: make memory_block_size_bytes available for !MEMORY_HOTPLUG
  s390: replace ACCESS_ONCE with READ_ONCE
  s390: Audit and remove any remaining unnecessary uses of module.h
  s390: mm: Audit and remove any unnecessary uses of module.h
  s390: kernel: Audit and remove any unnecessary uses of module.h
  s390/kdump: Use "LINUX" ELF note name instead of "CORE"
  s390: add no-execute support
  s390: report new vector facilities
  s390: use correct input data address for setup_randomness
  s390/sclp: get rid of common response code handling
  s390/sclp: don't add new lines to each printed string
  s390/sclp: make early sclp code readable
  s390/sclp: disable early sclp code as soon as the base sclp driver is active
  s390/sclp: move early printk code to drivers
  ...
parents 3051bf36 d24b98e3

Documentation/admin-guide/kernel-parameters.txt

+4 −1
Original line number Diff line number Diff line
@@ -970,9 +970,10 @@ 
			address. The serial port must already be setup

			and configured. Options are not yet supported.



	earlyprintk=	[X86,SH,BLACKFIN,ARM,M68k]

	earlyprintk=	[X86,SH,BLACKFIN,ARM,M68k,S390]

			earlyprintk=vga

			earlyprintk=efi

			earlyprintk=sclp

			earlyprintk=xen

			earlyprintk=serial[,ttySn[,baudrate]]

			earlyprintk=serial[,0x...[,baudrate]]
@@ -1007,6 +1008,8 @@ 


			The xen output can only be used by Xen PV guests.



			The sclp output can only be used on s390.



	edac_report=	[HW,EDAC] Control how to report EDAC event

			Format: {"on" | "off" | "force"}

			on: enable EDAC to report H/W event. May be overridden

arch/s390/Kconfig.debug

+3 −0
Original line number Diff line number Diff line
@@ -17,4 +17,7 @@ config S390_PTDUMP 
	  kernel.

	  If in doubt, say "N"



config EARLY_PRINTK

	def_bool y



endmenu

arch/s390/boot/compressed/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ KBUILD_CFLAGS += $(call cc-option,-ffreestanding) 
GCOV_PROFILE := n

UBSAN_SANITIZE := n



OBJECTS := $(addprefix $(objtree)/arch/s390/kernel/, head.o sclp.o ebcdic.o als.o)

OBJECTS := $(addprefix $(objtree)/arch/s390/kernel/, head.o ebcdic.o als.o)

OBJECTS += $(objtree)/drivers/s390/char/sclp_early_core.o

OBJECTS += $(obj)/head.o $(obj)/misc.o $(obj)/piggy.o



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

arch/s390/boot/compressed/misc.c

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static unsigned long free_mem_end_ptr; 


static int puts(const char *s)

{

	_sclp_print_early(s);

	sclp_early_printk(s);

	return 0;

}

arch/s390/crypto/aes_s390.c

+7 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#include <linux/cpufeature.h>

#include <linux/init.h>

#include <linux/spinlock.h>

#include <linux/fips.h>

#include <crypto/xts.h>

#include <asm/cpacf.h>
@@ -501,6 +502,12 @@ static int xts_aes_set_key(struct crypto_tfm *tfm, const u8 *in_key, 
	if (err)

		return err;



	/* In fips mode only 128 bit or 256 bit keys are valid */

	if (fips_enabled && key_len != 32 && key_len != 64) {

		tfm->crt_flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;

		return -EINVAL;

	}



	/* Pick the correct function code based on the key length */

	fc = (key_len == 32) ? CPACF_KM_XTS_128 :

	     (key_len == 64) ? CPACF_KM_XTS_256 : 0;