aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm27xx/patches-4.19/950-0159-mmc-bcm2835-sdhost-Recover-from-MMC_SEND_EXT_CSD.patch
diff options
context:
space:
mode:
authorAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-02-08 21:58:55 +0100
committerAdrian Schmutzler <freifunk@adrianschmutzler.de>2020-02-14 14:10:51 +0100
commit7d7aa2fd924c27829ec25f825481554dd81bce97 (patch)
tree658b87b89331670266163e522ea5fb52535633cb /target/linux/bcm27xx/patches-4.19/950-0159-mmc-bcm2835-sdhost-Recover-from-MMC_SEND_EXT_CSD.patch
parente7bfda2c243e66a75ff966ba04c28b1590b5d24c (diff)
downloadupstream-7d7aa2fd924c27829ec25f825481554dd81bce97.tar.gz
upstream-7d7aa2fd924c27829ec25f825481554dd81bce97.tar.bz2
upstream-7d7aa2fd924c27829ec25f825481554dd81bce97.zip
brcm2708: rename target to bcm27xx
This change makes the names of Broadcom targets consistent by using the common notation based on SoC/CPU ID (which is used internally anyway), bcmXXXX instead of brcmXXXX. This is even used for target TITLE in make menuconfig already, only the short target name used brcm so far. Despite, since subtargets range from bcm2708 to bcm2711, it seems appropriate to use bcm27xx instead of bcm2708 (again, as already done for BOARDNAME). This also renames the packages brcm2708-userland and brcm2708-gpu-fw. Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> Acked-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/bcm27xx/patches-4.19/950-0159-mmc-bcm2835-sdhost-Recover-from-MMC_SEND_EXT_CSD.patch')
-rw-r--r--target/linux/bcm27xx/patches-4.19/950-0159-mmc-bcm2835-sdhost-Recover-from-MMC_SEND_EXT_CSD.patch50
1 files changed, 50 insertions, 0 deletions
diff --git a/target/linux/bcm27xx/patches-4.19/950-0159-mmc-bcm2835-sdhost-Recover-from-MMC_SEND_EXT_CSD.patch b/target/linux/bcm27xx/patches-4.19/950-0159-mmc-bcm2835-sdhost-Recover-from-MMC_SEND_EXT_CSD.patch
new file mode 100644
index 0000000000..c6a9e355c5
--- /dev/null
+++ b/target/linux/bcm27xx/patches-4.19/950-0159-mmc-bcm2835-sdhost-Recover-from-MMC_SEND_EXT_CSD.patch
@@ -0,0 +1,50 @@
+From 5010dba0e3f6f2c9d623e265276d9b6993fa96b0 Mon Sep 17 00:00:00 2001
+From: Phil Elwell <phil@raspberrypi.org>
+Date: Fri, 26 Oct 2018 17:29:51 +0100
+Subject: [PATCH] mmc/bcm2835-sdhost: Recover from MMC_SEND_EXT_CSD
+
+If the user issues an "mmc extcsd read", the SD controller receives
+what it thinks is a SEND_IF_COND command with an unexpected data block.
+The resulting operations leave the FSM stuck in READWAIT, a state which
+persists until the MMC framework resets the controller, by which point
+the root filesystem is likely to have been unmounted.
+
+A less heavyweight solution is to detect the condition and nudge the
+FSM by asserting the (self-clearing) FORCE_DATA_MODE bit.
+
+N.B. This workaround was essentially discovered by accident and without
+a full understanding the inner workings of the controller, so it is
+fortunate that the "fix" only modifies error paths.
+
+See: https://github.com/raspberrypi/linux/issues/2728
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.org>
+---
+ drivers/mmc/host/bcm2835-sdhost.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+--- a/drivers/mmc/host/bcm2835-sdhost.c
++++ b/drivers/mmc/host/bcm2835-sdhost.c
+@@ -1244,6 +1244,8 @@ static void bcm2835_sdhost_finish_comman
+ pr_info("%s: ignoring CRC7 error for CMD1\n",
+ mmc_hostname(host->mmc));
+ } else {
++ u32 edm, fsm;
++
+ if (sdhsts & SDHSTS_CMD_TIME_OUT) {
+ if (host->debug)
+ pr_warn("%s: command %d timeout\n",
+@@ -1256,6 +1258,13 @@ static void bcm2835_sdhost_finish_comman
+ host->cmd->opcode);
+ host->cmd->error = -EILSEQ;
+ }
++
++ edm = readl(host->ioaddr + SDEDM);
++ fsm = edm & SDEDM_FSM_MASK;
++ if (fsm == SDEDM_FSM_READWAIT ||
++ fsm == SDEDM_FSM_WRITESTART1)
++ writel(edm | SDEDM_FORCE_DATA_MODE,
++ host->ioaddr + SDEDM);
+ tasklet_schedule(&host->finish_tasklet);
+ return;
+ }