Merge branches 'v5.10/vfio/fsl-mc-v6' and 'v5.10/vfio/zpci-info-v3' into v5.10/vfio/next (20993632) · Commits · 戴 / test

MAINTAINERS

+14 −0

Original line number	Diff line number	Diff line
		@@ -15165,6 +15165,14 @@ F: Documentation/s390/vfio-ccw.rst
		F: drivers/s390/cio/vfio_ccw*
		F: include/uapi/linux/vfio_ccw.h

		S390 VFIO-PCI DRIVER
		M: Matthew Rosato <mjrosato@linux.ibm.com>
		L: linux-s390@vger.kernel.org
		L: kvm@vger.kernel.org
		S: Supported
		F: drivers/vfio/pci/vfio_pci_zdev.c
		F: include/uapi/linux/vfio_zdev.h

		S390 ZCRYPT DRIVER
		M: Harald Freudenberger <freude@linux.ibm.com>
		L: linux-s390@vger.kernel.org
		@@ -18260,6 +18268,12 @@ F: drivers/vfio/
		F: include/linux/vfio.h
		F: include/uapi/linux/vfio.h

		VFIO FSL-MC DRIVER
		M: Diana Craciun <diana.craciun@oss.nxp.com>
		L: kvm@vger.kernel.org
		S: Maintained
		F: drivers/vfio/fsl-mc/

		VFIO MEDIATED DEVICE DRIVERS
		M: Kirti Wankhede <kwankhede@nvidia.com>
		L: kvm@vger.kernel.org

+3 −1

Original line number	Diff line number	Diff line
		@@ -132,7 +132,8 @@ struct zpci_dev {
		u8 rid_available : 1;
		u8 has_hp_slot : 1;
		u8 is_physfn : 1;
		u8 reserved : 5;
		u8 util_str_avail : 1;
		u8 reserved : 4;
		unsigned int devfn; /* DEVFN part of the RID*/

		struct mutex lock;
		@@ -179,6 +180,7 @@ struct zpci_dev {
		atomic64_t mapped_pages;
		atomic64_t unmapped_pages;

		u8 version;
		enum pci_bus_speed max_bus_speed;

		struct dentry *debugfs_dev;

+2 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,7 @@ static void clp_store_query_pci_fngrp(struct zpci_dev *zdev,
		zdev->msi_addr = response->msia;
		zdev->max_msi = response->noi;
		zdev->fmb_update = response->mui;
		zdev->version = response->version;

		switch (response->version) {
		case 1:
		@@ -167,6 +168,7 @@ static int clp_store_query_pci_fn(struct zpci_dev *zdev,
		if (response->util_str_avail) {
		memcpy(zdev->util_str, response->util_str,
		sizeof(zdev->util_str));
		zdev->util_str_avail = 1;
		}
		zdev->mio_capable = response->mio_addr_avail;
		for (i = 0; i < PCI_STD_NUM_BARS; i++) {

+1 −0

Original line number	Diff line number	Diff line
		@@ -47,4 +47,5 @@ menuconfig VFIO_NOIOMMU
		source "drivers/vfio/pci/Kconfig"
		source "drivers/vfio/platform/Kconfig"
		source "drivers/vfio/mdev/Kconfig"
		source "drivers/vfio/fsl-mc/Kconfig"
		source "virt/lib/Kconfig"

+1 −0

Original line number	Diff line number	Diff line
		@@ -9,3 +9,4 @@ obj-$(CONFIG_VFIO_SPAPR_EEH) += vfio_spapr_eeh.o
		obj-$(CONFIG_VFIO_PCI) += pci/
		obj-$(CONFIG_VFIO_PLATFORM) += platform/
		obj-$(CONFIG_VFIO_MDEV) += mdev/
		obj-$(CONFIG_VFIO_FSL_MC) += fsl-mc/