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: sdhci-brcmstb: improve bcm2712 card removal handling

Browse Source 
If the controller is being reset, then the CQE needs to be reset as well.

For removable cards, CQHCI_SSC1 must specify a polling mode (CBC=0)
otherwise it's possible that the controller stops emitting periodic
CMD13s on card removal, without raising an error status interrupt.

Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
This commit is contained in:
Jonathan Bell
2024-06-13 15:01:02 +01:00
committed by Dom Cobley
parent 741dc64ddf
commit 3addc60d27
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/mmc/host/sdhci-brcmstb.c
View File

@@ -412,8 +412,21 @@ static void sdhci_brcmstb_cqe_enable(struct mmc_host *mmc)
sdhci_cqe_enable(mmc); sdhci_cqe_enable(mmc);
/* Reset CMD13 polling timer back to eMMC specification default */ /*
cqhci_writel(cq_host, 0x00011000, CQHCI_SSC1); * The controller resets this register to a very short default interval
* whenever CQHCI is disabled.
*
* For removable cards CBC needs to be clear or card removal can hang
* the CQE. In polling mode, a CIT of 0x4000 "cycles" seems to produce the best
* throughput.
*
* For nonremovable cards, the specification default of CBC=1 CIT=0x1000
* suffices.
*/
if (mmc->caps & MMC_CAP_NONREMOVABLE)
cqhci_writel(cq_host, 0x00011000, CQHCI_SSC1);
else
cqhci_writel(cq_host, 0x00004000, CQHCI_SSC1);
} }
static const struct cqhci_host_ops sdhci_brcmstb_cqhci_ops = { static const struct cqhci_host_ops sdhci_brcmstb_cqhci_ops = {
@@ -433,7 +446,7 @@ static struct sdhci_ops sdhci_brcmstb_ops_2712 = {
.set_clock = sdhci_bcm2712_set_clock, .set_clock = sdhci_bcm2712_set_clock,
.set_power = sdhci_brcmstb_set_power, .set_power = sdhci_brcmstb_set_power,
.set_bus_width = sdhci_set_bus_width, .set_bus_width = sdhci_set_bus_width,
.reset = sdhci_reset, .reset = brcmstb_reset,
.set_uhs_signaling = sdhci_set_uhs_signaling, .set_uhs_signaling = sdhci_set_uhs_signaling,
.init_sd_express = bcm2712_init_sd_express, .init_sd_express = bcm2712_init_sd_express,
}; };