On 01/03/2018 06:54 PM, Alistair Francis wrote:
> On Wed, Jan 3, 2018 at 8:41 AM, Philippe Mathieu-Daudé <f4...@amsat.org>
> wrote:
>> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
>> ---
>> hw/sd/pxa2xx_mmci.c | 63
>> ++++++++++++++++++++++++++++++++++-------------------
>> hw/sd/trace-events | 4 ++++
>> 2 files changed, 44 insertions(+), 23 deletions(-)
>>
>> diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c
>> index 3deccf02c9..0759a0d2eb 100644
>> --- a/hw/sd/pxa2xx_mmci.c
>> +++ b/hw/sd/pxa2xx_mmci.c
>> @@ -19,6 +19,7 @@
>> #include "hw/qdev.h"
>> #include "hw/qdev-properties.h"
>> #include "qemu/error-report.h"
>> +#include "trace.h"
>>
>> #define TYPE_PXA2XX_MMCI "pxa2xx-mmci"
>> #define PXA2XX_MMCI(obj) OBJECT_CHECK(PXA2xxMMCIState, (obj),
>> TYPE_PXA2XX_MMCI)
>> @@ -278,43 +279,55 @@ static void pxa2xx_mmci_wakequeues(PXA2xxMMCIState *s)
>> static uint64_t pxa2xx_mmci_read(void *opaque, hwaddr offset, unsigned size)
>> {
>> PXA2xxMMCIState *s = (PXA2xxMMCIState *) opaque;
>> - uint32_t ret;
>> + uint32_t ret = 0;
>>
>> switch (offset) {
>> case MMC_STRPCL:
>> - return 0;
>> + break;
>> case MMC_STAT:
>> - return s->status;
>> + ret = s->status;
>> + break;
>> case MMC_CLKRT:
>> - return s->clkrt;
>> + ret = s->clkrt;
>> + break;
>> case MMC_SPI:
>> - return s->spi;
>> + ret = s->spi;
>> + break;
>> case MMC_CMDAT:
>> - return s->cmdat;
>> + ret = s->cmdat;
>> + break;
>> case MMC_RESTO:
>> - return s->resp_tout;
>> + ret = s->resp_tout;
>> + break;
>> case MMC_RDTO:
>> - return s->read_tout;
>> + ret = s->read_tout;
>> + break;
>> case MMC_BLKLEN:
>> - return s->blklen;
>> + ret = s->blklen;
>> + break;
>> case MMC_NUMBLK:
>> - return s->numblk;
>> + ret = s->numblk;
>> + break;
>> case MMC_PRTBUF:
>> - return 0;
>> + break;
>> case MMC_I_MASK:
>> - return s->intmask;
>> + ret = s->intmask;
>> + break;
>> case MMC_I_REG:
>> - return s->intreq;
>> + ret = s->intreq;
>> + break;
>> case MMC_CMD:
>> - return s->cmd | 0x40;
>> + ret = s->cmd | 0x40;
>> + break;
>> case MMC_ARGH:
>> - return s->arg >> 16;
>> + ret = s->arg >> 16;
>> + break;
>> case MMC_ARGL:
>> - return s->arg & 0xffff;
>> + ret = s->arg & 0xffff;
>> + break;
>> case MMC_RES:
>> - if (s->resp_len < 9)
>> - return s->resp_fifo[s->resp_len ++];
>> - return 0;
>> + ret = (s->resp_len < 9) ? s->resp_fifo[s->resp_len++] : 0;
>> + break;
>> case MMC_RXFIFO:
>> ret = 0;
>> while (size-- && s->rx_len) {
>> @@ -324,16 +337,19 @@ static uint64_t pxa2xx_mmci_read(void *opaque, hwaddr
>> offset, unsigned size)
>> }
>> s->intreq &= ~INT_RXFIFO_REQ;
>> pxa2xx_mmci_fifo_update(s);
>> - return ret;
>> + break;
>> + ret = ret;
Oops...
>> case MMC_RDWAIT:
>> - return 0;
>> + break;
>> case MMC_BLKS_REM:
>> - return s->numblk;
>> + ret = s->numblk;
>> + break;
>> default:
>> hw_error("%s: Bad offset " REG_FMT "\n", __FUNCTION__, offset);
>
> Maybe worth removing this as well?
Indeed!
>
> Either way:
>
> Reviewed-by: Alistair Francis <alistair.fran...@xilinx.com>
Thanks :)
>
> Alistair
>
>> }
>> + trace_pxa2xx_mmci_read(size, offset, ret);
>>
>> - return 0;
>> + return ret;
>> }
>>
>> static void pxa2xx_mmci_write(void *opaque,
>> @@ -341,6 +357,7 @@ static void pxa2xx_mmci_write(void *opaque,
>> {
>> PXA2xxMMCIState *s = (PXA2xxMMCIState *) opaque;
>>
>> + trace_pxa2xx_mmci_write(size, offset, value);
>> switch (offset) {
>> case MMC_STRPCL:
>> if (value & STRPCL_STRT_CLK) {
>> diff --git a/hw/sd/trace-events b/hw/sd/trace-events
>> index 1fc0bcf44b..6eca3470e2 100644
>> --- a/hw/sd/trace-events
>> +++ b/hw/sd/trace-events
>> @@ -3,3 +3,7 @@
>> # hw/sd/milkymist-memcard.c
>> milkymist_memcard_memory_read(uint32_t addr, uint32_t value) "addr 0x%08x
>> value 0x%08x"
>> milkymist_memcard_memory_write(uint32_t addr, uint32_t value) "addr 0x%08x
>> value 0x%08x"
>> +
>> +# hw/sd/pxa2xx_mmci.c
>> +pxa2xx_mmci_read(uint8_t size, uint32_t addr, uint32_t value) "size %d addr
>> 0x%02x value 0x%08x"
>> +pxa2xx_mmci_write(uint8_t size, uint32_t addr, uint32_t value) "size %d
>> addr 0x%02x value 0x%08x"
>> --
>> 2.15.1
>>
>>
