Patch "r8152: adjust ALDPS function" has been added to the 4.4-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
r8152: adjust ALDPS function
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
r8152-adjust-aldps-function.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
cda9fb01dc3cafd718b2865b447e869bf6624dddMon Sep 17 00:00:00 2001
From: hayeswang <[email protected]>
Date: Thu, 7 Jan 2016 17:51:12 +0800
Subject: r8152: adjust ALDPS function
From: hayeswang <[email protected]>
commit cda9fb01dc3cafd718b2865b447e869bf6624ddd upstream.
Replace disable_aldps() and enable_aldps() with aldps_en().
--- drivers/net/usb/r8152.c | 72 ++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 38 deletions(-)
drivers/net/usb/r8152.c +34 -38
@@ -2461,23 +2461,23 @@ static void r8153_teredo_off(struct r815ocp_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) -{ -ocp_reg_write (tp,OCP_ALDPS_CONFIG ,ENPWRSAVE |ENPDNPS | -LINKENA |DIS_SDSAVE ); +if (enable) { +ocp_reg_write (tp,OCP_ALDPS_CONFIG ,ENPWRSAVE |ENPDNPS | +LINKENA |DIS_SDSAVE ); + }else { +ocp_reg_write (tp,OCP_ALDPS_CONFIG ,ENPDNPS |LINKENA | +DIS_SDSAVE ); +msleep (20 ); + } }static void rtl8152_disable (struct r8152 *tp) { -r8152b_disable_aldps (tp); +r8152_aldps_en (tp, false);rtl_disable (tp); -r8152b_enable_aldps (tp); +r8152_aldps_en (tp, true); }static void r8152b_hw_phy_cfg (struct r8152 *tp)
@@ -2789,30 +2789,26 @@ static void r8153_enter_oob(struct r8152ocp_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; data =ocp_reg_read (tp,OCP_POWER_CFG ); - data &= ~EN_ALDPS ; -ocp_reg_write (tp,OCP_POWER_CFG , data); -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); +if (enable) { + data |=EN_ALDPS ; +ocp_reg_write (tp,OCP_POWER_CFG , data); + }else { + data &= ~EN_ALDPS ; +ocp_reg_write (tp,OCP_POWER_CFG , data); +msleep (20 ); + } }static void rtl8153_disable (struct r8152 *tp) { -r8153_disable_aldps (tp); +r8153_aldps_en (tp, false);rtl_disable (tp); -r8153_enable_aldps (tp); +r8153_aldps_en (tp, true);usb_enable_lpm (tp->udev); }
@@ -2909,9 +2905,9 @@ static void rtl8152_up(struct r8152 *tp)if (test_bit (RTL8152_UNPLUG , &tp->flags))return ; -r8152b_disable_aldps (tp); +r8152_aldps_en (tp, false);r8152b_exit_oob (tp); -r8152b_enable_aldps (tp); +r8152_aldps_en (tp, true); }static void rtl8152_down (struct r8152 *tp)
@@ -2922,9 +2918,9 @@ static void rtl8152_down(struct r8152 *t }r8152_power_cut_en (tp, false); -r8152b_disable_aldps (tp); +r8152_aldps_en (tp, false);r8152b_enter_oob (tp); -r8152b_enable_aldps (tp); +r8152_aldps_en (tp, true); }static void rtl8153_up (struct r8152 *tp)
@@ -2933,9 +2929,9 @@ static void rtl8153_up(struct r8152 *tp)return ;r8153_u1u2en (tp, false); -r8153_disable_aldps (tp); +r8153_aldps_en (tp, false);r8153_first_init (tp); -r8153_enable_aldps (tp); +r8153_aldps_en (tp, true);r8153_u2p3en (tp, true);r8153_u1u2en (tp, true);usb_enable_lpm (tp->udev);
@@ -2951,9 +2947,9 @@ static void rtl8153_down(struct r8152 *tr8153_u1u2en (tp, false);r8153_u2p3en (tp, false);r8153_power_cut_en (tp, false); -r8153_disable_aldps (tp); +r8153_aldps_en (tp, false);r8153_enter_oob (tp); -r8153_enable_aldps (tp); +r8153_aldps_en (tp, true); }static bool rtl8152_in_nway (struct r8152 *tp)
@@ -3280,7 +3276,7 @@ static void r8152b_init(struct r8152 *tpif (test_bit (RTL8152_UNPLUG , &tp->flags))return ; -r8152b_disable_aldps (tp); +r8152_aldps_en (tp, false);if (tp->version ==RTL_VER_01 ) { ocp_data =ocp_read_word (tp,MCU_TYPE_PLA ,PLA_LED_FEATURE );
@@ -3302,7 +3298,7 @@ static void r8152b_init(struct r8152 *tpocp_write_word (tp,MCU_TYPE_PLA ,PLA_GPHY_INTR_IMR , ocp_data);r8152b_enable_eee (tp); -r8152b_enable_aldps (tp); +r8152_aldps_en (tp, true);r8152b_enable_fc (tp);rtl_tally_reset (tp);
@@ -3320,7 +3316,7 @@ static void r8153_init(struct r8152 *tp)if (test_bit (RTL8152_UNPLUG , &tp->flags))return ; -r8153_disable_aldps (tp); +r8153_aldps_en (tp, false);r8153_u1u2en (tp, false);for (i =0 ; i <500 ; i++) {
@@ -3409,7 +3405,7 @@ static void r8153_init(struct r8152 *tp) EEE_SPDWN_EN);r8153_enable_eee (tp); -r8153_enable_aldps (tp); +r8153_aldps_en (tp, true);r8152b_enable_fc (tp);rtl_tally_reset (tp);r8153_u2p3en (tp, true);
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/r8152-fix-the-wake-event.patchqueue-4.4/r8152-adjust-aldps-function.patchqueue-4.4/r8152-use-test_and_clear_bit.patch