r8169: factor out disabling ALDPS
Heiner Kallweit
maintainerPATCH 1/1 r8169: factor out disabling ALDPS
Chip versions from RTL8168g onward use the same sequence to disable ALDPS (Advanced Link-Down Power Saving). So let's factor this out.
Signed-off-by Heiner Kallweit <[email protected]>
--- drivers/net/ethernet/realtek/r8169.c | 31 ++++++++++------------------ 1 file changed, 11 insertions(+), 20 deletions(-)
drivers/net/ethernet/realtek/r8169.c +11 -20
@@ -3366,6 +3366,12 @@ static void rtl8411_hw_phy_config(struct rtl8169_private *tp)rtl_writephy (tp,0x1f ,0x0000 ); } +static void rtl8168g_disable_aldps (struct rtl8169_private *tp) +{ +phy_write (tp->phydev,0x1f ,0x0a43 ); +phy_clear_bits (tp->phydev,0x10 ,BIT (2 )); +} +static void rtl8168g_1_hw_phy_config (struct rtl8169_private *tp) {rtl_apply_firmware (tp);
@@ -3424,10 +3430,7 @@ static void rtl8168g_1_hw_phy_config(struct rtl8169_private *tp)rtl_writephy (tp,0x14 ,0x9065 );rtl_writephy (tp,0x14 ,0x1065 ); -/* Check ALDPS bit, disable it if enabled */ -rtl_writephy (tp,0x1f ,0x0a43 ); -if (rtl_readphy (tp,0x10 ) &0x0004 ) -rtl_w0w1_phy (tp,0x10 ,0x0000 ,0x0004 ); +rtl8168g_disable_aldps (tp);rtl_writephy (tp,0x1f ,0x0000 ); }
@@ -3539,10 +3542,7 @@ static void rtl8168h_1_hw_phy_config(struct rtl8169_private *tp)rtl_w0w1_phy (tp,0x11 ,0x0000 ,0x0080 );rtl_writephy (tp,0x1f ,0x0000 ); -/* Check ALDPS bit, disable it if enabled */ -rtl_writephy (tp,0x1f ,0x0a43 ); -if (rtl_readphy (tp,0x10 ) &0x0004 ) -rtl_w0w1_phy (tp,0x10 ,0x0000 ,0x0004 ); +rtl8168g_disable_aldps (tp);rtl_writephy (tp,0x1f ,0x0000 ); }
@@ -3612,10 +3612,7 @@ static void rtl8168h_2_hw_phy_config(struct rtl8169_private *tp)rtl_w0w1_phy (tp,0x11 ,0x0000 ,0x0080 );rtl_writephy (tp,0x1f ,0x0000 ); -/* Check ALDPS bit, disable it if enabled */ -rtl_writephy (tp,0x1f ,0x0a43 ); -if (rtl_readphy (tp,0x10 ) &0x0004 ) -rtl_w0w1_phy (tp,0x10 ,0x0000 ,0x0004 ); +rtl8168g_disable_aldps (tp);rtl_writephy (tp,0x1f ,0x0000 ); }
@@ -3654,10 +3651,7 @@ static void rtl8168ep_1_hw_phy_config(struct rtl8169_private *tp)rtl_w0w1_phy (tp,0x11 ,0x4000 ,0x2000 );rtl_writephy (tp,0x1f ,0x0000 ); -/* Check ALDPS bit, disable it if enabled */ -rtl_writephy (tp,0x1f ,0x0a43 ); -if (rtl_readphy (tp,0x10 ) &0x0004 ) -rtl_w0w1_phy (tp,0x10 ,0x0000 ,0x0004 ); +rtl8168g_disable_aldps (tp);rtl_writephy (tp,0x1f ,0x0000 ); }
@@ -3745,10 +3739,7 @@ static void rtl8168ep_2_hw_phy_config(struct rtl8169_private *tp)rtl_writephy (tp,0x14 ,0x1065 );rtl_writephy (tp,0x1f ,0x0000 ); -/* Check ALDPS bit, disable it if enabled */ -rtl_writephy (tp,0x1f ,0x0a43 ); -if (rtl_readphy (tp,0x10 ) &0x0004 ) -rtl_w0w1_phy (tp,0x10 ,0x0000 ,0x0004 ); +rtl8168g_disable_aldps (tp);rtl_writephy (tp,0x1f ,0x0000 ); }
Signature · 1 line
2.20.1
From: Heiner Kallweit <[email protected]>
Date: Wed, 23 Jan 2019 20:39:09 +0100
Quoted 4 lines
Chip versions from RTL8168g onward use the same sequence to disable ALDPS (Advanced Link-Down Power Saving). So let's factor this out.
Signed-off-by Heiner Kallweit <[email protected]>
Applied.