[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stable-7.2.6 11/51] raven: disable reentrancy detection for iomem
From: |
Michael Tokarev |
Subject: |
[Stable-7.2.6 11/51] raven: disable reentrancy detection for iomem |
Date: |
Mon, 11 Sep 2023 11:02:02 +0300 |
From: Alexander Bulekov <alxndr@bu.edu>
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>
(cherry picked from commit 6dad5a6810d9c60ca320d01276f6133bbcfa1fc7)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
diff --git a/hw/pci-host/raven.c b/hw/pci-host/raven.c
index 7a105e4a63..42fb02b7e6 100644
--- a/hw/pci-host/raven.c
+++ b/hw/pci-host/raven.c
@@ -293,6 +293,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);
--
2.39.2
- [Stable-7.2.6 00/51] v2 Patch Round-up for stable 7.2.6, freeze on 2023-09-19, Michael Tokarev, 2023/09/11
- [Stable-7.2.6 01/51] gitlab-ci: check-dco.py: switch from master to stable-7.2 branch, Michael Tokarev, 2023/09/11
- [Stable-7.2.6 03/51] memory: prevent dma-reentracy issues, Michael Tokarev, 2023/09/11
- [Stable-7.2.6 02/51] python: drop pipenv, Michael Tokarev, 2023/09/11
- [Stable-7.2.6 06/51] checkpatch: add qemu_bh_new/aio_bh_new checks, Michael Tokarev, 2023/09/11
- [Stable-7.2.6 05/51] async: avoid use-after-free on re-entrancy guard, Michael Tokarev, 2023/09/11
- [Stable-7.2.6 04/51] async: Add an optional reentrancy guard to the BH API, Michael Tokarev, 2023/09/11
- [Stable-7.2.6 07/51] hw: replace most qemu_bh_new calls with qemu_bh_new_guarded, Michael Tokarev, 2023/09/11
- [Stable-7.2.6 08/51] lsi53c895a: disable reentrancy detection for script RAM, Michael Tokarev, 2023/09/11
- [Stable-7.2.6 09/51] lsi53c895a: disable reentrancy detection for MMIO region, too, Michael Tokarev, 2023/09/11
- [Stable-7.2.6 11/51] raven: disable reentrancy detection for iomem,
Michael Tokarev <=
- [Stable-7.2.6 10/51] bcm2835_property: disable reentrancy detection for iomem, Michael Tokarev, 2023/09/11
- [Stable-7.2.6 12/51] apic: disable reentrancy detection for apic-msi, Michael Tokarev, 2023/09/11
- [Stable-7.2.6 13/51] loongarch: mark loongarch_ipi_iocsr re-entrnacy safe, Michael Tokarev, 2023/09/11
- [Stable-7.2.6 14/51] pnv_lpc: disable reentrancy detection for lpc-hc, Michael Tokarev, 2023/09/11
- [Stable-7.2.6 43/51] hw/ide/ahci: PxCI should not get cleared when ERR_STAT is set, Michael Tokarev, 2023/09/11