mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 06:57:57 +00:00
37bb389392
Changelog: https://cdn.kernel.org/pub/linux/kernel/v5.x/ChangeLog-5.15.146 Removed upstreamed: generic/hack-5.15/940-ksmbd-have-a-dependency-on-cifs-arc4.patch[1] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.146&id=ac385518598f50dd1b9b41bd05f50ce9795481d5 Build system: x86_64 Build-tested: ramips/tplink_archer-a6-v3 Run-tested: ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me>
55 lines
1.4 KiB
Diff
55 lines
1.4 KiB
Diff
--- a/drivers/net/ethernet/broadcom/b44.c
|
|
+++ b/drivers/net/ethernet/broadcom/b44.c
|
|
@@ -430,10 +430,34 @@ static void b44_wap54g10_workaround(stru
|
|
error:
|
|
pr_warn("PHY: cannot reset MII transceiver isolate bit\n");
|
|
}
|
|
+
|
|
+static void b44_bcm47xx_workarounds(struct b44 *bp)
|
|
+{
|
|
+ char buf[20];
|
|
+ struct ssb_device *sdev = bp->sdev;
|
|
+
|
|
+ /* Toshiba WRC-1000, Siemens SE505 v1, Askey RT-210W, RT-220W */
|
|
+ if (sdev->bus->sprom.board_num == 100) {
|
|
+ bp->phy_addr = B44_PHY_ADDR_NO_LOCAL_PHY;
|
|
+ } else {
|
|
+ /* WL-HDD */
|
|
+ if (bcm47xx_nvram_getenv("hardware_version", buf, sizeof(buf)) >= 0 &&
|
|
+ !strncmp(buf, "WL300-", strlen("WL300-"))) {
|
|
+ if (sdev->bus->sprom.et0phyaddr == 0 &&
|
|
+ sdev->bus->sprom.et1phyaddr == 1)
|
|
+ bp->phy_addr = B44_PHY_ADDR_NO_LOCAL_PHY;
|
|
+ }
|
|
+ }
|
|
+ return;
|
|
+}
|
|
#else
|
|
static inline void b44_wap54g10_workaround(struct b44 *bp)
|
|
{
|
|
}
|
|
+
|
|
+static inline void b44_bcm47xx_workarounds(struct b44 *bp)
|
|
+{
|
|
+}
|
|
#endif
|
|
|
|
static int b44_setup_phy(struct b44 *bp)
|
|
@@ -442,6 +466,7 @@ static int b44_setup_phy(struct b44 *bp)
|
|
int err;
|
|
|
|
b44_wap54g10_workaround(bp);
|
|
+ b44_bcm47xx_workarounds(bp);
|
|
|
|
if (bp->flags & B44_FLAG_EXTERNAL_PHY)
|
|
return 0;
|
|
@@ -2175,6 +2200,8 @@ static int b44_get_invariants(struct b44
|
|
* valid PHY address. */
|
|
bp->phy_addr &= 0x1F;
|
|
|
|
+ b44_bcm47xx_workarounds(bp);
|
|
+
|
|
memcpy(bp->dev->dev_addr, addr, ETH_ALEN);
|
|
|
|
if (!is_valid_ether_addr(&bp->dev->dev_addr[0])){
|