raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

drivers: mmc: cqhci: clear CQHCI_CTL if halt fails

Browse Source 
The eMMC spec says that in certain circumstances the controller can't
respond to a halt request - in practice, this occurs if a CMD
timeout happens (card went away/crashed).

Clear the halt request by writing 0 to CQHCI_CTL. Also fix a logic error
testing for halt in cqhci_request.

Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
This commit is contained in:
Jonathan Bell
2024-03-26 13:17:10 +00:00
committed by Dom Cobley
parent f92a6b11c3
commit 95532b6e18
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/mmc/host/cqhci-core.c
View File

@@ -388,9 +388,11 @@ static void cqhci_off(struct mmc_host *mmc)
err = readx_poll_timeout(cqhci_read_ctl, cq_host, reg, err = readx_poll_timeout(cqhci_read_ctl, cq_host, reg,
reg & CQHCI_HALT, 0, CQHCI_OFF_TIMEOUT); reg & CQHCI_HALT, 0, CQHCI_OFF_TIMEOUT);
if (err < 0) if (err < 0) {
pr_err("%s: cqhci: CQE stuck on\n", mmc_hostname(mmc)); pr_err("%s: cqhci: CQE stuck on\n", mmc_hostname(mmc));
else /* eMMC v5.1 B.2.8 recommends writing 0 to CQHCI_CTL if stuck */
cqhci_writel(cq_host, 0, CQHCI_CTL);
} else
pr_debug("%s: cqhci: CQE off\n", mmc_hostname(mmc)); pr_debug("%s: cqhci: CQE off\n", mmc_hostname(mmc));
if (cq_host->ops->post_disable) if (cq_host->ops->post_disable)
@@ -980,8 +982,11 @@ static bool cqhci_halt(struct mmc_host *mmc, unsigned int timeout)
ret = cqhci_halted(cq_host); ret = cqhci_halted(cq_host);
if (!ret) if (!ret) {
pr_warn("%s: cqhci: Failed to halt\n", mmc_hostname(mmc)); pr_warn("%s: cqhci: Failed to halt\n", mmc_hostname(mmc));
/* eMMC v5.1 B.2.8 recommends writing 0 to CQHCI_CTL if stuck */
cqhci_writel(cq_host, 0, CQHCI_CTL);
}
return ret; return ret;
} }