sdhci_transfer_data_dma() only watched for the completion and DMA-boundary interrupts, so a transfer/ADMA error (SDHCI_INT_ERROR, e.g. an ADMA descriptor fault) left it spinning until the 10s timeout. Check the error bits and abort the transfer with -EIO, dumping the ADMA error status.
Assisted-by: Claude Opus 4.8 (1M context) Signed-off-by: Johannes Schneider <[email protected]> --- drivers/mci/sdhci.c | 8 ++++++++ drivers/mci/sdhci.h | 1 + 2 files changed, 9 insertions(+) diff --git a/drivers/mci/sdhci.c b/drivers/mci/sdhci.c index 3474ef129b..ccd5d4b83c 100644 --- a/drivers/mci/sdhci.c +++ b/drivers/mci/sdhci.c @@ -779,6 +779,14 @@ int sdhci_transfer_data_dma(struct sdhci *sdhci, struct mci_cmd *cmd, goto out; } + /* e.g. ADMA error: SDHCI_INT_ERROR without a data-error bit */ + if (irqstat & SDHCI_INT_ERROR) { + dev_err(dev, "transfer error: int 0x%08x adma 0x%02x\n", + irqstat, sdhci_read8(sdhci, SDHCI_ADMA_ERROR)); + ret = -EIO; + goto out; + } + /* * We currently don't do anything fancy with DMA * boundaries, but as we can't disable the feature diff --git a/drivers/mci/sdhci.h b/drivers/mci/sdhci.h index d1f05ac968..558469e8ab 100644 --- a/drivers/mci/sdhci.h +++ b/drivers/mci/sdhci.h @@ -111,6 +111,7 @@ #define SDHCI_RESET_DATA BIT(2) #define SDHCI_INT_STATUS 0x30 #define SDHCI_INT_NORMAL_STATUS 0x30 +#define SDHCI_INT_ADMA_ERROR BIT(25) #define SDHCI_INT_DATA_END_BIT BIT(22) #define SDHCI_INT_DATA_CRC BIT(21) #define SDHCI_INT_DATA_TIMEOUT BIT(20) -- 2.43.0
