dec64939c6
- arm/virt: Fix vcpu hotplug idx_from_topo_ids - Revert patches related to the vSVA - sync some bugfix patches from upstream - add generic vDPA device support Signed-off-by: yezengruan <yezengruan@huawei.com> (cherry picked from commit b99dbfd9847104300672fb4f559f1c2abba8aa33)
85 lines
2.6 KiB
Diff
85 lines
2.6 KiB
Diff
From 9f843b181db3d73e86df140a41975a7645adc071 Mon Sep 17 00:00:00 2001
|
|
From: Kunkun Jiang <jiangkunkun@huawei.com>
|
|
Date: Fri, 18 Nov 2022 15:22:27 +0800
|
|
Subject: [PATCH 10/36] Revert "pci: Add return_page_response pci ops"
|
|
|
|
This reverts commit 228345cfa59c764e725e2d3680a4bc3ecb237609.
|
|
|
|
Signed-off-by: Kunkun Jiang <jiangkunkun@huawei.com>
|
|
---
|
|
hw/pci/pci.c | 16 ----------------
|
|
include/hw/iommu/iommu.h | 8 --------
|
|
include/hw/pci/pci.h | 4 ----
|
|
3 files changed, 28 deletions(-)
|
|
|
|
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
|
|
index 0743dc7c42..71076fff48 100644
|
|
--- a/hw/pci/pci.c
|
|
+++ b/hw/pci/pci.c
|
|
@@ -2797,22 +2797,6 @@ int pci_device_set_pasid_table(PCIBus *bus, int32_t devfn,
|
|
return -ENOENT;
|
|
}
|
|
|
|
-int pci_device_return_page_response(PCIBus *bus, int32_t devfn,
|
|
- IOMMUPageResponse *resp)
|
|
-{
|
|
- PCIDevice *dev;
|
|
-
|
|
- if (!bus) {
|
|
- return -EINVAL;
|
|
- }
|
|
-
|
|
- dev = bus->devices[devfn];
|
|
- if (dev && dev->pasid_ops && dev->pasid_ops->return_page_response) {
|
|
- return dev->pasid_ops->return_page_response(bus, devfn, resp);
|
|
- }
|
|
- return -ENOENT;
|
|
-}
|
|
-
|
|
static void pci_dev_get_w64(PCIBus *b, PCIDevice *dev, void *opaque)
|
|
{
|
|
Range *range = opaque;
|
|
diff --git a/include/hw/iommu/iommu.h b/include/hw/iommu/iommu.h
|
|
index 5890f095b1..12092bda7b 100644
|
|
--- a/include/hw/iommu/iommu.h
|
|
+++ b/include/hw/iommu/iommu.h
|
|
@@ -24,13 +24,5 @@ typedef struct IOMMUConfig {
|
|
};
|
|
} IOMMUConfig;
|
|
|
|
-typedef struct IOMMUPageResponse {
|
|
- union {
|
|
-#ifdef __linux__
|
|
- struct iommu_page_response resp;
|
|
-#endif
|
|
- };
|
|
-} IOMMUPageResponse;
|
|
-
|
|
|
|
#endif /* QEMU_HW_IOMMU_IOMMU_H */
|
|
diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h
|
|
index bfe3a6bca7..4cf3dc6b43 100644
|
|
--- a/include/hw/pci/pci.h
|
|
+++ b/include/hw/pci/pci.h
|
|
@@ -268,8 +268,6 @@ typedef struct PCIReqIDCache PCIReqIDCache;
|
|
|
|
struct PCIPASIDOps {
|
|
int (*set_pasid_table)(PCIBus *bus, int32_t devfn, IOMMUConfig *config);
|
|
- int (*return_page_response)(PCIBus *bus, int32_t devfn,
|
|
- IOMMUPageResponse *resp);
|
|
};
|
|
typedef struct PCIPASIDOps PCIPASIDOps;
|
|
|
|
@@ -510,8 +508,6 @@ 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);
|
|
-int pci_device_return_page_response(PCIBus *bus, int32_t devfn,
|
|
- IOMMUPageResponse *resp);
|
|
|
|
static inline void
|
|
pci_set_byte(uint8_t *config, uint8_t val)
|
|
--
|
|
2.27.0
|
|
|