mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 15:32:33 +00:00
f5919b65d4
Patch generation process: - rebase rpi/rpi-4.14.y on v4.14.89 from linux-stable - git format-patch v4.14.89 Patches skipped during rebase: - lan78xx: Read MAC address from DT if present - lan78xx: Enable LEDs and auto-negotiation - Revert "softirq: Let ksoftirqd do its job" - sc16is7xx: Fix for multi-channel stall - lan78xx: Ignore DT MAC address if already valid - lan78xx: Simple patch to prevent some crashes - tcp_write_queue_purge clears all the SKBs in the write queue - Revert "lan78xx: Simple patch to prevent some crashes" - lan78xx: Connect phy early - Arm: mm: ftrace: Only set text back to ro after kernel has been marked ro - Revert "Revert "softirq: Let ksoftirqd do its job"" - ASoC: cs4265: SOC_SINGLE register value error fix - Revert "ASoC: cs4265: SOC_SINGLE register value error fix" - Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends" - Revert "Revert "net: pskb_trim_rcsum() and CHECKSUM_COMPLETE are friends"" Patches dropped after rebase: - net: Add non-mainline source for rtl8192cu wlan - net: Fix rtl8192cu build errors on other platforms - brcm: adds support for BCM43341 wifi - brcmfmac: Mute expected startup 'errors' - ARM64: Fix build break for RTL8187/RTL8192CU wifi - ARM64: Enable RTL8187/RTL8192CU wifi in build config - This is the driver for Sony CXD2880 DVB-T2/T tuner + demodulator - brcmfmac: add CLM download support - brcmfmac: request_firmware_direct is quieter - Sets the BCDC priority to constant 0 - brcmfmac: Disable ARP offloading when promiscuous - brcmfmac: Avoid possible out-of-bounds read - brcmfmac: Delete redundant length check - net: rtl8192cu: Normalize indentation - net: rtl8192cu: Fix implicit fallthrough warnings - Revert "Sets the BCDC priority to constant 0" - media: cxd2880: Bump to match 4.18.y version - media: cxd2880-spi: Bump to match 4.18.y version - Revert "mm: alloc_contig: re-allow CMA to compact FS pages" - Revert "Revert "mm: alloc_contig: re-allow CMA to compact FS pages"" - cxd2880: CXD2880_SPI_DRV should select DVB_CXD2880 with MEDIA_SUBDRV_AUTOSELECT - 950-0421-HID-hid-bigbenff-driver-for-BigBen-Interactive-PS3OF.patch - 950-0453-Add-hid-bigbenff-to-list-of-have_special_driver-for-.patch Make I2C built-in instead of modular as in upstream defconfig; also the easiest way to get MFD_ARIZONA enabled, which is required by kmod-sound-soc-rpi-cirrus. Add missing compatible strings from 4.9/960-add-rasbperrypi-compatible.patch, using upstream names for compute modules. Add extra patch to enable the LEDs on lan78xx. Compile-tested: bcm2708, bcm2709, bcm2710 (with CONFIG_ALL_KMODS=y) Runtime-tested: bcm2708, bcm2710 Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
51 lines
1.8 KiB
Diff
51 lines
1.8 KiB
Diff
From 6191e47f23fe4fa13dfbb38dfdda12e567028963 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Fri, 26 Oct 2018 17:29:51 +0100
|
|
Subject: [PATCH 433/454] 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;
|
|
}
|