Skip to content

Commit

Permalink
bcm2835_property: disable reentrancy detection for iomem
Browse files Browse the repository at this point in the history
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 985c4a4)
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
  • Loading branch information
a1xndr authored and Michael Tokarev committed Sep 11, 2023
1 parent f5072ff commit 65ad790
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions hw/misc/bcm2835_property.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down

0 comments on commit 65ad790

Please sign in to comment.