Linux uses a generic sdhci_send_cmd function for most sdhci host drivers. Port the v6.18-rc1 version and mix and match with the arasan_sdhci_send_cmd function already in barebox.
Also add sdhci_dumpregs for debugging errors. Signed-off-by: Steffen Trumtrar <[email protected]> --- drivers/mci/sdhci.c | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/mci/sdhci.h | 21 +++++++++ include/mci.h | 1 + 3 files changed, 152 insertions(+) diff --git a/drivers/mci/sdhci.c b/drivers/mci/sdhci.c index 2d32a8b311..cfdfdbba8d 100644 --- a/drivers/mci/sdhci.c +++ b/drivers/mci/sdhci.c @@ -11,6 +11,8 @@ #define MAX_TUNING_LOOP 40 +#define DRIVER_NAME "sdhci" + enum sdhci_reset_reason { SDHCI_RESET_FOR_INIT, SDHCI_RESET_FOR_REQUEST_ERROR, @@ -25,6 +27,71 @@ static inline struct device *sdhci_dev(struct sdhci *host) return host->mci ? host->mci->hw_dev : NULL; } +#define SDHCI_DUMP(f, x...) pr_err("%s: " DRIVER_NAME ": " f, host->mci->devname, ## x) + +void sdhci_dumpregs(struct sdhci *host) +{ + SDHCI_DUMP("============ SDHCI REGISTER DUMP ===========\n"); + + SDHCI_DUMP("Sys addr: 0x%08x | Version: 0x%08x\n", + sdhci_read32(host, SDHCI_DMA_ADDRESS), + sdhci_read16(host, SDHCI_HOST_VERSION)); + SDHCI_DUMP("Blk size: 0x%08x | Blk cnt: 0x%08x\n", + sdhci_read16(host, SDHCI_BLOCK_SIZE), + sdhci_read16(host, SDHCI_BLOCK_COUNT)); + SDHCI_DUMP("Argument: 0x%08x | Trn mode: 0x%08x\n", + sdhci_read32(host, SDHCI_ARGUMENT), + sdhci_read16(host, SDHCI_TRANSFER_MODE)); + SDHCI_DUMP("Present: 0x%08x | Host ctl: 0x%08x\n", + sdhci_read32(host, SDHCI_PRESENT_STATE), + sdhci_read8(host, SDHCI_HOST_CONTROL)); + SDHCI_DUMP("Power: 0x%08x | Blk gap: 0x%08x\n", + sdhci_read8(host, SDHCI_POWER_CONTROL), + sdhci_read8(host, SDHCI_BLOCK_GAP_CONTROL)); + SDHCI_DUMP("Wake-up: 0x%08x | Clock: 0x%08x\n", + sdhci_read8(host, SDHCI_WAKE_UP_CONTROL), + sdhci_read16(host, SDHCI_CLOCK_CONTROL)); + SDHCI_DUMP("Timeout: 0x%08x | Int stat: 0x%08x\n", + sdhci_read8(host, SDHCI_TIMEOUT_CONTROL), + sdhci_read32(host, SDHCI_INT_STATUS)); + SDHCI_DUMP("Int enab: 0x%08x | Sig enab: 0x%08x\n", + sdhci_read32(host, SDHCI_INT_ENABLE), + sdhci_read32(host, SDHCI_SIGNAL_ENABLE)); + SDHCI_DUMP("ACmd stat: 0x%08x | Slot int: 0x%08x\n", + sdhci_read16(host, SDHCI_ACMD12_ERR__HOST_CONTROL2), + sdhci_read16(host, SDHCI_SLOT_INT_STATUS)); + SDHCI_DUMP("Caps: 0x%08x | Caps_1: 0x%08x\n", + sdhci_read32(host, SDHCI_CAPABILITIES), + sdhci_read32(host, SDHCI_CAPABILITIES_1)); + SDHCI_DUMP("Cmd: 0x%08x | Max curr: 0x%08x\n", + sdhci_read16(host, SDHCI_COMMAND), + sdhci_read32(host, SDHCI_MAX_CURRENT)); + SDHCI_DUMP("Resp[0]: 0x%08x | Resp[1]: 0x%08x\n", + sdhci_read32(host, SDHCI_RESPONSE_0), + sdhci_read32(host, SDHCI_RESPONSE_1)); + SDHCI_DUMP("Resp[2]: 0x%08x | Resp[3]: 0x%08x\n", + sdhci_read32(host, SDHCI_RESPONSE_2), + sdhci_read32(host, SDHCI_RESPONSE_3)); + SDHCI_DUMP("Host ctl2: 0x%08x\n", + sdhci_read16(host, SDHCI_HOST_CONTROL2)); + + if (host->flags & SDHCI_USE_ADMA) { + if (host->flags & SDHCI_USE_64_BIT_DMA) { + SDHCI_DUMP("ADMA Err: 0x%08x | ADMA Ptr: 0x%08x%08x\n", + sdhci_read32(host, SDHCI_ADMA_ERROR), + sdhci_read32(host, SDHCI_ADMA_ADDRESS_HI), + sdhci_read32(host, SDHCI_ADMA_ADDRESS)); + } else { + SDHCI_DUMP("ADMA Err: 0x%08x | ADMA Ptr: 0x%08x\n", + sdhci_read32(host, SDHCI_ADMA_ERROR), + sdhci_read32(host, SDHCI_ADMA_ADDRESS)); + } + } + + SDHCI_DUMP("============================================\n"); +} +EXPORT_SYMBOL_GPL(sdhci_dumpregs); + static void sdhci_reset_for_reason(struct sdhci *host, enum sdhci_reset_reason reason) { if (host->quirks2 & SDHCI_QUIRK2_ISSUE_CMD_DAT_RESET_TOGETHER) { @@ -51,6 +118,69 @@ static void sdhci_reset_for_reason(struct sdhci *host, enum sdhci_reset_reason r #define sdhci_reset_for(h, r) sdhci_reset_for_reason((h), SDHCI_RESET_FOR_##r) +bool sdhci_send_command(struct sdhci *host, struct mci_cmd *cmd) +{ + u32 mask, command, xfer; + dma_addr_t dma; + int ret; + + ret = sdhci_wait_idle(host, cmd, cmd->data); + if (ret) + return false; + + sdhci_write32(host, SDHCI_INT_STATUS, ~0); + + mask = SDHCI_INT_CMD_COMPLETE; + if (cmd->resp_type & MMC_RSP_BUSY) + mask |= SDHCI_INT_XFER_COMPLETE; + + sdhci_setup_data_dma(host, cmd->data, &dma); + + sdhci_set_cmd_xfer_mode(host, cmd, cmd->data, + dma == SDHCI_NO_DMA ? false : true, + &command, &xfer); + + sdhci_write8(host, SDHCI_TIMEOUT_CONTROL, 0xf); + if (xfer) + sdhci_write16(host, SDHCI_TRANSFER_MODE, xfer); + if (cmd->data) { + sdhci_write16(host, SDHCI_BLOCK_SIZE, + SDHCI_DMA_BOUNDARY_512K | + SDHCI_TRANSFER_BLOCK_SIZE(cmd->data->blocksize)); + sdhci_write16(host, SDHCI_BLOCK_COUNT, cmd->data->blocks); + } + sdhci_write32(host, SDHCI_ARGUMENT, cmd->cmdarg); + sdhci_write16(host, SDHCI_COMMAND, command); + + /* CMD19/21 generate _only_ Buffer Read Ready interrupt */ + if (mmc_op_tuning(cmd->cmdidx)) + mask = SDHCI_INT_DATA_AVAIL; + + ret = sdhci_wait_for_done(host, mask); + if (ret) { + sdhci_teardown_data(host, cmd->data, dma); + sdhci_dumpregs(host); + goto error; + } + + sdhci_read_response(host, cmd); + sdhci_write32(host, SDHCI_INT_STATUS, SDHCI_INT_CMD_COMPLETE); + + if (cmd->data) + ret = sdhci_transfer_data_dma(host, cmd, cmd->data, dma); + + return true; + +error: + if (ret) { + sdhci_reset(host, SDHCI_RESET_CMD); + sdhci_reset(host, SDHCI_RESET_DATA); + } + + sdhci_write32(host, SDHCI_INT_STATUS, ~0); + return false; +} + static int sdhci_send_command_retry(struct sdhci *host, struct mci_cmd *cmd) { int timeout = 10; diff --git a/drivers/mci/sdhci.h b/drivers/mci/sdhci.h index ec82b1b8ff..6b3849e5f7 100644 --- a/drivers/mci/sdhci.h +++ b/drivers/mci/sdhci.h @@ -85,6 +85,11 @@ #define SDHCI_BUS_VOLTAGE_330 SDHCI_BUS_VOLTAGE(7) #define SDHCI_BUS_VOLTAGE(v) ((v) << 1) #define SDHCI_BUS_POWER_EN BIT(0) +#define SDHCI_BLOCK_GAP_CONTROL 0x2A +#define SDHCI_WAKE_UP_CONTROL 0x2B +#define SDHCI_WAKE_ON_INT 0x01 +#define SDHCI_WAKE_ON_INSERT 0x02 +#define SDHCI_WAKE_ON_REMOVE 0x04 #define SDHCI_CLOCK_CONTROL__TIMEOUT_CONTROL__SOFTWARE_RESET 0x2c #define SDHCI_CLOCK_CONTROL 0x2C #define SDHCI_DIVIDER_SHIFT 8 @@ -177,6 +182,17 @@ #define SDHCI_CAN_DO_ADMA3 0x08000000 #define SDHCI_SUPPORT_HS400 0x80000000 /* Non-standard */ +#define SDHCI_MAX_CURRENT 0x48 +#define SDHCI_MAX_CURRENT_LIMIT GENMASK(7, 0) +#define SDHCI_MAX_CURRENT_330_MASK GENMASK(7, 0) +#define SDHCI_MAX_CURRENT_300_MASK GENMASK(15, 8) +#define SDHCI_MAX_CURRENT_180_MASK GENMASK(23, 16) +#define SDHCI_MAX_CURRENT_1 0x4C +#define SDHCI_MAX_CURRENT_VDD2_180_MASK GENMASK(7, 0) /* UHS2 */ +#define SDHCI_MAX_CURRENT_MULTIPLIER 4 + +#define SDHCI_ADMA_ERROR 0x54 + #define SDHCI_PRESET_FOR_SDR12 0x66 #define SDHCI_PRESET_FOR_SDR25 0x68 #define SDHCI_PRESET_FOR_SDR50 0x6A @@ -207,6 +223,8 @@ #define SDHCI_MMC_BOOT 0xC4 +#define SDHCI_SLOT_INT_STATUS 0xFC + #define SDHCI_MAX_DIV_SPEC_200 256 #define SDHCI_MAX_DIV_SPEC_300 2046 @@ -357,6 +375,9 @@ static inline void sdhci_read_caps(struct sdhci *host) { __sdhci_read_caps(host, NULL, NULL, NULL); } + +void sdhci_dumpregs(struct sdhci *host); +bool sdhci_send_command(struct sdhci *host, struct mci_cmd *cmd); void sdhci_set_bus_width(struct sdhci *host, int width); #define sdhci_read8_poll_timeout(sdhci, reg, val, cond, timeout_us) \ diff --git a/include/mci.h b/include/mci.h index 3db33f9142..e54f6eba8d 100644 --- a/include/mci.h +++ b/include/mci.h @@ -489,6 +489,7 @@ struct mci_cmd { unsigned cmdarg; /**< Command's arguments */ unsigned busy_timeout; /**< Busy timeout in ms */ unsigned response[4]; /**< card's response */ + struct mci_data *data; /* data segment associated with cmd */ }; /** -- 2.51.0
