From: Cédric Le Goater Date: Tue, 12 Oct 2021 06:20:08 +0000 (+0200) Subject: aspeed/smc: Dump address offset in trace events X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e2804a1ec97ceede14b69a2a6e9a8b5dfa0b15c2;p=qemu.git aspeed/smc: Dump address offset in trace events The register index is currently printed and this is confusing. Reviewed-by: Francisco Iglesias Signed-off-by: Cédric Le Goater --- diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c index 7129341c12..8a988c1676 100644 --- a/hw/ssi/aspeed_smc.c +++ b/hw/ssi/aspeed_smc.c @@ -728,7 +728,7 @@ static uint64_t aspeed_smc_read(void *opaque, hwaddr addr, unsigned int size) addr < R_SEG_ADDR0 + asc->max_peripherals) || (addr >= s->r_ctrl0 && addr < s->r_ctrl0 + asc->max_peripherals)) { - trace_aspeed_smc_read(addr, size, s->regs[addr]); + trace_aspeed_smc_read(addr << 2, size, s->regs[addr]); return s->regs[addr]; } else { @@ -1029,10 +1029,10 @@ static void aspeed_smc_write(void *opaque, hwaddr addr, uint64_t data, AspeedSMCClass *asc = ASPEED_SMC_GET_CLASS(s); uint32_t value = data; - addr >>= 2; - trace_aspeed_smc_write(addr, size, data); + addr >>= 2; + if (addr == s->r_conf || (addr >= s->r_timings && addr < s->r_timings + asc->nregs_timings) ||