| Message ID | 20171213195852.30439-13-f4bug@amsat.org |
|---|---|
| State | Superseded, archived |
| Headers | show |
| Series | SDHCI housekeeping | expand |
On Wed, Dec 13, 2017 at 11:58 AM, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > It blinks to caution the user not to remove the card while the SD card is > being accessed. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> If you turn this on does it just fill the trace log? It seems like this will generate too much output if it happens on every LED blink. Alistair > --- > hw/sd/sdhci.c | 1 + > hw/sd/trace-events | 1 + > 2 files changed, 2 insertions(+) > > diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c > index aa2d2fa3d3..dadc4787b2 100644 > --- a/hw/sd/sdhci.c > +++ b/hw/sd/sdhci.c > @@ -1041,6 +1041,7 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) > !(s->capareg & (1 << (31 - ((s->pwrcon >> 1) & 0x7))))) { > s->pwrcon &= ~SDHC_POWER_ON; > } > + trace_sdhci_led(s->hostctl & 1); > break; > case SDHC_CLKCON: > if (!(mask & 0xFF000000)) { > diff --git a/hw/sd/trace-events b/hw/sd/trace-events > index f7a85be53d..11f8fa4fc1 100644 > --- a/hw/sd/trace-events > +++ b/hw/sd/trace-events > @@ -13,6 +13,7 @@ sdhci_adma_transfer_completed(void) "ADMA transfer completed" > sdhci_access(const char *access, unsigned int size, uint64_t offset, const char *dir, uint64_t val, uint64_t val2) "%s %ub: addr[0x%04" HWADDR_PRIx "] %s %" PRIu64 "(0x%" PRIx64 ")" > sdhci_read_dataport(uint16_t data_count) "all %u bytes of data have been read from input buffer" > sdhci_write_dataport(uint16_t data_count) "write buffer filled with %u bytes of data" > +sdhci_led(bool state) "LED: %u" > > # hw/sd/milkymist-memcard.c > milkymist_memcard_memory_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x" > -- > 2.15.1 > >
On Thu, Dec 14, 2017 at 2:55 PM, Alistair Francis <alistair.francis@xilinx.com> wrote: > On Wed, Dec 13, 2017 at 11:58 AM, Philippe Mathieu-Daudé > <f4bug@amsat.org> wrote: >> It blinks to caution the user not to remove the card while the SD card is >> being accessed. >> >> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > > If you turn this on does it just fill the trace log? > > It seems like this will generate too much output if it happens on > every LED blink. You don't need to enable this trace event if you don't want it :) It is supposed to turn ON previous to start write access, and then turn OFF. Anyway you are right, I currently log it on each access while I should just log the ON/OFF state changes, I'll fix this.
diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index aa2d2fa3d3..dadc4787b2 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1041,6 +1041,7 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) !(s->capareg & (1 << (31 - ((s->pwrcon >> 1) & 0x7))))) { s->pwrcon &= ~SDHC_POWER_ON; } + trace_sdhci_led(s->hostctl & 1); break; case SDHC_CLKCON: if (!(mask & 0xFF000000)) { diff --git a/hw/sd/trace-events b/hw/sd/trace-events index f7a85be53d..11f8fa4fc1 100644 --- a/hw/sd/trace-events +++ b/hw/sd/trace-events @@ -13,6 +13,7 @@ sdhci_adma_transfer_completed(void) "ADMA transfer completed" sdhci_access(const char *access, unsigned int size, uint64_t offset, const char *dir, uint64_t val, uint64_t val2) "%s %ub: addr[0x%04" HWADDR_PRIx "] %s %" PRIu64 "(0x%" PRIx64 ")" sdhci_read_dataport(uint16_t data_count) "all %u bytes of data have been read from input buffer" sdhci_write_dataport(uint16_t data_count) "write buffer filled with %u bytes of data" +sdhci_led(bool state) "LED: %u" # hw/sd/milkymist-memcard.c milkymist_memcard_memory_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"
It blinks to caution the user not to remove the card while the SD card is being accessed. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/sd/sdhci.c | 1 + hw/sd/trace-events | 1 + 2 files changed, 2 insertions(+)