| Message ID | 20190516220331.91984-2-shweta.choudaha@gmail.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | xiaolong ye |
| Headers | show |
| Series | net/e1000: set/clear GO_LINKD bit only if PHY reset is not blocked | expand |
| Context | Check | Description |
|---|---|---|
| ci/checkpatch | success | coding style OK |
| ci/Intel-compilation | success | Compilation OK |
| ci/mellanox-Performance-Testing | success | Performance Testing PASS |
| ci/intel-Performance-Testing | success | Performance Testing PASS |
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.
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);