aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorAlexander Bulekov <alxndr@bu.edu>2023-04-27 17:10:12 -0400
committerThomas Huth <thuth@redhat.com>2023-04-28 11:31:54 +0200
commit6dad5a6810d9c60ca320d01276f6133bbcfa1fc7 (patch)
tree43dea22af3f6c3375b0d226d69ea2c0624649ea2 /hw
parent985c4a4e547afb9573b6bd6843d20eb2c3d1d1cd (diff)
downloadqemu-6dad5a6810d9c60ca320d01276f6133bbcfa1fc7.zip
qemu-6dad5a6810d9c60ca320d01276f6133bbcfa1fc7.tar.gz
qemu-6dad5a6810d9c60ca320d01276f6133bbcfa1fc7.tar.bz2
raven: disable reentrancy detection for iomem
As the code is designed for re-entrant calls from raven_io_ops to pci-conf, mark raven_io_ops as reentrancy-safe. Signed-off-by: Alexander Bulekov <alxndr@bu.edu> Message-Id: <20230427211013.2994127-8-alxndr@bu.edu> Signed-off-by: Thomas Huth <thuth@redhat.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/pci-host/raven.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c
index 072ffe3..9a11ac4 100644
--- a/hw/pci-host/raven.c
+++ b/hw/pci-host/raven.c
@@ -294,6 +294,13 @@ static void raven_pcihost_initfn(Object *obj)
memory_region_init(&s->pci_memory, obj, "pci-memory", 0x3f000000);
address_space_init(&s->pci_io_as, &s->pci_io, "raven-io");
+ /*
+ * Raven's raven_io_ops use the address-space API to access pci-conf-idx
+ * (which is also owned by the raven device). As such, mark the
+ * pci_io_non_contiguous as re-entrancy safe.
+ */
+ s->pci_io_non_contiguous.disable_reentrancy_guard = true;
+
/* CPU address space */
memory_region_add_subregion(address_space_mem, PCI_IO_BASE_ADDR,
&s->pci_io);