Skip to contentSkip to conversation

Patch "net: dsa: bcm_sf2: Ensure we re-negotiate EEE during after link change" has been added to the 4.8-stable tree

PATCH [email protected] 1 participant 1 message Dec 8, 2016

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

net: dsa: bcm_sf2: Ensure we re-negotiate EEE during after link change

to the 4.8-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
net-dsa-bcm_sf2-ensure-we-re-negotiate-eee-during-after-link-change.patch
and it can be found in the queue-4.8 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From foo@baz Thu Dec 8 07:19:12 CET 2016

From: Florian Fainelli <[email protected]>
Date: Tue, 22 Nov 2016 11:40:58 -0800
Subject: net: dsa: bcm_sf2: Ensure we re-negotiate EEE during after link change

From: Florian Fainelli <[email protected]>

[ Upstream commit 76da8706d90d8641eeb9b8e579942ed80b6c0880 ]

In case the link change and EEE is enabled or disabled, always try to re-negotiate this with the link partner.

Fixes 450b05c15f9c ("net: dsa: bcm_sf2: add support for controlling EEE")
---
 drivers/net/dsa/bcm_sf2.c |    4 ++++
 1 file changed, 4 insertions(+)
drivers/net/dsa/bcm_sf2.c +4 -0
@@ -1167,6 +1167,7 @@ static void bcm_sf2_sw_adjust_link(struc
 				   struct phy_device *phydev)
 {
 	struct bcm_sf2_priv *priv = ds_to_priv(ds);
+	struct ethtool_eee *p = &priv->port_sts[port].eee;
 	u32 id_mode_dis = 0, port_mode;
 	const char *str = NULL;
 	u32 reg;
@@ -1241,6 +1242,9 @@ force_link:
 		reg |= DUPLX_MODE;
 
 	core_writel(priv, reg, CORE_STS_OVERRIDE_GMIIP_PORT(port));
+
+	if (!phydev->is_pseudo_fixed_link)
+		p->eee_enabled = bcm_sf2_eee_init(ds, port, phydev);
 }
 
 static void bcm_sf2_sw_fixed_link_update(struct dsa_switch *ds, int port,

Patches currently in stable-queue which might be from [email protected] are

queue-4.8/net-dsa-bcm_sf2-ensure-we-re-negotiate-eee-during-after-link-change.patch queue-4.8/net-dsa-b53-fix-vlan-usage-and-how-we-treat-cpu-port.patch queue-4.8/net-bcmgenet-utilize-correct-struct-device-for-all-dma-operations.patch