mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 17:18:59 +00:00
69dd5a788f
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.37 Added: generic/hack-6.6/900-fix-build-to-handle-return-value.patch[1] Manually rebased: generic/pending-6.6/834-ledtrig-libata.patch Removed upstreamed: bcm27xx/patches-6.6/950-0398-drm-panel-panel-ilitek9881c-Use-cansleep-methods.patch[2] All other patches automatically rebased. 1. Patch suggested by @DragonBluep to circumvent upstream breakage of kernel 6.6.37 compilation. See comments in https://github.com/openwrt/openwrt/pull/15879 for additional discussion. 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.37&id=1618f7a875ffd916596392fd29880c0429b8af60 Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/15879 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
53 lines
1.9 KiB
Diff
53 lines
1.9 KiB
Diff
From 5c0f94088e0694220a2f0d8ad6e8216b50a80f2e Mon Sep 17 00:00:00 2001
|
|
From: Jonathan Bell <jonathan@raspberrypi.com>
|
|
Date: Thu, 13 Jun 2024 15:01:02 +0100
|
|
Subject: [PATCH 1133/1145] drivers: mmc: sdhci-brcmstb: improve bcm2712 card
|
|
removal handling
|
|
|
|
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>
|
|
---
|
|
drivers/mmc/host/sdhci-brcmstb.c | 19 ++++++++++++++++---
|
|
1 file changed, 16 insertions(+), 3 deletions(-)
|
|
|
|
--- a/drivers/mmc/host/sdhci-brcmstb.c
|
|
+++ b/drivers/mmc/host/sdhci-brcmstb.c
|
|
@@ -366,8 +366,21 @@ static void sdhci_brcmstb_cqe_enable(str
|
|
|
|
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 = {
|
|
@@ -387,7 +400,7 @@ static struct sdhci_ops sdhci_brcmstb_op
|
|
.set_clock = sdhci_bcm2712_set_clock,
|
|
.set_power = sdhci_brcmstb_set_power,
|
|
.set_bus_width = sdhci_set_bus_width,
|
|
- .reset = sdhci_reset,
|
|
+ .reset = brcmstb_reset,
|
|
.set_uhs_signaling = sdhci_set_uhs_signaling,
|
|
.init_sd_express = bcm2712_init_sd_express,
|
|
};
|