[v3] spapr: Remove support for NVIDIA V100 GPU with NVLink2

From: Cédric Le Goater <clg@redhat.com>

NVLink2 support was removed from the PPC PowerNV platform and VFIO in
Linux 5.13 with commits :

  562d1e207d32 ("powerpc/powernv: remove the nvlink support")
  b392a1989170 ("vfio/pci: remove vfio_pci_nvlink2")

This was 2.5 years ago. Do the same in QEMU with a revert of commit
ec132efaa81f ("spapr: Support NVIDIA V100 GPU with NVLink2"). Some
adjustements are required on the NUMA part.

Cc: Alexey Kardashevskiy <aik@ozlabs.ru>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Acked-by: Alex Williamson <alex.williamson@redhat.com>
Signed-off-by: Cédric Le Goater <clg@redhat.com>
---

 v3: Adds Alex's ack. Also switched to @redhat.com email because
     this is VFIO related. 
 v2: Fixes compile error in spapr_numa_FORM1_write_rtas_dt()

 hw/vfio/pci.h               |   2 -
 include/hw/pci-host/spapr.h |  45 ----
 include/hw/ppc/spapr.h      |   9 +-
 hw/ppc/spapr.c              |  22 +-
 hw/ppc/spapr_numa.c         |  49 +---
 hw/ppc/spapr_pci.c          |  19 --
 hw/ppc/spapr_pci_nvlink2.c  | 442 ------------------------------------
 hw/vfio/pci-quirks.c        | 115 ----------
 hw/vfio/pci.c               |  14 --
 hw/ppc/meson.build          |   1 -
 hw/vfio/trace-events        |   4 -
 11 files changed, 14 insertions(+), 708 deletions(-)
 delete mode 100644 hw/ppc/spapr_pci_nvlink2.c

Queued in gitlab.com/danielhb/qemu/tree/ppc-next. Thanks,


Daniel

On 9/18/23 06:17, Cédric Le Goater wrote:
> From: Cédric Le Goater <clg@redhat.com>
> 
> NVLink2 support was removed from the PPC PowerNV platform and VFIO in
> Linux 5.13 with commits :
> 
>    562d1e207d32 ("powerpc/powernv: remove the nvlink support")
>    b392a1989170 ("vfio/pci: remove vfio_pci_nvlink2")
> 
> This was 2.5 years ago. Do the same in QEMU with a revert of commit
> ec132efaa81f ("spapr: Support NVIDIA V100 GPU with NVLink2"). Some
> adjustements are required on the NUMA part.
> 
> Cc: Alexey Kardashevskiy <aik@ozlabs.ru>
> Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
> Acked-by: Alex Williamson <alex.williamson@redhat.com>
> Signed-off-by: Cédric Le Goater <clg@redhat.com>
> ---
> 
>   v3: Adds Alex's ack. Also switched to @redhat.com email because
>       this is VFIO related.
>   v2: Fixes compile error in spapr_numa_FORM1_write_rtas_dt()
> 
>   hw/vfio/pci.h               |   2 -
>   include/hw/pci-host/spapr.h |  45 ----
>   include/hw/ppc/spapr.h      |   9 +-
>   hw/ppc/spapr.c              |  22 +-
>   hw/ppc/spapr_numa.c         |  49 +---
>   hw/ppc/spapr_pci.c          |  19 --
>   hw/ppc/spapr_pci_nvlink2.c  | 442 ------------------------------------
>   hw/vfio/pci-quirks.c        | 115 ----------
>   hw/vfio/pci.c               |  14 --
>   hw/ppc/meson.build          |   1 -
>   hw/vfio/trace-events        |   4 -
>   11 files changed, 14 insertions(+), 708 deletions(-)
>   delete mode 100644 hw/ppc/spapr_pci_nvlink2.c
> 
> diff --git a/hw/vfio/pci.h b/hw/vfio/pci.h
> index a2771b9ff3cc..2d836093a83d 100644
> --- a/hw/vfio/pci.h
> +++ b/hw/vfio/pci.h
> @@ -221,8 +221,6 @@ int vfio_populate_vga(VFIOPCIDevice *vdev, Error **errp);
>   int vfio_pci_igd_opregion_init(VFIOPCIDevice *vdev,
>                                  struct vfio_region_info *info,
>                                  Error **errp);
> -int vfio_pci_nvidia_v100_ram_init(VFIOPCIDevice *vdev, Error **errp);
> -int vfio_pci_nvlink2_init(VFIOPCIDevice *vdev, Error **errp);
>   
>   void vfio_display_reset(VFIOPCIDevice *vdev);
>   int vfio_display_probe(VFIOPCIDevice *vdev, Error **errp);
> diff --git a/include/hw/pci-host/spapr.h b/include/hw/pci-host/spapr.h
> index 5b03a7b0eb3f..3778aac27b60 100644
> --- a/include/hw/pci-host/spapr.h
> +++ b/include/hw/pci-host/spapr.h
> @@ -47,8 +47,6 @@ typedef struct SpaprPciLsi {
>       uint32_t irq;
>   } SpaprPciLsi;
>   
> -typedef struct SpaprPhbPciNvGpuConfig SpaprPhbPciNvGpuConfig;
> -
>   struct SpaprPhbState {
>       PCIHostState parent_obj;
>   
> @@ -90,9 +88,6 @@ struct SpaprPhbState {
>       uint32_t mig_liobn;
>       hwaddr mig_mem_win_addr, mig_mem_win_size;
>       hwaddr mig_io_win_addr, mig_io_win_size;
> -    hwaddr nv2_gpa_win_addr;
> -    hwaddr nv2_atsd_win_addr;
> -    SpaprPhbPciNvGpuConfig *nvgpus;
>       bool pre_5_1_assoc;
>   };
>   
> @@ -112,20 +107,6 @@ struct SpaprPhbState {
>   
>   #define SPAPR_PCI_MSI_WINDOW         0x40000000000ULL
>   
> -#define SPAPR_PCI_NV2RAM64_WIN_BASE  SPAPR_PCI_LIMIT
> -#define SPAPR_PCI_NV2RAM64_WIN_SIZE  (2 * TiB) /* For up to 6 GPUs 256GB each */
> -
> -/* Max number of NVLinks per GPU in any physical box */
> -#define NVGPU_MAX_LINKS              3
> -
> -/*
> - * GPU RAM starts at 64TiB so huge DMA window to cover it all ends at 128TiB
> - * which is enough. We do not need DMA for ATSD so we put them at 128TiB.
> - */
> -#define SPAPR_PCI_NV2ATSD_WIN_BASE   (128 * TiB)
> -#define SPAPR_PCI_NV2ATSD_WIN_SIZE   (NVGPU_MAX_NUM * NVGPU_MAX_LINKS * \
> -                                      64 * KiB)
> -
>   int spapr_dt_phb(SpaprMachineState *spapr, SpaprPhbState *phb,
>                    uint32_t intc_phandle, void *fdt, int *node_offset);
>   
> @@ -149,13 +130,6 @@ int spapr_phb_vfio_eeh_get_state(SpaprPhbState *sphb, int *state);
>   int spapr_phb_vfio_eeh_reset(SpaprPhbState *sphb, int option);
>   int spapr_phb_vfio_eeh_configure(SpaprPhbState *sphb);
>   void spapr_phb_vfio_reset(DeviceState *qdev);
> -void spapr_phb_nvgpu_setup(SpaprPhbState *sphb, Error **errp);
> -void spapr_phb_nvgpu_free(SpaprPhbState *sphb);
> -void spapr_phb_nvgpu_populate_dt(SpaprPhbState *sphb, void *fdt, int bus_off,
> -                                 Error **errp);
> -void spapr_phb_nvgpu_ram_populate_dt(SpaprPhbState *sphb, void *fdt);
> -void spapr_phb_nvgpu_populate_pcidev_dt(PCIDevice *dev, void *fdt, int offset,
> -                                        SpaprPhbState *sphb);
>   #else
>   static inline bool spapr_phb_eeh_available(SpaprPhbState *sphb)
>   {
> @@ -182,25 +156,6 @@ static inline int spapr_phb_vfio_eeh_configure(SpaprPhbState *sphb)
>   static inline void spapr_phb_vfio_reset(DeviceState *qdev)
>   {
>   }
> -static inline void spapr_phb_nvgpu_setup(SpaprPhbState *sphb, Error **errp)
> -{
> -}
> -static inline void spapr_phb_nvgpu_free(SpaprPhbState *sphb)
> -{
> -}
> -static inline void spapr_phb_nvgpu_populate_dt(SpaprPhbState *sphb, void *fdt,
> -                                               int bus_off, Error **errp)
> -{
> -}
> -static inline void spapr_phb_nvgpu_ram_populate_dt(SpaprPhbState *sphb,
> -                                                   void *fdt)
> -{
> -}
> -static inline void spapr_phb_nvgpu_populate_pcidev_dt(PCIDevice *dev, void *fdt,
> -                                                      int offset,
> -                                                      SpaprPhbState *sphb)
> -{
> -}
>   #endif
>   
>   void spapr_phb_dma_reset(SpaprPhbState *sphb);
> diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
> index f4bd204d8633..fca60b403198 100644
> --- a/include/hw/ppc/spapr.h
> +++ b/include/hw/ppc/spapr.h
> @@ -103,11 +103,8 @@ typedef enum {
>   
>   #define FDT_MAX_SIZE                    0x200000
>   
> -/* Max number of GPUs per system */
> -#define NVGPU_MAX_NUM              6
> -
>   /* Max number of NUMA nodes */
> -#define NUMA_NODES_MAX_NUM         (MAX_NODES + NVGPU_MAX_NUM)
> +#define NUMA_NODES_MAX_NUM         (MAX_NODES)
>   
>   /*
>    * NUMA FORM1 macros. FORM1_DIST_REF_POINTS was taken from
> @@ -160,8 +157,7 @@ struct SpaprMachineClass {
>       bool (*phb_placement)(SpaprMachineState *spapr, uint32_t index,
>                             uint64_t *buid, hwaddr *pio,
>                             hwaddr *mmio32, hwaddr *mmio64,
> -                          unsigned n_dma, uint32_t *liobns, hwaddr *nv2gpa,
> -                          hwaddr *nv2atsd, Error **errp);
> +                          unsigned n_dma, uint32_t *liobns, Error **errp);
>       SpaprResizeHpt resize_hpt_default;
>       SpaprCapabilities default_caps;
>       SpaprIrq *irq;
> @@ -276,7 +272,6 @@ struct SpaprMachineState {
>       bool cmd_line_caps[SPAPR_CAP_NUM];
>       SpaprCapabilities def, eff, mig;
>   
> -    unsigned gpu_numa_id;
>       SpaprTpmProxy *tpm_proxy;
>   
>       uint32_t FORM1_assoc_array[NUMA_NODES_MAX_NUM][FORM1_NUMA_ASSOC_SIZE];
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index f7cc6a890f45..de3c616b4637 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -2875,8 +2875,6 @@ static void spapr_machine_init(MachineState *machine)
>       /* init CPUs */
>       spapr_init_cpus(spapr);
>   
> -    spapr->gpu_numa_id = spapr_numa_initial_nvgpu_numa_id(machine);
> -
>       /* Init numa_assoc_array */
>       spapr_numa_associativity_init(spapr, machine);
>   
> @@ -4134,7 +4132,6 @@ static bool spapr_phb_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
>                              &sphb->buid, &sphb->io_win_addr,
>                              &sphb->mem_win_addr, &sphb->mem64_win_addr,
>                              windows_supported, sphb->dma_liobn,
> -                           &sphb->nv2_gpa_win_addr, &sphb->nv2_atsd_win_addr,
>                              errp);
>   }
>   
> @@ -4397,8 +4394,7 @@ static const CPUArchIdList *spapr_possible_cpu_arch_ids(MachineState *machine)
>   static bool spapr_phb_placement(SpaprMachineState *spapr, uint32_t index,
>                                   uint64_t *buid, hwaddr *pio,
>                                   hwaddr *mmio32, hwaddr *mmio64,
> -                                unsigned n_dma, uint32_t *liobns,
> -                                hwaddr *nv2gpa, hwaddr *nv2atsd, Error **errp)
> +                                unsigned n_dma, uint32_t *liobns, Error **errp)
>   {
>       /*
>        * New-style PHB window placement.
> @@ -4443,9 +4439,6 @@ static bool spapr_phb_placement(SpaprMachineState *spapr, uint32_t index,
>       *pio = SPAPR_PCI_BASE + index * SPAPR_PCI_IO_WIN_SIZE;
>       *mmio32 = SPAPR_PCI_BASE + (index + 1) * SPAPR_PCI_MEM32_WIN_SIZE;
>       *mmio64 = SPAPR_PCI_BASE + (index + 1) * SPAPR_PCI_MEM64_WIN_SIZE;
> -
> -    *nv2gpa = SPAPR_PCI_NV2RAM64_WIN_BASE + index * SPAPR_PCI_NV2RAM64_WIN_SIZE;
> -    *nv2atsd = SPAPR_PCI_NV2ATSD_WIN_BASE + index * SPAPR_PCI_NV2ATSD_WIN_SIZE;
>       return true;
>   }
>   
> @@ -4963,16 +4956,12 @@ DEFINE_SPAPR_MACHINE(4_1, "4.1", false);
>   static bool phb_placement_4_0(SpaprMachineState *spapr, uint32_t index,
>                                 uint64_t *buid, hwaddr *pio,
>                                 hwaddr *mmio32, hwaddr *mmio64,
> -                              unsigned n_dma, uint32_t *liobns,
> -                              hwaddr *nv2gpa, hwaddr *nv2atsd, Error **errp)
> +                              unsigned n_dma, uint32_t *liobns, Error **errp)
>   {
>       if (!spapr_phb_placement(spapr, index, buid, pio, mmio32, mmio64, n_dma,
> -                             liobns, nv2gpa, nv2atsd, errp)) {
> +                             liobns, errp)) {
>           return false;
>       }
> -
> -    *nv2gpa = 0;
> -    *nv2atsd = 0;
>       return true;
>   }
>   static void spapr_machine_4_0_class_options(MachineClass *mc)
> @@ -5137,8 +5126,7 @@ DEFINE_SPAPR_MACHINE(2_8, "2.8", false);
>   static bool phb_placement_2_7(SpaprMachineState *spapr, uint32_t index,
>                                 uint64_t *buid, hwaddr *pio,
>                                 hwaddr *mmio32, hwaddr *mmio64,
> -                              unsigned n_dma, uint32_t *liobns,
> -                              hwaddr *nv2gpa, hwaddr *nv2atsd, Error **errp)
> +                              unsigned n_dma, uint32_t *liobns, Error **errp)
>   {
>       /* Legacy PHB placement for pseries-2.7 and earlier machine types */
>       const uint64_t base_buid = 0x800000020000000ULL;
> @@ -5183,8 +5171,6 @@ static bool phb_placement_2_7(SpaprMachineState *spapr, uint32_t index,
>        * window into contiguous 32-bit and 64-bit windows
>        */
>   
> -    *nv2gpa = 0;
> -    *nv2atsd = 0;
>       return true;
>   }
>   
> diff --git a/hw/ppc/spapr_numa.c b/hw/ppc/spapr_numa.c
> index a64098c375e0..ea6762d3d2be 100644
> --- a/hw/ppc/spapr_numa.c
> +++ b/hw/ppc/spapr_numa.c
> @@ -108,20 +108,6 @@ static bool spapr_numa_is_symmetrical(MachineState *ms)
>       return true;
>   }
>   
> -/*
> - * NVLink2-connected GPU RAM needs to be placed on a separate NUMA node.
> - * We assign a new numa ID per GPU in spapr_pci_collect_nvgpu() which is
> - * called from vPHB reset handler so we initialize the counter here.
> - * If no NUMA is configured from the QEMU side, we start from 1 as GPU RAM
> - * must be equally distant from any other node.
> - * The final value of spapr->gpu_numa_id is going to be written to
> - * max-associativity-domains in spapr_build_fdt().
> - */
> -unsigned int spapr_numa_initial_nvgpu_numa_id(MachineState *machine)
> -{
> -    return MAX(1, machine->numa_state->num_nodes);
> -}
> -
>   /*
>    * This function will translate the user distances into
>    * what the kernel understand as possible values: 10
> @@ -277,7 +263,7 @@ static void spapr_numa_FORM1_affinity_init(SpaprMachineState *spapr,
>   {
>       SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);
>       int nb_numa_nodes = machine->numa_state->num_nodes;
> -    int i, j, max_nodes_with_gpus;
> +    int i, j;
>   
>       /*
>        * For all associativity arrays: first position is the size,
> @@ -293,17 +279,7 @@ static void spapr_numa_FORM1_affinity_init(SpaprMachineState *spapr,
>           spapr->FORM1_assoc_array[i][FORM1_DIST_REF_POINTS] = cpu_to_be32(i);
>       }
>   
> -    /*
> -     * Initialize NVLink GPU associativity arrays. We know that
> -     * the first GPU will take the first available NUMA id, and
> -     * we'll have a maximum of NVGPU_MAX_NUM GPUs in the machine.
> -     * At this point we're not sure if there are GPUs or not, but
> -     * let's initialize the associativity arrays and allow NVLink
> -     * GPUs to be handled like regular NUMA nodes later on.
> -     */
> -    max_nodes_with_gpus = nb_numa_nodes + NVGPU_MAX_NUM;
> -
> -    for (i = nb_numa_nodes; i < max_nodes_with_gpus; i++) {
> +    for (i = nb_numa_nodes; i < nb_numa_nodes; i++) {
>           spapr->FORM1_assoc_array[i][0] = cpu_to_be32(FORM1_DIST_REF_POINTS);
>   
>           for (j = 1; j < FORM1_DIST_REF_POINTS; j++) {
> @@ -345,10 +321,6 @@ static void spapr_numa_FORM2_affinity_init(SpaprMachineState *spapr)
>        * CPUs will write an additional 'vcpu_id' on top of the arrays
>        * being initialized here. 'numa_id' is represented by the
>        * index 'i' of the loop.
> -     *
> -     * Given that this initialization is also valid for GPU associativity
> -     * arrays, handle everything in one single step by populating the
> -     * arrays up to NUMA_NODES_MAX_NUM.
>        */
>       for (i = 0; i < NUMA_NODES_MAX_NUM; i++) {
>           spapr->FORM2_assoc_array[i][0] = cpu_to_be32(1);
> @@ -461,8 +433,6 @@ static void spapr_numa_FORM1_write_rtas_dt(SpaprMachineState *spapr,
>   {
>       MachineState *ms = MACHINE(spapr);
>       SpaprMachineClass *smc = SPAPR_MACHINE_GET_CLASS(spapr);
> -    uint32_t number_nvgpus_nodes = spapr->gpu_numa_id -
> -                                   spapr_numa_initial_nvgpu_numa_id(ms);
>       uint32_t refpoints[] = {
>           cpu_to_be32(0x4),
>           cpu_to_be32(0x3),
> @@ -470,7 +440,7 @@ static void spapr_numa_FORM1_write_rtas_dt(SpaprMachineState *spapr,
>           cpu_to_be32(0x1),
>       };
>       uint32_t nr_refpoints = ARRAY_SIZE(refpoints);
> -    uint32_t maxdomain = ms->numa_state->num_nodes + number_nvgpus_nodes;
> +    uint32_t maxdomain = ms->numa_state->num_nodes;
>       uint32_t maxdomains[] = {
>           cpu_to_be32(4),
>           cpu_to_be32(maxdomain),
> @@ -486,13 +456,12 @@ static void spapr_numa_FORM1_write_rtas_dt(SpaprMachineState *spapr,
>               cpu_to_be32(0x4),
>               cpu_to_be32(0x2),
>           };
> -        uint32_t legacy_maxdomain = spapr->gpu_numa_id > 1 ? 1 : 0;
>           uint32_t legacy_maxdomains[] = {
>               cpu_to_be32(4),
> -            cpu_to_be32(legacy_maxdomain),
> -            cpu_to_be32(legacy_maxdomain),
> -            cpu_to_be32(legacy_maxdomain),
> -            cpu_to_be32(spapr->gpu_numa_id),
> +            cpu_to_be32(0),
> +            cpu_to_be32(0),
> +            cpu_to_be32(0),
> +            cpu_to_be32(maxdomain ? maxdomain : 1),
>           };
>   
>           G_STATIC_ASSERT(sizeof(legacy_refpoints) <= sizeof(refpoints));
> @@ -581,8 +550,6 @@ static void spapr_numa_FORM2_write_rtas_dt(SpaprMachineState *spapr,
>                                              void *fdt, int rtas)
>   {
>       MachineState *ms = MACHINE(spapr);
> -    uint32_t number_nvgpus_nodes = spapr->gpu_numa_id -
> -                                   spapr_numa_initial_nvgpu_numa_id(ms);
>   
>       /*
>        * In FORM2, ibm,associativity-reference-points will point to
> @@ -596,7 +563,7 @@ static void spapr_numa_FORM2_write_rtas_dt(SpaprMachineState *spapr,
>        */
>       uint32_t refpoints[] = { cpu_to_be32(1) };
>   
> -    uint32_t maxdomain = ms->numa_state->num_nodes + number_nvgpus_nodes;
> +    uint32_t maxdomain = ms->numa_state->num_nodes;
>       uint32_t maxdomains[] = { cpu_to_be32(1), cpu_to_be32(maxdomain) };
>   
>       _FDT(fdt_setprop(fdt, rtas, "ibm,associativity-reference-points",
> diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
> index 75aacda65a14..ce1495931744 100644
> --- a/hw/ppc/spapr_pci.c
> +++ b/hw/ppc/spapr_pci.c
> @@ -1443,8 +1443,6 @@ static int spapr_dt_pci_device(SpaprPhbState *sphb, PCIDevice *dev,
>           _FDT(fdt_setprop_cell(fdt, offset, "ibm,pci-config-space-type", 0x1));
>       }
>   
> -    spapr_phb_nvgpu_populate_pcidev_dt(dev, fdt, offset, sphb);
> -
>       if (!IS_PCI_BRIDGE(dev)) {
>           /* Properties only for non-bridges */
>           uint32_t min_grant = pci_default_read_config(dev, PCI_MIN_GNT, 1);
> @@ -1757,8 +1755,6 @@ static void spapr_phb_unrealize(DeviceState *dev)
>       int i;
>       const unsigned windows_supported = spapr_phb_windows_supported(sphb);
>   
> -    spapr_phb_nvgpu_free(sphb);
> -
>       if (sphb->msi) {
>           g_hash_table_unref(sphb->msi);
>           sphb->msi = NULL;
> @@ -2069,14 +2065,8 @@ void spapr_phb_dma_reset(SpaprPhbState *sphb)
>   static void spapr_phb_reset(DeviceState *qdev)
>   {
>       SpaprPhbState *sphb = SPAPR_PCI_HOST_BRIDGE(qdev);
> -    Error *err = NULL;
>   
>       spapr_phb_dma_reset(sphb);
> -    spapr_phb_nvgpu_free(sphb);
> -    spapr_phb_nvgpu_setup(sphb, &err);
> -    if (err) {
> -        error_report_err(err);
> -    }
>   
>       /* Reset the IOMMU state */
>       object_child_foreach(OBJECT(qdev), spapr_phb_children_reset, NULL);
> @@ -2112,8 +2102,6 @@ static Property spapr_phb_properties[] = {
>                        pre_2_8_migration, false),
>       DEFINE_PROP_BOOL("pcie-extended-configuration-space", SpaprPhbState,
>                        pcie_ecs, true),
> -    DEFINE_PROP_UINT64("gpa", SpaprPhbState, nv2_gpa_win_addr, 0),
> -    DEFINE_PROP_UINT64("atsd", SpaprPhbState, nv2_atsd_win_addr, 0),
>       DEFINE_PROP_BOOL("pre-5.1-associativity", SpaprPhbState,
>                        pre_5_1_assoc, false),
>       DEFINE_PROP_END_OF_LIST(),
> @@ -2362,7 +2350,6 @@ int spapr_dt_phb(SpaprMachineState *spapr, SpaprPhbState *phb,
>       };
>       SpaprTceTable *tcet;
>       SpaprDrc *drc;
> -    Error *err = NULL;
>   
>       /* Start populating the FDT */
>       _FDT(bus_off = fdt_add_subnode(fdt, 0, phb->dtbusname));
> @@ -2443,12 +2430,6 @@ int spapr_dt_phb(SpaprMachineState *spapr, SpaprPhbState *phb,
>           return ret;
>       }
>   
> -    spapr_phb_nvgpu_populate_dt(phb, fdt, bus_off, &err);
> -    if (err) {
> -        error_report_err(err);
> -    }
> -    spapr_phb_nvgpu_ram_populate_dt(phb, fdt);
> -
>       return 0;
>   }
>   
> diff --git a/hw/ppc/spapr_pci_nvlink2.c b/hw/ppc/spapr_pci_nvlink2.c
> deleted file mode 100644
> index 2a8a11be1d68..000000000000
> --- a/hw/ppc/spapr_pci_nvlink2.c
> +++ /dev/null
> @@ -1,442 +0,0 @@
> -/*
> - * QEMU sPAPR PCI for NVLink2 pass through
> - *
> - * Copyright (c) 2019 Alexey Kardashevskiy, IBM Corporation.
> - *
> - * Permission is hereby granted, free of charge, to any person obtaining a copy
> - * of this software and associated documentation files (the "Software"), to deal
> - * in the Software without restriction, including without limitation the rights
> - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
> - * copies of the Software, and to permit persons to whom the Software is
> - * furnished to do so, subject to the following conditions:
> - *
> - * The above copyright notice and this permission notice shall be included in
> - * all copies or substantial portions of the Software.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
> - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
> - * THE SOFTWARE.
> - */
> -#include "qemu/osdep.h"
> -#include "qapi/error.h"
> -#include "hw/pci/pci.h"
> -#include "hw/pci-host/spapr.h"
> -#include "hw/ppc/spapr_numa.h"
> -#include "qemu/error-report.h"
> -#include "hw/ppc/fdt.h"
> -#include "hw/pci/pci_bridge.h"
> -
> -#define PHANDLE_PCIDEV(phb, pdev)    (0x12000000 | \
> -                                     (((phb)->index) << 16) | ((pdev)->devfn))
> -#define PHANDLE_GPURAM(phb, n)       (0x110000FF | ((n) << 8) | \
> -                                     (((phb)->index) << 16))
> -#define PHANDLE_NVLINK(phb, gn, nn)  (0x00130000 | (((phb)->index) << 8) | \
> -                                     ((gn) << 4) | (nn))
> -
> -typedef struct SpaprPhbPciNvGpuSlot {
> -        uint64_t tgt;
> -        uint64_t gpa;
> -        unsigned numa_id;
> -        PCIDevice *gpdev;
> -        int linknum;
> -        struct {
> -            uint64_t atsd_gpa;
> -            PCIDevice *npdev;
> -            uint32_t link_speed;
> -        } links[NVGPU_MAX_LINKS];
> -} SpaprPhbPciNvGpuSlot;
> -
> -struct SpaprPhbPciNvGpuConfig {
> -    uint64_t nv2_ram_current;
> -    uint64_t nv2_atsd_current;
> -    int num; /* number of non empty (i.e. tgt!=0) entries in slots[] */
> -    SpaprPhbPciNvGpuSlot slots[NVGPU_MAX_NUM];
> -    Error *err;
> -};
> -
> -static SpaprPhbPciNvGpuSlot *
> -spapr_nvgpu_get_slot(SpaprPhbPciNvGpuConfig *nvgpus, uint64_t tgt)
> -{
> -    int i;
> -
> -    /* Search for partially collected "slot" */
> -    for (i = 0; i < nvgpus->num; ++i) {
> -        if (nvgpus->slots[i].tgt == tgt) {
> -            return &nvgpus->slots[i];
> -        }
> -    }
> -
> -    if (nvgpus->num == ARRAY_SIZE(nvgpus->slots)) {
> -        return NULL;
> -    }
> -
> -    i = nvgpus->num;
> -    nvgpus->slots[i].tgt = tgt;
> -    ++nvgpus->num;
> -
> -    return &nvgpus->slots[i];
> -}
> -
> -static void spapr_pci_collect_nvgpu(SpaprPhbPciNvGpuConfig *nvgpus,
> -                                    PCIDevice *pdev, uint64_t tgt,
> -                                    MemoryRegion *mr, Error **errp)
> -{
> -    MachineState *machine = MACHINE(qdev_get_machine());
> -    SpaprMachineState *spapr = SPAPR_MACHINE(machine);
> -    SpaprPhbPciNvGpuSlot *nvslot = spapr_nvgpu_get_slot(nvgpus, tgt);
> -
> -    if (!nvslot) {
> -        error_setg(errp, "Found too many GPUs per vPHB");
> -        return;
> -    }
> -    g_assert(!nvslot->gpdev);
> -    nvslot->gpdev = pdev;
> -
> -    nvslot->gpa = nvgpus->nv2_ram_current;
> -    nvgpus->nv2_ram_current += memory_region_size(mr);
> -    nvslot->numa_id = spapr->gpu_numa_id;
> -    ++spapr->gpu_numa_id;
> -}
> -
> -static void spapr_pci_collect_nvnpu(SpaprPhbPciNvGpuConfig *nvgpus,
> -                                    PCIDevice *pdev, uint64_t tgt,
> -                                    MemoryRegion *mr, Error **errp)
> -{
> -    SpaprPhbPciNvGpuSlot *nvslot = spapr_nvgpu_get_slot(nvgpus, tgt);
> -    int j;
> -
> -    if (!nvslot) {
> -        error_setg(errp, "Found too many NVLink bridges per vPHB");
> -        return;
> -    }
> -
> -    j = nvslot->linknum;
> -    if (j == ARRAY_SIZE(nvslot->links)) {
> -        error_setg(errp, "Found too many NVLink bridges per GPU");
> -        return;
> -    }
> -    ++nvslot->linknum;
> -
> -    g_assert(!nvslot->links[j].npdev);
> -    nvslot->links[j].npdev = pdev;
> -    nvslot->links[j].atsd_gpa = nvgpus->nv2_atsd_current;
> -    nvgpus->nv2_atsd_current += memory_region_size(mr);
> -    nvslot->links[j].link_speed =
> -        object_property_get_uint(OBJECT(pdev), "nvlink2-link-speed", NULL);
> -}
> -
> -static void spapr_phb_pci_collect_nvgpu(PCIBus *bus, PCIDevice *pdev,
> -                                        void *opaque)
> -{
> -    PCIBus *sec_bus;
> -    Object *po = OBJECT(pdev);
> -    uint64_t tgt = object_property_get_uint(po, "nvlink2-tgt", NULL);
> -
> -    if (tgt) {
> -        Error *local_err = NULL;
> -        SpaprPhbPciNvGpuConfig *nvgpus = opaque;
> -        Object *mr_gpu = object_property_get_link(po, "nvlink2-mr[0]", NULL);
> -        Object *mr_npu = object_property_get_link(po, "nvlink2-atsd-mr[0]",
> -                                                  NULL);
> -
> -        g_assert(mr_gpu || mr_npu);
> -        if (mr_gpu) {
> -            spapr_pci_collect_nvgpu(nvgpus, pdev, tgt, MEMORY_REGION(mr_gpu),
> -                                    &local_err);
> -        } else {
> -            spapr_pci_collect_nvnpu(nvgpus, pdev, tgt, MEMORY_REGION(mr_npu),
> -                                    &local_err);
> -        }
> -        error_propagate(&nvgpus->err, local_err);
> -    }
> -    if ((pci_default_read_config(pdev, PCI_HEADER_TYPE, 1) !=
> -         PCI_HEADER_TYPE_BRIDGE)) {
> -        return;
> -    }
> -
> -    sec_bus = pci_bridge_get_sec_bus(PCI_BRIDGE(pdev));
> -    if (!sec_bus) {
> -        return;
> -    }
> -
> -    pci_for_each_device_under_bus(sec_bus, spapr_phb_pci_collect_nvgpu, opaque);
> -}
> -
> -void spapr_phb_nvgpu_setup(SpaprPhbState *sphb, Error **errp)
> -{
> -    int i, j, valid_gpu_num;
> -    PCIBus *bus;
> -
> -    /* Search for GPUs and NPUs */
> -    if (!sphb->nv2_gpa_win_addr || !sphb->nv2_atsd_win_addr) {
> -        return;
> -    }
> -
> -    sphb->nvgpus = g_new0(SpaprPhbPciNvGpuConfig, 1);
> -    sphb->nvgpus->nv2_ram_current = sphb->nv2_gpa_win_addr;
> -    sphb->nvgpus->nv2_atsd_current = sphb->nv2_atsd_win_addr;
> -
> -    bus = PCI_HOST_BRIDGE(sphb)->bus;
> -    pci_for_each_device_under_bus(bus, spapr_phb_pci_collect_nvgpu,
> -                                  sphb->nvgpus);
> -
> -    if (sphb->nvgpus->err) {
> -        error_propagate(errp, sphb->nvgpus->err);
> -        sphb->nvgpus->err = NULL;
> -        goto cleanup_exit;
> -    }
> -
> -    /* Add found GPU RAM and ATSD MRs if found */
> -    for (i = 0, valid_gpu_num = 0; i < sphb->nvgpus->num; ++i) {
> -        Object *nvmrobj;
> -        SpaprPhbPciNvGpuSlot *nvslot = &sphb->nvgpus->slots[i];
> -
> -        if (!nvslot->gpdev) {
> -            continue;
> -        }
> -        nvmrobj = object_property_get_link(OBJECT(nvslot->gpdev),
> -                                           "nvlink2-mr[0]", NULL);
> -        /* ATSD is pointless without GPU RAM MR so skip those */
> -        if (!nvmrobj) {
> -            continue;
> -        }
> -
> -        ++valid_gpu_num;
> -        memory_region_add_subregion(get_system_memory(), nvslot->gpa,
> -                                    MEMORY_REGION(nvmrobj));
> -
> -        for (j = 0; j < nvslot->linknum; ++j) {
> -            Object *atsdmrobj;
> -
> -            atsdmrobj = object_property_get_link(OBJECT(nvslot->links[j].npdev),
> -                                                 "nvlink2-atsd-mr[0]", NULL);
> -            if (!atsdmrobj) {
> -                continue;
> -            }
> -            memory_region_add_subregion(get_system_memory(),
> -                                        nvslot->links[j].atsd_gpa,
> -                                        MEMORY_REGION(atsdmrobj));
> -        }
> -    }
> -
> -    if (valid_gpu_num) {
> -        return;
> -    }
> -    /* We did not find any interesting GPU */
> -cleanup_exit:
> -    g_free(sphb->nvgpus);
> -    sphb->nvgpus = NULL;
> -}
> -
> -void spapr_phb_nvgpu_free(SpaprPhbState *sphb)
> -{
> -    int i, j;
> -
> -    if (!sphb->nvgpus) {
> -        return;
> -    }
> -
> -    for (i = 0; i < sphb->nvgpus->num; ++i) {
> -        SpaprPhbPciNvGpuSlot *nvslot = &sphb->nvgpus->slots[i];
> -        Object *nv_mrobj = object_property_get_link(OBJECT(nvslot->gpdev),
> -                                                    "nvlink2-mr[0]", NULL);
> -
> -        if (nv_mrobj) {
> -            memory_region_del_subregion(get_system_memory(),
> -                                        MEMORY_REGION(nv_mrobj));
> -        }
> -        for (j = 0; j < nvslot->linknum; ++j) {
> -            PCIDevice *npdev = nvslot->links[j].npdev;
> -            Object *atsd_mrobj;
> -            atsd_mrobj = object_property_get_link(OBJECT(npdev),
> -                                                  "nvlink2-atsd-mr[0]", NULL);
> -            if (atsd_mrobj) {
> -                memory_region_del_subregion(get_system_memory(),
> -                                            MEMORY_REGION(atsd_mrobj));
> -            }
> -        }
> -    }
> -    g_free(sphb->nvgpus);
> -    sphb->nvgpus = NULL;
> -}
> -
> -void spapr_phb_nvgpu_populate_dt(SpaprPhbState *sphb, void *fdt, int bus_off,
> -                                 Error **errp)
> -{
> -    int i, j, atsdnum = 0;
> -    uint64_t atsd[8]; /* The existing limitation of known guests */
> -
> -    if (!sphb->nvgpus) {
> -        return;
> -    }
> -
> -    for (i = 0; (i < sphb->nvgpus->num) && (atsdnum < ARRAY_SIZE(atsd)); ++i) {
> -        SpaprPhbPciNvGpuSlot *nvslot = &sphb->nvgpus->slots[i];
> -
> -        if (!nvslot->gpdev) {
> -            continue;
> -        }
> -        for (j = 0; j < nvslot->linknum; ++j) {
> -            if (!nvslot->links[j].atsd_gpa) {
> -                continue;
> -            }
> -
> -            if (atsdnum == ARRAY_SIZE(atsd)) {
> -                error_report("Only %"PRIuPTR" ATSD registers supported",
> -                             ARRAY_SIZE(atsd));
> -                break;
> -            }
> -            atsd[atsdnum] = cpu_to_be64(nvslot->links[j].atsd_gpa);
> -            ++atsdnum;
> -        }
> -    }
> -
> -    if (!atsdnum) {
> -        error_setg(errp, "No ATSD registers found");
> -        return;
> -    }
> -
> -    if (!spapr_phb_eeh_available(sphb)) {
> -        /*
> -         * ibm,mmio-atsd contains ATSD registers; these belong to an NPU PHB
> -         * which we do not emulate as a separate device. Instead we put
> -         * ibm,mmio-atsd to the vPHB with GPU and make sure that we do not
> -         * put GPUs from different IOMMU groups to the same vPHB to ensure
> -         * that the guest will use ATSDs from the corresponding NPU.
> -         */
> -        error_setg(errp, "ATSD requires separate vPHB per GPU IOMMU group");
> -        return;
> -    }
> -
> -    _FDT((fdt_setprop(fdt, bus_off, "ibm,mmio-atsd", atsd,
> -                      atsdnum * sizeof(atsd[0]))));
> -}
> -
> -void spapr_phb_nvgpu_ram_populate_dt(SpaprPhbState *sphb, void *fdt)
> -{
> -    int i, j, linkidx, npuoff;
> -    g_autofree char *npuname = NULL;
> -
> -    if (!sphb->nvgpus) {
> -        return;
> -    }
> -
> -    npuname = g_strdup_printf("npuphb%d", sphb->index);
> -    npuoff = fdt_add_subnode(fdt, 0, npuname);
> -    _FDT(npuoff);
> -    _FDT(fdt_setprop_cell(fdt, npuoff, "#address-cells", 1));
> -    _FDT(fdt_setprop_cell(fdt, npuoff, "#size-cells", 0));
> -    /* Advertise NPU as POWER9 so the guest can enable NPU2 contexts */
> -    _FDT((fdt_setprop_string(fdt, npuoff, "compatible", "ibm,power9-npu")));
> -
> -    for (i = 0, linkidx = 0; i < sphb->nvgpus->num; ++i) {
> -        for (j = 0; j < sphb->nvgpus->slots[i].linknum; ++j) {
> -            g_autofree char *linkname = g_strdup_printf("link@%d", linkidx);
> -            int off = fdt_add_subnode(fdt, npuoff, linkname);
> -
> -            _FDT(off);
> -            /* _FDT((fdt_setprop_cell(fdt, off, "reg", linkidx))); */
> -            _FDT((fdt_setprop_string(fdt, off, "compatible",
> -                                     "ibm,npu-link")));
> -            _FDT((fdt_setprop_cell(fdt, off, "phandle",
> -                                   PHANDLE_NVLINK(sphb, i, j))));
> -            _FDT((fdt_setprop_cell(fdt, off, "ibm,npu-link-index", linkidx)));
> -            ++linkidx;
> -        }
> -    }
> -
> -    /* Add memory nodes for GPU RAM and mark them unusable */
> -    for (i = 0; i < sphb->nvgpus->num; ++i) {
> -        SpaprPhbPciNvGpuSlot *nvslot = &sphb->nvgpus->slots[i];
> -        Object *nv_mrobj = object_property_get_link(OBJECT(nvslot->gpdev),
> -                                                    "nvlink2-mr[0]",
> -                                                    &error_abort);
> -        uint64_t size = object_property_get_uint(nv_mrobj, "size", NULL);
> -        uint64_t mem_reg[2] = { cpu_to_be64(nvslot->gpa), cpu_to_be64(size) };
> -        g_autofree char *mem_name = g_strdup_printf("memory@%"PRIx64,
> -                                                    nvslot->gpa);
> -        int off = fdt_add_subnode(fdt, 0, mem_name);
> -
> -        _FDT(off);
> -        _FDT((fdt_setprop_string(fdt, off, "device_type", "memory")));
> -        _FDT((fdt_setprop(fdt, off, "reg", mem_reg, sizeof(mem_reg))));
> -
> -        spapr_numa_write_associativity_dt(SPAPR_MACHINE(qdev_get_machine()),
> -                                          fdt, off, nvslot->numa_id);
> -
> -        _FDT((fdt_setprop_string(fdt, off, "compatible",
> -                                 "ibm,coherent-device-memory")));
> -
> -        mem_reg[1] = cpu_to_be64(0);
> -        _FDT((fdt_setprop(fdt, off, "linux,usable-memory", mem_reg,
> -                          sizeof(mem_reg))));
> -        _FDT((fdt_setprop_cell(fdt, off, "phandle",
> -                               PHANDLE_GPURAM(sphb, i))));
> -    }
> -
> -}
> -
> -void spapr_phb_nvgpu_populate_pcidev_dt(PCIDevice *dev, void *fdt, int offset,
> -                                        SpaprPhbState *sphb)
> -{
> -    int i, j;
> -
> -    if (!sphb->nvgpus) {
> -        return;
> -    }
> -
> -    for (i = 0; i < sphb->nvgpus->num; ++i) {
> -        SpaprPhbPciNvGpuSlot *nvslot = &sphb->nvgpus->slots[i];
> -
> -        /* Skip "slot" without attached GPU */
> -        if (!nvslot->gpdev) {
> -            continue;
> -        }
> -        if (dev == nvslot->gpdev) {
> -            g_autofree uint32_t *npus = g_new(uint32_t, nvslot->linknum);
> -
> -            for (j = 0; j < nvslot->linknum; ++j) {
> -                PCIDevice *npdev = nvslot->links[j].npdev;
> -
> -                npus[j] = cpu_to_be32(PHANDLE_PCIDEV(sphb, npdev));
> -            }
> -            _FDT(fdt_setprop(fdt, offset, "ibm,npu", npus,
> -                             j * sizeof(npus[0])));
> -            _FDT((fdt_setprop_cell(fdt, offset, "phandle",
> -                                   PHANDLE_PCIDEV(sphb, dev))));
> -            continue;
> -        }
> -
> -        for (j = 0; j < nvslot->linknum; ++j) {
> -            if (dev != nvslot->links[j].npdev) {
> -                continue;
> -            }
> -
> -            _FDT((fdt_setprop_cell(fdt, offset, "phandle",
> -                                   PHANDLE_PCIDEV(sphb, dev))));
> -            _FDT(fdt_setprop_cell(fdt, offset, "ibm,gpu",
> -                                  PHANDLE_PCIDEV(sphb, nvslot->gpdev)));
> -            _FDT((fdt_setprop_cell(fdt, offset, "ibm,nvlink",
> -                                   PHANDLE_NVLINK(sphb, i, j))));
> -            /*
> -             * If we ever want to emulate GPU RAM at the same location as on
> -             * the host - here is the encoding GPA->TGT:
> -             *
> -             * gta  = ((sphb->nv2_gpa >> 42) & 0x1) << 42;
> -             * gta |= ((sphb->nv2_gpa >> 45) & 0x3) << 43;
> -             * gta |= ((sphb->nv2_gpa >> 49) & 0x3) << 45;
> -             * gta |= sphb->nv2_gpa & ((1UL << 43) - 1);
> -             */
> -            _FDT(fdt_setprop_cell(fdt, offset, "memory-region",
> -                                  PHANDLE_GPURAM(sphb, i)));
> -            _FDT(fdt_setprop_u64(fdt, offset, "ibm,device-tgt-addr",
> -                                 nvslot->tgt));
> -            _FDT(fdt_setprop_cell(fdt, offset, "ibm,nvlink-speed",
> -                                  nvslot->links[j].link_speed));
> -        }
> -    }
> -}
> diff --git a/hw/vfio/pci-quirks.c b/hw/vfio/pci-quirks.c
> index f4ff83680572..84b1a7b9485c 100644
> --- a/hw/vfio/pci-quirks.c
> +++ b/hw/vfio/pci-quirks.c
> @@ -1610,121 +1610,6 @@ static int vfio_add_nv_gpudirect_cap(VFIOPCIDevice *vdev, Error **errp)
>       return 0;
>   }
>   
> -int vfio_pci_nvidia_v100_ram_init(VFIOPCIDevice *vdev, Error **errp)
> -{
> -    int ret;
> -    void *p;
> -    struct vfio_region_info *nv2reg = NULL;
> -    struct vfio_info_cap_header *hdr;
> -    struct vfio_region_info_cap_nvlink2_ssatgt *cap;
> -    VFIOQuirk *quirk;
> -
> -    ret = vfio_get_dev_region_info(&vdev->vbasedev,
> -                                   VFIO_REGION_TYPE_PCI_VENDOR_TYPE |
> -                                   PCI_VENDOR_ID_NVIDIA,
> -                                   VFIO_REGION_SUBTYPE_NVIDIA_NVLINK2_RAM,
> -                                   &nv2reg);
> -    if (ret) {
> -        return ret;
> -    }
> -
> -    hdr = vfio_get_region_info_cap(nv2reg, VFIO_REGION_INFO_CAP_NVLINK2_SSATGT);
> -    if (!hdr) {
> -        ret = -ENODEV;
> -        goto free_exit;
> -    }
> -    cap = (void *) hdr;
> -
> -    p = mmap(NULL, nv2reg->size, PROT_READ | PROT_WRITE,
> -             MAP_SHARED, vdev->vbasedev.fd, nv2reg->offset);
> -    if (p == MAP_FAILED) {
> -        ret = -errno;
> -        goto free_exit;
> -    }
> -
> -    quirk = vfio_quirk_alloc(1);
> -    memory_region_init_ram_ptr(&quirk->mem[0], OBJECT(vdev), "nvlink2-mr",
> -                               nv2reg->size, p);
> -    QLIST_INSERT_HEAD(&vdev->bars[0].quirks, quirk, next);
> -
> -    object_property_add_uint64_ptr(OBJECT(vdev), "nvlink2-tgt",
> -                                   (uint64_t *) &cap->tgt,
> -                                   OBJ_PROP_FLAG_READ);
> -    trace_vfio_pci_nvidia_gpu_setup_quirk(vdev->vbasedev.name, cap->tgt,
> -                                          nv2reg->size);
> -free_exit:
> -    g_free(nv2reg);
> -
> -    return ret;
> -}
> -
> -int vfio_pci_nvlink2_init(VFIOPCIDevice *vdev, Error **errp)
> -{
> -    int ret;
> -    void *p;
> -    struct vfio_region_info *atsdreg = NULL;
> -    struct vfio_info_cap_header *hdr;
> -    struct vfio_region_info_cap_nvlink2_ssatgt *captgt;
> -    struct vfio_region_info_cap_nvlink2_lnkspd *capspeed;
> -    VFIOQuirk *quirk;
> -
> -    ret = vfio_get_dev_region_info(&vdev->vbasedev,
> -                                   VFIO_REGION_TYPE_PCI_VENDOR_TYPE |
> -                                   PCI_VENDOR_ID_IBM,
> -                                   VFIO_REGION_SUBTYPE_IBM_NVLINK2_ATSD,
> -                                   &atsdreg);
> -    if (ret) {
> -        return ret;
> -    }
> -
> -    hdr = vfio_get_region_info_cap(atsdreg,
> -                                   VFIO_REGION_INFO_CAP_NVLINK2_SSATGT);
> -    if (!hdr) {
> -        ret = -ENODEV;
> -        goto free_exit;
> -    }
> -    captgt = (void *) hdr;
> -
> -    hdr = vfio_get_region_info_cap(atsdreg,
> -                                   VFIO_REGION_INFO_CAP_NVLINK2_LNKSPD);
> -    if (!hdr) {
> -        ret = -ENODEV;
> -        goto free_exit;
> -    }
> -    capspeed = (void *) hdr;
> -
> -    /* Some NVLink bridges may not have assigned ATSD */
> -    if (atsdreg->size) {
> -        p = mmap(NULL, atsdreg->size, PROT_READ | PROT_WRITE,
> -                 MAP_SHARED, vdev->vbasedev.fd, atsdreg->offset);
> -        if (p == MAP_FAILED) {
> -            ret = -errno;
> -            goto free_exit;
> -        }
> -
> -        quirk = vfio_quirk_alloc(1);
> -        memory_region_init_ram_device_ptr(&quirk->mem[0], OBJECT(vdev),
> -                                          "nvlink2-atsd-mr", atsdreg->size, p);
> -        QLIST_INSERT_HEAD(&vdev->bars[0].quirks, quirk, next);
> -    }
> -
> -    object_property_add_uint64_ptr(OBJECT(vdev), "nvlink2-tgt",
> -                                   (uint64_t *) &captgt->tgt,
> -                                   OBJ_PROP_FLAG_READ);
> -    trace_vfio_pci_nvlink2_setup_quirk_ssatgt(vdev->vbasedev.name, captgt->tgt,
> -                                              atsdreg->size);
> -
> -    object_property_add_uint32_ptr(OBJECT(vdev), "nvlink2-link-speed",
> -                                   &capspeed->link_speed,
> -                                   OBJ_PROP_FLAG_READ);
> -    trace_vfio_pci_nvlink2_setup_quirk_lnkspd(vdev->vbasedev.name,
> -                                              capspeed->link_speed);
> -free_exit:
> -    g_free(atsdreg);
> -
> -    return ret;
> -}
> -
>   /*
>    * The VMD endpoint provides a real PCIe domain to the guest and the guest
>    * kernel performs enumeration of the VMD sub-device domain. Guest transactions
> diff --git a/hw/vfio/pci.c b/hw/vfio/pci.c
> index a205c6b1130f..3b2ca3c24ca2 100644
> --- a/hw/vfio/pci.c
> +++ b/hw/vfio/pci.c
> @@ -3271,20 +3271,6 @@ static void vfio_realize(PCIDevice *pdev, Error **errp)
>           }
>       }
>   
> -    if (vfio_pci_is(vdev, PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID)) {
> -        ret = vfio_pci_nvidia_v100_ram_init(vdev, errp);
> -        if (ret && ret != -ENODEV) {
> -            error_report("Failed to setup NVIDIA V100 GPU RAM");
> -        }
> -    }
> -
> -    if (vfio_pci_is(vdev, PCI_VENDOR_ID_IBM, PCI_ANY_ID)) {
> -        ret = vfio_pci_nvlink2_init(vdev, errp);
> -        if (ret && ret != -ENODEV) {
> -            error_report("Failed to setup NVlink2 bridge");
> -        }
> -    }
> -
>       if (!pdev->failover_pair_id) {
>           if (!vfio_migration_realize(vbasedev, errp)) {
>               goto out_deregister;
> diff --git a/hw/ppc/meson.build b/hw/ppc/meson.build
> index a313d4b964ad..7c2c52434a66 100644
> --- a/hw/ppc/meson.build
> +++ b/hw/ppc/meson.build
> @@ -36,7 +36,6 @@ ppc_ss.add(when: ['CONFIG_PSERIES', 'CONFIG_TCG'], if_true: files(
>   ppc_ss.add(when: 'CONFIG_SPAPR_RNG', if_true: files('spapr_rng.c'))
>   ppc_ss.add(when: ['CONFIG_PSERIES', 'CONFIG_LINUX'], if_true: files(
>     'spapr_pci_vfio.c',
> -  'spapr_pci_nvlink2.c'
>   ))
>   
>   # IBM PowerNV
> diff --git a/hw/vfio/trace-events b/hw/vfio/trace-events
> index 81ec7c7a958b..e64ca4a01961 100644
> --- a/hw/vfio/trace-events
> +++ b/hw/vfio/trace-events
> @@ -82,10 +82,6 @@ vfio_ioeventfd_handler(const char *name, uint64_t addr, unsigned size, uint64_t
>   vfio_ioeventfd_init(const char *name, uint64_t addr, unsigned size, uint64_t data, bool vfio) "%s+0x%"PRIx64"[%d]:0x%"PRIx64" vfio:%d"
>   vfio_pci_igd_opregion_enabled(const char *name) "%s"
>   
> -vfio_pci_nvidia_gpu_setup_quirk(const char *name, uint64_t tgt, uint64_t size) "%s tgt=0x%"PRIx64" size=0x%"PRIx64
> -vfio_pci_nvlink2_setup_quirk_ssatgt(const char *name, uint64_t tgt, uint64_t size) "%s tgt=0x%"PRIx64" size=0x%"PRIx64
> -vfio_pci_nvlink2_setup_quirk_lnkspd(const char *name, uint32_t link_speed) "%s link_speed=0x%x"
> -
>   # igd.c
>   vfio_pci_igd_bar4_write(const char *name, uint32_t index, uint32_t data, uint32_t base) "%s [0x%03x] 0x%08x -> 0x%08x"
>   vfio_pci_igd_bdsm_enabled(const char *name, int size) "%s %dMB"