a39364b9d1
The previous version was picked from the mailing list and still had an object_dynamic_cast call in a hot path, which is avoided with the version that landed in git. Also adds a few more exceptions for devices that need reentrancy. Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Bulekov <alxndr@bu.edu>
|
|
Date: Thu, 27 Apr 2023 17:10:11 -0400
|
|
Subject: [PATCH] bcm2835_property: disable reentrancy detection for iomem
|
|
|
|
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: Fiona Ebner <f.ebner@proxmox.com>
|
|
---
|
|
hw/misc/bcm2835_property.c | 7 +++++++
|
|
1 file changed, 7 insertions(+)
|
|
|
|
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);
|
|
}
|