Message ID | 20230913204410.65650-2-mark.cave-ayland@ilande.co.uk |
---|---|
State | New |
Headers | show |
Series | esp/scsi: minor fixes | expand |
On 13/9/23 22:44, Mark Cave-Ayland wrote: > The call to esp_dma_enable() was being made with the SYSBUS_ESP type instead of > the ESP type. This meant that when GPIO 1 was being used to trigger a DMA > request from an external DMA controller, the setting of ESPState's dma_enabled > field would clobber unknown memory whilst the dma_cb callback pointer would > typically return NULL so the DMA request would never start. > Cc: qemu-stable@nongnu.org Fixes: a391fdbc7f ("esp: split esp code into generic chip emulation and sysbus layer") Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > --- > hw/scsi/esp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c > index e52188d022..4218a6a960 100644 > --- a/hw/scsi/esp.c > +++ b/hw/scsi/esp.c > @@ -1395,7 +1395,7 @@ static void sysbus_esp_gpio_demux(void *opaque, int irq, int level) > parent_esp_reset(s, irq, level); > break; > case 1: > - esp_dma_enable(opaque, irq, level); > + esp_dma_enable(s, irq, level); > break; > } > }
On 13/09/2023 22.44, Mark Cave-Ayland wrote: > The call to esp_dma_enable() was being made with the SYSBUS_ESP type instead of > the ESP type. This meant that when GPIO 1 was being used to trigger a DMA > request from an external DMA controller, the setting of ESPState's dma_enabled > field would clobber unknown memory whilst the dma_cb callback pointer would > typically return NULL so the DMA request would never start. > > Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> > --- > hw/scsi/esp.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c > index e52188d022..4218a6a960 100644 > --- a/hw/scsi/esp.c > +++ b/hw/scsi/esp.c > @@ -1395,7 +1395,7 @@ static void sysbus_esp_gpio_demux(void *opaque, int irq, int level) > parent_esp_reset(s, irq, level); > break; > case 1: > - esp_dma_enable(opaque, irq, level); > + esp_dma_enable(s, irq, level); > break; > } > } Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c index e52188d022..4218a6a960 100644 --- a/hw/scsi/esp.c +++ b/hw/scsi/esp.c @@ -1395,7 +1395,7 @@ static void sysbus_esp_gpio_demux(void *opaque, int irq, int level) parent_esp_reset(s, irq, level); break; case 1: - esp_dma_enable(opaque, irq, level); + esp_dma_enable(s, irq, level); break; } }
The call to esp_dma_enable() was being made with the SYSBUS_ESP type instead of the ESP type. This meant that when GPIO 1 was being used to trigger a DMA request from an external DMA controller, the setting of ESPState's dma_enabled field would clobber unknown memory whilst the dma_cb callback pointer would typically return NULL so the DMA request would never start. Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> --- hw/scsi/esp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)