Skip to contentSkip to conversation

net/e1000: set/clear GO_LINKD bit only if PHY reset is not blocked

PATCH Superseded Shweta Choudaha 2 participants 5 messages May 16, 2019 – Oct 28, 2019 Network drivers

lore
Share & tools
lore
#0 lore raw

cover net/e1000: set/clear GO_LINKD bit only if PHY reset is not blocked

From: Shweta Choudaha <[email protected]>

Hello,

This fixes an issue where GO_LINKD bit is incorrectly set/cleared even when PHY reset is blocked.
Fixes f34dec0b41 ("igb: force phy power up/down")

Thanks,
Shweta

Shweta Choudaha (1):
net/e1000: set/clear GO_LINKD bit only if PHY reset is not blocked

 drivers/net/e1000/igb_ethdev.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 net/e1000: set/clear GO_LINKD bit only if PHY reset is not blocked

From: Shweta Choudaha <[email protected]>

When PHY reset is blocked as is the case when BMC is connected via NC-SI do not set GO_LINKD bit in PHY power management register in dev_stop as this will disconnect the PHY. Also, in dev_close clear the GO_LINKD bit only if PHY reset is not blocked

Fixes 3af34dec0b41 ("igb: force phy power up/down")
---
 drivers/net/e1000/igb_ethdev.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
drivers/net/e1000/igb_ethdev.c +7 -4
index d3a8f5bf4..d0de15531 100644
@@ -1515,8 +1515,10 @@ eth_igb_stop(struct rte_eth_dev *dev)
 	igb_pf_reset_hw(hw);
 	E1000_WRITE_REG(hw, E1000_WUC, 0);
 
-	/* Set bit for Go Link disconnect */
-	if (hw->mac.type >= e1000_82580) {
+
+	/* Set bit for Go Link disconnect if PHY reset is not blocked */
+	if ((hw->mac.type >= e1000_82580) &&
+	    (e1000_check_reset_block(hw) != E1000_BLK_PHY_RESET)) {
 		uint32_t phpm_reg;
 
 		phpm_reg = E1000_READ_REG(hw, E1000_82580_PHY_POWER_MGMT);
@@ -1590,8 +1592,9 @@ eth_igb_close(struct rte_eth_dev *dev)
 	igb_release_manageability(hw);
 	igb_hw_control_release(hw);
 
-	/* Clear bit for Go Link disconnect */
-	if (hw->mac.type >= e1000_82580) {
+	/* Clear bit for Go Link disconnect if PHY reset is not blocked */
+	if ((hw->mac.type >= e1000_82580) &&
+	    (e1000_check_reset_block(hw) != E1000_BLK_PHY_RESET)) {
 		uint32_t phpm_reg;
 
 		phpm_reg = E1000_READ_REG(hw, E1000_82580_PHY_POWER_MGMT);
Signature · 1 line
2.11.0
#2 lore raw

v2 cover net/e1000: set/clear GO_LINKD bit only if PHY reset is not blocked

From: Shweta Choudaha <[email protected]>

Hello,

This patch fixes an issue where GO_LINKD bit is incorrectly set/cleared even when PHY reset is blocked
and is updated to fix the checkpatch warning
Fixes f34dec0b41 ("igb: force phy power up/down")

Thanks,
Shweta

Shweta Choudaha (1):
net/e1000: set/clear GO_LINKD bit only if PHY reset is not blocked

 drivers/net/e1000/igb_ethdev.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
Signature · 1 line
2.11.0
#3 lore raw

PATCH v2 1/1 net/e1000: set/clear GO_LINKD bit only if PHY reset is not blocked

From: Shweta Choudaha <[email protected]>

When PHY reset is blocked as is the case when BMC is connected via NC-SI do not set GO_LINKD bit in PHY power management register in dev_stop as this will disconnect the PHY. Also, in dev_close clear the GO_LINKD bit only if PHY reset is not blocked

Fixes 3af34dec0b41 ("igb: force phy power up/down")
---
 drivers/net/e1000/igb_ethdev.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/net/e1000/igb_ethdev.c +6 -4
index d3a8f5bf4..4d4065d05 100644
@@ -1515,8 +1515,9 @@ eth_igb_stop(struct rte_eth_dev *dev)
 	igb_pf_reset_hw(hw);
 	E1000_WRITE_REG(hw, E1000_WUC, 0);
 
-	/* Set bit for Go Link disconnect */
-	if (hw->mac.type >= e1000_82580) {
+	/* Set bit for Go Link disconnect if PHY reset is not blocked */
+	if (hw->mac.type >= e1000_82580 &&
+	    (e1000_check_reset_block(hw) != E1000_BLK_PHY_RESET)) {
 		uint32_t phpm_reg;
 
 		phpm_reg = E1000_READ_REG(hw, E1000_82580_PHY_POWER_MGMT);
@@ -1590,8 +1591,9 @@ eth_igb_close(struct rte_eth_dev *dev)
 	igb_release_manageability(hw);
 	igb_hw_control_release(hw);
 
-	/* Clear bit for Go Link disconnect */
-	if (hw->mac.type >= e1000_82580) {
+	/* Clear bit for Go Link disconnect if PHY reset is not blocked */
+	if (hw->mac.type >= e1000_82580 &&
+	    (e1000_check_reset_block(hw) != E1000_BLK_PHY_RESET)) {
 		uint32_t phpm_reg;
 
 		phpm_reg = E1000_READ_REG(hw, E1000_82580_PHY_POWER_MGMT);
Signature · 1 line
2.11.0
Reviewed-by on v2 1/1 Applied
#4 lore raw
Quoted 46 lines · Shweta Choudaha

From: Shweta Choudaha <[email protected]>

When PHY reset is blocked as is the case when BMC is connected via NC-SI do not set GO_LINKD bit in PHY power management register in dev_stop as this will disconnect the PHY. Also, in dev_close clear the GO_LINKD bit only if PHY reset is not blocked

Fixes 3af34dec0b41 ("igb: force phy power up/down")

---
drivers/net/e1000/igb_ethdev.c | 10 ++++++----

1 file changed, 6 insertions(+), 4 deletions(-)
drivers/net/e1000/igb_ethdev.c +6 -4
index d3a8f5bf4..4d4065d05 100644
@@ -1515,8 +1515,9 @@ eth_igb_stop(struct rte_eth_dev *dev)
 	igb_pf_reset_hw(hw);
 	E1000_WRITE_REG(hw, E1000_WUC, 0);
 
-	/* Set bit for Go Link disconnect */
-	if (hw->mac.type >= e1000_82580) {
+	/* Set bit for Go Link disconnect if PHY reset is not blocked */
+	if (hw->mac.type >= e1000_82580 &&
+	    (e1000_check_reset_block(hw) != E1000_BLK_PHY_RESET)) {
 		uint32_t phpm_reg;
 
 		phpm_reg = E1000_READ_REG(hw, E1000_82580_PHY_POWER_MGMT);
@@ -1590,8 +1591,9 @@ eth_igb_close(struct rte_eth_dev *dev)
 	igb_release_manageability(hw);
 	igb_hw_control_release(hw);
 
-	/* Clear bit for Go Link disconnect */
-	if (hw->mac.type >= e1000_82580) {
+	/* Clear bit for Go Link disconnect if PHY reset is not blocked */
+	if (hw->mac.type >= e1000_82580 &&
+	    (e1000_check_reset_block(hw) != E1000_BLK_PHY_RESET)) {
 		uint32_t phpm_reg;
 
 		phpm_reg = E1000_READ_REG(hw, E1000_82580_PHY_POWER_MGMT);
Signature · 1 line
2.11.0

Applied to dpdk-next-net-intel. Thanks.