Skip to contentSkip to conversation

VFIO updates for v5.13-rc1

GIT PULL Merged Alex Williamson 2 participants 2 messages Apr 28, 2021 – Apr 29, 2021 KVM

lore
Share & tools
lore
#0 lore raw

Hi Linus,

There's a conflict versus Dave's drm tree that was just merged in this one. Stephen noted the resolution vs linux-next here[1], essentially dropping the function contents from HEAD and using the new body. Thanks,

Alex

[1] https://lore.kernel.org/lkml/[email protected]/

The following changes since commit e49d033bddf5b565044e2abe4241353959bc9120:

Linux 5.12-rc6 (2021-04-04 14:15:36 -0700)

are available in the Git repository at:

git://github.com/awilliam/linux-vfio.git tags/vfio-v5.13-rc1

for you to fetch changes up to adaeb718d46f6b42a3fc1dffd4f946f26b33779a:

vfio/gvt: fix DRM_I915_GVT dependency on VFIO_MDEV (2021-04-27 13:36:54 -0600)

----------------------------------------------------------------
VFIO updates for v5.13-rc1

- Embed struct vfio_device into vfio driver structures (Jason Gunthorpe)

- Make vfio_mdev type safe (Jason Gunthorpe)

- Remove vfio-pci NVLink2 extensions for POWER9 (Christoph Hellwig)

- Update vfio-pci IGD extensions for OpRegion 2.1+ (Fred Gao)

- Various spelling/blank line fixes (Zhen Lei, Zhou Wang, Bhaskar Chowdhury)

- Simplify unpin_pages error handling (Shenming Lu)

- Fix i915 mdev Kconfig dependency (Arnd Bergmann)

- Remove unused structure member (Keqian Zhu)

----------------------------------------------------------------
Alex Williamson (1):

      Merge branches 'v5.13/vfio/embed-vfio_device', 'v5.13/vfio/misc' and 'v5.13/vfio/nvlink' into v5.13/vfio/next

Arnd Bergmann (1):
vfio/gvt: fix DRM_I915_GVT dependency on VFIO_MDEV

Bhaskar Chowdhury (1):
vfio: pci: Spello fix in the file vfio_pci.c

Christoph Hellwig (1):
vfio/pci: remove vfio_pci_nvlink2

Fred Gao (1):
vfio/pci: Add support for opregion v2.1+

Jason Gunthorpe (32):
vfio: Remove extra put/gets around vfio_device->group
vfio: Simplify the lifetime logic for vfio_device
vfio: Split creation of a vfio_device into init and register ops vfio/platform: Use vfio_init/register/unregister_group_dev vfio/fsl-mc: Re-order vfio_fsl_mc_probe()
vfio/fsl-mc: Use vfio_init/register/unregister_group_dev vfio/pci: Move VGA and VF initialization to functions
vfio/pci: Re-order vfio_pci_probe()
vfio/pci: Use vfio_init/register/unregister_group_dev vfio/mdev: Use vfio_init/register/unregister_group_dev vfio/mdev: Make to_mdev_device() into a static inline
vfio: Make vfio_device_ops pass a 'struct vfio_device *' instead of 'void *' vfio/pci: Replace uses of vfio_device_data() with container_of
vfio: Remove device_data from the vfio bus driver API vfio/mdev: Fix missing static's on MDEV_TYPE_ATTR's
vfio/mdev: Do not allow a mdev_type to have a NULL parent pointer vfio/mdev: Add missing typesafety around mdev_device
vfio/mdev: Simplify driver registration
vfio/mdev: Use struct mdev_type in struct mdev_device vfio/mdev: Expose mdev_get/put_parent to mdev_private.h vfio/mdev: Add missing reference counting to mdev_type vfio/mdev: Reorganize mdev_device_create()
vfio/mdev: Add missing error handling to dev_set_name() vfio/mdev: Remove duplicate storage of parent in mdev_device vfio/mdev: Add mdev/mtype_get_type_group_id()
vfio/mtty: Use mdev_get_type_group_id()
vfio/mdpy: Use mdev_get_type_group_id()
vfio/mbochs: Use mdev_get_type_group_id()
vfio/gvt: Make DRM_I915_GVT depend on VFIO_MDEV
vfio/gvt: Use mdev_get_type_group_id()
vfio/mdev: Remove kobj from mdev_parent_ops->create() vfio/mdev: Correct the function signatures for the mdev_type_attributes

Keqian Zhu (1):
vfio/iommu_type1: Remove unused pinned_page_dirty_scope in vfio_iommu

Shenming Lu (1):
vfio/type1: Remove the almost unused check in vfio_iommu_type1_unpin_pages

Zhen Lei (4):
vfio/type1: fix a couple of spelling mistakes vfio/mdev: Fix spelling mistake "interal" -> "internal" vfio/pci: fix a couple of spelling mistakes vfio/platform: Fix spelling mistake "registe" -> "register"

Zhou Wang (1):
vfio/pci: Remove an unnecessary blank line in vfio_pci_enable

 Documentation/driver-api/vfio-mediated-device.rst  |   9 +-
 Documentation/driver-api/vfio.rst                  |  48 +-
 drivers/gpu/drm/i915/Kconfig                       |   1 +
 drivers/gpu/drm/i915/gvt/gvt.c                     |  41 +-
 drivers/gpu/drm/i915/gvt/gvt.h                     |   4 +-
 drivers/gpu/drm/i915/gvt/kvmgt.c                   |   7 +-
 drivers/s390/cio/vfio_ccw_ops.c                    |  17 +-
 drivers/s390/crypto/vfio_ap_ops.c                  |  14 +-
 drivers/vfio/fsl-mc/vfio_fsl_mc.c                  | 127 ++++--
 drivers/vfio/fsl-mc/vfio_fsl_mc_private.h          |   1 +
 drivers/vfio/mdev/mdev_core.c                      | 174 +++-----
 drivers/vfio/mdev/mdev_driver.c                    |  19 +-
 drivers/vfio/mdev/mdev_private.h                   |  39 +-
 drivers/vfio/mdev/mdev_sysfs.c                     |  59 ++-
 drivers/vfio/mdev/vfio_mdev.c                      |  80 ++--
 drivers/vfio/pci/Kconfig                           |   6 -
 drivers/vfio/pci/Makefile                          |   1 -
 drivers/vfio/pci/vfio_pci.c                        | 274 ++++++------
 drivers/vfio/pci/vfio_pci_config.c                 |   2 +-
 drivers/vfio/pci/vfio_pci_igd.c                    |  53 +++
 drivers/vfio/pci/vfio_pci_nvlink2.c                | 490 ---------------------
 drivers/vfio/pci/vfio_pci_private.h                |  15 +-
 .../platform/reset/vfio_platform_calxedaxgmac.c    |   2 +-
 drivers/vfio/platform/vfio_amba.c                  |   8 +-
 drivers/vfio/platform/vfio_platform.c              |  20 +-
 drivers/vfio/platform/vfio_platform_common.c       |  56 +--
 drivers/vfio/platform/vfio_platform_private.h      |   5 +-
 drivers/vfio/vfio.c                                | 210 +++------
 drivers/vfio/vfio_iommu_type1.c                    |  40 +-
 include/linux/mdev.h                               |  80 +++-
 include/linux/vfio.h                               |  37 +-
 include/uapi/linux/vfio.h                          |  38 +-
 samples/vfio-mdev/mbochs.c                         |  55 ++-
 samples/vfio-mdev/mdpy.c                           |  56 ++-
 samples/vfio-mdev/mtty.c                           |  66 +--
 35 files changed, 793 insertions(+), 1361 deletions(-)
 delete mode 100644 drivers/vfio/pci/vfio_pci_nvlink2.c