summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2018-12-29 13:53:24 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2018-12-29 13:53:24 +0100
commit211d574db3effde8582768f56656085bf63f3ec3 (patch)
tree3907dde23946c570455f20d40ca4651b7c4e55a2
parent6fe390ad252460f99372bd6554de35a9137679e8 (diff)
parentb2ff26baaa8515dd380850209d6111fc821a2167 (diff)
downloadkernel-211d574db3effde8582768f56656085bf63f3ec3.tar.gz
kernel-211d574db3effde8582768f56656085bf63f3ec3.tar.xz
kernel-211d574db3effde8582768f56656085bf63f3ec3.zip
merge origin
Diffstat
-rw-r--r--bcm2835-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch38
-rw-r--r--configs/fedora/generic/CONFIG_REALTEK_PHY2
-rw-r--r--kernel-aarch64-debug.config2
-rw-r--r--kernel-aarch64.config2
-rw-r--r--kernel-armv7hl-debug.config2
-rw-r--r--kernel-armv7hl-lpae-debug.config2
-rw-r--r--kernel-armv7hl-lpae.config2
-rw-r--r--kernel-armv7hl.config2
-rw-r--r--kernel-i686-debug.config2
-rw-r--r--kernel-i686.config2
-rw-r--r--kernel-ppc64le-debug.config2
-rw-r--r--kernel-ppc64le.config2
-rw-r--r--kernel-s390x-debug.config2
-rw-r--r--kernel-s390x.config2
-rw-r--r--kernel-x86_64-debug.config2
-rw-r--r--kernel-x86_64.config2
-rw-r--r--kernel.spec12
17 files changed, 65 insertions, 15 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/configs/fedora/generic/CONFIG_REALTEK_PHY b/configs/fedora/generic/CONFIG_REALTEK_PHY
index 051e7cc45..366b69345 100644
--- a/configs/fedora/generic/CONFIG_REALTEK_PHY
+++ b/configs/fedora/generic/CONFIG_REALTEK_PHY
@@ -1 +1 @@
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 23772d09d..3a9a31500 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -4777,7 +4777,7 @@ CONFIG_RDS_TCP=m
CONFIG_RD_XZ=y
# CONFIG_READABLE_ASM is not set
CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
CONFIG_REFCOUNT_FULL=y
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_SPMI=y
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 567915d11..0092c7877 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -4754,7 +4754,7 @@ CONFIG_RDS_TCP=m
CONFIG_RD_XZ=y
# CONFIG_READABLE_ASM is not set
CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
CONFIG_REFCOUNT_FULL=y
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_SPMI=y
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index e6bf6f531..ea0391f31 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -5047,7 +5047,7 @@ CONFIG_RDS_TCP=m
CONFIG_RD_XZ=y
# CONFIG_READABLE_ASM is not set
CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
CONFIG_REFCOUNT_FULL=y
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_IRQ=y
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index ab0414af8..12a25c380 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -4771,7 +4771,7 @@ CONFIG_RDS_TCP=m
CONFIG_RD_XZ=y
# CONFIG_READABLE_ASM is not set
CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
CONFIG_REFCOUNT_FULL=y
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_IRQ=y
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index bda4737f7..529907957 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -4748,7 +4748,7 @@ CONFIG_RDS_TCP=m
CONFIG_RD_XZ=y
# CONFIG_READABLE_ASM is not set
CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
CONFIG_REFCOUNT_FULL=y
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_IRQ=y
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 382662436..5f2c880de 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -5024,7 +5024,7 @@ CONFIG_RDS_TCP=m
CONFIG_RD_XZ=y
# CONFIG_READABLE_ASM is not set
CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
CONFIG_REFCOUNT_FULL=y
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_IRQ=y
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 817209ac6..d2052bb41 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -4524,7 +4524,7 @@ CONFIG_RDS_TCP=m
CONFIG_RD_XZ=y
# CONFIG_READABLE_ASM is not set
CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
CONFIG_REFCOUNT_FULL=y
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP=y
diff --git a/kernel-i686.config b/kernel-i686.config
index 6bf7093fe..e593d5e7b 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -4500,7 +4500,7 @@ CONFIG_RDS_TCP=m
CONFIG_RD_XZ=y
# CONFIG_READABLE_ASM is not set
CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
# CONFIG_REFCOUNT_FULL is not set
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 2ce22ad07..df1995d9b 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -4260,7 +4260,7 @@ CONFIG_RDS_TCP=m
CONFIG_RD_XZ=y
# CONFIG_READABLE_ASM is not set
CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
CONFIG_REFCOUNT_FULL=y
CONFIG_REGMAP_I2C=m
CONFIG_REGMAP=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index bfebf587f..9ae64b1d7 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -4234,7 +4234,7 @@ CONFIG_RDS_TCP=m
CONFIG_RD_XZ=y
# CONFIG_READABLE_ASM is not set
CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
# CONFIG_REFCOUNT_FULL is not set
CONFIG_REGMAP_I2C=m
CONFIG_REGMAP=y
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 21f201d19..d413ec61c 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -4151,7 +4151,7 @@ CONFIG_RDS_TCP=m
CONFIG_RD_XZ=y
# CONFIG_READABLE_ASM is not set
CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
CONFIG_REFCOUNT_FULL=y
CONFIG_REGMAP_I2C=m
CONFIG_REGMAP=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 08c84a193..e072819a9 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -4125,7 +4125,7 @@ CONFIG_RDS_TCP=m
CONFIG_RD_XZ=y
# CONFIG_READABLE_ASM is not set
CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
# CONFIG_REFCOUNT_FULL is not set
CONFIG_REGMAP_I2C=m
CONFIG_REGMAP=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index ced1cdc8a..8bc77b750 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -4564,7 +4564,7 @@ CONFIG_RDS_TCP=m
CONFIG_RD_XZ=y
# CONFIG_READABLE_ASM is not set
CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
CONFIG_REFCOUNT_FULL=y
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 5a0df6f10..2bf9062ad 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -4540,7 +4540,7 @@ CONFIG_RDS_TCP=m
CONFIG_RD_XZ=y
# CONFIG_READABLE_ASM is not set
CONFIG_REALTEK_AUTOPM=y
-CONFIG_REALTEK_PHY=m
+CONFIG_REALTEK_PHY=y
# CONFIG_REFCOUNT_FULL is not set
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP=y
diff --git a/kernel.spec b/kernel.spec
index 5e1521b95..0f6153d4b 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -615,6 +615,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
@@ -1913,6 +1916,15 @@ fi
#
#
%changelog
+* Thu Dec 27 2018 Hans de Goede <hdegoede@redhat.com>
+- Set CONFIG_REALTEK_PHY=y to workaround realtek ethernet issues (rhbz 1650984)
+
+* Mon Dec 24 2018 Peter Robinson <pbrobinson@fedoraproject.org> 4.19.12-301
+- Another fix for issue affecting Raspberry Pi 3-series WiFi (rhbz 1652093)
+
+* Sat Dec 22 2018 Peter Robinson <pbrobinson@fedoraproject.org> 4.19.12-300
+- Linux v4.19.12
+
* Thu Dec 20 2018 Jeremy Cline <jcline@redhat.com> - 4.19.11-300
- Linux v4.19.11
generated by cgit (git 2.34.1) at 2024-06-01 12:42:46 +0000