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

Commit 9e85ae6a 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:
 "The first part of the s390 updates for 4.14:

   - Add machine type 0x3906 for IBM z14

   - Add IBM z14 TLB flushing improvements for KVM guests

   - Exploit the TOD clock epoch extension to provide a continuous TOD
     clock afer 2042/09/17

   - Add NIAI spinlock hints for IBM z14

   - Rework the vmcp driver and use CMA for the respone buffer of z/VM
     CP commands

   - Drop some s390 specific asm headers and use the generic version

   - Add block discard for DASD-FBA devices under z/VM

   - Add average request times to DASD statistics

   - A few of those constify patches which seem to be in vogue right now

   - Cleanup and bug fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (50 commits)
  s390/mm: avoid empty zero pages for KVM guests to avoid postcopy hangs
  s390/dasd: Add discard support for FBA devices
  s390/zcrypt: make CPRBX const
  s390/uaccess: avoid mvcos jump label
  s390/mm: use generic mm_hooks
  s390/facilities: fix typo
  s390/vmcp: simplify vmcp_response_free()
  s390/topology: Remove the unused parent_node() macro
  s390/dasd: Change unsigned long long to unsigned long
  s390/smp: convert cpuhp_setup_state() return code to zero on success
  s390: fix 'novx' early parameter handling
  s390/dasd: add average request times to dasd statistics
  s390/scm: use common completion path
  s390/pci: log changes to uid checking
  s390/vmcp: simplify vmcp_ioctl()
  s390/vmcp: return -ENOTTY for unknown ioctl commands
  s390/vmcp: split vmcp header file and move to uapi
  s390/vmcp: make use of contiguous memory allocator
  s390/cpcmd,vmcp: avoid GFP_DMA allocations
  s390/vmcp: fix uaccess check and avoid undefined behavior
  ...
parents 6caffe21 fa41ba0d

Documentation/admin-guide/kernel-parameters.txt

+4 −0
Original line number Diff line number Diff line
@@ -4395,6 +4395,10 @@ 
			decrease the size and leave more room for directly

			mapped kernel RAM.



	vmcp_cma=nn[MG]	[KNL,S390]

			Sets the memory size reserved for contiguous memory

			allocations for the vmcp device driver.



	vmhalt=		[KNL,S390] Perform z/VM CP command after system halt.

			Format: <command>

arch/s390/Kconfig

+18 −0
Original line number Diff line number Diff line
@@ -222,6 +222,10 @@ config HAVE_MARCH_Z13_FEATURES 
	def_bool n

	select HAVE_MARCH_ZEC12_FEATURES



config HAVE_MARCH_Z14_FEATURES

	def_bool n

	select HAVE_MARCH_Z13_FEATURES



choice

	prompt "Processor type"

	default MARCH_Z196
@@ -282,6 +286,14 @@ config MARCH_Z13 
	  2964 series). The kernel will be slightly faster but will not work on

	  older machines.



config MARCH_Z14

	bool "IBM z14"

	select HAVE_MARCH_Z14_FEATURES

	help

	  Select this to enable optimizations for IBM z14 (3906 series).

	  The kernel will be slightly faster but will not work on older

	  machines.



endchoice



config MARCH_Z900_TUNE
@@ -305,6 +317,9 @@ config MARCH_ZEC12_TUNE 
config MARCH_Z13_TUNE

	def_bool TUNE_Z13 || MARCH_Z13 && TUNE_DEFAULT



config MARCH_Z14_TUNE

	def_bool TUNE_Z14 || MARCH_Z14 && TUNE_DEFAULT



choice

	prompt "Tune code generation"

	default TUNE_DEFAULT
@@ -343,6 +358,9 @@ config TUNE_ZEC12 
config TUNE_Z13

	bool "IBM z13"



config TUNE_Z14

	bool "IBM z14"



endchoice



config 64BIT

arch/s390/Makefile

+4 −2
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ mflags-$(CONFIG_MARCH_Z10) := -march=z10 
mflags-$(CONFIG_MARCH_Z196)   := -march=z196

mflags-$(CONFIG_MARCH_ZEC12)  := -march=zEC12

mflags-$(CONFIG_MARCH_Z13)    := -march=z13

mflags-$(CONFIG_MARCH_Z14)    := -march=z14



export CC_FLAGS_MARCH := $(mflags-y)
@@ -45,6 +46,7 @@ cflags-$(CONFIG_MARCH_Z10_TUNE) += -mtune=z10 
cflags-$(CONFIG_MARCH_Z196_TUNE)	+= -mtune=z196

cflags-$(CONFIG_MARCH_ZEC12_TUNE)	+= -mtune=zEC12

cflags-$(CONFIG_MARCH_Z13_TUNE)		+= -mtune=z13

cflags-$(CONFIG_MARCH_Z14_TUNE)		+= -mtune=z14



cflags-y += -Wa,-I$(srctree)/arch/$(ARCH)/include

arch/s390/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -16,4 +16,5 @@ generic-y += mcs_spinlock.h 
generic-y += mm-arch-hooks.h

generic-y += preempt.h

generic-y += trace_clock.h

generic-y += unaligned.h

generic-y += word-at-a-time.h

arch/s390/include/asm/cpcmd.h

+3 −4
Original line number Diff line number Diff line
@@ -10,9 +10,8 @@ 


/*

 * the lowlevel function for cpcmd

 * the caller of __cpcmd has to ensure that the response buffer is below 2 GB

 */

extern int __cpcmd(const char *cmd, char *response, int rlen, int *response_code);

int __cpcmd(const char *cmd, char *response, int rlen, int *response_code);



/*

 * cpcmd is the in-kernel interface for issuing CP commands
@@ -25,8 +24,8 @@ extern int __cpcmd(const char *cmd, char *response, int rlen, int *response_code 
 * response_code: return pointer for VM's error code

 * return value: the size of the response. The caller can check if the buffer

 *		was large enough by comparing the return value and rlen

 * NOTE: If the response buffer is not below 2 GB, cpcmd can sleep

 * NOTE: If the response buffer is not in real storage, cpcmd can sleep

 */

extern int cpcmd(const char *cmd, char *response, int rlen, int *response_code);

int cpcmd(const char *cmd, char *response, int rlen, int *response_code);



#endif /* _ASM_S390_CPCMD_H */