[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v3 10/55] intel_iommu: rename VTD_PCI_DEVFN_MAX to x8
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v3 10/55] intel_iommu: rename VTD_PCI_DEVFN_MAX to x86-iommu |
Date: |
Wed, 20 Jul 2016 20:45:02 +0300 |
From: Peter Xu <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
include/hw/i386/intel_iommu.h | 1 -
include/hw/i386/x86-iommu.h | 2 ++
hw/i386/intel_iommu.c | 11 +++++++----
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/include/hw/i386/intel_iommu.h b/include/hw/i386/intel_iommu.h
index 680a0c4..0794309 100644
--- a/include/hw/i386/intel_iommu.h
+++ b/include/hw/i386/intel_iommu.h
@@ -35,7 +35,6 @@
#define VTD_PCI_BUS_MAX 256
#define VTD_PCI_SLOT_MAX 32
#define VTD_PCI_FUNC_MAX 8
-#define VTD_PCI_DEVFN_MAX 256
#define VTD_PCI_SLOT(devfn) (((devfn) >> 3) & 0x1f)
#define VTD_PCI_FUNC(devfn) ((devfn) & 0x07)
#define VTD_SID_TO_BUS(sid) (((sid) >> 8) & 0xff)
diff --git a/include/hw/i386/x86-iommu.h b/include/hw/i386/x86-iommu.h
index 924f39a..fac693d 100644
--- a/include/hw/i386/x86-iommu.h
+++ b/include/hw/i386/x86-iommu.h
@@ -30,6 +30,8 @@
#define X86_IOMMU_GET_CLASS(obj) \
OBJECT_GET_CLASS(X86IOMMUClass, obj, TYPE_X86_IOMMU_DEVICE)
+#define X86_IOMMU_PCI_DEVFN_MAX 256
+
typedef struct X86IOMMUState X86IOMMUState;
typedef struct X86IOMMUClass X86IOMMUClass;
diff --git a/hw/i386/intel_iommu.c b/hw/i386/intel_iommu.c
index a430d7d..3ee5782 100644
--- a/hw/i386/intel_iommu.c
+++ b/hw/i386/intel_iommu.c
@@ -26,6 +26,8 @@
#include "hw/pci/pci.h"
#include "hw/pci/pci_bus.h"
#include "hw/i386/pc.h"
+#include "hw/boards.h"
+#include "hw/i386/x86-iommu.h"
/*#define DEBUG_INTEL_IOMMU*/
#ifdef DEBUG_INTEL_IOMMU
@@ -192,7 +194,7 @@ static void vtd_reset_context_cache(IntelIOMMUState *s)
VTD_DPRINTF(CACHE, "global context_cache_gen=1");
while (g_hash_table_iter_next (&bus_it, NULL, (void**)&vtd_bus)) {
- for (devfn_it = 0; devfn_it < VTD_PCI_DEVFN_MAX; ++devfn_it) {
+ for (devfn_it = 0; devfn_it < X86_IOMMU_PCI_DEVFN_MAX; ++devfn_it) {
vtd_as = vtd_bus->dev_as[devfn_it];
if (!vtd_as) {
continue;
@@ -964,7 +966,7 @@ static void vtd_context_device_invalidate(IntelIOMMUState
*s,
vtd_bus = vtd_find_as_from_bus_num(s, VTD_SID_TO_BUS(source_id));
if (vtd_bus) {
devfn = VTD_SID_TO_DEVFN(source_id);
- for (devfn_it = 0; devfn_it < VTD_PCI_DEVFN_MAX; ++devfn_it) {
+ for (devfn_it = 0; devfn_it < X86_IOMMU_PCI_DEVFN_MAX; ++devfn_it) {
vtd_as = vtd_bus->dev_as[devfn_it];
if (vtd_as && ((devfn_it & mask) == (devfn & mask))) {
VTD_DPRINTF(INV, "invalidate context-cahce of devfn 0x%"PRIx16,
@@ -1916,7 +1918,8 @@ VTDAddressSpace *vtd_find_add_as(IntelIOMMUState *s,
PCIBus *bus, int devfn)
if (!vtd_bus) {
/* No corresponding free() */
- vtd_bus = g_malloc0(sizeof(VTDBus) + sizeof(VTDAddressSpace *) *
VTD_PCI_DEVFN_MAX);
+ vtd_bus = g_malloc0(sizeof(VTDBus) + sizeof(VTDAddressSpace *) * \
+ X86_IOMMU_PCI_DEVFN_MAX);
vtd_bus->bus = bus;
key = (uintptr_t)bus;
g_hash_table_insert(s->vtd_as_by_busptr, &key, vtd_bus);
@@ -2032,7 +2035,7 @@ static AddressSpace *vtd_host_dma_iommu(PCIBus *bus, void
*opaque, int devfn)
IntelIOMMUState *s = opaque;
VTDAddressSpace *vtd_as;
- assert(0 <= devfn && devfn <= VTD_PCI_DEVFN_MAX);
+ assert(0 <= devfn && devfn <= X86_IOMMU_PCI_DEVFN_MAX);
vtd_as = vtd_find_add_as(s, bus, devfn);
return &vtd_as->as;
--
MST
- [Qemu-devel] [PULL v3 00/55] pc, pci, virtio: new features, cleanups, fixes, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 01/55] nvdimm: fix memory leak in error code path, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 02/55] tests/prom-env-test: increase the test timeout, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 03/55] hw/alpha: fix PCI bus initialization, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 04/55] hw/mips: fix PCI bus initialization, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 05/55] hw/apb: fix PCI bus initialization, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 06/55] hw/grackle: fix PCI bus initialization, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 07/55] hw/prep: realize the PCI root bus as part of the prep init, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 09/55] x86-iommu: introduce parent class, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 08/55] hw/versatile: realize the PCI root bus as part of the versatile init, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 10/55] intel_iommu: rename VTD_PCI_DEVFN_MAX to x86-iommu,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v3 11/55] x86-iommu: provide x86_iommu_get_default, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 12/55] x86-iommu: introduce "intremap" property, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 13/55] acpi: enable INTR for DMAR report structure, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 14/55] intel_iommu: allow queued invalidation for IR, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 15/55] intel_iommu: set IR bit for ECAP register, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 16/55] acpi: add DMAR scope definition for root IOAPIC, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 17/55] intel_iommu: define interrupt remap table addr register, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 18/55] intel_iommu: handle interrupt remap enable, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 19/55] intel_iommu: define several structs for IOMMU IR, Michael S. Tsirkin, 2016/07/20
- [Qemu-devel] [PULL v3 20/55] intel_iommu: add IR translation faults defines, Michael S. Tsirkin, 2016/07/20