* [PATCH net-next v2 0/3] r8169: small improvements
@ 2021-01-08 11:55 Heiner Kallweit
2021-01-08 11:57 ` [PATCH net-next v2 1/3] r8169: replace BUG_ON with WARN in _rtl_eri_write Heiner Kallweit
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Heiner Kallweit @ 2021-01-08 11:55 UTC (permalink / raw)
To: Jakub Kicinski, David Miller, Realtek linux nic maintainers; +Cc: netdev
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(-)
--
2.30.0
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH net-next v2 1/3] r8169: replace BUG_ON with WARN in _rtl_eri_write
2021-01-08 11:55 [PATCH net-next v2 0/3] r8169: small improvements Heiner Kallweit
@ 2021-01-08 11:57 ` Heiner Kallweit
2021-01-08 11:58 ` [PATCH net-next v2 2/3] r8169: improve rtl_ocp_reg_failure Heiner Kallweit
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Heiner Kallweit @ 2021-01-08 11:57 UTC (permalink / raw)
To: Jakub Kicinski, David Miller, Realtek linux nic maintainers; +Cc: netdev
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
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/ethernet/realtek/r8169_main.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index c9abc7ccb..317b34723 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -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);
--
2.30.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH net-next v2 2/3] r8169: improve rtl_ocp_reg_failure
2021-01-08 11:55 [PATCH net-next v2 0/3] r8169: small improvements Heiner Kallweit
2021-01-08 11:57 ` [PATCH net-next v2 1/3] r8169: replace BUG_ON with WARN in _rtl_eri_write Heiner Kallweit
@ 2021-01-08 11:58 ` Heiner Kallweit
2021-01-08 12:00 ` [PATCH net-next v2 3/3] r8169: don't wakeup-enable device on shutdown if WOL is disabled Heiner Kallweit
2021-01-10 2:10 ` [PATCH net-next v2 0/3] r8169: small improvements patchwork-bot+netdevbpf
3 siblings, 0 replies; 5+ messages in thread
From: Heiner Kallweit @ 2021-01-08 11:58 UTC (permalink / raw)
To: Jakub Kicinski, David Miller, Realtek linux nic maintainers; +Cc: netdev
Use WARN_ONCE here to get a call trace in case of a problem.
This facilitates finding the offending code part.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/ethernet/realtek/r8169_main.c | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 9af048ad0..6005d37b6 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -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);
--
2.30.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH net-next v2 3/3] r8169: don't wakeup-enable device on shutdown if WOL is disabled
2021-01-08 11:55 [PATCH net-next v2 0/3] r8169: small improvements Heiner Kallweit
2021-01-08 11:57 ` [PATCH net-next v2 1/3] r8169: replace BUG_ON with WARN in _rtl_eri_write Heiner Kallweit
2021-01-08 11:58 ` [PATCH net-next v2 2/3] r8169: improve rtl_ocp_reg_failure Heiner Kallweit
@ 2021-01-08 12:00 ` Heiner Kallweit
2021-01-10 2:10 ` [PATCH net-next v2 0/3] r8169: small improvements patchwork-bot+netdevbpf
3 siblings, 0 replies; 5+ messages in thread
From: Heiner Kallweit @ 2021-01-08 12:00 UTC (permalink / raw)
To: Jakub Kicinski, David Miller, Realtek linux nic maintainers; +Cc: netdev
If WOL isn't enabled, then there's no need to enable wakeup from D3
on system shutdown.
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
---
drivers/net/ethernet/realtek/r8169_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/realtek/r8169_main.c b/drivers/net/ethernet/realtek/r8169_main.c
index 6005d37b6..982e6b2f0 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -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);
}
}
--
2.30.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH net-next v2 0/3] r8169: small improvements
2021-01-08 11:55 [PATCH net-next v2 0/3] r8169: small improvements Heiner Kallweit
` (2 preceding siblings ...)
2021-01-08 12:00 ` [PATCH net-next v2 3/3] r8169: don't wakeup-enable device on shutdown if WOL is disabled Heiner Kallweit
@ 2021-01-10 2:10 ` patchwork-bot+netdevbpf
3 siblings, 0 replies; 5+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-01-10 2:10 UTC (permalink / raw)
To: Heiner Kallweit; +Cc: kuba, davem, nic_swsd, netdev
Hello:
This series was applied to netdev/net-next.git (refs/heads/master):
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 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
>
> [...]
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
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2021-01-10 2:11 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-08 11:55 [PATCH net-next v2 0/3] r8169: small improvements Heiner Kallweit
2021-01-08 11:57 ` [PATCH net-next v2 1/3] r8169: replace BUG_ON with WARN in _rtl_eri_write Heiner Kallweit
2021-01-08 11:58 ` [PATCH net-next v2 2/3] r8169: improve rtl_ocp_reg_failure Heiner Kallweit
2021-01-08 12:00 ` [PATCH net-next v2 3/3] r8169: don't wakeup-enable device on shutdown if WOL is disabled Heiner Kallweit
2021-01-10 2:10 ` [PATCH net-next v2 0/3] r8169: small improvements patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.