| Message ID | 20180809130115.28951-16-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | arm: Implement MPS2 watchdogs and DMA | expand |
On 08/09/2018 10:01 AM, Peter Maydell wrote: > The PL08x model currently will unconditionally call hw_error() > if the DMA engine is enabled by the guest. This has been > present since the PL080 model was edded in 2006, and is > presumably either unintentional debug code left enabled, > or a guard against untested DMA engine code being used. > > Remove the hw_error(), since we now have a guest which > will actually try to use the DMA engine (the self-test > binary for the AN505 MPS2 FPGA image). > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/dma/pl080.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c > index 8f92550392b..ef15d3e628d 100644 > --- a/hw/dma/pl080.c > +++ b/hw/dma/pl080.c > @@ -110,7 +110,6 @@ static void pl080_run(PL080State *s) > if ((s->conf & PL080_CONF_E) == 0) > return; > > -hw_error("DMA active\n"); > /* If we are already in the middle of a DMA operation then indicate that > there may be new DMA requests and return immediately. */ > if (s->running) { >
diff --git a/hw/dma/pl080.c b/hw/dma/pl080.c index 8f92550392b..ef15d3e628d 100644 --- a/hw/dma/pl080.c +++ b/hw/dma/pl080.c @@ -110,7 +110,6 @@ static void pl080_run(PL080State *s) if ((s->conf & PL080_CONF_E) == 0) return; -hw_error("DMA active\n"); /* If we are already in the middle of a DMA operation then indicate that there may be new DMA requests and return immediately. */ if (s->running) {
The PL08x model currently will unconditionally call hw_error() if the DMA engine is enabled by the guest. This has been present since the PL080 model was edded in 2006, and is presumably either unintentional debug code left enabled, or a guard against untested DMA engine code being used. Remove the hw_error(), since we now have a guest which will actually try to use the DMA engine (the self-test binary for the AN505 MPS2 FPGA image). Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- hw/dma/pl080.c | 1 - 1 file changed, 1 deletion(-) -- 2.17.1