[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stable-7.2.6 10/51] bcm2835_property: disable reentrancy detection for
From: |
Michael Tokarev |
Subject: |
[Stable-7.2.6 10/51] bcm2835_property: disable reentrancy detection for iomem |
Date: |
Mon, 11 Sep 2023 11:02:01 +0300 |
From: Alexander Bulekov <alxndr@bu.edu>
As the code is designed for re-entrant calls from bcm2835_property to
bcm2835_mbox and back into bcm2835_property, mark iomem as
reentrancy-safe.
Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20230427211013.2994127-7-alxndr@bu.edu>
Signed-off-by: Thomas Huth <thuth@redhat.com>
(cherry picked from commit 985c4a4e547afb9573b6bd6843d20eb2c3d1d1cd)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
diff --git a/hw/misc/bcm2835_property.c b/hw/misc/bcm2835_property.c
index 890ae7bae5..de056ea2df 100644
--- a/hw/misc/bcm2835_property.c
+++ b/hw/misc/bcm2835_property.c
@@ -382,6 +382,13 @@ static void bcm2835_property_init(Object *obj)
memory_region_init_io(&s->iomem, OBJECT(s), &bcm2835_property_ops, s,
TYPE_BCM2835_PROPERTY, 0x10);
+
+ /*
+ * bcm2835_property_ops call into bcm2835_mbox, which in-turn reads from
+ * iomem. As such, mark iomem as re-entracy safe.
+ */
+ s->iomem.disable_reentrancy_guard = true;
+
sysbus_init_mmio(SYS_BUS_DEVICE(s), &s->iomem);
sysbus_init_irq(SYS_BUS_DEVICE(s), &s->mbox_irq);
}
--
2.39.2
- [Stable-7.2.6 01/51] gitlab-ci: check-dco.py: switch from master to stable-7.2 branch, (continued)
- [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, 2023/09/11
- [Stable-7.2.6 10/51] bcm2835_property: disable reentrancy detection for iomem,
Michael Tokarev <=
- [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