r8169: improve conditional firmware loading for RTL8168d
Heiner Kallweit
maintainerPATCH 1/1 r8169: improve conditional firmware loading for RTL8168d
Using constant MII_EXPANSION is misleading here because register 0x06 has a different meaning on page 0x0005. Here a proprietary PHY parameter is read by writing the parameter id to register 0x05 on page 0x0005, followed by reading the parameter value from register 0x06.
Signed-off-by Heiner Kallweit <[email protected]>
--- drivers/net/ethernet/realtek/r8169_main.c | 39 +++++++++++------------ 1 file changed, 19 insertions(+), 20 deletions(-)
drivers/net/ethernet/realtek/r8169_main.c +19 -20
@@ -2297,14 +2297,6 @@ static void rtl_apply_firmware(struct rtl8169_private *tp)rtl_fw_write_firmware (tp, tp->rtl_fw); } -static void rtl_apply_firmware_cond (struct rtl8169_private *tp,u8 reg,u16 val) -{ -if (rtl_readphy (tp, reg) != val) -netif_warn (tp, hw, tp->dev,"chipset not ready for firmware\n" ); -else -rtl_apply_firmware (tp); -} -static void rtl8168_config_eee_mac (struct rtl8169_private *tp) {/* Adjust EEE LED frequency */
@@ -2691,6 +2683,21 @@ static const struct phy_reg rtl8168d_1_phy_reg_init_1[] = { { 0x1f, 0x0002 } }; +static void rtl8168d_apply_firmware_cond (struct rtl8169_private *tp,u16 val) +{ +u16 reg_val; + +rtl_writephy (tp,0x1f ,0x0005 ); +rtl_writephy (tp,0x05 ,0x001b ); + reg_val =rtl_readphy (tp,0x06 ); +rtl_writephy (tp,0x1f ,0x0000 ); + +if (reg_val != val) +netif_warn (tp, hw, tp->dev,"chipset not ready for firmware\n" ); +else +rtl_apply_firmware (tp); +} +static void rtl8168d_1_hw_phy_config (struct rtl8169_private *tp) {rtl_writephy_batch (tp, rtl8168d_1_phy_reg_init_0);
@@ -2737,13 +2744,9 @@ static void rtl8168d_1_hw_phy_config(struct rtl8169_private *tp)rtl_writephy (tp,0x1f ,0x0002 );rtl_w0w1_phy (tp,0x02 ,0x0100 ,0x0600 );rtl_w0w1_phy (tp,0x03 ,0x0000 ,0xe000 ); - -rtl_writephy (tp,0x1f ,0x0005 ); -rtl_writephy (tp,0x05 ,0x001b ); - -rtl_apply_firmware_cond (tp,MII_EXPANSION ,0xbf00 ); -rtl_writephy (tp,0x1f ,0x0000 ); + +rtl8168d_apply_firmware_cond (tp,0xbf00 ); }static void rtl8168d_2_hw_phy_config (struct rtl8169_private *tp)
@@ -2782,13 +2785,9 @@ static void rtl8168d_2_hw_phy_config(struct rtl8169_private *tp)/* Switching regulator Slew rate */ rtl_writephy (tp,0x1f ,0x0002 );rtl_patchphy (tp,0x0f ,0x0017 ); - -rtl_writephy (tp,0x1f ,0x0005 ); -rtl_writephy (tp,0x05 ,0x001b ); - -rtl_apply_firmware_cond (tp,MII_EXPANSION ,0xb300 ); -rtl_writephy (tp,0x1f ,0x0000 ); + +rtl8168d_apply_firmware_cond (tp,0xb300 ); }static void rtl8168d_3_hw_phy_config (struct rtl8169_private *tp)
Signature · 1 line
2.24.0
From: Heiner Kallweit <[email protected]>
Date: Fri, 15 Nov 2019 21:35:22 +0100
Quoted 6 lines
Using constant
MII_EXPANSIONis misleading here because register0x06has a different meaning on page0x0005. Here a proprietary PHY parameter is read by writing the parameter id to register0x05on page0x0005, followed by reading the parameter value from register0x06.Signed-off-by Heiner Kallweit <[email protected]>
Applied.