| Message ID | 20230526073850.2772197-1-clg@kaod.org |
|---|---|
| State | New |
| Headers | show |
| Series | pnv_lpc: disable reentrancy detection for lpc-hc | expand |
On 26/05/2023 09:38, Cédric Le Goater wrote: > From: Alexander Bulekov <alxndr@bu.edu> > > As lpc-hc is designed for re-entrant calls from xscom, mark it > re-entrancy safe. > > Reported-by: Thomas Huth <thuth@redhat.com> > Signed-off-by: Alexander Bulekov <alxndr@bu.edu> > [clg: mark opb_master_regs as re-entrancy safe also ] > Signed-off-by: Cédric Le Goater <clg@kaod.org> > --- Reviewed-by: Frederic Barrat <fbarrat@linux.ibm.com> Thanks, Fred > 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 01f44c19ebba..605d3908617a 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); >
On 26/05/2023 09.38, Cédric Le Goater wrote: > From: Alexander Bulekov <alxndr@bu.edu> > > As lpc-hc is designed for re-entrant calls from xscom, mark it > re-entrancy safe. > > Reported-by: Thomas Huth <thuth@redhat.com> > Signed-off-by: Alexander Bulekov <alxndr@bu.edu> > [clg: mark opb_master_regs as re-entrancy safe also ] > Signed-off-by: Cédric Le Goater <clg@kaod.org> > --- > 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 01f44c19ebba..605d3908617a 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); > Tested-by: Thomas Huth <thuth@redhat.com>
On 5/26/23 04:38, Cédric Le Goater wrote: > From: Alexander Bulekov <alxndr@bu.edu> > > As lpc-hc is designed for re-entrant calls from xscom, mark it > re-entrancy safe. > > Reported-by: Thomas Huth <thuth@redhat.com> > Signed-off-by: Alexander Bulekov <alxndr@bu.edu> > [clg: mark opb_master_regs as re-entrancy safe also ] > Signed-off-by: Cédric Le Goater <clg@kaod.org> > --- Queued in gitlab.com/danielhb/qemu/tree/ppc-next. Thanks, Daniel > 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 01f44c19ebba..605d3908617a 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); >
diff --git a/hw/ppc/pnv_lpc.c b/hw/ppc/pnv_lpc.c index 01f44c19ebba..605d3908617a 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);