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

Merge tag 'vfio-v6.5-rc1' of https://github.com/awilliam/linux-vfio 

Pull VFIO updates from Alex Williamson:

 - Adjust log levels for common messages (Oleksandr Natalenko, Alex
   Williamson)

 - Support for dynamic MSI-X allocation (Reinette Chatre)

 - Enable and report PCIe AtomicOp Completer capabilities (Alex
   Williamson)

 - Cleanup Kconfigs for vfio bus drivers (Alex Williamson)

 - Add support for CDX bus based devices (Nipun Gupta)

 - Fix race with concurrent mdev initialization (Eric Farman)

* tag 'vfio-v6.5-rc1' of https://github.com/awilliam/linux-vfio:
  vfio/mdev: Move the compat_class initialization to module init
  vfio/cdx: add support for CDX bus
  vfio/fsl: Create Kconfig sub-menu
  vfio/platform: Cleanup Kconfig
  vfio/pci: Cleanup Kconfig
  vfio/pci-core: Add capability for AtomicOp completer support
  vfio/pci: Also demote hiding standard cap messages
  vfio/pci: Clear VFIO_IRQ_INFO_NORESIZE for MSI-X
  vfio/pci: Support dynamic MSI-X
  vfio/pci: Probe and store ability to support dynamic MSI-X
  vfio/pci: Use bitfield for struct vfio_pci_core_device flags
  vfio/pci: Update stale comment
  vfio/pci: Remove interrupt context counter
  vfio/pci: Use xarray for interrupt context storage
  vfio/pci: Move to single error path
  vfio/pci: Prepare for dynamic interrupt context storage
  vfio/pci: Remove negative check on unsigned vector
  vfio/pci: Consolidate irq cleanup on MSI/MSI-X disable
  vfio/pci: demote hiding ecap messages to debug level
parents 9070577a ff598081

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -22254,6 +22254,13 @@ F: Documentation/filesystems/vfat.rst 
F:	fs/fat/

F:	tools/testing/selftests/filesystems/fat/









VFIO CDX DRIVER









M:	Nipun Gupta <nipun.gupta@amd.com>









M:	Nikhil Agarwal <nikhil.agarwal@amd.com>









L:	kvm@vger.kernel.org









S:	Maintained









F:	drivers/vfio/cdx/*

















VFIO DRIVER









M:	Alex Williamson <alex.williamson@redhat.com>









L:	kvm@vger.kernel.org

























drivers/vfio/Kconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -57,6 +57,7 @@ source "drivers/vfio/pci/Kconfig"







source "drivers/vfio/platform/Kconfig"









source "drivers/vfio/mdev/Kconfig"









source "drivers/vfio/fsl-mc/Kconfig"









source "drivers/vfio/cdx/Kconfig"









endif



















source "virt/lib/Kconfig"
























drivers/vfio/Makefile



+3
−2






























Original line number
Diff line number
Diff line







@@ -10,7 +10,8 @@ vfio-$(CONFIG_VFIO_VIRQFD) += virqfd.o

















obj-$(CONFIG_VFIO_IOMMU_TYPE1) += vfio_iommu_type1.o









obj-$(CONFIG_VFIO_IOMMU_SPAPR_TCE) += vfio_iommu_spapr_tce.o









obj-$(CONFIG_VFIO_PCI) += pci/









obj-$(CONFIG_VFIO_PLATFORM) += platform/









obj-$(CONFIG_VFIO_PCI_CORE) += pci/









obj-$(CONFIG_VFIO_PLATFORM_BASE) += platform/









obj-$(CONFIG_VFIO_MDEV) += mdev/









obj-$(CONFIG_VFIO_FSL_MC) += fsl-mc/









obj-$(CONFIG_VFIO_CDX) += cdx/
























drivers/vfio/cdx/Kconfig
0 → 100644



+17
−0






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0









#









# VFIO CDX configuration









#









# Copyright (C) 2022-2023, Advanced Micro Devices, Inc.









#



















config VFIO_CDX









	tristate "VFIO support for CDX bus devices"









	depends on CDX_BUS









	select EVENTFD









	help









	  Driver to enable VFIO support for the devices on CDX bus.









	  This is required to make use of CDX devices present in









	  the system using the VFIO framework.



















	  If you don't know what to do here, say N.
























drivers/vfio/cdx/Makefile
0 → 100644



+8
−0






























Original line number
Diff line number
Diff line









# SPDX-License-Identifier: GPL-2.0









#









# Copyright (C) 2022-2023, Advanced Micro Devices, Inc.









#



















obj-$(CONFIG_VFIO_CDX) += vfio-cdx.o



















vfio-cdx-objs := main.o