r8169: remove mask argument from few ERI/OCP functions
Heiner Kallweit
maintainercover r8169: remove mask argument from few ERI/OCP functions
Few ERI/OCP functions have a mask argument that isn't needed. Remove it to simplify the functions.
Heiner Kallweit (3):
r8169: remove mask argument from rtl_w0w1_eri
r8169: remove mask argument from r8168dp_ocp_read
r8169: remove mask argument from r8168ep_ocp_read
drivers/net/ethernet/realtek/r8169_main.c | 86 ++++++++++------------- 1 file changed, 39 insertions(+), 47 deletions(-)
Signature · 1 line
2.26.2
Heiner Kallweit
maintainerPATCH 1/3 r8169: remove mask argument from rtl_w0w1_eri
rtl_eri_read() returns the full 32bit value, therefore there's no benefit in writing back parts of it only. handle it like the vendor driver and write the full 32 bit always. Omitting the mask argument avoids some overhead and makes the code better readable.
--- drivers/net/ethernet/realtek/r8169_main.c | 66 +++++++++++------------ 1 file changed, 30 insertions(+), 36 deletions(-)
drivers/net/ethernet/realtek/r8169_main.c +30 -36
@@ -1074,25 +1074,21 @@ static u32 rtl_eri_read(struct rtl8169_private *tp, int addr)return _rtl_eri_read (tp, addr,ERIAR_EXGMAC ); } -static void rtl_w0w1_eri (struct rtl8169_private *tp,int addr,u32 mask,u32 p, -u32 m) +static void rtl_w0w1_eri (struct rtl8169_private *tp,int addr,u32 p,u32 m) { -u32 val; +u32 val =rtl_eri_read (tp, addr); - val =rtl_eri_read (tp, addr); -rtl_eri_write (tp, addr, mask, (val & ~m) | p); +rtl_eri_write (tp, addr,ERIAR_MASK_1111 , (val & ~m) | p); } -static void rtl_eri_set_bits (struct rtl8169_private *tp,int addr,u32 mask, -u32 p) +static void rtl_eri_set_bits (struct rtl8169_private *tp,int addr,u32 p) { -rtl_w0w1_eri (tp, addr, mask, p,0 ); +rtl_w0w1_eri (tp, addr, p,0 ); } -static void rtl_eri_clear_bits (struct rtl8169_private *tp,int addr,u32 mask, -u32 m) +static void rtl_eri_clear_bits (struct rtl8169_private *tp,int addr,u32 m) { -rtl_w0w1_eri (tp, addr, mask,0 , m); +rtl_w0w1_eri (tp, addr,0 , m); }static u32 r8168dp_ocp_read (struct rtl8169_private *tp,u8 mask,u16 reg)
@@ -1256,8 +1252,8 @@ static bool r8168_check_dash(struct rtl8169_private *tp)static void rtl_reset_packet_filter (struct rtl8169_private *tp) { -rtl_eri_clear_bits (tp,0xdc ,ERIAR_MASK_0001 ,BIT (0 )); -rtl_eri_set_bits (tp,0xdc ,ERIAR_MASK_0001 ,BIT (0 )); +rtl_eri_clear_bits (tp,0xdc ,BIT (0 )); +rtl_eri_set_bits (tp,0xdc ,BIT (0 )); }DECLARE_RTL_COND (rtl_efusear_cond)
@@ -1384,11 +1380,9 @@ static void __rtl8169_set_wol(struct rtl8169_private *tp, u32 wolopts)if (rtl_is_8168evl_up (tp)) { tmp--;if (wolopts &WAKE_MAGIC ) -rtl_eri_set_bits (tp,0x0dc ,ERIAR_MASK_0100 , - MagicPacket_v2); +rtl_eri_set_bits (tp,0x0dc , MagicPacket_v2);else -rtl_eri_clear_bits (tp,0x0dc ,ERIAR_MASK_0100 , - MagicPacket_v2); +rtl_eri_clear_bits (tp,0x0dc , MagicPacket_v2); }else if (rtl_is_8125 (tp)) { tmp--;if (wolopts &WAKE_MAGIC )
@@ -2132,7 +2126,7 @@ static void rtl8168_config_eee_mac(struct rtl8169_private *tp)if (tp->mac_version !=RTL_GIGA_MAC_VER_38 )RTL_W8 (tp,EEE_LED ,RTL_R8 (tp,EEE_LED ) & ~0x07 ); -rtl_eri_set_bits (tp,0x1b0 ,ERIAR_MASK_1111 ,0x0003 ); +rtl_eri_set_bits (tp,0x1b0 ,0x0003 ); }static void rtl8125_config_eee_mac (struct rtl8169_private *tp)
@@ -2296,7 +2290,7 @@ static void rtl_pll_power_down(struct rtl8169_private *tp)case RTL_GIGA_MAC_VER_40 :case RTL_GIGA_MAC_VER_41 :case RTL_GIGA_MAC_VER_49 : -rtl_eri_clear_bits (tp,0x1a8 ,ERIAR_MASK_1111 ,0xfc000000 ); +rtl_eri_clear_bits (tp,0x1a8 ,0xfc000000 );RTL_W8 (tp,PMCH ,RTL_R8 (tp,PMCH ) & ~0x80 );break ;default :
@@ -2329,7 +2323,7 @@ static void rtl_pll_power_up(struct rtl8169_private *tp)case RTL_GIGA_MAC_VER_41 :case RTL_GIGA_MAC_VER_49 :RTL_W8 (tp,PMCH ,RTL_R8 (tp,PMCH ) |0xc0 ); -rtl_eri_set_bits (tp,0x1a8 ,ERIAR_MASK_1111 ,0xfc000000 ); +rtl_eri_set_bits (tp,0x1a8 ,0xfc000000 );break ;default :break ;
@@ -2938,8 +2932,8 @@ static void rtl_hw_start_8168e_2(struct rtl8169_private *tp)rtl_set_fifo_size (tp,0x10 ,0x10 ,0x02 ,0x06 );rtl_eri_write (tp,0xcc ,ERIAR_MASK_1111 ,0x00000050 );rtl_eri_write (tp,0xd0 ,ERIAR_MASK_1111 ,0x07ff0060 ); -rtl_eri_set_bits (tp,0x1b0 ,ERIAR_MASK_0001 ,BIT (4 )); -rtl_w0w1_eri (tp,0x0d4 ,ERIAR_MASK_0011 ,0x0c00 ,0xff00 ); +rtl_eri_set_bits (tp,0x1b0 ,BIT (4 )); +rtl_w0w1_eri (tp,0x0d4 ,0x0c00 ,0xff00 );rtl_disable_clock_request (tp);
@@ -2962,8 +2956,8 @@ static void rtl_hw_start_8168f(struct rtl8169_private *tp)rtl_eri_write (tp,0xb8 ,ERIAR_MASK_0011 ,0x0000 );rtl_set_fifo_size (tp,0x10 ,0x10 ,0x02 ,0x06 );rtl_reset_packet_filter (tp); -rtl_eri_set_bits (tp,0x1b0 ,ERIAR_MASK_0001 ,BIT (4 )); -rtl_eri_set_bits (tp,0x1d0 ,ERIAR_MASK_0001 ,BIT (4 )); +rtl_eri_set_bits (tp,0x1b0 ,BIT (4 )); +rtl_eri_set_bits (tp,0x1d0 ,BIT (4 ));rtl_eri_write (tp,0xcc ,ERIAR_MASK_1111 ,0x00000050 );rtl_eri_write (tp,0xd0 ,ERIAR_MASK_1111 ,0x00000060 );
@@ -2992,7 +2986,7 @@ static void rtl_hw_start_8168f_1(struct rtl8169_private *tp)rtl_ephy_init (tp, e_info_8168f_1); -rtl_w0w1_eri (tp,0x0d4 ,ERIAR_MASK_0011 ,0x0c00 ,0xff00 ); +rtl_w0w1_eri (tp,0x0d4 ,0x0c00 ,0xff00 ); }static void rtl_hw_start_8411 (struct rtl8169_private *tp)
@@ -3010,7 +3004,7 @@ static void rtl_hw_start_8411(struct rtl8169_private *tp)rtl_ephy_init (tp, e_info_8168f_1); -rtl_eri_set_bits (tp,0x0d4 ,ERIAR_MASK_0011 ,0x0c00 ); +rtl_eri_set_bits (tp,0x0d4 ,0x0c00 ); }static void rtl_hw_start_8168g (struct rtl8169_private *tp)
@@ -3030,8 +3024,8 @@ static void rtl_hw_start_8168g(struct rtl8169_private *tp)rtl8168_config_eee_mac (tp); -rtl_w0w1_eri (tp,0x2fc ,ERIAR_MASK_0001 ,0x01 ,0x06 ); -rtl_eri_clear_bits (tp,0x1b0 ,ERIAR_MASK_0011 ,BIT (12 )); +rtl_w0w1_eri (tp,0x2fc ,0x01 ,0x06 ); +rtl_eri_clear_bits (tp,0x1b0 ,BIT (12 ));rtl_pcie_state_l2l3_disable (tp); }
@@ -3257,9 +3251,9 @@ static void rtl_hw_start_8168h_1(struct rtl8169_private *tp)rtl_reset_packet_filter (tp); -rtl_eri_set_bits (tp,0xdc ,ERIAR_MASK_1111 ,BIT (4 )); +rtl_eri_set_bits (tp,0xdc ,BIT (4 )); -rtl_eri_set_bits (tp,0xd4 ,ERIAR_MASK_1111 ,0x1f00 ); +rtl_eri_set_bits (tp,0xd4 ,0x1f00 );rtl_eri_write (tp,0x5f0 ,ERIAR_MASK_0011 ,0x4f87 );
@@ -3275,7 +3269,7 @@ static void rtl_hw_start_8168h_1(struct rtl8169_private *tp)RTL_W8 (tp,DLLPR ,RTL_R8 (tp,DLLPR ) & ~TX_10M_PS_EN ); -rtl_eri_clear_bits (tp,0x1b0 ,ERIAR_MASK_0011 ,BIT (12 )); +rtl_eri_clear_bits (tp,0x1b0 ,BIT (12 ));rtl_pcie_state_l2l3_disable (tp);
@@ -3312,7 +3306,7 @@ static void rtl_hw_start_8168ep(struct rtl8169_private *tp)rtl_reset_packet_filter (tp); -rtl_eri_set_bits (tp,0xd4 ,ERIAR_MASK_1111 ,0x1f80 ); +rtl_eri_set_bits (tp,0xd4 ,0x1f80 );rtl_eri_write (tp,0x5f0 ,ERIAR_MASK_0011 ,0x4f87 );
@@ -3323,7 +3317,7 @@ static void rtl_hw_start_8168ep(struct rtl8169_private *tp)rtl8168_config_eee_mac (tp); -rtl_w0w1_eri (tp,0x2fc ,ERIAR_MASK_0001 ,0x01 ,0x06 ); +rtl_w0w1_eri (tp,0x2fc ,0x01 ,0x06 );RTL_W8 (tp,DLLPR ,RTL_R8 (tp,DLLPR ) & ~TX_10M_PS_EN );
@@ -3415,7 +3409,7 @@ static void rtl_hw_start_8117(struct rtl8169_private *tp)rtl_reset_packet_filter (tp); -rtl_eri_set_bits (tp,0xd4 ,ERIAR_MASK_1111 ,0x1f90 ); +rtl_eri_set_bits (tp,0xd4 ,0x1f90 );rtl_eri_write (tp,0x5f0 ,ERIAR_MASK_0011 ,0x4f87 );
@@ -3431,7 +3425,7 @@ static void rtl_hw_start_8117(struct rtl8169_private *tp)RTL_W8 (tp,DLLPR ,RTL_R8 (tp,DLLPR ) & ~TX_10M_PS_EN ); -rtl_eri_clear_bits (tp,0x1b0 ,ERIAR_MASK_0011 ,BIT (12 )); +rtl_eri_clear_bits (tp,0x1b0 ,BIT (12 ));rtl_pcie_state_l2l3_disable (tp);
@@ -3556,7 +3550,7 @@ static void rtl_hw_start_8402(struct rtl8169_private *tp)rtl_reset_packet_filter (tp);rtl_eri_write (tp,0xc0 ,ERIAR_MASK_0011 ,0x0000 );rtl_eri_write (tp,0xb8 ,ERIAR_MASK_0011 ,0x0000 ); -rtl_w0w1_eri (tp,0x0d4 ,ERIAR_MASK_0011 ,0x0e00 ,0xff00 ); +rtl_w0w1_eri (tp,0x0d4 ,0x0e00 ,0xff00 );/* disable EEE */ rtl_eri_write (tp,0x1b0 ,ERIAR_MASK_0011 ,0x0000 );
Signature · 1 line
2.26.2
Heiner Kallweit
maintainerPATCH 2/3 r8169: remove mask argument from r8168dp_ocp_read
In reply to Heiner KallweitAll callers read the full 32bit value, therefore the mask argument can be removed.
--- drivers/net/ethernet/realtek/r8169_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ethernet/realtek/r8169_main.c +4 -4
@@ -1091,9 +1091,9 @@ static void rtl_eri_clear_bits(struct rtl8169_private *tp, int addr, u32 m)rtl_w0w1_eri (tp, addr,0 , m); } -static u32 r8168dp_ocp_read (struct rtl8169_private *tp,u8 mask,u16 reg) +static u32 r8168dp_ocp_read (struct rtl8169_private *tp,u16 reg) { -RTL_W32 (tp,OCPAR , ((u32 )mask &0x0f ) <<12 | (reg &0x0fff )); +RTL_W32 (tp,OCPAR ,0x0fu <<12 | (reg &0x0fff ));return rtl_loop_wait_high (tp, &rtl_ocpar_cond,100 ,20 ) ?RTL_R32 (tp,OCPDR ) : ~0 ; }
@@ -1140,7 +1140,7 @@ DECLARE_RTL_COND(rtl_dp_ocp_read_cond) reg =rtl8168_get_ocp_reg (tp); -return r8168dp_ocp_read (tp,0x0f , reg) &0x00000800 ; +return r8168dp_ocp_read (tp, reg) &0x00000800 ; }DECLARE_RTL_COND (rtl_ep_ocp_read_cond)
@@ -1228,7 +1228,7 @@ static bool r8168dp_check_dash(struct rtl8169_private *tp) {u16 reg =rtl8168_get_ocp_reg (tp); -return !!(r8168dp_ocp_read (tp,0x0f , reg) &0x00008000 ); +return !!(r8168dp_ocp_read (tp, reg) &0x00008000 ); }static bool r8168ep_check_dash (struct rtl8169_private *tp)
Signature · 1 line
2.26.2
Heiner Kallweit
maintainerPATCH 3/3 r8169: remove mask argument from r8168ep_ocp_read
In reply to Heiner KallweitRemove the mask argument as it's not used by r8168ep_ocp_read().
--- drivers/net/ethernet/realtek/r8169_main.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/net/ethernet/realtek/r8169_main.c +5 -7
@@ -1098,7 +1098,7 @@ static u32 r8168dp_ocp_read(struct rtl8169_private *tp, u16 reg) RTL_R32(tp, OCPDR) : ~0; } -static u32 r8168ep_ocp_read (struct rtl8169_private *tp,u8 mask,u16 reg) +static u32 r8168ep_ocp_read (struct rtl8169_private *tp,u16 reg) {return _rtl_eri_read (tp, reg,ERIAR_OOB ); }
@@ -1145,7 +1145,7 @@ DECLARE_RTL_COND(rtl_dp_ocp_read_cond)DECLARE_RTL_COND (rtl_ep_ocp_read_cond) { -return r8168ep_ocp_read (tp,0x0f ,0x124 ) &0x00000001 ; +return r8168ep_ocp_read (tp,0x124 ) &0x00000001 ; }DECLARE_RTL_COND (rtl_ocp_tx_cond)
@@ -1170,8 +1170,7 @@ static void rtl8168dp_driver_start(struct rtl8169_private *tp)static void rtl8168ep_driver_start (struct rtl8169_private *tp) {r8168ep_ocp_write (tp,0x01 ,0x180 ,OOB_CMD_DRIVER_START ); -r8168ep_ocp_write (tp,0x01 ,0x30 , -r8168ep_ocp_read (tp,0x01 ,0x30 ) |0x01 ); +r8168ep_ocp_write (tp,0x01 ,0x30 ,r8168ep_ocp_read (tp,0x30 ) |0x01 );rtl_loop_wait_high (tp, &rtl_ep_ocp_read_cond,10000 ,10 ); }
@@ -1202,8 +1201,7 @@ static void rtl8168ep_driver_stop(struct rtl8169_private *tp) {rtl8168ep_stop_cmac (tp);r8168ep_ocp_write (tp,0x01 ,0x180 ,OOB_CMD_DRIVER_STOP ); -r8168ep_ocp_write (tp,0x01 ,0x30 , -r8168ep_ocp_read (tp,0x01 ,0x30 ) |0x01 ); +r8168ep_ocp_write (tp,0x01 ,0x30 ,r8168ep_ocp_read (tp,0x30 ) |0x01 );rtl_loop_wait_low (tp, &rtl_ep_ocp_read_cond,10000 ,10 ); }
@@ -1233,7 +1231,7 @@ static bool r8168dp_check_dash(struct rtl8169_private *tp)static bool r8168ep_check_dash (struct rtl8169_private *tp) { -return !!(r8168ep_ocp_read (tp,0x0f ,0x128 ) &0x00000001 ); +return r8168ep_ocp_read (tp,0x128 ) &0x00000001 ; }static bool r8168_check_dash (struct rtl8169_private *tp)
Signature · 1 line
2.26.2
David Miller
maintainerFrom: Heiner Kallweit <[email protected]>
Date: Sat, 23 May 2020 13:20:33 +0200
Quoted 2 lines
Few ERI/OCP functions have a mask argument that isn't needed. Remove it to simplify the functions.
Series applied, thanks Heiner.