[qemu-xen stable-4.18] pnv_lpc: disable reentrancy detection for lpc-hc

[patchbot@xxxxxxx]

commit e7f12ce43d9fc6016c1f12d49bcb5e024663d7ad
Author:     Alexander Bulekov <alxndr@xxxxxx>
AuthorDate: Fri May 26 09:38:50 2023 +0200
Commit:     Michael Tokarev <mjt@xxxxxxxxxx>
CommitDate: Sun Sep 10 19:38:01 2023 +0300

    pnv_lpc: disable reentrancy detection for lpc-hc
    
    As lpc-hc is designed for re-entrant calls from xscom, mark it
    re-entrancy safe.
    
    Reported-by: Thomas Huth <thuth@xxxxxxxxxx>
    Signed-off-by: Alexander Bulekov <alxndr@xxxxxx>
    [clg: mark opb_master_regs as re-entrancy safe also ]
    Signed-off-by: Cédric Le Goater <clg@xxxxxxxx>
    Reviewed-by: Frederic Barrat <fbarrat@xxxxxxxxxxxxx>
    Tested-by: Thomas Huth <thuth@xxxxxxxxxx>
    Message-Id: <20230526073850.2772197-1-clg@xxxxxxxx>
    Signed-off-by: Daniel Henrique Barboza <danielhb413@xxxxxxxxx>
    (cherry picked from commit 76f9ebffcd41b62ae9ec26a1c25676f2ae1d9cc3)
    Signed-off-by: Michael Tokarev <mjt@xxxxxxxxxx>
---
 hw/ppc/pnv_lpc.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hw/ppc/pnv_lpc.c b/hw/ppc/pnv_lpc.c
index 01f44c19eb..605d390861 100644
--- a/hw/ppc/pnv_lpc.c
+++ b/hw/ppc/pnv_lpc.c
@@ -734,10 +734,13 @@ static void pnv_lpc_realize(DeviceState *dev, Error 
**errp)
     /* Create MMIO regions for LPC HC and OPB registers */
     memory_region_init_io(&lpc->opb_master_regs, OBJECT(dev), &opb_master_ops,
                           lpc, "lpc-opb-master", LPC_OPB_REGS_OPB_SIZE);
+    lpc->opb_master_regs.disable_reentrancy_guard = true;
     memory_region_add_subregion(&lpc->opb_mr, LPC_OPB_REGS_OPB_ADDR,
                                 &lpc->opb_master_regs);
     memory_region_init_io(&lpc->lpc_hc_regs, OBJECT(dev), &lpc_hc_ops, lpc,
                           "lpc-hc", LPC_HC_REGS_OPB_SIZE);
+    /* xscom writes to lpc-hc. As such mark lpc-hc re-entrancy safe */
+    lpc->lpc_hc_regs.disable_reentrancy_guard = true;
     memory_region_add_subregion(&lpc->opb_mr, LPC_HC_REGS_OPB_ADDR,
                                 &lpc->lpc_hc_regs);
 
--
generated by git-patchbot for /home/xen/git/qemu-xen.git#stable-4.18