From 87a125d3a175fd65f921dc7089450e13ce2ac457 Mon Sep 17 00:00:00 2001
From: Kunkun Jiang <jiangkunkun@huawei.com>
Date: Fri, 18 Nov 2022 15:22:49 +0800
Subject: [PATCH 27/36] Revert "pci: introduce PCIPASIDOps to PCIDevice"

This reverts commit c71485494970e7aa986be2b05bf7e2847017e264.

Signed-off-by: Kunkun Jiang <jiangkunkun@huawei.com>
---
 hw/pci/pci.c         | 34 ----------------------------------
 include/hw/pci/pci.h | 11 -----------
 2 files changed, 45 deletions(-)

diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 71076fff48..40e2516d99 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -2763,40 +2763,6 @@ void pci_setup_iommu(PCIBus *bus, PCIIOMMUFunc fn, void *opaque)
     bus->iommu_opaque = opaque;
 }
 
-void pci_setup_pasid_ops(PCIDevice *dev, PCIPASIDOps *ops)
-{
-    assert(ops && !dev->pasid_ops);
-    dev->pasid_ops = ops;
-}
-
-bool pci_device_is_pasid_ops_set(PCIBus *bus, int32_t devfn)
-{
-    PCIDevice *dev;
-
-    if (!bus) {
-        return false;
-    }
-
-    dev = bus->devices[devfn];
-    return !!(dev && dev->pasid_ops);
-}
-
-int pci_device_set_pasid_table(PCIBus *bus, int32_t devfn,
-                               IOMMUConfig *config)
-{
-    PCIDevice *dev;
-
-    if (!bus) {
-        return -EINVAL;
-    }
-
-    dev = bus->devices[devfn];
-    if (dev && dev->pasid_ops && dev->pasid_ops->set_pasid_table) {
-        return dev->pasid_ops->set_pasid_table(bus, devfn, config);
-    }
-    return -ENOENT;
-}
-
 static void pci_dev_get_w64(PCIBus *b, PCIDevice *dev, void *opaque)
 {
     Range *range = opaque;
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
index 4cf3dc6b43..5b36334a28 100644
--- a/include/hw/pci/pci.h
+++ b/include/hw/pci/pci.h
@@ -9,7 +9,6 @@
 
 #include "hw/pci/pcie.h"
 #include "qom/object.h"
-#include "hw/iommu/iommu.h"
 
 extern bool pci_available;
 
@@ -266,11 +265,6 @@ struct PCIReqIDCache {
 };
 typedef struct PCIReqIDCache PCIReqIDCache;
 
-struct PCIPASIDOps {
-    int (*set_pasid_table)(PCIBus *bus, int32_t devfn, IOMMUConfig *config);
-};
-typedef struct PCIPASIDOps PCIPASIDOps;
-
 struct PCIDevice {
     DeviceState qdev;
     bool partially_hotplugged;
@@ -367,7 +361,6 @@ struct PCIDevice {
     /* ID of standby device in net_failover pair */
     char *failover_pair_id;
     uint32_t acpi_index;
-    PCIPASIDOps *pasid_ops;
 };
 
 void pci_register_bar(PCIDevice *pci_dev, int region_num,
@@ -505,10 +498,6 @@ typedef AddressSpace *(*PCIIOMMUFunc)(PCIBus *, void *, int);
 AddressSpace *pci_device_iommu_address_space(PCIDevice *dev);
 void pci_setup_iommu(PCIBus *bus, PCIIOMMUFunc fn, void *opaque);
 
-void pci_setup_pasid_ops(PCIDevice *dev, PCIPASIDOps *ops);
-bool pci_device_is_pasid_ops_set(PCIBus *bus, int32_t devfn);
-int pci_device_set_pasid_table(PCIBus *bus, int32_t devfn, IOMMUConfig *config);
-
 static inline void
 pci_set_byte(uint8_t *config, uint8_t val)
 {
-- 
2.27.0