aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/bcm53xx/patches-5.10
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2021-10-07 11:29:52 +0200
committerRafał Miłecki <rafal@milecki.pl>2021-10-07 11:30:18 +0200
commitfd71ef34b75c81646d17d21d80dc3a5b5e2e6bb8 (patch)
tree044a892c668c937798656cfc35a2be2aa8698328 /target/linux/bcm53xx/patches-5.10
parentd69bf6601e5bff897781361f2718513d4dd8efd8 (diff)
downloadupstream-fd71ef34b75c81646d17d21d80dc3a5b5e2e6bb8.tar.gz
upstream-fd71ef34b75c81646d17d21d80dc3a5b5e2e6bb8.tar.bz2
upstream-fd71ef34b75c81646d17d21d80dc3a5b5e2e6bb8.zip
kernel: backport bgmac upstream commits from 5.15 / for 5.16
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/bcm53xx/patches-5.10')
-rw-r--r--target/linux/bcm53xx/patches-5.10/099-net-bcma-handle-deferred-probe.patch41
1 files changed, 0 insertions, 41 deletions
diff --git a/target/linux/bcm53xx/patches-5.10/099-net-bcma-handle-deferred-probe.patch b/target/linux/bcm53xx/patches-5.10/099-net-bcma-handle-deferred-probe.patch
deleted file mode 100644
index 628d7cddf2..0000000000
--- a/target/linux/bcm53xx/patches-5.10/099-net-bcma-handle-deferred-probe.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 029497e66bdc762e001880e4c85a91f35a54b1e2 Mon Sep 17 00:00:00 2001
-From: Christian Lamparter <chunkeey@gmail.com>
-Date: Sun, 19 Sep 2021 13:57:25 +0200
-Subject: net: bgmac-bcma: handle deferred probe error due to mac-address
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Due to the inclusion of nvmem handling into the mac-address getter
-function of_get_mac_address() by
-commit d01f449c008a ("of_net: add NVMEM support to of_get_mac_address")
-it is now possible to get a -EPROBE_DEFER return code. Which did cause
-bgmac to assign a random ethernet address.
-
-This exact issue happened on my Meraki MR32. The nvmem provider is
-an EEPROM (at24c64) which gets instantiated once the module
-driver is loaded... This happens once the filesystem becomes available.
-
-With this patch, bgmac_probe() will propagate the -EPROBE_DEFER error.
-Then the driver subsystem will reschedule the probe at a later time.
-
-Cc: Petr Štetiar <ynezz@true.cz>
-Cc: Michael Walle <michael@walle.cc>
-Fixes: d01f449c008a ("of_net: add NVMEM support to of_get_mac_address")
-Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
-Signed-off-by: David S. Miller <davem@davemloft.net>
----
- drivers/net/ethernet/broadcom/bgmac-bcma.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/net/ethernet/broadcom/bgmac-bcma.c
-+++ b/drivers/net/ethernet/broadcom/bgmac-bcma.c
-@@ -129,6 +129,8 @@ static int bgmac_probe(struct bcma_devic
- bcma_set_drvdata(core, bgmac);
-
- err = of_get_mac_address(bgmac->dev->of_node, bgmac->net_dev->dev_addr);
-+ if (err == -EPROBE_DEFER)
-+ return err;
-
- /* If no MAC address assigned via device tree, check SPROM */
- if (err) {