ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sparc32_dma: add len to esp/le DMA memory tracing 

This is surprisingly useful when trying to debug DMA issues.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Artyom Tarasenko <atar4qemu@gmail.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
This commit is contained in:
Mark Cave-Ayland 2017-10-14 13:22:22 +01:00
parent 4ca3d368d2
commit 331b7fc156
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hw/dma/sparc32_dma.c
View File

@ -74,7 +74,7 @@ void ledma_memory_read(void *opaque, hwaddr addr,
int i; int i;
addr |= s->dmaregs[3]; addr |= s->dmaregs[3];
trace_ledma_memory_read(addr); trace_ledma_memory_read(addr, len);
if (do_bswap) { if (do_bswap) {
sparc_iommu_memory_read(s->iommu, addr, buf, len); sparc_iommu_memory_read(s->iommu, addr, buf, len);
} else { } else {
@ -95,7 +95,7 @@ void ledma_memory_write(void *opaque, hwaddr addr,
uint16_t tmp_buf[32]; uint16_t tmp_buf[32];
addr |= s->dmaregs[3]; addr |= s->dmaregs[3];
trace_ledma_memory_write(addr); trace_ledma_memory_write(addr, len);
if (do_bswap) { if (do_bswap) {
sparc_iommu_memory_write(s->iommu, addr, buf, len); sparc_iommu_memory_write(s->iommu, addr, buf, len);
} else { } else {
@ -140,7 +140,7 @@ void espdma_memory_read(void *opaque, uint8_t *buf, int len)
{ {
DMADeviceState *s = opaque; DMADeviceState *s = opaque;
trace_espdma_memory_read(s->dmaregs[1]); trace_espdma_memory_read(s->dmaregs[1], len);
sparc_iommu_memory_read(s->iommu, s->dmaregs[1], buf, len); sparc_iommu_memory_read(s->iommu, s->dmaregs[1], buf, len);
s->dmaregs[1] += len; s->dmaregs[1] += len;
} }
@ -149,7 +149,7 @@ void espdma_memory_write(void *opaque, uint8_t *buf, int len)
{ {
DMADeviceState *s = opaque; DMADeviceState *s = opaque;
trace_espdma_memory_write(s->dmaregs[1]); trace_espdma_memory_write(s->dmaregs[1], len);
sparc_iommu_memory_write(s->iommu, s->dmaregs[1], buf, len); sparc_iommu_memory_write(s->iommu, s->dmaregs[1], buf, len);
s->dmaregs[1] += len; s->dmaregs[1] += len;
} }

8
hw/dma/trace-events
View File

@ -7,12 +7,12 @@ rc4030_read(uint64_t addr, uint32_t ret) "read reg[0x%"PRIx64"] = 0x%x"
rc4030_write(uint64_t addr, uint32_t val) "write reg[0x%"PRIx64"] = 0x%x" rc4030_write(uint64_t addr, uint32_t val) "write reg[0x%"PRIx64"] = 0x%x"
# hw/dma/sparc32_dma.c # hw/dma/sparc32_dma.c
ledma_memory_read(uint64_t addr) "DMA read addr 0x%"PRIx64 ledma_memory_read(uint64_t addr, int len) "DMA read addr 0x%"PRIx64 " len %d"
ledma_memory_write(uint64_t addr) "DMA write addr 0x%"PRIx64 ledma_memory_write(uint64_t addr, int len) "DMA write addr 0x%"PRIx64 " len %d"
sparc32_dma_set_irq_raise(void) "Raise IRQ" sparc32_dma_set_irq_raise(void) "Raise IRQ"
sparc32_dma_set_irq_lower(void) "Lower IRQ" sparc32_dma_set_irq_lower(void) "Lower IRQ"
espdma_memory_read(uint32_t addr) "DMA read addr 0x%08x" espdma_memory_read(uint32_t addr, int len) "DMA read addr 0x%08x len %d"
espdma_memory_write(uint32_t addr) "DMA write addr 0x%08x" espdma_memory_write(uint32_t addr, int len) "DMA write addr 0x%08x len %d"
sparc32_dma_mem_readl(uint64_t addr, uint32_t ret) "read dmareg 0x%"PRIx64": 0x%08x" sparc32_dma_mem_readl(uint64_t addr, uint32_t ret) "read dmareg 0x%"PRIx64": 0x%08x"
sparc32_dma_mem_writel(uint64_t addr, uint32_t old, uint32_t val) "write dmareg 0x%"PRIx64": 0x%08x -> 0x%08x" sparc32_dma_mem_writel(uint64_t addr, uint32_t old, uint32_t val) "write dmareg 0x%"PRIx64": 0x%08x -> 0x%08x"
sparc32_dma_enable_raise(void) "Raise DMA enable" sparc32_dma_enable_raise(void) "Raise DMA enable"