On Mon, 5 Dec 2022 11:29:15 -0400 Jason Gunthorpe <jgg@xxxxxxxxxx> wrote: > This series does a little house cleaning to remove the SPAPR exported > symbols, presence in the public header file, and reduce the number of > modules that comprise VFIO. > > v5: > - Reword commit messages > - Remove whitespace change from drivers/vfio/pci/vfio_pci_priv.h > v4: https://lore.kernel.org/r/0-v4-7993c351e9dc+33a818-vfio_modules_jgg@xxxxxxxxxx > - Copy IBM copyright header to vfio_iommu_spapr_tce.c > - Use "return" not "ret = " in vfio_spapr_ioctl_eeh_pe_op() > - Use just "#if IS_ENABLED(CONFIG_EEH)" > v3: https://lore.kernel.org/r/0-v3-8db96837cdf9+784-vfio_modules_jgg@xxxxxxxxxx > - New patch to fold SPAPR VFIO_CHECK_EXTENSION EEH code into the actual ioctl > - Remove the 'case VFIO_EEH_PE_OP' indenting level > - Just open code the calls and #ifdefs to eeh_dev_open()/release() > instead of using inline wrappers > - Rebase to v6.1-rc1 > v2: https://lore.kernel.org/r/0-v2-18daead6a41e+98-vfio_modules_jgg@xxxxxxxxxx > - Add stubs for vfio_virqfd_init()/vfio_virqfd_exit() so that linking > works even if vfio_pci/etc is not selected > v1: https://lore.kernel.org/r/0-v1-10a2dba77915+c23-vfio_modules_jgg@xxxxxxxxxx > > Signed-off-by: Jason Gunthorpe <jgg@xxxxxxxxxx> > > Jason Gunthorpe (5): > vfio/pci: Move all the SPAPR PCI specific logic to vfio_pci_core.ko > vfio/spapr: Move VFIO_CHECK_EXTENSION into tce_iommu_ioctl() > vfio: Move vfio_spapr_iommu_eeh_ioctl into vfio_iommu_spapr_tce.c > vfio: Remove CONFIG_VFIO_SPAPR_EEH > vfio: Fold vfio_virqfd.ko into vfio.ko > > drivers/vfio/Kconfig | 7 +- > drivers/vfio/Makefile | 5 +- > drivers/vfio/pci/vfio_pci_core.c | 11 ++- > drivers/vfio/vfio.h | 13 ++++ > drivers/vfio/vfio_iommu_spapr_tce.c | 65 ++++++++++++++--- > drivers/vfio/vfio_main.c | 7 ++ > drivers/vfio/vfio_spapr_eeh.c | 107 ---------------------------- > drivers/vfio/virqfd.c | 17 +---- > include/linux/vfio.h | 23 ------ > 9 files changed, 91 insertions(+), 164 deletions(-) > delete mode 100644 drivers/vfio/vfio_spapr_eeh.c > > > base-commit: 9abf2313adc1ca1b6180c508c25f22f9395cc780 Applied to vfio next branch for v6.2. Thanks, Alex
