mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +00:00
8590531048
Manually rebased: bcm4908/patches-5.15/071-v6.1-0001-net-broadcom-bcm4908_enet-handle-EPROBE_DEFER-when-g.patch bcm53xx/patches-5.15/180-usb-xhci-add-support-for-performing-fake-doorbell.patch ipq40xx/patches-5.15/902-dts-ipq4019-ap-dk04.1.patch[*] Removed upstreamed: backport-5.15/735-v6.5-net-bgmac-postpone-turning-IRQs-off-to-avoid-SoC-han.patch[1] backport-5.15/817-v6.5-01-leds-trigger-netdev-Recheck-NETDEV_LED_MODE_LINKUP-o.patch[2] pending-5.15/143-jffs2-reduce-stack-usage-in-jffs2_build_xattr_subsys.patch[3] pending-5.15/160-workqueue-fix-enum-type-for-gcc-13.patch[4] bcm53xx/patches-5.15/036-v6.5-0003-ARM-dts-BCM5301X-Drop-clock-names-from-the-SPI-node.patch[5] bcm53xx/patches-5.15/036-v6.5-0015-ARM-dts-BCM5301X-fix-duplex-full-full-duplex.patch[6] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=02474292a44205c1eb5a03634ead155a3c9134f4 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=86b93cbfe104e99fd3d25a49748b99fb88101573 3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=79b9ab357b6f5675007f4c02ff8765cbd8dc06a2 4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=d528faa9e828b9fc46dfb684a2a9fd8c2e860ed8 5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=5899bc4058e89d5110a23797ff94439c53b77c25 6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.123&id=95afd2c7c7d26087730dc938709e025a303e5499 Build system: x86/64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 Co-authored-by: Hauke Mehrtens <hauke@hauke-m.de> Signed-off-by: John Audia <therealgraysky@proton.me> [rebased ipq40xx/patches-5.15/902-dts-ipq4019-ap-dk04.1.patch ] Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
54 lines
1.6 KiB
Diff
54 lines
1.6 KiB
Diff
From e93a766da57fff3273bcb618edf5dfca1fb86b89 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Thu, 15 Sep 2022 15:30:13 +0200
|
|
Subject: [PATCH] net: broadcom: bcm4908_enet: handle -EPROBE_DEFER when
|
|
getting MAC
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Reading MAC from OF may return -EPROBE_DEFER if underlaying NVMEM device
|
|
isn't ready yet. In such case pass that error code up and "wait" to be
|
|
probed later.
|
|
|
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
|
Link: https://lore.kernel.org/r/20220915133013.2243-1-zajec5@gmail.com
|
|
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
|
|
---
|
|
drivers/net/ethernet/broadcom/bcm4908_enet.c | 13 +++++++++----
|
|
1 file changed, 9 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/net/ethernet/broadcom/bcm4908_enet.c
|
|
+++ b/drivers/net/ethernet/broadcom/bcm4908_enet.c
|
|
@@ -720,6 +720,8 @@ static int bcm4908_enet_probe(struct pla
|
|
|
|
SET_NETDEV_DEV(netdev, &pdev->dev);
|
|
err = of_get_ethdev_address(dev->of_node, netdev);
|
|
+ if (err == -EPROBE_DEFER)
|
|
+ goto err_dma_free;
|
|
if (err)
|
|
eth_hw_addr_random(netdev);
|
|
netdev->netdev_ops = &bcm4908_enet_netdev_ops;
|
|
@@ -730,14 +732,17 @@ static int bcm4908_enet_probe(struct pla
|
|
netif_napi_add(netdev, &enet->rx_ring.napi, bcm4908_enet_poll_rx, NAPI_POLL_WEIGHT);
|
|
|
|
err = register_netdev(netdev);
|
|
- if (err) {
|
|
- bcm4908_enet_dma_free(enet);
|
|
- return err;
|
|
- }
|
|
+ if (err)
|
|
+ goto err_dma_free;
|
|
|
|
platform_set_drvdata(pdev, enet);
|
|
|
|
return 0;
|
|
+
|
|
+err_dma_free:
|
|
+ bcm4908_enet_dma_free(enet);
|
|
+
|
|
+ return err;
|
|
}
|
|
|
|
static int bcm4908_enet_remove(struct platform_device *pdev)
|