diff options
-rw-r--r-- | bcm2835-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch | 38 | ||||
-rw-r--r-- | kernel.spec | 9 | ||||
-rw-r--r-- | sources | 2 |
3 files changed, 47 insertions, 2 deletions
diff --git a/bcm2835-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch b/bcm2835-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch new file mode 100644 index 000000000..1119f006c --- /dev/null +++ b/bcm2835-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch @@ -0,0 +1,38 @@ +From 2ffa450426683e05ff79aead017862311852818a Mon Sep 17 00:00:00 2001 +From: Peter Robinson <pbrobinson@gmail.com> +Date: Mon, 24 Dec 2018 01:15:55 +0000 +Subject: [PATCH] mmc: sdhci-iproc: handle mmc_of_parse() errors during probe + +We need to handle mmc_of_parse() errors during probe. + +This finally fixes the wifi regression on Raspberry Pi 3 series. +In error case the wifi chip was permanently in reset because of +the power sequence depending on the deferred probe of the GPIO expander. + +Fixes: b580c52d58d9 ("mmc: sdhci-iproc: add IPROC SDHCI driver") +Cc: stable@vger.kernel.org +Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> +Signed-off-by: Peter Robinson <pbrobinson@gmail.com> +--- + drivers/mmc/host/sdhci-iproc.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/drivers/mmc/host/sdhci-iproc.c b/drivers/mmc/host/sdhci-iproc.c +index d0e83db42ae5..94eeed2a1b53 100644 +--- a/drivers/mmc/host/sdhci-iproc.c ++++ b/drivers/mmc/host/sdhci-iproc.c +@@ -279,7 +279,10 @@ static int sdhci_iproc_probe(struct platform_device *pdev) + + iproc_host->data = iproc_data; + +- mmc_of_parse(host->mmc); ++ ret = mmc_of_parse(host->mmc); ++ if (ret) ++ goto err; ++ + sdhci_get_of_property(pdev); + + host->mmc->caps |= iproc_host->data->mmc_caps; +-- +2.20.1 + diff --git a/kernel.spec b/kernel.spec index 77c654a88..59836434e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -54,7 +54,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 11 +%define stable_update 12 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -599,6 +599,9 @@ Patch332: raspberrypi-Fix-firmware-calls-with-large-buffers.patch # From 4.20, fix eth link/act lights on 3B+ Patch334: bcm2837-fix-eth-leds.patch +# https://patchwork.kernel.org/patch/10741809/ +Patch335: bcm2835-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch + # Patches enabling device specific brcm firmware nvram # https://www.spinics.net/lists/linux-wireless/msg178827.html Patch340: brcmfmac-Remove-firmware-loading-code-duplication.patch @@ -1878,6 +1881,10 @@ fi # # %changelog +* Mon Dec 24 2018 Peter Robinson <pbrobinson@fedoraproject.org> 4.19.12-200 +- Linux v4.19.12 +- Another fix for issue affecting Raspberry Pi 3-series WiFi (rhbz 1652093) + * Thu Dec 20 2018 Jeremy Cline <jcline@redhat.com> - 4.19.11-200 - Linux v4.19.11 @@ -1,2 +1,2 @@ SHA512 (linux-4.19.tar.xz) = ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4 -SHA512 (patch-4.19.11.xz) = 7dbf211441848db045e3c29b885bfadf4c1dea0bf738c0e719c9fb09551a7c41b85e59c995e66a4e354cba42ba302f4988e334e80ef864d92085b938a8954589 +SHA512 (patch-4.19.12.xz) = e878f30a56d436820a08db08e68676f3ad65f7f6946af2fc8bc2379c1f64ace758f6c5292285a10003b8bdd199e422c95263690a64e19a32b3b10cf876cbcd93 |