| Message ID | 20211018132609.160008-6-clg@kaod.org |
|---|---|
| State | New |
| Headers | show |
| Series | aspeed/smc: Improve support for the alternate boot function | expand |
On 10/18/21 15:26, Cédric Le Goater wrote: > Signed-off-by: Cédric Le Goater <clg@kaod.org> > --- > hw/sd/aspeed_sdhci.c | 5 +++++ > hw/sd/trace-events | 4 ++++ > 2 files changed, 9 insertions(+) Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Hi Cedric, On the subject s/speed/aspeed/. Otherwise: Reviewed-by: Francisco Iglesias <frasse.iglesias@gmail.com> /BR On [2021 Oct 18] Mon 15:26:09, Cédric Le Goater wrote: > Signed-off-by: Cédric Le Goater <clg@kaod.org> > --- > hw/sd/aspeed_sdhci.c | 5 +++++ > hw/sd/trace-events | 4 ++++ > 2 files changed, 9 insertions(+) > > diff --git a/hw/sd/aspeed_sdhci.c b/hw/sd/aspeed_sdhci.c > index 3299844de6dc..df1bdf1fa4ed 100644 > --- a/hw/sd/aspeed_sdhci.c > +++ b/hw/sd/aspeed_sdhci.c > @@ -14,6 +14,7 @@ > #include "hw/irq.h" > #include "migration/vmstate.h" > #include "hw/qdev-properties.h" > +#include "trace.h" > > #define ASPEED_SDHCI_INFO 0x00 > #define ASPEED_SDHCI_INFO_SLOT1 (1 << 17) > @@ -60,6 +61,8 @@ static uint64_t aspeed_sdhci_read(void *opaque, hwaddr addr, unsigned int size) > } > } > > + trace_aspeed_sdhci_read(addr, size, (uint64_t) val); > + > return (uint64_t)val; > } > > @@ -68,6 +71,8 @@ static void aspeed_sdhci_write(void *opaque, hwaddr addr, uint64_t val, > { > AspeedSDHCIState *sdhci = opaque; > > + trace_aspeed_sdhci_write(addr, size, val); > + > switch (addr) { > case ASPEED_SDHCI_INFO: > /* The RESET bit automatically clears. */ > diff --git a/hw/sd/trace-events b/hw/sd/trace-events > index 3cc2ef89ba6b..94a00557b26f 100644 > --- a/hw/sd/trace-events > +++ b/hw/sd/trace-events > @@ -68,3 +68,7 @@ pl181_fifo_push(uint32_t data) "FIFO push 0x%08" PRIx32 > pl181_fifo_pop(uint32_t data) "FIFO pop 0x%08" PRIx32 > pl181_fifo_transfer_complete(void) "FIFO transfer complete" > pl181_data_engine_idle(void) "data engine idle" > + > +# aspeed_sdhci.c > +aspeed_sdhci_read(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size %u: 0x%" PRIx64 > +aspeed_sdhci_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size %u: 0x%" PRIx64 > -- > 2.31.1 > >
diff --git a/hw/sd/aspeed_sdhci.c b/hw/sd/aspeed_sdhci.c index 3299844de6dc..df1bdf1fa4ed 100644 --- a/hw/sd/aspeed_sdhci.c +++ b/hw/sd/aspeed_sdhci.c @@ -14,6 +14,7 @@ #include "hw/irq.h" #include "migration/vmstate.h" #include "hw/qdev-properties.h" +#include "trace.h" #define ASPEED_SDHCI_INFO 0x00 #define ASPEED_SDHCI_INFO_SLOT1 (1 << 17) @@ -60,6 +61,8 @@ static uint64_t aspeed_sdhci_read(void *opaque, hwaddr addr, unsigned int size) } } + trace_aspeed_sdhci_read(addr, size, (uint64_t) val); + return (uint64_t)val; } @@ -68,6 +71,8 @@ static void aspeed_sdhci_write(void *opaque, hwaddr addr, uint64_t val, { AspeedSDHCIState *sdhci = opaque; + trace_aspeed_sdhci_write(addr, size, val); + switch (addr) { case ASPEED_SDHCI_INFO: /* The RESET bit automatically clears. */ diff --git a/hw/sd/trace-events b/hw/sd/trace-events index 3cc2ef89ba6b..94a00557b26f 100644 --- a/hw/sd/trace-events +++ b/hw/sd/trace-events @@ -68,3 +68,7 @@ pl181_fifo_push(uint32_t data) "FIFO push 0x%08" PRIx32 pl181_fifo_pop(uint32_t data) "FIFO pop 0x%08" PRIx32 pl181_fifo_transfer_complete(void) "FIFO transfer complete" pl181_data_engine_idle(void) "data engine idle" + +# aspeed_sdhci.c +aspeed_sdhci_read(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size %u: 0x%" PRIx64 +aspeed_sdhci_write(uint64_t addr, uint32_t size, uint64_t data) "@0x%" PRIx64 " size %u: 0x%" PRIx64
Signed-off-by: Cédric Le Goater <clg@kaod.org> --- hw/sd/aspeed_sdhci.c | 5 +++++ hw/sd/trace-events | 4 ++++ 2 files changed, 9 insertions(+)