Message ID | 20180123020820.1288-11-f4bug@amsat.org |
---|---|
State | Awaiting Upstream |
Headers | show |
Series | SDHCI: clean v1/v2 Specs (part 2) | expand |
On Mon, Jan 22, 2018 at 6:08 PM, Philippe Mathieu-Daudé <f4bug@amsat.org> wrote: > Incorrect value will throw an error. > > Note than Spec v2 is supported by default. > > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Alistair Francis <alistair.francis@xilinx.com> Alistair > --- > hw/sd/sdhci-internal.h | 21 ++++++++++- > hw/sd/sdhci.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++- > hw/sd/trace-events | 1 + > 3 files changed, 117 insertions(+), 2 deletions(-) > > diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h > index 577ca9da54..c5e26bf8f3 100644 > --- a/hw/sd/sdhci-internal.h > +++ b/hw/sd/sdhci-internal.h > @@ -86,6 +86,9 @@ > > /* R/W Host control Register 0x0 */ > #define SDHC_HOSTCTL 0x28 > +FIELD(SDHC_HOSTCTL, LED_CTRL, 0, 1); > +FIELD(SDHC_HOSTCTL, DATATRANSFERWIDTH, 1, 1); /* SD mode only */ > +FIELD(SDHC_HOSTCTL, HIGH_SPEED, 2, 1); > #define SDHC_CTRL_DMA_CHECK_MASK 0x18 > #define SDHC_CTRL_SDMA 0x00 > #define SDHC_CTRL_ADMA1_32 0x08 > @@ -96,6 +99,7 @@ > /* R/W Power Control Register 0x0 */ > #define SDHC_PWRCON 0x29 > #define SDHC_POWER_ON (1 << 0) > +FIELD(SDHC_PWRCON, BUS_VOLTAGE, 1, 3); > > /* R/W Block Gap Control Register 0x0 */ > #define SDHC_BLKGAP 0x2A > @@ -118,6 +122,7 @@ > > /* R/W Timeout Control Register 0x0 */ > #define SDHC_TIMEOUTCON 0x2E > +FIELD(SDHC_TIMEOUTCON, COUNTER, 0, 4); > > /* R/W Software Reset Register 0x0 */ > #define SDHC_SWRST 0x2F > @@ -174,17 +179,31 @@ > > /* ROC Auto CMD12 error status register 0x0 */ > #define SDHC_ACMD12ERRSTS 0x3C > +FIELD(SDHC_ACMD12ERRSTS, TIMEOUT_ERR, 1, 1); > +FIELD(SDHC_ACMD12ERRSTS, CRC_ERR, 2, 1); > +FIELD(SDHC_ACMD12ERRSTS, INDEX_ERR, 4, 1); > > /* HWInit Capabilities Register 0x05E80080 */ > #define SDHC_CAPAB 0x40 > -#define SDHC_CAN_DO_DMA 0x00400000 > #define SDHC_CAN_DO_ADMA2 0x00080000 > #define SDHC_CAN_DO_ADMA1 0x00100000 > #define SDHC_64_BIT_BUS_SUPPORT (1 << 28) > +FIELD(SDHC_CAPAB, TOCLKFREQ, 0, 6); > +FIELD(SDHC_CAPAB, TOUNIT, 7, 1); > +FIELD(SDHC_CAPAB, BASECLKFREQ, 8, 8); > FIELD(SDHC_CAPAB, MAXBLOCKLENGTH, 16, 2); > +FIELD(SDHC_CAPAB, HIGHSPEED, 21, 1); > +FIELD(SDHC_CAPAB, SDMA, 22, 1); > +FIELD(SDHC_CAPAB, SUSPRESUME, 23, 1); > +FIELD(SDHC_CAPAB, V33, 24, 1); > +FIELD(SDHC_CAPAB, V30, 25, 1); > +FIELD(SDHC_CAPAB, V18, 26, 1); > > /* HWInit Maximum Current Capabilities Register 0x0 */ > #define SDHC_MAXCURR 0x48 > +FIELD(SDHC_MAXCURR, V33_VDD1, 0, 8); > +FIELD(SDHC_MAXCURR, V30_VDD1, 8, 8); > +FIELD(SDHC_MAXCURR, V18_VDD1, 16, 8); > > /* W Force Event Auto CMD12 Error Interrupt Register 0x0000 */ > #define SDHC_FEAER 0x50 > diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c > index dce1a49af1..91dfd684d8 100644 > --- a/hw/sd/sdhci.c > +++ b/hw/sd/sdhci.c > @@ -23,6 +23,7 @@ > */ > > #include "qemu/osdep.h" > +#include "qemu/error-report.h" > #include "qapi/error.h" > #include "hw/hw.h" > #include "sysemu/block-backend.h" > @@ -64,6 +65,92 @@ static inline unsigned int sdhci_get_fifolen(SDHCIState *s) > return 1 << (9 + FIELD_EX32(s->capareg, SDHC_CAPAB, MAXBLOCKLENGTH)); > } > > +/* return true on error */ > +static bool sdhci_check_capab_freq_range(SDHCIState *s, const char *desc, > + uint8_t freq, Error **errp) > +{ > + switch (freq) { > + case 0: > + case 10 ... 63: > + break; > + default: > + error_setg(errp, "SD %s clock frequency can have value" > + "in range 0-63 only", desc); > + return true; > + } > + return false; > +} > + > +static void sdhci_check_capareg(SDHCIState *s, Error **errp) > +{ > + uint64_t msk = s->capareg; > + uint32_t val; > + bool y; > + > + switch (s->sd_spec_version) { > + case 2: /* default version */ > + > + /* fallback */ > + case 1: > + y = FIELD_EX64(s->capareg, SDHC_CAPAB, TOUNIT); > + msk = FIELD_DP64(msk, SDHC_CAPAB, TOUNIT, 0); > + > + val = FIELD_EX64(s->capareg, SDHC_CAPAB, TOCLKFREQ); > + trace_sdhci_capareg(y ? "timeout (MHz)" : "Timeout (KHz)", val); > + if (sdhci_check_capab_freq_range(s, "timeout", val, errp)) { > + return; > + } > + msk = FIELD_DP64(msk, SDHC_CAPAB, TOCLKFREQ, 0); > + > + val = FIELD_EX64(s->capareg, SDHC_CAPAB, BASECLKFREQ); > + trace_sdhci_capareg(y ? "base (MHz)" : "Base (KHz)", val); > + if (sdhci_check_capab_freq_range(s, "base", val, errp)) { > + return; > + } > + msk = FIELD_DP64(msk, SDHC_CAPAB, BASECLKFREQ, 0); > + > + val = FIELD_EX64(s->capareg, SDHC_CAPAB, MAXBLOCKLENGTH); > + if (val >= 0b11) { > + error_setg(errp, "block size can be 512, 1024 or 2048 only"); > + return; > + } > + trace_sdhci_capareg("max block length", sdhci_get_fifolen(s)); > + msk = FIELD_DP64(msk, SDHC_CAPAB, MAXBLOCKLENGTH, 0); > + > + val = FIELD_EX64(s->capareg, SDHC_CAPAB, HIGHSPEED); > + trace_sdhci_capareg("high speed", val); > + msk = FIELD_DP64(msk, SDHC_CAPAB, HIGHSPEED, 0); > + > + val = FIELD_EX64(s->capareg, SDHC_CAPAB, SDMA); > + trace_sdhci_capareg("SDMA", val); > + msk = FIELD_DP64(msk, SDHC_CAPAB, SDMA, 0); > + > + val = FIELD_EX64(s->capareg, SDHC_CAPAB, SUSPRESUME); > + trace_sdhci_capareg("suspend/resume", val); > + msk = FIELD_DP64(msk, SDHC_CAPAB, SUSPRESUME, 0); > + > + val = FIELD_EX64(s->capareg, SDHC_CAPAB, V33); > + trace_sdhci_capareg("3.3v", val); > + msk = FIELD_DP64(msk, SDHC_CAPAB, V33, 0); > + > + val = FIELD_EX64(s->capareg, SDHC_CAPAB, V30); > + trace_sdhci_capareg("3.0v", val); > + msk = FIELD_DP64(msk, SDHC_CAPAB, V30, 0); > + > + val = FIELD_EX64(s->capareg, SDHC_CAPAB, V18); > + trace_sdhci_capareg("1.8v", val); > + msk = FIELD_DP64(msk, SDHC_CAPAB, V18, 0); > + break; > + > + default: > + error_setg(errp, "Unsupported spec version: %u", s->sd_spec_version); > + } > + if (msk) { > + qemu_log_mask(LOG_UNIMP, > + "SDHCI: unknown CAPAB mask: 0x%016" PRIx64 "\n", msk); > + } > +} > + > static uint8_t sdhci_slotint(SDHCIState *s) > { > return (s->norintsts & s->norintsigen) || (s->errintsts & s->errintsigen) || > @@ -990,7 +1077,7 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) > case SDHC_TRNMOD: > /* DMA can be enabled only if it is supported as indicated by > * capabilities register */ > - if (!(s->capareg & SDHC_CAN_DO_DMA)) { > + if (!(s->capareg & R_SDHC_CAPAB_SDMA_MASK)) { > value &= ~SDHC_TRNS_DMA; > } > MASKED_WRITE(s->trnmod, mask, value & SDHC_TRNMOD_MASK); > @@ -1125,11 +1212,19 @@ static const MemoryRegionOps sdhci_mmio_ops = { > > static void sdhci_init_readonly_registers(SDHCIState *s, Error **errp) > { > + Error *local_err = NULL; > + > if (s->sd_spec_version != 2) { > error_setg(errp, "Only Spec v2 is supported"); > return; > } > s->version = (SDHC_HCVER_VENDOR << 8) | (s->sd_spec_version - 1); > + > + sdhci_check_capareg(s, &local_err); > + if (local_err) { > + error_propagate(errp, local_err); > + return; > + } > } > > /* --- qdev common --- */ > diff --git a/hw/sd/trace-events b/hw/sd/trace-events > index 0a121156a3..78d8707669 100644 > --- a/hw/sd/trace-events > +++ b/hw/sd/trace-events > @@ -13,6 +13,7 @@ sdhci_adma_transfer_completed(void) "" > sdhci_access(const char *access, unsigned int size, uint64_t offset, const char *dir, uint64_t val, uint64_t val2) "%s%u: addr[0x%04" PRIx64 "] %s 0x%08" PRIx64 " (%" PRIu64 ")" > 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_capareg(const char *desc, uint16_t val) "%s: %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 > >
diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index 577ca9da54..c5e26bf8f3 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -86,6 +86,9 @@ /* R/W Host control Register 0x0 */ #define SDHC_HOSTCTL 0x28 +FIELD(SDHC_HOSTCTL, LED_CTRL, 0, 1); +FIELD(SDHC_HOSTCTL, DATATRANSFERWIDTH, 1, 1); /* SD mode only */ +FIELD(SDHC_HOSTCTL, HIGH_SPEED, 2, 1); #define SDHC_CTRL_DMA_CHECK_MASK 0x18 #define SDHC_CTRL_SDMA 0x00 #define SDHC_CTRL_ADMA1_32 0x08 @@ -96,6 +99,7 @@ /* R/W Power Control Register 0x0 */ #define SDHC_PWRCON 0x29 #define SDHC_POWER_ON (1 << 0) +FIELD(SDHC_PWRCON, BUS_VOLTAGE, 1, 3); /* R/W Block Gap Control Register 0x0 */ #define SDHC_BLKGAP 0x2A @@ -118,6 +122,7 @@ /* R/W Timeout Control Register 0x0 */ #define SDHC_TIMEOUTCON 0x2E +FIELD(SDHC_TIMEOUTCON, COUNTER, 0, 4); /* R/W Software Reset Register 0x0 */ #define SDHC_SWRST 0x2F @@ -174,17 +179,31 @@ /* ROC Auto CMD12 error status register 0x0 */ #define SDHC_ACMD12ERRSTS 0x3C +FIELD(SDHC_ACMD12ERRSTS, TIMEOUT_ERR, 1, 1); +FIELD(SDHC_ACMD12ERRSTS, CRC_ERR, 2, 1); +FIELD(SDHC_ACMD12ERRSTS, INDEX_ERR, 4, 1); /* HWInit Capabilities Register 0x05E80080 */ #define SDHC_CAPAB 0x40 -#define SDHC_CAN_DO_DMA 0x00400000 #define SDHC_CAN_DO_ADMA2 0x00080000 #define SDHC_CAN_DO_ADMA1 0x00100000 #define SDHC_64_BIT_BUS_SUPPORT (1 << 28) +FIELD(SDHC_CAPAB, TOCLKFREQ, 0, 6); +FIELD(SDHC_CAPAB, TOUNIT, 7, 1); +FIELD(SDHC_CAPAB, BASECLKFREQ, 8, 8); FIELD(SDHC_CAPAB, MAXBLOCKLENGTH, 16, 2); +FIELD(SDHC_CAPAB, HIGHSPEED, 21, 1); +FIELD(SDHC_CAPAB, SDMA, 22, 1); +FIELD(SDHC_CAPAB, SUSPRESUME, 23, 1); +FIELD(SDHC_CAPAB, V33, 24, 1); +FIELD(SDHC_CAPAB, V30, 25, 1); +FIELD(SDHC_CAPAB, V18, 26, 1); /* HWInit Maximum Current Capabilities Register 0x0 */ #define SDHC_MAXCURR 0x48 +FIELD(SDHC_MAXCURR, V33_VDD1, 0, 8); +FIELD(SDHC_MAXCURR, V30_VDD1, 8, 8); +FIELD(SDHC_MAXCURR, V18_VDD1, 16, 8); /* W Force Event Auto CMD12 Error Interrupt Register 0x0000 */ #define SDHC_FEAER 0x50 diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index dce1a49af1..91dfd684d8 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -23,6 +23,7 @@ */ #include "qemu/osdep.h" +#include "qemu/error-report.h" #include "qapi/error.h" #include "hw/hw.h" #include "sysemu/block-backend.h" @@ -64,6 +65,92 @@ static inline unsigned int sdhci_get_fifolen(SDHCIState *s) return 1 << (9 + FIELD_EX32(s->capareg, SDHC_CAPAB, MAXBLOCKLENGTH)); } +/* return true on error */ +static bool sdhci_check_capab_freq_range(SDHCIState *s, const char *desc, + uint8_t freq, Error **errp) +{ + switch (freq) { + case 0: + case 10 ... 63: + break; + default: + error_setg(errp, "SD %s clock frequency can have value" + "in range 0-63 only", desc); + return true; + } + return false; +} + +static void sdhci_check_capareg(SDHCIState *s, Error **errp) +{ + uint64_t msk = s->capareg; + uint32_t val; + bool y; + + switch (s->sd_spec_version) { + case 2: /* default version */ + + /* fallback */ + case 1: + y = FIELD_EX64(s->capareg, SDHC_CAPAB, TOUNIT); + msk = FIELD_DP64(msk, SDHC_CAPAB, TOUNIT, 0); + + val = FIELD_EX64(s->capareg, SDHC_CAPAB, TOCLKFREQ); + trace_sdhci_capareg(y ? "timeout (MHz)" : "Timeout (KHz)", val); + if (sdhci_check_capab_freq_range(s, "timeout", val, errp)) { + return; + } + msk = FIELD_DP64(msk, SDHC_CAPAB, TOCLKFREQ, 0); + + val = FIELD_EX64(s->capareg, SDHC_CAPAB, BASECLKFREQ); + trace_sdhci_capareg(y ? "base (MHz)" : "Base (KHz)", val); + if (sdhci_check_capab_freq_range(s, "base", val, errp)) { + return; + } + msk = FIELD_DP64(msk, SDHC_CAPAB, BASECLKFREQ, 0); + + val = FIELD_EX64(s->capareg, SDHC_CAPAB, MAXBLOCKLENGTH); + if (val >= 0b11) { + error_setg(errp, "block size can be 512, 1024 or 2048 only"); + return; + } + trace_sdhci_capareg("max block length", sdhci_get_fifolen(s)); + msk = FIELD_DP64(msk, SDHC_CAPAB, MAXBLOCKLENGTH, 0); + + val = FIELD_EX64(s->capareg, SDHC_CAPAB, HIGHSPEED); + trace_sdhci_capareg("high speed", val); + msk = FIELD_DP64(msk, SDHC_CAPAB, HIGHSPEED, 0); + + val = FIELD_EX64(s->capareg, SDHC_CAPAB, SDMA); + trace_sdhci_capareg("SDMA", val); + msk = FIELD_DP64(msk, SDHC_CAPAB, SDMA, 0); + + val = FIELD_EX64(s->capareg, SDHC_CAPAB, SUSPRESUME); + trace_sdhci_capareg("suspend/resume", val); + msk = FIELD_DP64(msk, SDHC_CAPAB, SUSPRESUME, 0); + + val = FIELD_EX64(s->capareg, SDHC_CAPAB, V33); + trace_sdhci_capareg("3.3v", val); + msk = FIELD_DP64(msk, SDHC_CAPAB, V33, 0); + + val = FIELD_EX64(s->capareg, SDHC_CAPAB, V30); + trace_sdhci_capareg("3.0v", val); + msk = FIELD_DP64(msk, SDHC_CAPAB, V30, 0); + + val = FIELD_EX64(s->capareg, SDHC_CAPAB, V18); + trace_sdhci_capareg("1.8v", val); + msk = FIELD_DP64(msk, SDHC_CAPAB, V18, 0); + break; + + default: + error_setg(errp, "Unsupported spec version: %u", s->sd_spec_version); + } + if (msk) { + qemu_log_mask(LOG_UNIMP, + "SDHCI: unknown CAPAB mask: 0x%016" PRIx64 "\n", msk); + } +} + static uint8_t sdhci_slotint(SDHCIState *s) { return (s->norintsts & s->norintsigen) || (s->errintsts & s->errintsigen) || @@ -990,7 +1077,7 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) case SDHC_TRNMOD: /* DMA can be enabled only if it is supported as indicated by * capabilities register */ - if (!(s->capareg & SDHC_CAN_DO_DMA)) { + if (!(s->capareg & R_SDHC_CAPAB_SDMA_MASK)) { value &= ~SDHC_TRNS_DMA; } MASKED_WRITE(s->trnmod, mask, value & SDHC_TRNMOD_MASK); @@ -1125,11 +1212,19 @@ static const MemoryRegionOps sdhci_mmio_ops = { static void sdhci_init_readonly_registers(SDHCIState *s, Error **errp) { + Error *local_err = NULL; + if (s->sd_spec_version != 2) { error_setg(errp, "Only Spec v2 is supported"); return; } s->version = (SDHC_HCVER_VENDOR << 8) | (s->sd_spec_version - 1); + + sdhci_check_capareg(s, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } } /* --- qdev common --- */ diff --git a/hw/sd/trace-events b/hw/sd/trace-events index 0a121156a3..78d8707669 100644 --- a/hw/sd/trace-events +++ b/hw/sd/trace-events @@ -13,6 +13,7 @@ sdhci_adma_transfer_completed(void) "" sdhci_access(const char *access, unsigned int size, uint64_t offset, const char *dir, uint64_t val, uint64_t val2) "%s%u: addr[0x%04" PRIx64 "] %s 0x%08" PRIx64 " (%" PRIu64 ")" 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_capareg(const char *desc, uint16_t val) "%s: %u" # hw/sd/milkymist-memcard.c milkymist_memcard_memory_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x"
Incorrect value will throw an error. Note than Spec v2 is supported by default. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- hw/sd/sdhci-internal.h | 21 ++++++++++- hw/sd/sdhci.c | 97 +++++++++++++++++++++++++++++++++++++++++++++++++- hw/sd/trace-events | 1 + 3 files changed, 117 insertions(+), 2 deletions(-)