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

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

Pull s390 updates from Heiko Carstens:

 - Add vfio-ap support to pass-through crypto devices to secure
   execution guests

 - Add API ordinal 6 support to zcrypt_ep11misc device drive, which is
   required to handle key generate and key derive (e.g. secure key to
   protected key) correctly

 - Add missing secure/has_secure sysfs files for the case where it is
   not possible to figure where a system has been booted from. Existing
   user space relies on that these files are always present

 - Fix DCSS block device driver list corruption, caused by incorrect
   error handling

 - Convert virt_to_pfn() and pfn_to_virt() from defines to static inline
   functions to enforce type checking

 - Cleanups, improvements, and minor fixes to the kernel mapping setup

 - Fix various virtual vs physical address confusions

 - Move pfault code to separate file, since it has nothing to do with
   regular fault handling

 - Move s390 documentation to Documentation/arch/ like it has been done
   for other architectures already

 - Add HAVE_FUNCTION_GRAPH_RETVAL support

 - Factor out the s390_hypfs filesystem and add a new config option for
   it. The filesystem is deprecated and as soon as all users are gone it
   can be removed some time in the not so near future

 - Remove support for old CEX2 and CEX3 crypto cards from zcrypt device
   driver

 - Add support for user-defined certificates: receive user-defined
   certificates with a diagnose call and provide them via 'cert_store'
   keyring to user space

 - Couple of other small fixes and improvements all over the place

* tag 's390-6.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (66 commits)
  s390/pci: use builtin_misc_device macro to simplify the code
  s390/vfio-ap: make sure nib is shared
  KVM: s390: export kvm_s390_pv*_is_protected functions
  s390/uv: export uv_pin_shared for direct usage
  s390/vfio-ap: check for TAPQ response codes 0x35 and 0x36
  s390/vfio-ap: handle queue state change in progress on reset
  s390/vfio-ap: use work struct to verify queue reset
  s390/vfio-ap: store entire AP queue status word with the queue object
  s390/vfio-ap: remove upper limit on wait for queue reset to complete
  s390/vfio-ap: allow deconfigured queue to be passed through to a guest
  s390/vfio-ap: wait for response code 05 to clear on queue reset
  s390/vfio-ap: clean up irq resources if possible
  s390/vfio-ap: no need to check the 'E' and 'I' bits in APQSW after TAPQ
  s390/ipl: refactor deprecated strncpy
  s390/ipl: fix virtual vs physical address confusion
  s390/zcrypt_ep11misc: support API ordinal 6 with empty pin-blob
  s390/paes: fix PKEY_TYPE_EP11_AES handling for secure keyblobs
  s390/pkey: fix PKEY_TYPE_EP11_AES handling for sysfs attributes
  s390/pkey: fix PKEY_TYPE_EP11_AES handling in PKEY_VERIFYKEY2 IOCTL
  s390/pkey: fix PKEY_TYPE_EP11_AES handling in PKEY_KBLOB2PROTK[23]
  ...
parents 97efd283 dedf98dd

Documentation/admin-guide/kernel-parameters.txt

+2 −2
Original line number Diff line number Diff line
@@ -553,7 +553,7 @@ 
			others).



	ccw_timeout_log	[S390]

			See Documentation/s390/common_io.rst for details.

			See Documentation/arch/s390/common_io.rst for details.



	cgroup_disable=	[KNL] Disable a particular controller or optional feature

			Format: {name of the controller(s) or feature(s) to disable}
@@ -598,7 +598,7 @@ 
			Setting checkreqprot to 1 is deprecated.



	cio_ignore=	[S390]

			See Documentation/s390/common_io.rst for details.

			See Documentation/arch/s390/common_io.rst for details.



	clearcpuid=X[,X...] [X86]

			Disable CPUID feature X for the kernel. See

Documentation/arch/index.rst

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ implementation. 
   parisc/index

   ../powerpc/index

   ../riscv/index

   ../s390/index

   s390/index

   sh/index

   sparc/index

   x86/index

Documentation/s390/3270.rst→Documentation/arch/s390/3270.rst

+2 −2
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ Here are the installation steps in detail: 
	as a 3270, not a 3215.



	5. Run the 3270 configuration script config3270.  It is

	distributed in this same directory, Documentation/s390, as

	distributed in this same directory, Documentation/arch/s390, as

	config3270.sh.  Inspect the output script it produces,

	/tmp/mkdev3270, and then run that script.  This will create the

	necessary character special device files and make the necessary
@@ -125,7 +125,7 @@ Here are the installation steps in detail: 
	Then notify /sbin/init that /etc/inittab has changed, by issuing

	the telinit command with the q operand::



		cd Documentation/s390

		cd Documentation/arch/s390

		sh config3270.sh

		sh /tmp/mkdev3270

		telinit q

Documentation/s390/cds.rst→Documentation/arch/s390/cds.rst

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ some of them are ESA/390 platform specific. 


Note:

  In order to write a driver for S/390, you also need to look into the interface

  described in Documentation/s390/driver-model.rst.

  described in Documentation/arch/s390/driver-model.rst.



Note for porting drivers from 2.4: