| Message ID | 20240219105637.65052-1-sai.pavan.boddu@amd.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] xlnx-versal-ospi: disable reentrancy detection for iomem_dac | expand |
On Mon, 19 Feb 2024 at 10:56, Sai Pavan Boddu <sai.pavan.boddu@amd.com> wrote: > > The OSPI DMA reads flash data through the OSPI linear address space (the > iomem_dac region), because of this the reentrancy guard introduced in > commit a2e1753b ("memory: prevent dma-reentracy issues") is disabled for > the memory region. > > Signed-off-by: Sai Pavan Boddu <sai.pavan.boddu@amd.com> > --- > Changes for V2: > Added code comments. > > hw/ssi/xlnx-versal-ospi.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/hw/ssi/xlnx-versal-ospi.c b/hw/ssi/xlnx-versal-ospi.c > index c7b95b1f37..c479138ec1 100644 > --- a/hw/ssi/xlnx-versal-ospi.c > +++ b/hw/ssi/xlnx-versal-ospi.c > @@ -1772,6 +1772,12 @@ static void xlnx_versal_ospi_init(Object *obj) > memory_region_init_io(&s->iomem_dac, obj, &ospi_dac_ops, s, > TYPE_XILINX_VERSAL_OSPI "-dac", 0x20000000); > sysbus_init_mmio(sbd, &s->iomem_dac); > + /* > + * The OSPI DMA reads flash data through the OSPI linear address space (the > + * iomem_dac region), because of this the reentrancy guard needs to be > + * disabled. > + */ > + s->iomem_dac.disable_reentrancy_guard = true; Applied to target-arm.next, thanks. -- PMM
diff --git a/hw/ssi/xlnx-versal-ospi.c b/hw/ssi/xlnx-versal-ospi.c index c7b95b1f37..c479138ec1 100644 --- a/hw/ssi/xlnx-versal-ospi.c +++ b/hw/ssi/xlnx-versal-ospi.c @@ -1772,6 +1772,12 @@ static void xlnx_versal_ospi_init(Object *obj) memory_region_init_io(&s->iomem_dac, obj, &ospi_dac_ops, s, TYPE_XILINX_VERSAL_OSPI "-dac", 0x20000000); sysbus_init_mmio(sbd, &s->iomem_dac); + /* + * The OSPI DMA reads flash data through the OSPI linear address space (the + * iomem_dac region), because of this the reentrancy guard needs to be + * disabled. + */ + s->iomem_dac.disable_reentrancy_guard = true; sysbus_init_irq(sbd, &s->irq);
The OSPI DMA reads flash data through the OSPI linear address space (the iomem_dac region), because of this the reentrancy guard introduced in commit a2e1753b ("memory: prevent dma-reentracy issues") is disabled for the memory region. Signed-off-by: Sai Pavan Boddu <sai.pavan.boddu@amd.com> --- Changes for V2: Added code comments. hw/ssi/xlnx-versal-ospi.c | 6 ++++++ 1 file changed, 6 insertions(+)