| Message ID | 20231029183600.451694-3-mirsad.todorovac@alu.unizg.hr (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [v5,1/7] r8169: Add r8169_mac_ocp_(write|modify)_seq helpers to reduce spinlock contention | expand |
On 29.10.2023 19:35, Mirsad Goran Todorovac wrote: > Repeated calls to r8168_mac_ocp_write() and r8168_mac_ocp_modify() in > the startup of 8168H involve implicit spin_lock_irqsave() and spin_unlock_irqrestore() > on each invocation. > > Coalesced with the corresponding helpers into r8168_mac_ocp_write_seq() and > r8168_mac_ocp_modify_seq() with a sinqle paired spin_lock_irqsave() and > spin_unlock_irqrestore(), these calls help reduce overall spinlock contention. > > Fixes: ef712ede3541d ("r8169: add helper r8168_mac_ocp_modify") > Fixes: 6e1d0b8988188 ("r8169:add support for RTL8168H and RTL8107E") > Cc: Heiner Kallweit <hkallweit1@gmail.com> > Cc: Marco Elver <elver@google.com> > Cc: nic_swsd@realtek.com > Cc: "David S. Miller" <davem@davemloft.net> > Cc: Eric Dumazet <edumazet@google.com> > Cc: Jakub Kicinski <kuba@kernel.org> > Cc: Paolo Abeni <pabeni@redhat.com> > Cc: netdev@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > Link: https://lore.kernel.org/lkml/20231028005153.2180411-1-mirsad.todorovac@alu.unizg.hr/ > Link: https://lore.kernel.org/lkml/20231028110459.2644926-1-mirsad.todorovac@alu.unizg.hr/ > Signed-off-by: Mirsad Goran Todorovac <mirsad.todorovac@alu.unizg.hr> > --- > v5: > added unlocked primitives to allow mac ocs modify grouping > applied coalescing of mac ocp writes/modifies for 8168ep and 8117 > some formatting fixes to please checkpatch.pl > > v4: > fixed complaints as advised by Heiner and checkpatch.pl > split the patch into five sections to be more easily manipulated and reviewed > introduced r8168_mac_ocp_write_seq() > applied coalescing of mac ocp writes/modifies for 8168H, 8125 and 8125B > > v3: > removed register/mask pair array sentinels, so using ARRAY_SIZE(). > avoided duplication of RTL_W32() call code as advised by Heiner. > > drivers/net/ethernet/realtek/r8169_main.c | 26 +++++++++++++++-------- > 1 file changed, 17 insertions(+), 9 deletions(-) > > diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c > index f4a1d1a74b8b..29ee93b8b702 100644 > --- a/drivers/net/ethernet/realtek/r8169_main.c > +++ b/drivers/net/ethernet/realtek/r8169_main.c > @@ -3231,6 +3231,21 @@ static void rtl_hw_start_8168h_1(struct rtl8169_private *tp) > { 0x04, 0xffff, 0x854a }, > { 0x01, 0xffff, 0x068b } > }; > + > + static const struct e_info_regmaskset e_info_regmaskset_8168h_1[] = { > + { 0xe056, 0x00f0, 0x0070 }, > + { 0xe052, 0x6000, 0x8008 }, > + { 0xe0d6, 0x01ff, 0x017f }, > + { 0xd420, 0x0fff, 0x047f }, > + }; > + > + static const struct e_info_regdata e_info_regdata_8168h_1[] = { > + { 0xe63e, 0x0001 }, > + { 0xe63e, 0x0000 }, > + { 0xc094, 0x0000 }, > + { 0xc09e, 0x0000 }, > + }; > + > int rg_saw_cnt; > > rtl_ephy_init(tp, e_info_8168h_1); > @@ -3271,15 +3286,8 @@ static void rtl_hw_start_8168h_1(struct rtl8169_private *tp) > r8168_mac_ocp_modify(tp, 0xd412, 0x0fff, sw_cnt_1ms_ini); > } > > - r8168_mac_ocp_modify(tp, 0xe056, 0x00f0, 0x0070); > - r8168_mac_ocp_modify(tp, 0xe052, 0x6000, 0x8008); > - r8168_mac_ocp_modify(tp, 0xe0d6, 0x01ff, 0x017f); > - r8168_mac_ocp_modify(tp, 0xd420, 0x0fff, 0x047f); > - > - r8168_mac_ocp_write(tp, 0xe63e, 0x0001); > - r8168_mac_ocp_write(tp, 0xe63e, 0x0000); > - r8168_mac_ocp_write(tp, 0xc094, 0x0000); > - r8168_mac_ocp_write(tp, 0xc09e, 0x0000); > + r8168_mac_ocp_modify_seq(tp, e_info_regmaskset_8168h_1); > + r8168_mac_ocp_write_seq(tp, e_info_regdata_8168h_1); > } > > static void rtl_hw_start_8168ep(struct rtl8169_private *tp) For these few calls I don't really see a benefit in the change. Instead it makes the code harder to read.
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c index f4a1d1a74b8b..29ee93b8b702 100644 --- a/drivers/net/ethernet/realtek/r8169_main.c +++ b/drivers/net/ethernet/realtek/r8169_main.c @@ -3231,6 +3231,21 @@ static void rtl_hw_start_8168h_1(struct rtl8169_private *tp) { 0x04, 0xffff, 0x854a }, { 0x01, 0xffff, 0x068b } }; + + static const struct e_info_regmaskset e_info_regmaskset_8168h_1[] = { + { 0xe056, 0x00f0, 0x0070 }, + { 0xe052, 0x6000, 0x8008 }, + { 0xe0d6, 0x01ff, 0x017f }, + { 0xd420, 0x0fff, 0x047f }, + }; + + static const struct e_info_regdata e_info_regdata_8168h_1[] = { + { 0xe63e, 0x0001 }, + { 0xe63e, 0x0000 }, + { 0xc094, 0x0000 }, + { 0xc09e, 0x0000 }, + }; + int rg_saw_cnt; rtl_ephy_init(tp, e_info_8168h_1); @@ -3271,15 +3286,8 @@ static void rtl_hw_start_8168h_1(struct rtl8169_private *tp) r8168_mac_ocp_modify(tp, 0xd412, 0x0fff, sw_cnt_1ms_ini); } - r8168_mac_ocp_modify(tp, 0xe056, 0x00f0, 0x0070); - r8168_mac_ocp_modify(tp, 0xe052, 0x6000, 0x8008); - r8168_mac_ocp_modify(tp, 0xe0d6, 0x01ff, 0x017f); - r8168_mac_ocp_modify(tp, 0xd420, 0x0fff, 0x047f); - - r8168_mac_ocp_write(tp, 0xe63e, 0x0001); - r8168_mac_ocp_write(tp, 0xe63e, 0x0000); - r8168_mac_ocp_write(tp, 0xc094, 0x0000); - r8168_mac_ocp_write(tp, 0xc09e, 0x0000); + r8168_mac_ocp_modify_seq(tp, e_info_regmaskset_8168h_1); + r8168_mac_ocp_write_seq(tp, e_info_regdata_8168h_1); } static void rtl_hw_start_8168ep(struct rtl8169_private *tp)
Repeated calls to r8168_mac_ocp_write() and r8168_mac_ocp_modify() in the startup of 8168H involve implicit spin_lock_irqsave() and spin_unlock_irqrestore() on each invocation. Coalesced with the corresponding helpers into r8168_mac_ocp_write_seq() and r8168_mac_ocp_modify_seq() with a sinqle paired spin_lock_irqsave() and spin_unlock_irqrestore(), these calls help reduce overall spinlock contention. Fixes: ef712ede3541d ("r8169: add helper r8168_mac_ocp_modify") Fixes: 6e1d0b8988188 ("r8169:add support for RTL8168H and RTL8107E") Cc: Heiner Kallweit <hkallweit1@gmail.com> Cc: Marco Elver <elver@google.com> Cc: nic_swsd@realtek.com Cc: "David S. Miller" <davem@davemloft.net> Cc: Eric Dumazet <edumazet@google.com> Cc: Jakub Kicinski <kuba@kernel.org> Cc: Paolo Abeni <pabeni@redhat.com> Cc: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org Link: https://lore.kernel.org/lkml/20231028005153.2180411-1-mirsad.todorovac@alu.unizg.hr/ Link: https://lore.kernel.org/lkml/20231028110459.2644926-1-mirsad.todorovac@alu.unizg.hr/ Signed-off-by: Mirsad Goran Todorovac <mirsad.todorovac@alu.unizg.hr> --- v5: added unlocked primitives to allow mac ocs modify grouping applied coalescing of mac ocp writes/modifies for 8168ep and 8117 some formatting fixes to please checkpatch.pl v4: fixed complaints as advised by Heiner and checkpatch.pl split the patch into five sections to be more easily manipulated and reviewed introduced r8168_mac_ocp_write_seq() applied coalescing of mac ocp writes/modifies for 8168H, 8125 and 8125B v3: removed register/mask pair array sentinels, so using ARRAY_SIZE(). avoided duplication of RTL_W32() call code as advised by Heiner. drivers/net/ethernet/realtek/r8169_main.c | 26 +++++++++++++++-------- 1 file changed, 17 insertions(+), 9 deletions(-)