[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/6] hw/i386/amd_iommu: Explicit use of AMDVI_BASE_ADDR in amdvi_
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH 2/6] hw/i386/amd_iommu: Explicit use of AMDVI_BASE_ADDR in amdvi_init |
Date: |
Mon, 13 Mar 2023 16:30:27 +0100 |
By accessing MemoryRegion internals, amdvi_init() gives the false
idea that the PCI BAR can be modified. However this isn't true
(at least the model isn't ready for that): the device is explicitly
maps at the BAR at the fixed AMDVI_BASE_ADDR address in
amdvi_sysbus_realize(). Since the SysBus API isn't designed to
remap regions, directly use the fixed address in amdvi_init().
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/i386/amd_iommu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hw/i386/amd_iommu.c b/hw/i386/amd_iommu.c
index bcd016f5c5..3813b341ec 100644
--- a/hw/i386/amd_iommu.c
+++ b/hw/i386/amd_iommu.c
@@ -1519,9 +1519,9 @@ static void amdvi_init(AMDVIState *s)
/* reset AMDVI specific capabilities, all r/o */
pci_set_long(s->pci.dev.config + s->capab_offset, AMDVI_CAPAB_FEATURES);
pci_set_long(s->pci.dev.config + s->capab_offset + AMDVI_CAPAB_BAR_LOW,
- s->mmio.addr & ~(0xffff0000));
+ AMDVI_BASE_ADDR & ~(0xffff0000));
pci_set_long(s->pci.dev.config + s->capab_offset + AMDVI_CAPAB_BAR_HIGH,
- (s->mmio.addr & ~(0xffff)) >> 16);
+ (AMDVI_BASE_ADDR & ~(0xffff)) >> 16);
pci_set_long(s->pci.dev.config + s->capab_offset + AMDVI_CAPAB_RANGE,
0xff000000);
pci_set_long(s->pci.dev.config + s->capab_offset + AMDVI_CAPAB_MISC, 0);
--
2.38.1
- [PATCH 0/6] hw/i386/amd_iommu: Orphanize & QDev cleanups, Philippe Mathieu-Daudé, 2023/03/13
- [PATCH 1/6] MAINTAINERS: Mark AMD-Vi emulation as orphan, Philippe Mathieu-Daudé, 2023/03/13
- [PATCH 2/6] hw/i386/amd_iommu: Explicit use of AMDVI_BASE_ADDR in amdvi_init,
Philippe Mathieu-Daudé <=
- [PATCH 3/6] hw/i386/amd_iommu: Remove intermediate AMDVIState::devid field, Philippe Mathieu-Daudé, 2023/03/13
- [PATCH 4/6] hw/i386/amd_iommu: Move capab_offset from AMDVIState to AMDVIPCIState, Philippe Mathieu-Daudé, 2023/03/13
- [PATCH 5/6] hw/i386/amd_iommu: Set PCI static/const fields via PCIDeviceClass, Philippe Mathieu-Daudé, 2023/03/13
- [PATCH 6/6] hw/i386/amd_iommu: Factor amdvi_pci_realize out of amdvi_sysbus_realize, Philippe Mathieu-Daudé, 2023/03/13
- Re: [PATCH 0/6] hw/i386/amd_iommu: Orphanize & QDev cleanups, Philippe Mathieu-Daudé, 2023/03/13