mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 17:48:58 +00:00
9af0e94fa6
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.64
Manually rebased:
generic/hack-6.6/780-usb-net-MeigLink_modem_support.patch
bcm27xx/patches-6.6/950-0585-drm-vc4-Introduce-generation-number-enum.patch
bcm27xx/patches-6.6/950-0610-drm-vc4-hvs-Support-BCM2712-HVS.patch
bcm27xx/patches-6.6/950-0829-vc4-hvs-Add-support-for-D0-register-changes.patch
Removed upstreamed:
bcm27xx/patches-6.6/950-0597-drm-vc4-hdmi-Avoid-hang-with-debug-registers-when-su.patch[1]
bcm27xx/patches-6.6/950-0599-drm-vc4-Fix-dlist-debug-not-resetting-the-next-entry.patch[2]
bcm27xx/patches-6.6/950-0600-drm-vc4-Remove-incorrect-limit-from-hvs_dlist-debugf.patch[3]
bcm27xx/patches-6.6/950-0708-drm-vc4-Correct-logic-on-stopping-an-HVS-channel.patch[4]
ramips/patches-6.6/002-01-v6.13-clk-ralink-mtmips-fix-clock-plan-for-Ralink-SoC-RT38.patch[5]
ramips/patches-6.6/002-02-v6.13-clk-ralink-mtmips-fix-clocks-probe-order-in-oldest-r.patch[6]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.64&id=223ee2567a55e4f80315c768d2969e6a3b9fb23d
2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.64&id=8182b5ca19c6f173b6498d1c6d3e4b034b76bbde
3. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.64&id=52c1716f65a558174e381360bd88f18dae4be85c
4. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.64&id=9728b508b01a5eeeac79ceb676364c674dd951ac
5. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.64&id=f85a1d06afbcc57ac44176db8f9d7a934979952c
6. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.64&id=fbb13732c6ffa9d58cedafabcd5ce8fd7ef8ae5a
Build system: x86/64
Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3
Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3
Co-authored-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Signed-off-by: John Audia <therealgraysky@proton.me>
Link: https://github.com/openwrt/openwrt/pull/17217
Signed-off-by: Robert Marko <robimarko@gmail.com>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
(cherry picked from commit 5158e28769)
65 lines
2.2 KiB
Diff
65 lines
2.2 KiB
Diff
From 54948a2d072e23217ebd5cb89f7ad3754790ee9d Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Thu, 5 Apr 2018 14:46:11 +0100
|
|
Subject: [PATCH 0127/1085] 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
|
|
@@ -2420,6 +2420,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;
|
|
@@ -3121,22 +3137,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);
|