Commit d72cf8ff authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

Merge tag 'kvm-s390-master-6.1-1' of... 

Merge tag 'kvm-s390-master-6.1-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD

A PCI allocation fix and a PV clock fix.
parents 556f3c9a b6662e37

Documentation/arm64/cpu-feature-registers.rst

+37 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ operation if the source belongs to the supported system register space. 


The infrastructure emulates only the following system register space::



	Op0=3, Op1=0, CRn=0, CRm=0,4,5,6,7

	Op0=3, Op1=0, CRn=0, CRm=0,2,3,4,5,6,7



(See Table C5-6 'System instruction encodings for non-Debug System

register accesses' in ARMv8 ARM DDI 0487A.h, for the list of
@@ -293,6 +293,42 @@ infrastructure: 
     | WFXT                         | [3-0]   |    y    |

     +------------------------------+---------+---------+



  10) MVFR0_EL1 - AArch32 Media and VFP Feature Register 0



     +------------------------------+---------+---------+

     | Name                         |  bits   | visible |

     +------------------------------+---------+---------+

     | FPDP                         | [11-8]  |    y    |

     +------------------------------+---------+---------+



  11) MVFR1_EL1 - AArch32 Media and VFP Feature Register 1



     +------------------------------+---------+---------+

     | Name                         |  bits   | visible |

     +------------------------------+---------+---------+

     | SIMDFMAC                     | [31-28] |    y    |

     +------------------------------+---------+---------+

     | SIMDSP                       | [19-16] |    y    |

     +------------------------------+---------+---------+

     | SIMDInt                      | [15-12] |    y    |

     +------------------------------+---------+---------+

     | SIMDLS                       | [11-8]  |    y    |

     +------------------------------+---------+---------+



  12) ID_ISAR5_EL1 - AArch32 Instruction Set Attribute Register 5



     +------------------------------+---------+---------+

     | Name                         |  bits   | visible |

     +------------------------------+---------+---------+

     | CRC32                        | [19-16] |    y    |

     +------------------------------+---------+---------+

     | SHA2                         | [15-12] |    y    |

     +------------------------------+---------+---------+

     | SHA1                         | [11-8]  |    y    |

     +------------------------------+---------+---------+

     | AES                          | [7-4]   |    y    |

     +------------------------------+---------+---------+





Appendix I: Example

-------------------

Documentation/devicetree/bindings/power/fsl,imx-gpcv2.yaml

+3 −0
Original line number Diff line number Diff line
@@ -81,6 +81,9 @@ properties: 


          power-supply: true



          power-domains:

            maxItems: 1



          resets:

            description: |

              A number of phandles to resets that need to be asserted during

Documentation/driver-api/driver-model/devres.rst

+1 −0
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ GPIO 
  devm_gpio_request_one()



I2C

  devm_i2c_add_adapter()

  devm_i2c_new_dummy_device()



IIO

Documentation/kbuild/reproducible-builds.rst

+10 −0
Original line number Diff line number Diff line
@@ -119,6 +119,16 @@ To avoid this, you can make the vDSO different for different 
kernel versions by including an arbitrary string of "salt" in it.

This is specified by the Kconfig symbol ``CONFIG_BUILD_SALT``.



Git

---



Uncommitted changes or different commit ids in git can also lead

to different compilation results. For example, after executing

``git reset HEAD^``, even if the code is the same, the

``include/config/kernel.release`` generated during compilation

will be different, which will eventually lead to binary differences.

See ``scripts/setlocalversion`` for details.



.. _KBUILD_BUILD_TIMESTAMP: kbuild.html#kbuild-build-timestamp

.. _KBUILD_BUILD_USER and KBUILD_BUILD_HOST: kbuild.html#kbuild-build-user-kbuild-build-host

.. _KCFLAGS: kbuild.html#kcflags

Documentation/virt/kvm/devices/vm.rst

+3 −0
Original line number Diff line number Diff line
@@ -215,6 +215,7 @@ KVM_S390_VM_TOD_EXT). 
:Parameters: address of a buffer in user space to store the data (u8) to

:Returns:   -EFAULT if the given address is not accessible from kernel space;

	    -EINVAL if setting the TOD clock extension to != 0 is not supported

	    -EOPNOTSUPP for a PV guest (TOD managed by the ultravisor)



3.2. ATTRIBUTE: KVM_S390_VM_TOD_LOW

-----------------------------------
@@ -224,6 +225,7 @@ the POP (u64). 


:Parameters: address of a buffer in user space to store the data (u64) to

:Returns:    -EFAULT if the given address is not accessible from kernel space

	     -EOPNOTSUPP for a PV guest (TOD managed by the ultravisor)



3.3. ATTRIBUTE: KVM_S390_VM_TOD_EXT

-----------------------------------
@@ -237,6 +239,7 @@ it, it is stored as 0 and not allowed to be set to a value != 0. 
	     (kvm_s390_vm_tod_clock) to

:Returns:   -EFAULT if the given address is not accessible from kernel space;

	    -EINVAL if setting the TOD clock extension to != 0 is not supported

	    -EOPNOTSUPP for a PV guest (TOD managed by the ultravisor)



4. GROUP: KVM_S390_VM_CRYPTO

============================