95 lines
3.9 KiB
Diff
95 lines
3.9 KiB
Diff
From f733325d3d91576ae9f6e341faabc301542fc6c8 Mon Sep 17 00:00:00 2001
|
|
From: John Allen <john.allen@amd.com>
|
|
Date: Wed, 11 Dec 2024 15:06:44 -0600
|
|
Subject: [PATCH 03/57] amd_iommu: Rename variable mmio to mr_mmio
|
|
|
|
RH-Author: John Allen <None>
|
|
RH-MergeRequest: 303: Interrupt Remap support for emulated amd viommu
|
|
RH-Jira: RHEL-66202
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-Commit: [1/5] 1996a48efb7210d4d1e0b929be2d115d672e1a02 (johnalle/qemu-kvm-fork)
|
|
|
|
JIRA: https://issues.redhat.com/browse/RHEL-66202
|
|
|
|
commit 2e6f051cfc58e69dcb392cd245d8f01b0c2e963f
|
|
Author: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
|
|
Date: Fri Sep 27 12:29:09 2024 -0500
|
|
|
|
amd_iommu: Rename variable mmio to mr_mmio
|
|
|
|
Rename the MMIO memory region variable 'mmio' to 'mr_mmio'
|
|
so to correctly name align with struct AMDVIState::variable type.
|
|
|
|
No functional change intended.
|
|
|
|
Reviewed-by: Alejandro Jimenez <alejandro.j.jimenez@oracle.com>
|
|
Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
|
|
Signed-off-by: Santosh Shukla <santosh.shukla@amd.com>
|
|
Message-Id: <20240927172913.121477-2-santosh.shukla@amd.com>
|
|
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
|
Signed-off-by: John Allen <john.allen@amd.com>
|
|
---
|
|
hw/i386/acpi-build.c | 4 ++--
|
|
hw/i386/amd_iommu.c | 6 +++---
|
|
hw/i386/amd_iommu.h | 2 +-
|
|
3 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
|
|
index 5d4bd2b710..032fb1f904 100644
|
|
--- a/hw/i386/acpi-build.c
|
|
+++ b/hw/i386/acpi-build.c
|
|
@@ -2397,7 +2397,7 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id,
|
|
/* Capability offset */
|
|
build_append_int_noprefix(table_data, s->pci.capab_offset, 2);
|
|
/* IOMMU base address */
|
|
- build_append_int_noprefix(table_data, s->mmio.addr, 8);
|
|
+ build_append_int_noprefix(table_data, s->mr_mmio.addr, 8);
|
|
/* PCI Segment Group */
|
|
build_append_int_noprefix(table_data, 0, 2);
|
|
/* IOMMU info */
|
|
@@ -2432,7 +2432,7 @@ build_amd_iommu(GArray *table_data, BIOSLinker *linker, const char *oem_id,
|
|
/* Capability offset */
|
|
build_append_int_noprefix(table_data, s->pci.capab_offset, 2);
|
|
/* IOMMU base address */
|
|
- build_append_int_noprefix(table_data, s->mmio.addr, 8);
|
|
+ build_append_int_noprefix(table_data, s->mr_mmio.addr, 8);
|
|
/* PCI Segment Group */
|
|
build_append_int_noprefix(table_data, 0, 2);
|
|
/* IOMMU info */
|
|
diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c
|
|
index 87643d2891..148b5ee51d 100644
|
|
--- a/hw/i386/amd_iommu.c
|
|
+++ b/hw/i386/amd_iommu.c
|
|
@@ -1598,10 +1598,10 @@ static void amdvi_sysbus_realize(DeviceState *dev, Error **errp)
|
|
x86ms->ioapic_as = amdvi_host_dma_iommu(bus, s, AMDVI_IOAPIC_SB_DEVID);
|
|
|
|
/* set up MMIO */
|
|
- memory_region_init_io(&s->mmio, OBJECT(s), &mmio_mem_ops, s, "amdvi-mmio",
|
|
- AMDVI_MMIO_SIZE);
|
|
+ memory_region_init_io(&s->mr_mmio, OBJECT(s), &mmio_mem_ops, s,
|
|
+ "amdvi-mmio", AMDVI_MMIO_SIZE);
|
|
memory_region_add_subregion(get_system_memory(), AMDVI_BASE_ADDR,
|
|
- &s->mmio);
|
|
+ &s->mr_mmio);
|
|
pci_setup_iommu(bus, &amdvi_iommu_ops, s);
|
|
amdvi_init(s);
|
|
}
|
|
diff --git a/hw/i386/amd_iommu.h b/hw/i386/amd_iommu.h
|
|
index 73619fe9ea..e5c2ae94f2 100644
|
|
--- a/hw/i386/amd_iommu.h
|
|
+++ b/hw/i386/amd_iommu.h
|
|
@@ -353,7 +353,7 @@ struct AMDVIState {
|
|
uint32_t pprlog_head; /* ppr log head */
|
|
uint32_t pprlog_tail; /* ppr log tail */
|
|
|
|
- MemoryRegion mmio; /* MMIO region */
|
|
+ MemoryRegion mr_mmio; /* MMIO region */
|
|
uint8_t mmior[AMDVI_MMIO_SIZE]; /* read/write MMIO */
|
|
uint8_t w1cmask[AMDVI_MMIO_SIZE]; /* read/write 1 clear mask */
|
|
uint8_t romask[AMDVI_MMIO_SIZE]; /* MMIO read/only mask */
|
|
--
|
|
2.39.3
|
|
|