From: Alexander Bulekov Date: Thu, 27 Apr 2023 17:10:12 -0400 Subject: raven: disable reentrancy detection for iomem Git-commit: 6dad5a6810d9c60ca320d01276f6133bbcfa1fc7 References: bsc#1223955 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 Message-Id: <20230427211013.2994127-8-alxndr@bu.edu> Signed-off-by: Thomas Huth Signed-off-by: Dario Faggioli --- hw/pci-host/prep.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c index 9b6166dc6d462704797aa044ffa7..e9b146c15fcf55fa532423e21e31 100644 --- a/hw/pci-host/prep.c +++ b/hw/pci-host/prep.c @@ -290,6 +290,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, 0x80000000, &s->pci_io); memory_region_add_subregion_overlap(address_space_mem, 0x80000000,