[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 11/11] hw/pci-host/raven: Remove temporary assertion 'root MR
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 11/11] hw/pci-host/raven: Remove temporary assertion 'root MR is zero-based' |
Date: |
Sat, 17 Apr 2021 12:30:28 +0200 |
Previous commit added a check in memory_region_add_subregion_common()
to ensure AS root MR can't be added as subregion (changing the MR
base address doing so). We can now remove the temporary assert in
the raven model.
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/pci-host/raven.c | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c
index d8c1aaa11f5..3f8508bd467 100644
--- a/hw/pci-host/raven.c
+++ b/hw/pci-host/raven.c
@@ -141,16 +141,6 @@ static const MemoryRegionOps raven_intack_ops = {
static inline hwaddr raven_io_address(PREPPCIState *s,
hwaddr addr)
{
- /*
- * We shouldn't access AddressSpace internals. However this assert
- * is temporarily used to prove a subtle inconsistency from commit
- * 1ae1dc5ba24 ("raven: Set a correct PCI I/O memory region") which
- * expected the PCI I/O root region base address to be 0x80000000.
- *
- * We now use an alias memory region as root, which is zero-based.
- */
- assert(s->pci_io_as.root->addr == 0);
-
if (s->contiguous_map == 0) {
/* 64 KB contiguous space for IOs */
addr &= 0xFFFF;
--
2.26.3
- [PATCH v2 04/11] hw/pci-host: Rename Raven ASIC PCI bridge as raven.c, (continued)
- [PATCH v2 04/11] hw/pci-host: Rename Raven ASIC PCI bridge as raven.c, Philippe Mathieu-Daudé, 2021/04/17
- [PATCH v2 05/11] hw/pci-host/raven: Add PCI_IO_BASE_ADDR definition, Philippe Mathieu-Daudé, 2021/04/17
- [PATCH v2 06/11] hw/pci-host/raven: Assert PCI I/O AddressSpace is based at 0x80000000, Philippe Mathieu-Daudé, 2021/04/17
- [PATCH v2 07/11] hw/pci-host/raven: Use MR alias for AS root, not sysbus mapped MR, Philippe Mathieu-Daudé, 2021/04/17
- [RFC PATCH v2 08/11] hw/pci-host/raven: Remove pointless alias mapping onto system bus, Philippe Mathieu-Daudé, 2021/04/17
- [PATCH v2 09/11] hw/pci-host/prep: Do not directly map bus-master region onto main bus, Philippe Mathieu-Daudé, 2021/04/17
- [PATCH v2 10/11] memory: Make sure root MR won't be added as subregion, Philippe Mathieu-Daudé, 2021/04/17
- [PATCH v2 11/11] hw/pci-host/raven: Remove temporary assertion 'root MR is zero-based',
Philippe Mathieu-Daudé <=
- Re: [PATCH v2 00/11] memory: Forbid mapping AddressSpace root MemoryRegion, Cédric Le Goater, 2021/04/19
- Re: [PATCH v2 00/11] memory: Forbid mapping AddressSpace root MemoryRegion, Peter Xu, 2021/04/20