mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-29 10:08:59 +00:00
da98603597
This PR is a blend of several kernel bumps authored by ldir taken from his
staging tree w/ some further adjustments made by me and update_kernel.sh
Summary:
Deleted upstreamed patches:
generic:
742-v5.5-net-sfp-add-support-for-module-quirks.patch
743-v5.5-net-sfp-add-some-quirks-for-GPON-modules.patch
bcm63xx:
022-v5.8-mtd-rawnand-brcmnand-correctly-verify-erased-pages.patch
024-v5.8-mtd-rawnand-brcmnand-fix-CS0-layout.patch
mediatek:
0402-net-ethernet-mtk_eth_soc-Always-call-mtk_gmac0_rgmii.patch
Deleted patches applied differently upstream:
generic:
641-sch_cake-fix-IP-protocol-handling-in-the-presence-of.patch
Manually merged patches:
generic:
395-v5.8-net-sch_cake-Take-advantage-of-skb-hash-where-appropriate.patch
bcm27xx:
950-0132-lan78xx-Debounce-link-events-to-minimize-poll-storm.patch
layerscape:
701-net-0231-enetc-Use-DT-protocol-information-to-set-up-the-port.patch
Build system: x86_64
Build-tested: ath79/generic, bcm27xx/bcm2708, bcm27xx/bcm2711,
imx6, mvebu/cortexa9, sunxi/a53
Run-tested: Netgear R7800 (ipq806x)
No dmesg regressions, everything functional
Signed-off-by: John Audia <graysky@archlinux.us>
Tested-By: Lucian Cristian <Lucian.cristian@gmail.com> [mvebu]
Tested-By: Curtis Deptuck <curtdept@me.com> [x86/64]
[do not remove 395-v5.8-net-sch_cake-Take-advantage-... patch,
adjust and refresh patches, adjust commit message]
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Tested-By: John Audia <graysky@archlinux.us> [ipq806x]
49 lines
1.6 KiB
Diff
49 lines
1.6 KiB
Diff
From e91aa9302b0d3f9730983d0f1b168a081aab6236 Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Tue, 17 Oct 2017 15:04:29 +0100
|
|
Subject: [PATCH] lan78xx: Enable LEDs and auto-negotiation
|
|
|
|
For applications of the LAN78xx that don't have valid programmed
|
|
EEPROMs or OTPs, enabling both LEDs and auto-negotiation by default
|
|
seems reasonable.
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
---
|
|
drivers/net/usb/lan78xx.c | 11 +++++++++++
|
|
1 file changed, 11 insertions(+)
|
|
|
|
--- a/drivers/net/usb/lan78xx.c
|
|
+++ b/drivers/net/usb/lan78xx.c
|
|
@@ -2461,6 +2461,11 @@ static int lan78xx_reset(struct lan78xx_
|
|
int ret = 0;
|
|
unsigned long timeout;
|
|
u8 sig;
|
|
+ bool has_eeprom;
|
|
+ bool has_otp;
|
|
+
|
|
+ has_eeprom = !lan78xx_read_eeprom(dev, 0, 0, NULL);
|
|
+ has_otp = !lan78xx_read_otp(dev, 0, 0, NULL);
|
|
|
|
ret = lan78xx_read_reg(dev, HW_CFG, &buf);
|
|
buf |= HW_CFG_LRST_;
|
|
@@ -2514,6 +2519,9 @@ static int lan78xx_reset(struct lan78xx_
|
|
|
|
ret = lan78xx_read_reg(dev, HW_CFG, &buf);
|
|
buf |= HW_CFG_MEF_;
|
|
+ /* If no valid EEPROM and no valid OTP, enable the LEDs by default */
|
|
+ if (!has_eeprom && !has_otp)
|
|
+ buf |= HW_CFG_LED0_EN_ | HW_CFG_LED1_EN_;
|
|
ret = lan78xx_write_reg(dev, HW_CFG, buf);
|
|
|
|
ret = lan78xx_read_reg(dev, USB_CFG0, &buf);
|
|
@@ -2569,6 +2577,9 @@ static int lan78xx_reset(struct lan78xx_
|
|
buf |= MAC_CR_AUTO_DUPLEX_ | MAC_CR_AUTO_SPEED_;
|
|
}
|
|
}
|
|
+ /* If no valid EEPROM and no valid OTP, enable AUTO negotiation */
|
|
+ if (!has_eeprom && !has_otp)
|
|
+ buf |= MAC_CR_AUTO_DUPLEX_ | MAC_CR_AUTO_SPEED_;
|
|
ret = lan78xx_write_reg(dev, MAC_CR, buf);
|
|
|
|
ret = lan78xx_read_reg(dev, MAC_TX, &buf);
|