raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

lan78xx: Move enabling of EEE into PHY init code

Browse Source 
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>
This commit is contained in:
Phil Elwell
2018-04-05 14:46:11 +01:00
committed by popcornmix
parent 43fc0a03de
commit c4de067dbe
1 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
drivers/net/usb/lan78xx.c
View File

@@ -2179,6 +2179,22 @@ static int lan78xx_phy_init(struct lan78xx_net *dev)
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;
@@ -2656,22 +2672,6 @@ static int lan78xx_open(struct net_device *net)
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);