Skip to content

L
linux
Commit e7bde56b authored by Hayes Wang's avatar Hayes Wang Committed by David S. Miller
Browse files
Options

r8152: add a helper function about setting EEE 

Add a helper function "rtl_eee_enable" for setting EEE. Besides, I
move r8153_eee_en() and r8153b_eee_en(). And, I remove r8152b_enable_eee(),
r8153_set_eee(), and r8153b_set_eee().
Signed-off-by: default avatarHayes Wang <hayeswang@realtek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f4a93be6
Hide whitespace changes
Inline Side-by-side
Showing with 77 additions and 91 deletions
drivers/net/usb/r8152.c
View file @ e7bde56b
...@@ -3202,14 +3202,75 @@ static void r8152_eee_en(struct r8152 *tp, bool enable) ...@@ -3202,14 +3202,75 @@ static void r8152_eee_en(struct r8152 *tp, bool enable)
ocp_reg_write(tp, OCP_EEE_CONFIG3, config3); ocp_reg_write(tp, OCP_EEE_CONFIG3, config3);
} }
static void r8152b_enable_eee(struct r8152 *tp) static void r8153_eee_en(struct r8152 *tp, bool enable)
{ {
if (tp->eee_en) { u32 ocp_data;
r8152_eee_en(tp, true); u16 config;
r8152_mmd_write(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV, tp->eee_adv);
ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EEE_CR);
config = ocp_reg_read(tp, OCP_EEE_CFG);
if (enable) {
ocp_data |= EEE_RX_EN | EEE_TX_EN;
config |= EEE10_EN;
} else { } else {
r8152_eee_en(tp, false); ocp_data &= ~(EEE_RX_EN | EEE_TX_EN);
r8152_mmd_write(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV, 0); config &= ~EEE10_EN;
}
ocp_write_word(tp, MCU_TYPE_PLA, PLA_EEE_CR, ocp_data);
ocp_reg_write(tp, OCP_EEE_CFG, config);
}
static void r8153b_eee_en(struct r8152 *tp, bool enable)
{
r8153_eee_en(tp, enable);
if (enable)
r8153b_ups_flags_w1w0(tp, UPS_FLAGS_EN_EEE, 0);
else
r8153b_ups_flags_w1w0(tp, 0, UPS_FLAGS_EN_EEE);
}
static void rtl_eee_enable(struct r8152 *tp, bool enable)
{
switch (tp->version) {
case RTL_VER_01:
case RTL_VER_02:
case RTL_VER_07:
if (enable) {
r8152_eee_en(tp, true);
r8152_mmd_write(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV,
tp->eee_adv);
} else {
r8152_eee_en(tp, false);
r8152_mmd_write(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV, 0);
}
break;
case RTL_VER_03:
case RTL_VER_04:
case RTL_VER_05:
case RTL_VER_06:
if (enable) {
r8153_eee_en(tp, true);
ocp_reg_write(tp, OCP_EEE_ADV, tp->eee_adv);
} else {
r8153_eee_en(tp, false);
ocp_reg_write(tp, OCP_EEE_ADV, 0);
}
break;
case RTL_VER_08:
case RTL_VER_09:
if (enable) {
r8153b_eee_en(tp, true);
ocp_reg_write(tp, OCP_EEE_ADV, tp->eee_adv);
} else {
r8153b_eee_en(tp, false);
ocp_reg_write(tp, OCP_EEE_ADV, 0);
}
break;
default:
break;
} }
} }
...@@ -3231,7 +3292,7 @@ static void rtl8152_disable(struct r8152 *tp) ...@@ -3231,7 +3292,7 @@ static void rtl8152_disable(struct r8152 *tp)
static void r8152b_hw_phy_cfg(struct r8152 *tp) static void r8152b_hw_phy_cfg(struct r8152 *tp)
{ {
r8152b_enable_eee(tp); rtl_eee_enable(tp, tp->eee_en);
r8152_aldps_en(tp, true); r8152_aldps_en(tp, true);
r8152b_enable_fc(tp); r8152b_enable_fc(tp);
...@@ -3425,36 +3486,6 @@ static void r8153b_aldps_en(struct r8152 *tp, bool enable) ...@@ -3425,36 +3486,6 @@ static void r8153b_aldps_en(struct r8152 *tp, bool enable)
r8153b_ups_flags_w1w0(tp, 0, UPS_FLAGS_EN_ALDPS); r8153b_ups_flags_w1w0(tp, 0, UPS_FLAGS_EN_ALDPS);
} }
static void r8153_eee_en(struct r8152 *tp, bool enable)
{
u32 ocp_data;
u16 config;
ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_EEE_CR);
config = ocp_reg_read(tp, OCP_EEE_CFG);
if (enable) {
ocp_data |= EEE_RX_EN | EEE_TX_EN;
config |= EEE10_EN;
} else {
ocp_data &= ~(EEE_RX_EN | EEE_TX_EN);
config &= ~EEE10_EN;
}
ocp_write_word(tp, MCU_TYPE_PLA, PLA_EEE_CR, ocp_data);
ocp_reg_write(tp, OCP_EEE_CFG, config);
}
static void r8153b_eee_en(struct r8152 *tp, bool enable)
{
r8153_eee_en(tp, enable);
if (enable)
r8153b_ups_flags_w1w0(tp, UPS_FLAGS_EN_EEE, 0);
else
r8153b_ups_flags_w1w0(tp, 0, UPS_FLAGS_EN_EEE);
}
static void r8153b_enable_fc(struct r8152 *tp) static void r8153b_enable_fc(struct r8152 *tp)
{ {
r8152b_enable_fc(tp); r8152b_enable_fc(tp);
...@@ -3470,8 +3501,7 @@ static void r8153_hw_phy_cfg(struct r8152 *tp) ...@@ -3470,8 +3501,7 @@ static void r8153_hw_phy_cfg(struct r8152 *tp)
r8153_aldps_en(tp, false); r8153_aldps_en(tp, false);
/* disable EEE before updating the PHY parameters */ /* disable EEE before updating the PHY parameters */
r8153_eee_en(tp, false); rtl_eee_enable(tp, false);
ocp_reg_write(tp, OCP_EEE_ADV, 0);
if (tp->version == RTL_VER_03) { if (tp->version == RTL_VER_03) {
data = ocp_reg_read(tp, OCP_EEE_CFG); data = ocp_reg_read(tp, OCP_EEE_CFG);
...@@ -3502,10 +3532,8 @@ static void r8153_hw_phy_cfg(struct r8152 *tp) ...@@ -3502,10 +3532,8 @@ static void r8153_hw_phy_cfg(struct r8152 *tp)
sram_write(tp, SRAM_10M_AMP1, 0x00af); sram_write(tp, SRAM_10M_AMP1, 0x00af);
sram_write(tp, SRAM_10M_AMP2, 0x0208); sram_write(tp, SRAM_10M_AMP2, 0x0208);
if (tp->eee_en) { if (tp->eee_en)
r8153_eee_en(tp, true); rtl_eee_enable(tp, true);
ocp_reg_write(tp, OCP_EEE_ADV, tp->eee_adv);
}
r8153_aldps_en(tp, true); r8153_aldps_en(tp, true);
r8152b_enable_fc(tp); r8152b_enable_fc(tp);
...@@ -3545,8 +3573,7 @@ static void r8153b_hw_phy_cfg(struct r8152 *tp) ...@@ -3545,8 +3573,7 @@ static void r8153b_hw_phy_cfg(struct r8152 *tp)
r8153b_aldps_en(tp, false); r8153b_aldps_en(tp, false);
/* disable EEE before updating the PHY parameters */ /* disable EEE before updating the PHY parameters */
r8153b_eee_en(tp, false); rtl_eee_enable(tp, false);
ocp_reg_write(tp, OCP_EEE_ADV, 0);
r8153b_green_en(tp, test_bit(GREEN_ETHERNET, &tp->flags)); r8153b_green_en(tp, test_bit(GREEN_ETHERNET, &tp->flags));
...@@ -3608,10 +3635,8 @@ static void r8153b_hw_phy_cfg(struct r8152 *tp) ...@@ -3608,10 +3635,8 @@ static void r8153b_hw_phy_cfg(struct r8152 *tp)
r8153b_ups_flags_w1w0(tp, ups_flags, 0); r8153b_ups_flags_w1w0(tp, ups_flags, 0);
if (tp->eee_en) { if (tp->eee_en)
r8153b_eee_en(tp, true); rtl_eee_enable(tp, true);
ocp_reg_write(tp, OCP_EEE_ADV, tp->eee_adv);
}
r8153b_aldps_en(tp, true); r8153b_aldps_en(tp, true);
r8153b_enable_fc(tp); r8153b_enable_fc(tp);
...@@ -4930,12 +4955,7 @@ static int r8152_set_eee(struct r8152 *tp, struct ethtool_eee *eee) ...@@ -4930,12 +4955,7 @@ static int r8152_set_eee(struct r8152 *tp, struct ethtool_eee *eee)
tp->eee_en = eee->eee_enabled; tp->eee_en = eee->eee_enabled;
tp->eee_adv = val; tp->eee_adv = val;
r8152_eee_en(tp, eee->eee_enabled); rtl_eee_enable(tp, tp->eee_en);
if (eee->eee_enabled)
r8152_mmd_write(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV, val);
else
r8152_mmd_write(tp, MDIO_MMD_AN, MDIO_AN_EEE_ADV, 0);
return 0; return 0;
} }
...@@ -4963,40 +4983,6 @@ static int r8153_get_eee(struct r8152 *tp, struct ethtool_eee *eee) ...@@ -4963,40 +4983,6 @@ static int r8153_get_eee(struct r8152 *tp, struct ethtool_eee *eee)
return 0; return 0;
} }
static int r8153_set_eee(struct r8152 *tp, struct ethtool_eee *eee)
{
u16 val = ethtool_adv_to_mmd_eee_adv_t(eee->advertised);
tp->eee_en = eee->eee_enabled;
tp->eee_adv = val;
r8153_eee_en(tp, eee->eee_enabled);
if (eee->eee_enabled)
ocp_reg_write(tp, OCP_EEE_ADV, val);
else
ocp_reg_write(tp, OCP_EEE_ADV, 0);
return 0;
}
static int r8153b_set_eee(struct r8152 *tp, struct ethtool_eee *eee)
{
u16 val = ethtool_adv_to_mmd_eee_adv_t(eee->advertised);
tp->eee_en = eee->eee_enabled;
tp->eee_adv = val;
r8153b_eee_en(tp, eee->eee_enabled);
if (eee->eee_enabled)
ocp_reg_write(tp, OCP_EEE_ADV, val);
else
ocp_reg_write(tp, OCP_EEE_ADV, 0);
return 0;
}
static int static int
rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata) rtl_ethtool_get_eee(struct net_device *net, struct ethtool_eee *edata)
{ {
...@@ -5382,7 +5368,7 @@ static int rtl_ops_init(struct r8152 *tp) ...@@ -5382,7 +5368,7 @@ static int rtl_ops_init(struct r8152 *tp)
ops->down = rtl8153_down; ops->down = rtl8153_down;
ops->unload = rtl8153_unload; ops->unload = rtl8153_unload;
ops->eee_get = r8153_get_eee; ops->eee_get = r8153_get_eee;
ops->eee_set = r8153_set_eee; ops->eee_set = r8152_set_eee;
ops->in_nway = rtl8153_in_nway; ops->in_nway = rtl8153_in_nway;
ops->hw_phy_cfg = r8153_hw_phy_cfg; ops->hw_phy_cfg = r8153_hw_phy_cfg;
ops->autosuspend_en = rtl8153_runtime_enable; ops->autosuspend_en = rtl8153_runtime_enable;
...@@ -5400,7 +5386,7 @@ static int rtl_ops_init(struct r8152 *tp) ...@@ -5400,7 +5386,7 @@ static int rtl_ops_init(struct r8152 *tp)
ops->down = rtl8153b_down; ops->down = rtl8153b_down;
ops->unload = rtl8153b_unload; ops->unload = rtl8153b_unload;
ops->eee_get = r8153_get_eee; ops->eee_get = r8153_get_eee;
ops->eee_set = r8153b_set_eee; ops->eee_set = r8152_set_eee;
ops->in_nway = rtl8153_in_nway; ops->in_nway = rtl8153_in_nway;
ops->hw_phy_cfg = r8153b_hw_phy_cfg; ops->hw_phy_cfg = r8153b_hw_phy_cfg;
ops->autosuspend_en = rtl8153b_runtime_enable; ops->autosuspend_en = rtl8153b_runtime_enable;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7