r8169: small improvements
Heiner Kallweit
maintainerv2 cover r8169: small improvements
This series includes a number of smaller improvements.
v2:
- return on WARN in patch 1
Heiner Kallweit (3):
r8169: replace BUG_ON with WARN in _rtl_eri_write
r8169: improve rtl_ocp_reg_failure
r8169: don't wakeup-enable device on shutdown if WOL is disabled
drivers/net/ethernet/realtek/r8169_main.c | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)
Signature · 1 line
2.30.0
Heiner Kallweit
maintainerPATCH v2 1/3 r8169: replace BUG_ON with WARN in _rtl_eri_write
Use WARN here to avoid stopping the system. In addition print the addr and mask values that triggered the warning.
v2:
- return on WARN to avoid an invalid register write
--- drivers/net/ethernet/realtek/r8169_main.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/ethernet/realtek/r8169_main.c +3 -1
@@ -763,7 +763,9 @@ static void _rtl_eri_write(struct rtl8169_private *tp, int addr, u32 mask, {u32 cmd =ERIAR_WRITE_CMD | type | mask | addr; -BUG_ON ((addr &3 ) || (mask ==0 )); +if (WARN (addr &3 || !mask,"addr: 0x%x, mask: 0x%08x\n" , addr, mask)) +return ; +RTL_W32 (tp,ERIDR , val);r8168fp_adjust_ocp_cmd (tp, &cmd, type);RTL_W32 (tp,ERIAR , cmd);
Signature · 1 line
2.30.0
Heiner Kallweit
maintainerPATCH v2 2/3 r8169: improve rtl_ocp_reg_failure
In reply to Heiner KallweitUse WARN_ONCE here to get a call trace in case of a problem. This facilitates finding the offending code part.
--- drivers/net/ethernet/realtek/r8169_main.c | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-)
drivers/net/ethernet/realtek/r8169_main.c +6 -11
@@ -810,14 +810,9 @@ static void rtl_eri_clear_bits(struct rtl8169_private *tp, int addr, u32 m)rtl_w0w1_eri (tp, addr,0 , m); } -static bool rtl_ocp_reg_failure (struct rtl8169_private *tp,u32 reg) +static bool rtl_ocp_reg_failure (u32 reg) { -if (reg &0xffff0001 ) { -if (net_ratelimit ()) -netdev_err (tp->dev,"Invalid ocp reg %x!\n" , reg); -return true; - } -return false; +return WARN_ONCE (reg &0xffff0001 ,"Invalid ocp reg %x!\n" , reg); }DECLARE_RTL_COND (rtl_ocp_gphy_cond)
@@ -827,7 +822,7 @@ DECLARE_RTL_COND(rtl_ocp_gphy_cond)static void r8168_phy_ocp_write (struct rtl8169_private *tp,u32 reg,u32 data) { -if (rtl_ocp_reg_failure (tp, reg)) +if (rtl_ocp_reg_failure (reg))return ;RTL_W32 (tp,GPHY_OCP ,OCPAR_FLAG | (reg <<15 ) | data);
@@ -837,7 +832,7 @@ static void r8168_phy_ocp_write(struct rtl8169_private *tp, u32 reg, u32 data)static int r8168_phy_ocp_read (struct rtl8169_private *tp,u32 reg) { -if (rtl_ocp_reg_failure (tp, reg)) +if (rtl_ocp_reg_failure (reg))return 0 ;RTL_W32 (tp,GPHY_OCP , reg <<15 );
@@ -848,7 +843,7 @@ static int r8168_phy_ocp_read(struct rtl8169_private *tp, u32 reg)static void r8168_mac_ocp_write (struct rtl8169_private *tp,u32 reg,u32 data) { -if (rtl_ocp_reg_failure (tp, reg)) +if (rtl_ocp_reg_failure (reg))return ;RTL_W32 (tp,OCPDR ,OCPAR_FLAG | (reg <<15 ) | data);
@@ -856,7 +851,7 @@ static void r8168_mac_ocp_write(struct rtl8169_private *tp, u32 reg, u32 data)static u16 r8168_mac_ocp_read (struct rtl8169_private *tp,u32 reg) { -if (rtl_ocp_reg_failure (tp, reg)) +if (rtl_ocp_reg_failure (reg))return 0 ;RTL_W32 (tp,OCPDR , reg <<15 );
Signature · 1 line
2.30.0
Heiner Kallweit
maintainerPATCH v2 3/3 r8169: don't wakeup-enable device on shutdown if WOL is disabled
In reply to Heiner KallweitIf WOL isn't enabled, then there's no need to enable wakeup from D3 on system shutdown.
--- drivers/net/ethernet/realtek/r8169_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/realtek/r8169_main.c +1 -1
@@ -4876,7 +4876,7 @@ static void rtl_shutdown(struct pci_dev *pdev)rtl_wol_shutdown_quirk (tp); } -pci_wake_from_d3 (pdev, true); +pci_wake_from_d3 (pdev, tp->saved_wolopts);pci_set_power_state (pdev, PCI_D3hot); } }
Signature · 1 line
2.30.0
This series was applied to netdev/net-next.git (refs/heads/master):
Hello:
This series was applied to netdev/net-next.git (refs/heads/master):
Quoted 11 lines · On Fri, 8 Jan 2021 12:55:32 +0100 you wrote:
This series includes a number of smaller improvements.
v2:
- return on WARN in patch 1Heiner Kallweit (3):
r8169: replaceBUG_ONwith WARN in_rtl_eri_write
r8169: improvertl_ocp_reg_failure
r8169: don't wakeup-enable device on shutdown if WOL is disabled[...]
Here is the summary with links:
- [net-next,v2,1/3] r8169: replace BUG_ON with WARN in _rtl_eri_write
https://git.kernel.org/netdev/net-next/c/5f1e1224d660 - [net-next,v2,2/3] r8169: improve rtl_ocp_reg_failure https://git.kernel.org/netdev/net-next/c/a46604d7ce49 - [net-next,v2,3/3] r8169: don't wakeup-enable device on shutdown if WOL is disabled https://git.kernel.org/netdev/net-next/c/bb703e5781d6
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html