net/ngbe: fix external PHY power down

[dpdk.git] / drivers / net / ngbe / base / ngbe_phy_yt.c

diff --git a/drivers/net/ngbe/base/ngbe_phy_yt.c b/drivers/net/ngbe/base/ngbe_phy_yt.c
index 2d184a1..f46121b 100644 (file)
--- a/drivers/net/ngbe/base/ngbe_phy_yt.c
+++ b/drivers/net/ngbe/base/ngbe_phy_yt.c
@@ -100,25 +100,13 @@ s32 ngbe_write_phy_reg_sds_ext_yt(struct ngbe_hw *hw,
 
 s32 ngbe_init_phy_yt(struct ngbe_hw *hw)
 {
-       u16 value = 0;
-
-       DEBUGFUNC("ngbe_init_phy_yt");
-
        /* close sds area register */
        ngbe_write_phy_reg_ext_yt(hw, YT_SMI_PHY, 0, 0);
        /* enable interrupts */
        ngbe_write_phy_reg_mdi(hw, YT_INTR, 0,
                                YT_INTR_ENA_MASK | YT_SDS_INTR_ENA_MASK);
 
-       /* power down in fiber mode */
-       hw->phy.read_reg(hw, YT_BCR, 0, &value);
-       value |= YT_BCR_PWDN;
-       hw->phy.write_reg(hw, YT_BCR, 0, value);
-
-       /* power down in UTP mode */
-       ngbe_read_phy_reg_mdi(hw, YT_BCR, 0, &value);
-       value |= YT_BCR_PWDN;
-       ngbe_write_phy_reg_mdi(hw, YT_BCR, 0, value);
+       hw->phy.set_phy_power(hw, false);
 
        return 0;
 }
@@ -130,7 +118,6 @@ s32 ngbe_setup_phy_link_yt(struct ngbe_hw *hw, u32 speed,
        u16 value_r9 = 0;
        u16 value;
 
-       DEBUGFUNC("ngbe_setup_phy_link_yt");
        UNREFERENCED_PARAMETER(autoneg_wait_to_complete);
 
        hw->phy.autoneg_advertised = 0;
@@ -153,7 +140,7 @@ s32 ngbe_setup_phy_link_yt(struct ngbe_hw *hw, u32 speed,
                        default:
                                value = YT_BCR_SPEED_SELECT0 |
                                        YT_BCR_SPEED_SELECT1;
-                               DEBUGOUT("unknown speed = 0x%x.\n",
+                               DEBUGOUT("unknown speed = 0x%x.",
                                        speed);
                                break;
                        }
@@ -203,10 +190,7 @@ s32 ngbe_setup_phy_link_yt(struct ngbe_hw *hw, u32 speed,
                value |= YT_BCR_RESET | YT_BCR_ANE | YT_BCR_RESTART_AN;
                hw->phy.write_reg(hw, YT_BCR, 0, value);
 skip_an:
-               /* power on in UTP mode */
-               ngbe_read_phy_reg_mdi(hw, YT_BCR, 0, &value);
-               value &= ~YT_BCR_PWDN;
-               ngbe_write_phy_reg_mdi(hw, YT_BCR, 0, value);
+               hw->phy.set_phy_power(hw, true);
        } else if ((value & YT_CHIP_MODE_MASK) == YT_CHIP_MODE_SEL(1)) {
                /* fiber to rgmii */
                hw->phy.autoneg_advertised |= NGBE_LINK_SPEED_1GB_FULL;
@@ -224,19 +208,9 @@ skip_an:
                /* software reset */
                ngbe_write_phy_reg_sds_ext_yt(hw, 0x0, 0, 0x9140);
 
-               /* power on phy */
-               hw->phy.read_reg(hw, YT_BCR, 0, &value);
-               value &= ~YT_BCR_PWDN;
-               hw->phy.write_reg(hw, YT_BCR, 0, value);
+               hw->phy.set_phy_power(hw, true);
        } else if ((value & YT_CHIP_MODE_MASK) == YT_CHIP_MODE_SEL(2)) {
-               /* power on in UTP mode */
-               ngbe_read_phy_reg_mdi(hw, YT_BCR, 0, &value);
-               value &= ~YT_BCR_PWDN;
-               ngbe_write_phy_reg_mdi(hw, YT_BCR, 0, value);
-               /* power down in fiber mode */
-               hw->phy.read_reg(hw, YT_BCR, 0, &value);
-               value &= ~YT_BCR_PWDN;
-               hw->phy.write_reg(hw, YT_BCR, 0, value);
+               hw->phy.set_phy_power(hw, true);
 
                hw->phy.read_reg(hw, YT_SPST, 0, &value);
                if (value & YT_SPST_LINK) {
@@ -306,10 +280,7 @@ skip_an:
                value &= ~YT_SMI_PHY_SW_RST;
                ngbe_write_phy_reg_ext_yt(hw, YT_CHIP, 0, value);
 
-               /* power on phy */
-               hw->phy.read_reg(hw, YT_BCR, 0, &value);
-               value &= ~YT_BCR_PWDN;
-               hw->phy.write_reg(hw, YT_BCR, 0, value);
+               hw->phy.set_phy_power(hw, true);
        }
 
        ngbe_write_phy_reg_ext_yt(hw, YT_SMI_PHY, 0, 0);
@@ -324,8 +295,6 @@ s32 ngbe_reset_phy_yt(struct ngbe_hw *hw)
        u16 ctrl = 0;
        s32 status = 0;
 
-       DEBUGFUNC("ngbe_reset_phy_yt");
-
        if (hw->phy.type != ngbe_phy_yt8521s &&
                hw->phy.type != ngbe_phy_yt8521s_sfi)
                return NGBE_ERR_PHY_TYPE;
@@ -361,7 +330,7 @@ s32 ngbe_reset_phy_yt(struct ngbe_hw *hw)
        }
 
        if (i == YT_PHY_RST_WAIT_PERIOD) {
-               DEBUGOUT("PHY reset polling failed to complete.\n");
+               DEBUGOUT("PHY reset polling failed to complete.");
                return NGBE_ERR_RESET_FAILED;
        }
 
@@ -373,8 +342,6 @@ s32 ngbe_get_phy_advertised_pause_yt(struct ngbe_hw *hw, u8 *pause_bit)
        u16 value;
        s32 status = 0;
 
-       DEBUGFUNC("ngbe_get_phy_advertised_pause_yt");
-
        status = hw->phy.read_reg(hw, YT_ANA, 0, &value);
        value &= YT_FANA_PAUSE_MASK;
        *pause_bit = (u8)(value >> 7);
@@ -387,8 +354,6 @@ s32 ngbe_get_phy_lp_advertised_pause_yt(struct ngbe_hw *hw, u8 *pause_bit)
        u16 value;
        s32 status = 0;
 
-       DEBUGFUNC("ngbe_get_phy_lp_advertised_pause_yt");
-
        status = hw->phy.read_reg(hw, YT_LPAR, 0, &value);
        value &= YT_FLPAR_PAUSE_MASK;
        *pause_bit = (u8)(value >> 7);
@@ -401,9 +366,6 @@ s32 ngbe_set_phy_pause_adv_yt(struct ngbe_hw *hw, u16 pause_bit)
        u16 value;
        s32 status = 0;
 
-       DEBUGFUNC("ngbe_set_phy_pause_adv_yt");
-
-
        status = hw->phy.read_reg(hw, YT_ANA, 0, &value);
        value &= ~YT_FANA_PAUSE_MASK;
        value |= pause_bit;
@@ -421,8 +383,6 @@ s32 ngbe_check_phy_link_yt(struct ngbe_hw *hw,
        u16 phy_data = 0;
        u16 insr = 0;
 
-       DEBUGFUNC("ngbe_check_phy_link_yt");
-
        /* Initialize speed and link to default case */
        *link_up = false;
        *speed = NGBE_LINK_SPEED_UNKNOWN;
@@ -448,3 +408,26 @@ s32 ngbe_check_phy_link_yt(struct ngbe_hw *hw,
        return status;
 }
 
+s32 ngbe_set_phy_power_yt(struct ngbe_hw *hw, bool on)
+{
+       u16 value = 0;
+
+       /* power down/up in fiber mode */
+       hw->phy.read_reg(hw, YT_BCR, 0, &value);
+       if (on)
+               value &= ~YT_BCR_PWDN;
+       else
+               value |= YT_BCR_PWDN;
+       hw->phy.write_reg(hw, YT_BCR, 0, value);
+
+       value = 0;
+       /* power down/up in UTP mode */
+       ngbe_read_phy_reg_mdi(hw, YT_BCR, 0, &value);
+       if (on)
+               value &= ~YT_BCR_PWDN;
+       else
+               value |= YT_BCR_PWDN;
+       ngbe_write_phy_reg_mdi(hw, YT_BCR, 0, value);
+
+       return 0;
+}