Skip to contentSkip to conversation

r8169: add new helper rtl8168g_enable_gphy_10m

PATCH Applied Heiner Kallweit 3 participants 4 messages Mar 21, 2020 – Mar 24, 2020

Subsystems (3)
lore
Share & tools
lore

Heiner Kallweit

author maintainer
#0 lore raw

PATCH 1/1 r8169: add new helper rtl8168g_enable_gphy_10m

Factor out setting GPHY 10M to new helper rtl8168g_enable_gphy_10m.

---
 .../net/ethernet/realtek/r8169_phy_config.c    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)
drivers/net/ethernet/realtek/r8169_phy_config.c +10 -8
index e367e77c7..b73f7d023 100644
@@ -796,6 +796,11 @@ static void rtl8168g_disable_aldps(struct phy_device *phydev)
 	phy_modify_paged(phydev, 0x0a43, 0x10, BIT(2), 0);
 }
 
+static void rtl8168g_enable_gphy_10m(struct phy_device *phydev)
+{
+	phy_modify_paged(phydev, 0x0a44, 0x11, 0, BIT(11));
+}
+
 static void rtl8168g_phy_adjust_10m_aldps(struct phy_device *phydev)
 {
 	phy_modify_paged(phydev, 0x0bcc, 0x14, BIT(8), 0);
@@ -904,8 +909,7 @@ static void rtl8168h_1_hw_phy_config(struct rtl8169_private *tp,
 	r8168g_phy_param(phydev, 0x0811, 0x0000, 0x0800);
 	phy_modify_paged(phydev, 0x0a42, 0x16, 0x0000, 0x0002);
 
-	/* enable GPHY 10M */
-	phy_modify_paged(phydev, 0x0a44, 0x11, 0, BIT(11));
+	rtl8168g_enable_gphy_10m(phydev);
 
 	/* SAR ADC performance */
 	phy_modify_paged(phydev, 0x0bca, 0x17, BIT(12) | BIT(13), BIT(14));
@@ -940,8 +944,7 @@ static void rtl8168h_2_hw_phy_config(struct rtl8169_private *tp,
 	r8168g_phy_param(phydev, 0x0811, 0x0000, 0x0800);
 	phy_modify_paged(phydev, 0x0a42, 0x16, 0x0000, 0x0002);
 
-	/* enable GPHY 10M */
-	phy_modify_paged(phydev, 0x0a44, 0x11, 0, BIT(11));
+	rtl8168g_enable_gphy_10m(phydev);
 
 	ioffset = rtl8168h_2_get_adc_bias_ioffset(tp);
 	if (ioffset != 0xffff)
@@ -1063,8 +1066,7 @@ static void rtl8117_hw_phy_config(struct rtl8169_private *tp,
 
 	r8168g_phy_param(phydev, 0x8011, 0x0000, 0x0800);
 
-	/* enable GPHY 10M */
-	phy_modify_paged(phydev, 0x0a44, 0x11, 0, BIT(11));
+	rtl8168g_enable_gphy_10m(phydev);
 
 	r8168g_phy_param(phydev, 0x8016, 0x0000, 0x0400);
 
@@ -1171,7 +1173,7 @@ static void rtl8125_1_hw_phy_config(struct rtl8169_private *tp,
 	phy_write_paged(phydev, 0xbc3, 0x12, 0x5555);
 	phy_modify_paged(phydev, 0xbf0, 0x15, 0x0e00, 0x0a00);
 	phy_modify_paged(phydev, 0xa5c, 0x10, 0x0400, 0x0000);
-	phy_modify_paged(phydev, 0xa44, 0x11, 0x0000, 0x0800);
+	rtl8168g_enable_gphy_10m(phydev);
 
 	rtl8125_config_eee_phy(phydev);
 }
@@ -1236,7 +1238,7 @@ static void rtl8125_2_hw_phy_config(struct rtl8169_private *tp,
 	phy_modify_paged(phydev, 0xa5d, 0x12, 0x0000, 0x0020);
 	phy_modify_paged(phydev, 0xad4, 0x17, 0x0010, 0x0000);
 	phy_modify_paged(phydev, 0xa86, 0x15, 0x0001, 0x0000);
-	phy_modify_paged(phydev, 0xa44, 0x11, 0x0000, 0x0800);
+	rtl8168g_enable_gphy_10m(phydev);
 
 	rtl8125_config_eee_phy(phydev);
 }
Signature · 1 line
2.25.2
#1 lore raw
Quoted 1 line · Heiner Kallweit

Factor out setting GPHY 10M to new helper rtl8168g_enable_gphy_10m.

[]

drivers/net/ethernet/realtek/r8169_phy_config.c

Quoted 1 line
drivers/net/ethernet/realtek/r8169_phy_config.c +0 -0

[]

drivers/net/ethernet/realtek/r8169_phy_config.c static void rtl8168g_disable_aldps(struct phy_device *phydev) · line 802

Quoted 8 lines
drivers/net/ethernet/realtek/r8169_phy_config.c +4 -0
@@ -796,6 +796,11 @@ static void rtl8168g_disable_aldps(struct phy_device *phydev)
 	phy_modify_paged(phydev, 0x0a43, 0x10, BIT(2), 0);
 }
 
+static void rtl8168g_enable_gphy_10m(struct phy_device *phydev)
+{
+	phy_modify_paged(phydev, 0x0a44, 0x11, 0, BIT(11));
+}

Perhaps this should be some generic to set characteristics like:

enum rtl8168g_char {
	...
}

static void rtl8168g_enable_char(struct phy_device *phydev,
enum rtl8168g_char type)

{
	switch (type) {
	case FOO:
		etc...
	}
author maintainer
#2 lore raw
Quoted 20 lines · Joe Perches
Quoted 1 line · Heiner Kallweit

Factor out setting GPHY 10M to new helper rtl8168g_enable_gphy_10m.

[]

drivers/net/ethernet/realtek/r8169_phy_config.c

Quoted 1 line
drivers/net/ethernet/realtek/r8169_phy_config.c +0 -0

[]

drivers/net/ethernet/realtek/r8169_phy_config.c static void rtl8168g_disable_aldps(struct phy_device *phydev) · line 802

Quoted 8 lines
drivers/net/ethernet/realtek/r8169_phy_config.c +4 -0
@@ -796,6 +796,11 @@ static void rtl8168g_disable_aldps(struct phy_device *phydev)
 	phy_modify_paged(phydev, 0x0a43, 0x10, BIT(2), 0);
 }
 
+static void rtl8168g_enable_gphy_10m(struct phy_device *phydev)
+{
+	phy_modify_paged(phydev, 0x0a44, 0x11, 0, BIT(11));
+}

Perhaps this should be some generic to set characteristics like:

enum rtl8168g_char {
	...
}
Quoted 9 lines

static void rtl8168g_enable_char(struct phy_device *phydev,
enum rtl8168g_char type)

{
	switch (type) {
	case FOO:
		etc...
	}

Then we'd need one more such generic to disable characteristics like in rtl8168g_disable_aldps(). Also we have existing functions like rtl8168g_phy_adjust_10m_aldps() that change a characteristic, and the function name is used to describe what the function does. So yes, it would be an option, but I don't see that we would gain anything. More the opposite, it would add overhead and we'd have a mix of fct_what_it_does() and fct_generic(WHAT_IT_DOES).