mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-27 01:11:14 +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]
65 lines
2.2 KiB
Diff
65 lines
2.2 KiB
Diff
From fa3bc9db82e8a0f90986c94f5c69ba8dae265ecf Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Thu, 5 Apr 2018 14:46:11 +0100
|
|
Subject: [PATCH] lan78xx: Move enabling of EEE into PHY init code
|
|
|
|
Enable EEE mode as soon as possible after connecting to the PHY, and
|
|
before phy_start. This avoids a second link negotiation, which speeds
|
|
up booting and stops the interface failing to become ready.
|
|
|
|
See: https://github.com/raspberrypi/linux/issues/2437
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
---
|
|
drivers/net/usb/lan78xx.c | 32 ++++++++++++++++----------------
|
|
1 file changed, 16 insertions(+), 16 deletions(-)
|
|
|
|
--- a/drivers/net/usb/lan78xx.c
|
|
+++ b/drivers/net/usb/lan78xx.c
|
|
@@ -2175,6 +2175,22 @@ static int lan78xx_phy_init(struct lan78
|
|
mii_adv_to_linkmode_adv_t(fc, mii_adv);
|
|
linkmode_or(phydev->advertising, fc, phydev->advertising);
|
|
|
|
+ if (of_property_read_bool(dev->udev->dev.of_node,
|
|
+ "microchip,eee-enabled")) {
|
|
+ struct ethtool_eee edata;
|
|
+ memset(&edata, 0, sizeof(edata));
|
|
+ edata.cmd = ETHTOOL_SEEE;
|
|
+ edata.advertised = ADVERTISED_1000baseT_Full |
|
|
+ ADVERTISED_100baseT_Full;
|
|
+ edata.eee_enabled = true;
|
|
+ edata.tx_lpi_enabled = true;
|
|
+ if (of_property_read_u32(dev->udev->dev.of_node,
|
|
+ "microchip,tx-lpi-timer",
|
|
+ &edata.tx_lpi_timer))
|
|
+ edata.tx_lpi_timer = 600; /* non-aggressive */
|
|
+ (void)lan78xx_set_eee(dev->net, &edata);
|
|
+ }
|
|
+
|
|
if (phydev->mdio.dev.of_node) {
|
|
u32 reg;
|
|
int len;
|
|
@@ -2652,22 +2668,6 @@ static int lan78xx_open(struct net_devic
|
|
|
|
netif_dbg(dev, ifup, dev->net, "phy initialised successfully");
|
|
|
|
- if (of_property_read_bool(dev->udev->dev.of_node,
|
|
- "microchip,eee-enabled")) {
|
|
- struct ethtool_eee edata;
|
|
- memset(&edata, 0, sizeof(edata));
|
|
- edata.cmd = ETHTOOL_SEEE;
|
|
- edata.advertised = ADVERTISED_1000baseT_Full |
|
|
- ADVERTISED_100baseT_Full;
|
|
- edata.eee_enabled = true;
|
|
- edata.tx_lpi_enabled = true;
|
|
- if (of_property_read_u32(dev->udev->dev.of_node,
|
|
- "microchip,tx-lpi-timer",
|
|
- &edata.tx_lpi_timer))
|
|
- edata.tx_lpi_timer = 600; /* non-aggressive */
|
|
- (void)lan78xx_set_eee(net, &edata);
|
|
- }
|
|
-
|
|
/* for Link Check */
|
|
if (dev->urb_intr) {
|
|
ret = usb_submit_urb(dev->urb_intr, GFP_KERNEL);
|