40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Alexander Bulekov <alxndr@bu.edu>
|
|
Date: Thu, 27 Apr 2023 17:10:10 -0400
|
|
Subject: [PATCH] lsi53c895a: disable reentrancy detection for script RAM
|
|
|
|
As the code is designed to use the memory APIs to access the script ram,
|
|
disable reentrancy checks for the pseudo-RAM ram_io MemoryRegion.
|
|
|
|
In the future, ram_io may be converted from an IO to a proper RAM MemoryRegion.
|
|
|
|
Reported-by: Fiona Ebner <f.ebner@proxmox.com>
|
|
Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
|
|
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
|
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
|
|
Message-Id: <20230427211013.2994127-6-alxndr@bu.edu>
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
(cherry-picked from commit bfd6e7ae6a72b84e2eb9574f56e6ec037f05182c)
|
|
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
|
---
|
|
hw/scsi/lsi53c895a.c | 6 ++++++
|
|
1 file changed, 6 insertions(+)
|
|
|
|
diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c
|
|
index bbf32d3f73..17af67935f 100644
|
|
--- a/hw/scsi/lsi53c895a.c
|
|
+++ b/hw/scsi/lsi53c895a.c
|
|
@@ -2313,6 +2313,12 @@ static void lsi_scsi_realize(PCIDevice *dev, Error **errp)
|
|
memory_region_init_io(&s->io_io, OBJECT(s), &lsi_io_ops, s,
|
|
"lsi-io", 256);
|
|
|
|
+ /*
|
|
+ * Since we use the address-space API to interact with ram_io, disable the
|
|
+ * re-entrancy guard.
|
|
+ */
|
|
+ s->ram_io.disable_reentrancy_guard = true;
|
|
+
|
|
address_space_init(&s->pci_io_as, pci_address_space_io(dev), "lsi-pci-io");
|
|
qdev_init_gpio_out(d, &s->ext_irq, 1);
|
|
|