Skip to content

K
Kernel

openeuler / Kernel
1 年多 前同步成功

通知 8
Star 0
Fork 0
K
Kernel
提交 becd837e 编写于 作者: H Heiner Kallweit 提交者： David S. Miller
浏览文件
操作

r8169: prepare for exporting rtl_hw_phy_config 

In preperation of factoring out the PHY configuration to a separate
source file this patch:
- avoids accessing rtl8169_private internals by passing the phy_device
  and mac_version as separate parameters
- renames rtl_hw_phy_config to r8169_hw_phy_config to avoid namespace
  clashes with other drivers for Realtek hardware
Signed-off-by: NHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 916d08f6
隐藏空白更改
内联 并排
Showing with 117 addition and 100 deletion
drivers/net/ethernet/realtek/r8169_main.c
浏览文件 @ becd837e
...@@ -693,6 +693,8 @@ struct rtl8169_private { ...@@ -693,6 +693,8 @@ struct rtl8169_private {
}; };
typedef void (*rtl_generic_fct)(struct rtl8169_private *tp); typedef void (*rtl_generic_fct)(struct rtl8169_private *tp);
typedef void (*rtl_phy_cfg_fct)(struct rtl8169_private *tp,
struct phy_device *phydev);
MODULE_AUTHOR("Realtek and the Linux r8169 crew <netdev@vger.kernel.org>"); MODULE_AUTHOR("Realtek and the Linux r8169 crew <netdev@vger.kernel.org>");
MODULE_DESCRIPTION("RealTek RTL-8169 Gigabit Ethernet driver"); MODULE_DESCRIPTION("RealTek RTL-8169 Gigabit Ethernet driver");
...@@ -2349,7 +2351,8 @@ static void rtl8125_config_eee_phy(struct rtl8169_private *tp) ...@@ -2349,7 +2351,8 @@ static void rtl8125_config_eee_phy(struct rtl8169_private *tp)
phy_modify_paged(phydev, 0xa6d, 0x14, 0x0010, 0x0000); phy_modify_paged(phydev, 0xa6d, 0x14, 0x0010, 0x0000);
} }
static void rtl8169s_hw_phy_config(struct rtl8169_private *tp) static void rtl8169s_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
static const struct phy_reg phy_reg_init[] = { static const struct phy_reg phy_reg_init[] = {
{ 0x1f, 0x0001 }, { 0x1f, 0x0001 },
...@@ -2416,9 +2419,10 @@ static void rtl8169s_hw_phy_config(struct rtl8169_private *tp) ...@@ -2416,9 +2419,10 @@ static void rtl8169s_hw_phy_config(struct rtl8169_private *tp)
rtl_writephy_batch(tp, phy_reg_init); rtl_writephy_batch(tp, phy_reg_init);
} }
static void rtl8169sb_hw_phy_config(struct rtl8169_private *tp) static void rtl8169sb_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
phy_write_paged(tp->phydev, 0x0002, 0x01, 0x90d0); phy_write_paged(phydev, 0x0002, 0x01, 0x90d0);
} }
static void rtl8169scd_hw_phy_config_quirk(struct rtl8169_private *tp) static void rtl8169scd_hw_phy_config_quirk(struct rtl8169_private *tp)
...@@ -2432,7 +2436,8 @@ static void rtl8169scd_hw_phy_config_quirk(struct rtl8169_private *tp) ...@@ -2432,7 +2436,8 @@ static void rtl8169scd_hw_phy_config_quirk(struct rtl8169_private *tp)
phy_write_paged(tp->phydev, 0x0001, 0x10, 0xf01b); phy_write_paged(tp->phydev, 0x0001, 0x10, 0xf01b);
} }
static void rtl8169scd_hw_phy_config(struct rtl8169_private *tp) static void rtl8169scd_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
static const struct phy_reg phy_reg_init[] = { static const struct phy_reg phy_reg_init[] = {
{ 0x1f, 0x0001 }, { 0x1f, 0x0001 },
...@@ -2479,7 +2484,8 @@ static void rtl8169scd_hw_phy_config(struct rtl8169_private *tp) ...@@ -2479,7 +2484,8 @@ static void rtl8169scd_hw_phy_config(struct rtl8169_private *tp)
rtl8169scd_hw_phy_config_quirk(tp); rtl8169scd_hw_phy_config_quirk(tp);
} }
static void rtl8169sce_hw_phy_config(struct rtl8169_private *tp) static void rtl8169sce_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
static const struct phy_reg phy_reg_init[] = { static const struct phy_reg phy_reg_init[] = {
{ 0x1f, 0x0001 }, { 0x1f, 0x0001 },
...@@ -2532,7 +2538,8 @@ static void rtl8169sce_hw_phy_config(struct rtl8169_private *tp) ...@@ -2532,7 +2538,8 @@ static void rtl8169sce_hw_phy_config(struct rtl8169_private *tp)
rtl_writephy_batch(tp, phy_reg_init); rtl_writephy_batch(tp, phy_reg_init);
} }
static void rtl8168bb_hw_phy_config(struct rtl8169_private *tp) static void rtl8168bb_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
rtl_writephy(tp, 0x1f, 0x0001); rtl_writephy(tp, 0x1f, 0x0001);
rtl_patchphy(tp, 0x16, 1 << 0); rtl_patchphy(tp, 0x16, 1 << 0);
...@@ -2540,25 +2547,29 @@ static void rtl8168bb_hw_phy_config(struct rtl8169_private *tp) ...@@ -2540,25 +2547,29 @@ static void rtl8168bb_hw_phy_config(struct rtl8169_private *tp)
rtl_writephy(tp, 0x1f, 0x0000); rtl_writephy(tp, 0x1f, 0x0000);
} }
static void rtl8168bef_hw_phy_config(struct rtl8169_private *tp) static void rtl8168bef_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
phy_write_paged(tp->phydev, 0x0001, 0x10, 0xf41b); phy_write_paged(phydev, 0x0001, 0x10, 0xf41b);
} }
static void rtl8168cp_1_hw_phy_config(struct rtl8169_private *tp) static void rtl8168cp_1_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
phy_write(tp->phydev, 0x1d, 0x0f00); phy_write(phydev, 0x1d, 0x0f00);
phy_write_paged(tp->phydev, 0x0002, 0x0c, 0x1ec8); phy_write_paged(phydev, 0x0002, 0x0c, 0x1ec8);
} }
static void rtl8168cp_2_hw_phy_config(struct rtl8169_private *tp) static void rtl8168cp_2_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
phy_set_bits(tp->phydev, 0x14, BIT(5)); phy_set_bits(phydev, 0x14, BIT(5));
phy_set_bits(tp->phydev, 0x0d, BIT(5)); phy_set_bits(phydev, 0x0d, BIT(5));
phy_write_paged(tp->phydev, 0x0001, 0x1d, 0x3d98); phy_write_paged(phydev, 0x0001, 0x1d, 0x3d98);
} }
static void rtl8168c_1_hw_phy_config(struct rtl8169_private *tp) static void rtl8168c_1_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
static const struct phy_reg phy_reg_init[] = { static const struct phy_reg phy_reg_init[] = {
{ 0x1f, 0x0001 }, { 0x1f, 0x0001 },
...@@ -2587,7 +2598,8 @@ static void rtl8168c_1_hw_phy_config(struct rtl8169_private *tp) ...@@ -2587,7 +2598,8 @@ static void rtl8168c_1_hw_phy_config(struct rtl8169_private *tp)
rtl_writephy(tp, 0x1f, 0x0000); rtl_writephy(tp, 0x1f, 0x0000);
} }
static void rtl8168c_2_hw_phy_config(struct rtl8169_private *tp) static void rtl8168c_2_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
static const struct phy_reg phy_reg_init[] = { static const struct phy_reg phy_reg_init[] = {
{ 0x1f, 0x0001 }, { 0x1f, 0x0001 },
...@@ -2615,7 +2627,8 @@ static void rtl8168c_2_hw_phy_config(struct rtl8169_private *tp) ...@@ -2615,7 +2627,8 @@ static void rtl8168c_2_hw_phy_config(struct rtl8169_private *tp)
rtl_writephy(tp, 0x1f, 0x0000); rtl_writephy(tp, 0x1f, 0x0000);
} }
static void rtl8168c_3_hw_phy_config(struct rtl8169_private *tp) static void rtl8168c_3_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
static const struct phy_reg phy_reg_init[] = { static const struct phy_reg phy_reg_init[] = {
{ 0x1f, 0x0001 }, { 0x1f, 0x0001 },
...@@ -2702,7 +2715,8 @@ static void rtl8168d_apply_firmware_cond(struct rtl8169_private *tp, u16 val) ...@@ -2702,7 +2715,8 @@ static void rtl8168d_apply_firmware_cond(struct rtl8169_private *tp, u16 val)
rtl_apply_firmware(tp); rtl_apply_firmware(tp);
} }
static void rtl8168d_1_hw_phy_config(struct rtl8169_private *tp) static void rtl8168d_1_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
rtl_writephy_batch(tp, rtl8168d_1_phy_reg_init_0); rtl_writephy_batch(tp, rtl8168d_1_phy_reg_init_0);
...@@ -2735,8 +2749,8 @@ static void rtl8168d_1_hw_phy_config(struct rtl8169_private *tp) ...@@ -2735,8 +2749,8 @@ static void rtl8168d_1_hw_phy_config(struct rtl8169_private *tp)
rtl_writephy(tp, 0x0d, val | set[i]); rtl_writephy(tp, 0x0d, val | set[i]);
} }
} else { } else {
phy_write_paged(tp->phydev, 0x0002, 0x05, 0x6662); phy_write_paged(phydev, 0x0002, 0x05, 0x6662);
r8168d_phy_param(tp->phydev, 0x8330, 0xffff, 0x6662); r8168d_phy_param(phydev, 0x8330, 0xffff, 0x6662);
} }
/* RSET couple improve */ /* RSET couple improve */
...@@ -2753,7 +2767,8 @@ static void rtl8168d_1_hw_phy_config(struct rtl8169_private *tp) ...@@ -2753,7 +2767,8 @@ static void rtl8168d_1_hw_phy_config(struct rtl8169_private *tp)
rtl8168d_apply_firmware_cond(tp, 0xbf00); rtl8168d_apply_firmware_cond(tp, 0xbf00);
} }
static void rtl8168d_2_hw_phy_config(struct rtl8169_private *tp) static void rtl8168d_2_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
rtl_writephy_batch(tp, rtl8168d_1_phy_reg_init_0); rtl_writephy_batch(tp, rtl8168d_1_phy_reg_init_0);
...@@ -2777,8 +2792,8 @@ static void rtl8168d_2_hw_phy_config(struct rtl8169_private *tp) ...@@ -2777,8 +2792,8 @@ static void rtl8168d_2_hw_phy_config(struct rtl8169_private *tp)
rtl_writephy(tp, 0x0d, val | set[i]); rtl_writephy(tp, 0x0d, val | set[i]);
} }
} else { } else {
phy_write_paged(tp->phydev, 0x0002, 0x05, 0x2642); phy_write_paged(phydev, 0x0002, 0x05, 0x2642);
r8168d_phy_param(tp->phydev, 0x8330, 0xffff, 0x2642); r8168d_phy_param(phydev, 0x8330, 0xffff, 0x2642);
} }
/* Fine tune PLL performance */ /* Fine tune PLL performance */
...@@ -2794,7 +2809,8 @@ static void rtl8168d_2_hw_phy_config(struct rtl8169_private *tp) ...@@ -2794,7 +2809,8 @@ static void rtl8168d_2_hw_phy_config(struct rtl8169_private *tp)
rtl8168d_apply_firmware_cond(tp, 0xb300); rtl8168d_apply_firmware_cond(tp, 0xb300);
} }
static void rtl8168d_3_hw_phy_config(struct rtl8169_private *tp) static void rtl8168d_3_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
static const struct phy_reg phy_reg_init[] = { static const struct phy_reg phy_reg_init[] = {
{ 0x1f, 0x0002 }, { 0x1f, 0x0002 },
...@@ -2849,17 +2865,19 @@ static void rtl8168d_3_hw_phy_config(struct rtl8169_private *tp) ...@@ -2849,17 +2865,19 @@ static void rtl8168d_3_hw_phy_config(struct rtl8169_private *tp)
rtl_writephy_batch(tp, phy_reg_init); rtl_writephy_batch(tp, phy_reg_init);
r8168d_modify_extpage(tp->phydev, 0x0023, 0x16, 0xffff, 0x0000); r8168d_modify_extpage(phydev, 0x0023, 0x16, 0xffff, 0x0000);
} }
static void rtl8168d_4_hw_phy_config(struct rtl8169_private *tp) static void rtl8168d_4_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
phy_write_paged(tp->phydev, 0x0001, 0x17, 0x0cc0); phy_write_paged(phydev, 0x0001, 0x17, 0x0cc0);
r8168d_modify_extpage(tp->phydev, 0x002d, 0x18, 0xffff, 0x0040); r8168d_modify_extpage(phydev, 0x002d, 0x18, 0xffff, 0x0040);
phy_set_bits(tp->phydev, 0x0d, BIT(5)); phy_set_bits(phydev, 0x0d, BIT(5));
} }
static void rtl8168e_1_hw_phy_config(struct rtl8169_private *tp) static void rtl8168e_1_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
static const struct phy_reg phy_reg_init[] = { static const struct phy_reg phy_reg_init[] = {
/* Channel estimation fine tune */ /* Channel estimation fine tune */
...@@ -2871,7 +2889,6 @@ static void rtl8168e_1_hw_phy_config(struct rtl8169_private *tp) ...@@ -2871,7 +2889,6 @@ static void rtl8168e_1_hw_phy_config(struct rtl8169_private *tp)
{ 0x14, 0x6420 }, { 0x14, 0x6420 },
{ 0x1f, 0x0000 }, { 0x1f, 0x0000 },
}; };
struct phy_device *phydev = tp->phydev;
rtl_apply_firmware(tp); rtl_apply_firmware(tp);
...@@ -2918,10 +2935,9 @@ static void rtl_rar_exgmac_set(struct rtl8169_private *tp, u8 *addr) ...@@ -2918,10 +2935,9 @@ static void rtl_rar_exgmac_set(struct rtl8169_private *tp, u8 *addr)
rtl_eri_write(tp, 0xf4, ERIAR_MASK_1111, w[1] | (w[2] << 16)); rtl_eri_write(tp, 0xf4, ERIAR_MASK_1111, w[1] | (w[2] << 16));
} }
static void rtl8168e_2_hw_phy_config(struct rtl8169_private *tp) static void rtl8168e_2_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
struct phy_device *phydev = tp->phydev;
rtl_apply_firmware(tp); rtl_apply_firmware(tp);
/* Enable Delay cap */ /* Enable Delay cap */
...@@ -2963,10 +2979,9 @@ static void rtl8168e_2_hw_phy_config(struct rtl8169_private *tp) ...@@ -2963,10 +2979,9 @@ static void rtl8168e_2_hw_phy_config(struct rtl8169_private *tp)
rtl_writephy(tp, 0x1f, 0x0000); rtl_writephy(tp, 0x1f, 0x0000);
} }
static void rtl8168f_hw_phy_config(struct rtl8169_private *tp) static void rtl8168f_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
struct phy_device *phydev = tp->phydev;
/* For 4-corner performance improve */ /* For 4-corner performance improve */
r8168d_phy_param(phydev, 0x8b80, 0x0000, 0x0006); r8168d_phy_param(phydev, 0x8b80, 0x0000, 0x0006);
...@@ -2980,10 +2995,9 @@ static void rtl8168f_hw_phy_config(struct rtl8169_private *tp) ...@@ -2980,10 +2995,9 @@ static void rtl8168f_hw_phy_config(struct rtl8169_private *tp)
rtl8168f_config_eee_phy(tp); rtl8168f_config_eee_phy(tp);
} }
static void rtl8168f_1_hw_phy_config(struct rtl8169_private *tp) static void rtl8168f_1_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
struct phy_device *phydev = tp->phydev;
rtl_apply_firmware(tp); rtl_apply_firmware(tp);
/* Channel estimation fine tune */ /* Channel estimation fine tune */
...@@ -3003,26 +3017,26 @@ static void rtl8168f_1_hw_phy_config(struct rtl8169_private *tp) ...@@ -3003,26 +3017,26 @@ static void rtl8168f_1_hw_phy_config(struct rtl8169_private *tp)
/* Disable hiimpedance detection (RTCT) */ /* Disable hiimpedance detection (RTCT) */
phy_write_paged(phydev, 0x0003, 0x01, 0x328a); phy_write_paged(phydev, 0x0003, 0x01, 0x328a);
rtl8168f_hw_phy_config(tp); rtl8168f_hw_phy_config(tp, phydev);
/* Improve 2-pair detection performance */ /* Improve 2-pair detection performance */
r8168d_phy_param(phydev, 0x8b85, 0x0000, 0x4000); r8168d_phy_param(phydev, 0x8b85, 0x0000, 0x4000);
} }
static void rtl8168f_2_hw_phy_config(struct rtl8169_private *tp) static void rtl8168f_2_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
rtl_apply_firmware(tp); rtl_apply_firmware(tp);
rtl8168f_hw_phy_config(tp); rtl8168f_hw_phy_config(tp, phydev);
} }
static void rtl8411_hw_phy_config(struct rtl8169_private *tp) static void rtl8411_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
struct phy_device *phydev = tp->phydev;
rtl_apply_firmware(tp); rtl_apply_firmware(tp);
rtl8168f_hw_phy_config(tp); rtl8168f_hw_phy_config(tp, phydev);
/* Improve 2-pair detection performance */ /* Improve 2-pair detection performance */
r8168d_phy_param(phydev, 0x8b85, 0x0000, 0x4000); r8168d_phy_param(phydev, 0x8b85, 0x0000, 0x4000);
...@@ -3078,36 +3092,37 @@ static void rtl8168g_phy_adjust_10m_aldps(struct rtl8169_private *tp) ...@@ -3078,36 +3092,37 @@ static void rtl8168g_phy_adjust_10m_aldps(struct rtl8169_private *tp)
phy_modify_paged(phydev, 0x0a43, 0x10, 0x0000, 0x1003); phy_modify_paged(phydev, 0x0a43, 0x10, 0x0000, 0x1003);
} }
static void rtl8168g_1_hw_phy_config(struct rtl8169_private *tp) static void rtl8168g_1_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
int ret; int ret;
rtl_apply_firmware(tp); rtl_apply_firmware(tp);
ret = phy_read_paged(tp->phydev, 0x0a46, 0x10); ret = phy_read_paged(phydev, 0x0a46, 0x10);
if (ret & BIT(8)) if (ret & BIT(8))
phy_modify_paged(tp->phydev, 0x0bcc, 0x12, BIT(15), 0); phy_modify_paged(phydev, 0x0bcc, 0x12, BIT(15), 0);
else else
phy_modify_paged(tp->phydev, 0x0bcc, 0x12, 0, BIT(15)); phy_modify_paged(phydev, 0x0bcc, 0x12, 0, BIT(15));
ret = phy_read_paged(tp->phydev, 0x0a46, 0x13); ret = phy_read_paged(phydev, 0x0a46, 0x13);
if (ret & BIT(8)) if (ret & BIT(8))
phy_modify_paged(tp->phydev, 0x0c41, 0x15, 0, BIT(1)); phy_modify_paged(phydev, 0x0c41, 0x15, 0, BIT(1));
else else
phy_modify_paged(tp->phydev, 0x0c41, 0x15, BIT(1), 0); phy_modify_paged(phydev, 0x0c41, 0x15, BIT(1), 0);
/* Enable PHY auto speed down */ /* Enable PHY auto speed down */
phy_modify_paged(tp->phydev, 0x0a44, 0x11, 0, BIT(3) | BIT(2)); phy_modify_paged(phydev, 0x0a44, 0x11, 0, BIT(3) | BIT(2));
rtl8168g_phy_adjust_10m_aldps(tp); rtl8168g_phy_adjust_10m_aldps(tp);
/* EEE auto-fallback function */ /* EEE auto-fallback function */
phy_modify_paged(tp->phydev, 0x0a4b, 0x11, 0, BIT(2)); phy_modify_paged(phydev, 0x0a4b, 0x11, 0, BIT(2));
/* Enable UC LPF tune function */ /* Enable UC LPF tune function */
r8168g_phy_param(tp->phydev, 0x8012, 0x0000, 0x8000); r8168g_phy_param(phydev, 0x8012, 0x0000, 0x8000);
phy_modify_paged(tp->phydev, 0x0c42, 0x11, BIT(13), BIT(14)); phy_modify_paged(phydev, 0x0c42, 0x11, BIT(13), BIT(14));
/* Improve SWR Efficiency */ /* Improve SWR Efficiency */
rtl_writephy(tp, 0x1f, 0x0bcd); rtl_writephy(tp, 0x1f, 0x0bcd);
...@@ -3125,15 +3140,16 @@ static void rtl8168g_1_hw_phy_config(struct rtl8169_private *tp) ...@@ -3125,15 +3140,16 @@ static void rtl8168g_1_hw_phy_config(struct rtl8169_private *tp)
rtl8168g_config_eee_phy(tp); rtl8168g_config_eee_phy(tp);
} }
static void rtl8168g_2_hw_phy_config(struct rtl8169_private *tp) static void rtl8168g_2_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
rtl_apply_firmware(tp); rtl_apply_firmware(tp);
rtl8168g_config_eee_phy(tp); rtl8168g_config_eee_phy(tp);
} }
static void rtl8168h_1_hw_phy_config(struct rtl8169_private *tp) static void rtl8168h_1_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
struct phy_device *phydev = tp->phydev;
u16 dout_tapbin; u16 dout_tapbin;
u32 data; u32 data;
...@@ -3177,10 +3193,10 @@ static void rtl8168h_1_hw_phy_config(struct rtl8169_private *tp) ...@@ -3177,10 +3193,10 @@ static void rtl8168h_1_hw_phy_config(struct rtl8169_private *tp)
phy_modify_paged(phydev, 0x0a42, 0x16, 0x0000, 0x0002); phy_modify_paged(phydev, 0x0a42, 0x16, 0x0000, 0x0002);
/* enable GPHY 10M */ /* enable GPHY 10M */
phy_modify_paged(tp->phydev, 0x0a44, 0x11, 0, BIT(11)); phy_modify_paged(phydev, 0x0a44, 0x11, 0, BIT(11));
/* SAR ADC performance */ /* SAR ADC performance */
phy_modify_paged(tp->phydev, 0x0bca, 0x17, BIT(12) | BIT(13), BIT(14)); phy_modify_paged(phydev, 0x0bca, 0x17, BIT(12) | BIT(13), BIT(14));
r8168g_phy_param(phydev, 0x803f, 0x3000, 0x0000); r8168g_phy_param(phydev, 0x803f, 0x3000, 0x0000);
r8168g_phy_param(phydev, 0x8047, 0x3000, 0x0000); r8168g_phy_param(phydev, 0x8047, 0x3000, 0x0000);
...@@ -3191,7 +3207,7 @@ static void rtl8168h_1_hw_phy_config(struct rtl8169_private *tp) ...@@ -3191,7 +3207,7 @@ static void rtl8168h_1_hw_phy_config(struct rtl8169_private *tp)
r8168g_phy_param(phydev, 0x806f, 0x3000, 0x0000); r8168g_phy_param(phydev, 0x806f, 0x3000, 0x0000);
/* disable phy pfm mode */ /* disable phy pfm mode */
phy_modify_paged(tp->phydev, 0x0a44, 0x11, BIT(7), 0); phy_modify_paged(phydev, 0x0a44, 0x11, BIT(7), 0);
rtl8168g_disable_aldps(tp); rtl8168g_disable_aldps(tp);
rtl8168h_config_eee_phy(tp); rtl8168h_config_eee_phy(tp);
...@@ -3213,9 +3229,9 @@ static u16 rtl8168h_2_get_adc_bias_ioffset(struct rtl8169_private *tp) ...@@ -3213,9 +3229,9 @@ static u16 rtl8168h_2_get_adc_bias_ioffset(struct rtl8169_private *tp)
return ioffset; return ioffset;
} }
static void rtl8168h_2_hw_phy_config(struct rtl8169_private *tp) static void rtl8168h_2_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
struct phy_device *phydev = tp->phydev;
u16 ioffset, rlen; u16 ioffset, rlen;
u32 data; u32 data;
...@@ -3229,7 +3245,7 @@ static void rtl8168h_2_hw_phy_config(struct rtl8169_private *tp) ...@@ -3229,7 +3245,7 @@ static void rtl8168h_2_hw_phy_config(struct rtl8169_private *tp)
phy_modify_paged(phydev, 0x0a42, 0x16, 0x0000, 0x0002); phy_modify_paged(phydev, 0x0a42, 0x16, 0x0000, 0x0002);
/* enable GPHY 10M */ /* enable GPHY 10M */
phy_modify_paged(tp->phydev, 0x0a44, 0x11, 0, BIT(11)); phy_modify_paged(phydev, 0x0a44, 0x11, 0, BIT(11));
ioffset = rtl8168h_2_get_adc_bias_ioffset(tp); ioffset = rtl8168h_2_get_adc_bias_ioffset(tp);
if (ioffset != 0xffff) if (ioffset != 0xffff)
...@@ -3251,10 +3267,9 @@ static void rtl8168h_2_hw_phy_config(struct rtl8169_private *tp) ...@@ -3251,10 +3267,9 @@ static void rtl8168h_2_hw_phy_config(struct rtl8169_private *tp)
rtl8168g_config_eee_phy(tp); rtl8168g_config_eee_phy(tp);
} }
static void rtl8168ep_1_hw_phy_config(struct rtl8169_private *tp) static void rtl8168ep_1_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
struct phy_device *phydev = tp->phydev;
/* Enable PHY auto speed down */ /* Enable PHY auto speed down */
phy_modify_paged(phydev, 0x0a44, 0x11, 0, BIT(3) | BIT(2)); phy_modify_paged(phydev, 0x0a44, 0x11, 0, BIT(3) | BIT(2));
...@@ -3273,17 +3288,16 @@ static void rtl8168ep_1_hw_phy_config(struct rtl8169_private *tp) ...@@ -3273,17 +3288,16 @@ static void rtl8168ep_1_hw_phy_config(struct rtl8169_private *tp)
rtl8168g_config_eee_phy(tp); rtl8168g_config_eee_phy(tp);
} }
static void rtl8168ep_2_hw_phy_config(struct rtl8169_private *tp) static void rtl8168ep_2_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
struct phy_device *phydev = tp->phydev;
rtl8168g_phy_adjust_10m_aldps(tp); rtl8168g_phy_adjust_10m_aldps(tp);
/* Enable UC LPF tune function */ /* Enable UC LPF tune function */
r8168g_phy_param(phydev, 0x8012, 0x0000, 0x8000); r8168g_phy_param(phydev, 0x8012, 0x0000, 0x8000);
/* Set rg_sel_sdm_rate */ /* Set rg_sel_sdm_rate */
phy_modify_paged(tp->phydev, 0x0c42, 0x11, BIT(13), BIT(14)); phy_modify_paged(phydev, 0x0c42, 0x11, BIT(13), BIT(14));
/* Channel estimation parameters */ /* Channel estimation parameters */
r8168g_phy_param(phydev, 0x80f3, 0xff00, 0x8b00); r8168g_phy_param(phydev, 0x80f3, 0xff00, 0x8b00);
...@@ -3324,10 +3338,9 @@ static void rtl8168ep_2_hw_phy_config(struct rtl8169_private *tp) ...@@ -3324,10 +3338,9 @@ static void rtl8168ep_2_hw_phy_config(struct rtl8169_private *tp)
rtl8168g_config_eee_phy(tp); rtl8168g_config_eee_phy(tp);
} }
static void rtl8117_hw_phy_config(struct rtl8169_private *tp) static void rtl8117_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
struct phy_device *phydev = tp->phydev;
/* CHN EST parameters adjust - fnet */ /* CHN EST parameters adjust - fnet */
r8168g_phy_param(phydev, 0x808e, 0xff00, 0x4800); r8168g_phy_param(phydev, 0x808e, 0xff00, 0x4800);
r8168g_phy_param(phydev, 0x8090, 0xff00, 0xcc00); r8168g_phy_param(phydev, 0x8090, 0xff00, 0xcc00);
...@@ -3355,7 +3368,7 @@ static void rtl8117_hw_phy_config(struct rtl8169_private *tp) ...@@ -3355,7 +3368,7 @@ static void rtl8117_hw_phy_config(struct rtl8169_private *tp)
r8168g_phy_param(phydev, 0x8011, 0x0000, 0x0800); r8168g_phy_param(phydev, 0x8011, 0x0000, 0x0800);
/* enable GPHY 10M */ /* enable GPHY 10M */
phy_modify_paged(tp->phydev, 0x0a44, 0x11, 0, BIT(11)); phy_modify_paged(phydev, 0x0a44, 0x11, 0, BIT(11));
r8168g_phy_param(phydev, 0x8016, 0x0000, 0x0400); r8168g_phy_param(phydev, 0x8016, 0x0000, 0x0400);
...@@ -3363,7 +3376,8 @@ static void rtl8117_hw_phy_config(struct rtl8169_private *tp) ...@@ -3363,7 +3376,8 @@ static void rtl8117_hw_phy_config(struct rtl8169_private *tp)
rtl8168h_config_eee_phy(tp); rtl8168h_config_eee_phy(tp);
} }
static void rtl8102e_hw_phy_config(struct rtl8169_private *tp) static void rtl8102e_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
static const struct phy_reg phy_reg_init[] = { static const struct phy_reg phy_reg_init[] = {
{ 0x1f, 0x0003 }, { 0x1f, 0x0003 },
...@@ -3380,23 +3394,25 @@ static void rtl8102e_hw_phy_config(struct rtl8169_private *tp) ...@@ -3380,23 +3394,25 @@ static void rtl8102e_hw_phy_config(struct rtl8169_private *tp)
rtl_writephy_batch(tp, phy_reg_init); rtl_writephy_batch(tp, phy_reg_init);
} }
static void rtl8105e_hw_phy_config(struct rtl8169_private *tp) static void rtl8105e_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
/* Disable ALDPS before ram code */ /* Disable ALDPS before ram code */
phy_write(tp->phydev, 0x18, 0x0310); phy_write(phydev, 0x18, 0x0310);
msleep(100); msleep(100);
rtl_apply_firmware(tp); rtl_apply_firmware(tp);
phy_write_paged(tp->phydev, 0x0005, 0x1a, 0x0000); phy_write_paged(phydev, 0x0005, 0x1a, 0x0000);
phy_write_paged(tp->phydev, 0x0004, 0x1c, 0x0000); phy_write_paged(phydev, 0x0004, 0x1c, 0x0000);
phy_write_paged(tp->phydev, 0x0001, 0x15, 0x7701); phy_write_paged(phydev, 0x0001, 0x15, 0x7701);
} }
static void rtl8402_hw_phy_config(struct rtl8169_private *tp) static void rtl8402_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
/* Disable ALDPS before setting firmware */ /* Disable ALDPS before setting firmware */
phy_write(tp->phydev, 0x18, 0x0310); phy_write(phydev, 0x18, 0x0310);
msleep(20); msleep(20);
rtl_apply_firmware(tp); rtl_apply_firmware(tp);
...@@ -3409,7 +3425,8 @@ static void rtl8402_hw_phy_config(struct rtl8169_private *tp) ...@@ -3409,7 +3425,8 @@ static void rtl8402_hw_phy_config(struct rtl8169_private *tp)
rtl_writephy(tp, 0x1f, 0x0000); rtl_writephy(tp, 0x1f, 0x0000);
} }
static void rtl8106e_hw_phy_config(struct rtl8169_private *tp) static void rtl8106e_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
static const struct phy_reg phy_reg_init[] = { static const struct phy_reg phy_reg_init[] = {
{ 0x1f, 0x0004 }, { 0x1f, 0x0004 },
...@@ -3419,7 +3436,7 @@ static void rtl8106e_hw_phy_config(struct rtl8169_private *tp) ...@@ -3419,7 +3436,7 @@ static void rtl8106e_hw_phy_config(struct rtl8169_private *tp)
}; };
/* Disable ALDPS before ram code */ /* Disable ALDPS before ram code */
phy_write(tp->phydev, 0x18, 0x0310); phy_write(phydev, 0x18, 0x0310);
msleep(100); msleep(100);
rtl_apply_firmware(tp); rtl_apply_firmware(tp);
...@@ -3430,10 +3447,9 @@ static void rtl8106e_hw_phy_config(struct rtl8169_private *tp) ...@@ -3430,10 +3447,9 @@ static void rtl8106e_hw_phy_config(struct rtl8169_private *tp)
rtl_eri_write(tp, 0x1d0, ERIAR_MASK_0011, 0x0000); rtl_eri_write(tp, 0x1d0, ERIAR_MASK_0011, 0x0000);
} }
static void rtl8125_1_hw_phy_config(struct rtl8169_private *tp) static void rtl8125_1_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
struct phy_device *phydev = tp->phydev;
phy_modify_paged(phydev, 0xad4, 0x10, 0x03ff, 0x0084); phy_modify_paged(phydev, 0xad4, 0x10, 0x03ff, 0x0084);
phy_modify_paged(phydev, 0xad4, 0x17, 0x0000, 0x0010); phy_modify_paged(phydev, 0xad4, 0x17, 0x0000, 0x0010);
phy_modify_paged(phydev, 0xad1, 0x13, 0x03ff, 0x0006); phy_modify_paged(phydev, 0xad1, 0x13, 0x03ff, 0x0006);
...@@ -3469,9 +3485,9 @@ static void rtl8125_1_hw_phy_config(struct rtl8169_private *tp) ...@@ -3469,9 +3485,9 @@ static void rtl8125_1_hw_phy_config(struct rtl8169_private *tp)
rtl8125_config_eee_phy(tp); rtl8125_config_eee_phy(tp);
} }
static void rtl8125_2_hw_phy_config(struct rtl8169_private *tp) static void rtl8125_2_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev)
{ {
struct phy_device *phydev = tp->phydev;
int i; int i;
phy_modify_paged(phydev, 0xad4, 0x17, 0x0000, 0x0010); phy_modify_paged(phydev, 0xad4, 0x17, 0x0000, 0x0010);
...@@ -3534,9 +3550,11 @@ static void rtl8125_2_hw_phy_config(struct rtl8169_private *tp) ...@@ -3534,9 +3550,11 @@ static void rtl8125_2_hw_phy_config(struct rtl8169_private *tp)
rtl8125_config_eee_phy(tp); rtl8125_config_eee_phy(tp);
} }
static void rtl_hw_phy_config(struct net_device *dev) static void r8169_hw_phy_config(struct rtl8169_private *tp,
struct phy_device *phydev,
enum mac_version ver)
{ {
static const rtl_generic_fct phy_configs[] = { static const rtl_phy_cfg_fct phy_configs[] = {
/* PCI devices. */ /* PCI devices. */
[RTL_GIGA_MAC_VER_02] = rtl8169s_hw_phy_config, [RTL_GIGA_MAC_VER_02] = rtl8169s_hw_phy_config,
[RTL_GIGA_MAC_VER_03] = rtl8169s_hw_phy_config, [RTL_GIGA_MAC_VER_03] = rtl8169s_hw_phy_config,
...@@ -3593,10 +3611,9 @@ static void rtl_hw_phy_config(struct net_device *dev) ...@@ -3593,10 +3611,9 @@ static void rtl_hw_phy_config(struct net_device *dev)
[RTL_GIGA_MAC_VER_60] = rtl8125_1_hw_phy_config, [RTL_GIGA_MAC_VER_60] = rtl8125_1_hw_phy_config,
[RTL_GIGA_MAC_VER_61] = rtl8125_2_hw_phy_config, [RTL_GIGA_MAC_VER_61] = rtl8125_2_hw_phy_config,
}; };
struct rtl8169_private *tp = netdev_priv(dev);
if (phy_configs[tp->mac_version]) if (phy_configs[ver])
phy_configs[tp->mac_version](tp); phy_configs[ver](tp, phydev);
} }
static void rtl_schedule_task(struct rtl8169_private *tp, enum rtl_flag flag) static void rtl_schedule_task(struct rtl8169_private *tp, enum rtl_flag flag)
...@@ -3607,7 +3624,7 @@ static void rtl_schedule_task(struct rtl8169_private *tp, enum rtl_flag flag) ...@@ -3607,7 +3624,7 @@ static void rtl_schedule_task(struct rtl8169_private *tp, enum rtl_flag flag)
static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp) static void rtl8169_init_phy(struct net_device *dev, struct rtl8169_private *tp)
{ {
rtl_hw_phy_config(dev); r8169_hw_phy_config(tp, tp->phydev, tp->mac_version);
if (tp->mac_version <= RTL_GIGA_MAC_VER_06) { if (tp->mac_version <= RTL_GIGA_MAC_VER_06) {
pci_write_config_byte(tp->pci_dev, PCI_LATENCY_TIMER, 0x40); pci_write_config_byte(tp->pci_dev, PCI_LATENCY_TIMER, 0x40);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或