Skip to content

L
linux
Commit d86cdfcd authored by David S. Miller's avatar David S. Miller
Browse files
Options

Merge branch 'r8152-adjustments' 

Hayes Wang says:

====================
r8152: code adjustment

Adjust test_bit(), clear_bit(), disable_aldps(), and enable_aldps().
====================
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 01dd194c cda9fb01
Show whitespace changes
Inline Side-by-side
Showing with 40 additions and 52 deletions
drivers/net/usb/r8152.c
View file @ d86cdfcd
...@@ -1938,7 +1938,6 @@ static void _rtl8152_set_rx_mode(struct net_device *netdev) ...@@ -1938,7 +1938,6 @@ static void _rtl8152_set_rx_mode(struct net_device *netdev)
__le32 tmp[2]; __le32 tmp[2];
u32 ocp_data; u32 ocp_data;
clear_bit(RTL8152_SET_RX_MODE, &tp->flags);
netif_stop_queue(netdev); netif_stop_queue(netdev);
ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR); ocp_data = ocp_read_dword(tp, MCU_TYPE_PLA, PLA_RCR);
ocp_data &= ~RCR_ACPT_ALL; ocp_data &= ~RCR_ACPT_ALL;
...@@ -2424,8 +2423,6 @@ static void rtl_phy_reset(struct r8152 *tp) ...@@ -2424,8 +2423,6 @@ static void rtl_phy_reset(struct r8152 *tp)
u16 data; u16 data;
int i; int i;
clear_bit(PHY_RESET, &tp->flags);
data = r8152_mdio_read(tp, MII_BMCR); data = r8152_mdio_read(tp, MII_BMCR);
/* don't reset again before the previous one complete */ /* don't reset again before the previous one complete */
...@@ -2455,23 +2452,23 @@ static void r8153_teredo_off(struct r8152 *tp) ...@@ -2455,23 +2452,23 @@ static void r8153_teredo_off(struct r8152 *tp)
ocp_write_dword(tp, MCU_TYPE_PLA, PLA_TEREDO_TIMER, 0); ocp_write_dword(tp, MCU_TYPE_PLA, PLA_TEREDO_TIMER, 0);
} }
static void r8152b_disable_aldps(struct r8152 *tp) static void r8152_aldps_en(struct r8152 *tp, bool enable)
{
ocp_reg_write(tp, OCP_ALDPS_CONFIG, ENPDNPS | LINKENA | DIS_SDSAVE);
msleep(20);
}
static inline void r8152b_enable_aldps(struct r8152 *tp)
{ {
if (enable) {
ocp_reg_write(tp, OCP_ALDPS_CONFIG, ENPWRSAVE | ENPDNPS | ocp_reg_write(tp, OCP_ALDPS_CONFIG, ENPWRSAVE | ENPDNPS |
LINKENA | DIS_SDSAVE); LINKENA | DIS_SDSAVE);
} else {
ocp_reg_write(tp, OCP_ALDPS_CONFIG, ENPDNPS | LINKENA |
DIS_SDSAVE);
msleep(20);
}
} }
static void rtl8152_disable(struct r8152 *tp) static void rtl8152_disable(struct r8152 *tp)
{ {
r8152b_disable_aldps(tp); r8152_aldps_en(tp, false);
rtl_disable(tp); rtl_disable(tp);
r8152b_enable_aldps(tp); r8152_aldps_en(tp, true);
} }
static void r8152b_hw_phy_cfg(struct r8152 *tp) static void r8152b_hw_phy_cfg(struct r8152 *tp)
...@@ -2783,30 +2780,26 @@ static void r8153_enter_oob(struct r8152 *tp) ...@@ -2783,30 +2780,26 @@ static void r8153_enter_oob(struct r8152 *tp)
ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data); ocp_write_dword(tp, MCU_TYPE_PLA, PLA_RCR, ocp_data);
} }
static void r8153_disable_aldps(struct r8152 *tp) static void r8153_aldps_en(struct r8152 *tp, bool enable)
{ {
u16 data; u16 data;
data = ocp_reg_read(tp, OCP_POWER_CFG); data = ocp_reg_read(tp, OCP_POWER_CFG);
if (enable) {
data |= EN_ALDPS;
ocp_reg_write(tp, OCP_POWER_CFG, data);
} else {
data &= ~EN_ALDPS; data &= ~EN_ALDPS;
ocp_reg_write(tp, OCP_POWER_CFG, data); ocp_reg_write(tp, OCP_POWER_CFG, data);
msleep(20); msleep(20);
} }
static void r8153_enable_aldps(struct r8152 *tp)
{
u16 data;
data = ocp_reg_read(tp, OCP_POWER_CFG);
data |= EN_ALDPS;
ocp_reg_write(tp, OCP_POWER_CFG, data);
} }
static void rtl8153_disable(struct r8152 *tp) static void rtl8153_disable(struct r8152 *tp)
{ {
r8153_disable_aldps(tp); r8153_aldps_en(tp, false);
rtl_disable(tp); rtl_disable(tp);
r8153_enable_aldps(tp); r8153_aldps_en(tp, true);
usb_enable_lpm(tp->udev); usb_enable_lpm(tp->udev);
} }
...@@ -2884,10 +2877,9 @@ static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u16 speed, u8 duplex) ...@@ -2884,10 +2877,9 @@ static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u16 speed, u8 duplex)
r8152_mdio_write(tp, MII_ADVERTISE, anar); r8152_mdio_write(tp, MII_ADVERTISE, anar);
r8152_mdio_write(tp, MII_BMCR, bmcr); r8152_mdio_write(tp, MII_BMCR, bmcr);
if (test_bit(PHY_RESET, &tp->flags)) { if (test_and_clear_bit(PHY_RESET, &tp->flags)) {
int i; int i;
clear_bit(PHY_RESET, &tp->flags);
for (i = 0; i < 50; i++) { for (i = 0; i < 50; i++) {
msleep(20); msleep(20);
if ((r8152_mdio_read(tp, MII_BMCR) & BMCR_RESET) == 0) if ((r8152_mdio_read(tp, MII_BMCR) & BMCR_RESET) == 0)
...@@ -2896,7 +2888,6 @@ static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u16 speed, u8 duplex) ...@@ -2896,7 +2888,6 @@ static int rtl8152_set_speed(struct r8152 *tp, u8 autoneg, u16 speed, u8 duplex)
} }
out: out:
return ret; return ret;
} }
...@@ -2905,9 +2896,9 @@ static void rtl8152_up(struct r8152 *tp) ...@@ -2905,9 +2896,9 @@ static void rtl8152_up(struct r8152 *tp)
if (test_bit(RTL8152_UNPLUG, &tp->flags)) if (test_bit(RTL8152_UNPLUG, &tp->flags))
return; return;
r8152b_disable_aldps(tp); r8152_aldps_en(tp, false);
r8152b_exit_oob(tp); r8152b_exit_oob(tp);
r8152b_enable_aldps(tp); r8152_aldps_en(tp, true);
} }
static void rtl8152_down(struct r8152 *tp) static void rtl8152_down(struct r8152 *tp)
...@@ -2918,9 +2909,9 @@ static void rtl8152_down(struct r8152 *tp) ...@@ -2918,9 +2909,9 @@ static void rtl8152_down(struct r8152 *tp)
} }
r8152_power_cut_en(tp, false); r8152_power_cut_en(tp, false);
r8152b_disable_aldps(tp); r8152_aldps_en(tp, false);
r8152b_enter_oob(tp); r8152b_enter_oob(tp);
r8152b_enable_aldps(tp); r8152_aldps_en(tp, true);
} }
static void rtl8153_up(struct r8152 *tp) static void rtl8153_up(struct r8152 *tp)
...@@ -2929,9 +2920,9 @@ static void rtl8153_up(struct r8152 *tp) ...@@ -2929,9 +2920,9 @@ static void rtl8153_up(struct r8152 *tp)
return; return;
r8153_u1u2en(tp, false); r8153_u1u2en(tp, false);
r8153_disable_aldps(tp); r8153_aldps_en(tp, false);
r8153_first_init(tp); r8153_first_init(tp);
r8153_enable_aldps(tp); r8153_aldps_en(tp, true);
r8153_u2p3en(tp, true); r8153_u2p3en(tp, true);
r8153_u1u2en(tp, true); r8153_u1u2en(tp, true);
usb_enable_lpm(tp->udev); usb_enable_lpm(tp->udev);
...@@ -2947,9 +2938,9 @@ static void rtl8153_down(struct r8152 *tp) ...@@ -2947,9 +2938,9 @@ static void rtl8153_down(struct r8152 *tp)
r8153_u1u2en(tp, false); r8153_u1u2en(tp, false);
r8153_u2p3en(tp, false); r8153_u2p3en(tp, false);
r8153_power_cut_en(tp, false); r8153_power_cut_en(tp, false);
r8153_disable_aldps(tp); r8153_aldps_en(tp, false);
r8153_enter_oob(tp); r8153_enter_oob(tp);
r8153_enable_aldps(tp); r8153_aldps_en(tp, true);
} }
static bool rtl8152_in_nway(struct r8152 *tp) static bool rtl8152_in_nway(struct r8152 *tp)
...@@ -2983,7 +2974,6 @@ static void set_carrier(struct r8152 *tp) ...@@ -2983,7 +2974,6 @@ static void set_carrier(struct r8152 *tp)
struct net_device *netdev = tp->netdev; struct net_device *netdev = tp->netdev;
u8 speed; u8 speed;
clear_bit(RTL8152_LINK_CHG, &tp->flags);
speed = rtl8152_get_speed(tp); speed = rtl8152_get_speed(tp);
if (speed & LINK_STATUS) { if (speed & LINK_STATUS) {
...@@ -3026,20 +3016,18 @@ static void rtl_work_func_t(struct work_struct *work) ...@@ -3026,20 +3016,18 @@ static void rtl_work_func_t(struct work_struct *work)
goto out1; goto out1;
} }
if (test_bit(RTL8152_LINK_CHG, &tp->flags)) if (test_and_clear_bit(RTL8152_LINK_CHG, &tp->flags))
set_carrier(tp); set_carrier(tp);
if (test_bit(RTL8152_SET_RX_MODE, &tp->flags)) if (test_and_clear_bit(RTL8152_SET_RX_MODE, &tp->flags))
_rtl8152_set_rx_mode(tp->netdev); _rtl8152_set_rx_mode(tp->netdev);
/* don't schedule napi before linking */ /* don't schedule napi before linking */
if (test_bit(SCHEDULE_NAPI, &tp->flags) && if (test_and_clear_bit(SCHEDULE_NAPI, &tp->flags) &&
netif_carrier_ok(tp->netdev)) { netif_carrier_ok(tp->netdev))
clear_bit(SCHEDULE_NAPI, &tp->flags);
napi_schedule(&tp->napi); napi_schedule(&tp->napi);
}
if (test_bit(PHY_RESET, &tp->flags)) if (test_and_clear_bit(PHY_RESET, &tp->flags))
rtl_phy_reset(tp); rtl_phy_reset(tp);
mutex_unlock(&tp->control); mutex_unlock(&tp->control);
...@@ -3238,7 +3226,7 @@ static void r8152b_init(struct r8152 *tp) ...@@ -3238,7 +3226,7 @@ static void r8152b_init(struct r8152 *tp)
if (test_bit(RTL8152_UNPLUG, &tp->flags)) if (test_bit(RTL8152_UNPLUG, &tp->flags))
return; return;
r8152b_disable_aldps(tp); r8152_aldps_en(tp, false);
if (tp->version == RTL_VER_01) { if (tp->version == RTL_VER_01) {
ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_LED_FEATURE); ocp_data = ocp_read_word(tp, MCU_TYPE_PLA, PLA_LED_FEATURE);
...@@ -3260,7 +3248,7 @@ static void r8152b_init(struct r8152 *tp) ...@@ -3260,7 +3248,7 @@ static void r8152b_init(struct r8152 *tp)
ocp_write_word(tp, MCU_TYPE_PLA, PLA_GPHY_INTR_IMR, ocp_data); ocp_write_word(tp, MCU_TYPE_PLA, PLA_GPHY_INTR_IMR, ocp_data);
r8152b_enable_eee(tp); r8152b_enable_eee(tp);
r8152b_enable_aldps(tp); r8152_aldps_en(tp, true);
r8152b_enable_fc(tp); r8152b_enable_fc(tp);
rtl_tally_reset(tp); rtl_tally_reset(tp);
...@@ -3278,7 +3266,7 @@ static void r8153_init(struct r8152 *tp) ...@@ -3278,7 +3266,7 @@ static void r8153_init(struct r8152 *tp)
if (test_bit(RTL8152_UNPLUG, &tp->flags)) if (test_bit(RTL8152_UNPLUG, &tp->flags))
return; return;
r8153_disable_aldps(tp); r8153_aldps_en(tp, false);
r8153_u1u2en(tp, false); r8153_u1u2en(tp, false);
for (i = 0; i < 500; i++) { for (i = 0; i < 500; i++) {
...@@ -3367,7 +3355,7 @@ static void r8153_init(struct r8152 *tp) ...@@ -3367,7 +3355,7 @@ static void r8153_init(struct r8152 *tp)
EEE_SPDWN_EN); EEE_SPDWN_EN);
r8153_enable_eee(tp); r8153_enable_eee(tp);
r8153_enable_aldps(tp); r8153_aldps_en(tp, true);
r8152b_enable_fc(tp); r8152b_enable_fc(tp);
rtl_tally_reset(tp); rtl_tally_reset(tp);
r8153_u2p3en(tp, true); r8153_u2p3en(tp, true);
......
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