[dpdk-dev] [PATCH 0/1] net/e1000: set/clear GO_LINKD bit only if PHY reset is not blocked

[dpdk-dev] [PATCH 0/1] net/e1000: set/clear GO_LINKD bit only if PHY reset is not blocked

[Shweta Choudaha]

From: Shweta Choudaha <shweta.choudaha@att.com>

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

-- 
2.11.0

[dpdk-dev] [PATCH 1/1] net/e1000: set/clear GO_LINKD bit only if PHY reset is not blocked

[Shweta Choudaha]

From: Shweta Choudaha <shweta.choudaha@att.com>

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")
CC: stable@dpdk.org

Signed-off-by: Shweta Choudaha <shweta.choudaha@att.com>
---
 drivers/net/e1000/igb_ethdev.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index d3a8f5bf4..d0de15531 100644
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -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);
-- 
2.11.0

[dpdk-dev] [PATCH v2 0/1] net/e1000: set/clear GO_LINKD bit only if PHY reset is not blocked

[Shweta Choudaha]

From: Shweta Choudaha <shweta.choudaha@att.com>

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

-- 
2.11.0

[dpdk-dev] [PATCH v2 1/1] net/e1000: set/clear GO_LINKD bit only if PHY reset is not blocked

[Shweta Choudaha]

From: Shweta Choudaha <shweta.choudaha@att.com>

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")
CC: stable@dpdk.org

Signed-off-by: Shweta Choudaha <shweta.choudaha@att.com>
---
 drivers/net/e1000/igb_ethdev.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
index d3a8f5bf4..4d4065d05 100644
--- a/drivers/net/e1000/igb_ethdev.c
+++ b/drivers/net/e1000/igb_ethdev.c
@@ -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);
-- 
2.11.0

Re: [dpdk-dev] [PATCH v2 1/1] net/e1000: set/clear GO_LINKD bit only if PHY reset is not blocked

[Ye Xiaolong]

On 05/16, Shweta Choudaha wrote:
>From: Shweta Choudaha <shweta.choudaha@att.com>
>
>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")
>CC: stable@dpdk.org
>
>Signed-off-by: Shweta Choudaha <shweta.choudaha@att.com>
>---
> drivers/net/e1000/igb_ethdev.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
>diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c
>index d3a8f5bf4..4d4065d05 100644
>--- a/drivers/net/e1000/igb_ethdev.c
>+++ b/drivers/net/e1000/igb_ethdev.c
>@@ -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);
>-- 
>2.11.0
>

Reviewed-by: Xiaolong Ye <xiaolong.ye@intel.com>

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