Skip to contentSkip to conversation

Patch "amd-xgbe: Don't overwrite SFP PHY mod_absent settings" has been added to the 4.10-stable tree

PATCH [email protected] 1 participant 1 message Mar 18, 2017

Subsystems (3)
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

amd-xgbe: Don't overwrite SFP PHY mod_absent settings

to the 4.10-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:
amd-xgbe-don-t-overwrite-sfp-phy-mod_absent-settings.patch
and it can be found in the queue-4.10 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 Sat Mar 18 22:03:53 CST 2017

From: "Lendacky, Thomas" <[email protected]>
Date: Tue, 28 Feb 2017 15:03:10 -0600
Subject: amd-xgbe: Don't overwrite SFP PHY mod_absent settings

From: "Lendacky, Thomas" <[email protected]>

[ Upstream commit 2697ea5a859b83ca49511dcfd98daf42584eb3cf ]

If an SFP module is not present, xgbe_phy_sfp_phy_settings() should return after applying the default settings. Currently there is no return statement and the default settings are overwritten.

---
 drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c |    2 ++
 1 file changed, 2 insertions(+)
drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c +2 -0
@@ -716,6 +716,8 @@ static void xgbe_phy_sfp_phy_settings(st
 		pdata->phy.duplex = DUPLEX_UNKNOWN;
 		pdata->phy.autoneg = AUTONEG_ENABLE;
 		pdata->phy.advertising = pdata->phy.supported;
+
+		return;
 	}
 
 	pdata->phy.advertising &= ~ADVERTISED_Autoneg;

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

queue-4.10/amd-xgbe-be-sure-to-set-mdio-modes-on-device-re-start.patch queue-4.10/amd-xgbe-enable-irqs-only-if-napi_complete_done-is-true.patch queue-4.10/amd-xgbe-don-t-overwrite-sfp-phy-mod_absent-settings.patch queue-4.10/amd-xgbe-stop-the-phy-before-releasing-interrupts.patch