From: Heiner Kallweit <hkallweit1@gmail.com>
To: Jakub Kicinski <kuba@kernel.org>,
David Miller <davem@davemloft.net>,
Realtek linux nic maintainers <nic_swsd@realtek.com>
Cc: "netdev@vger.kernel.org" <netdev@vger.kernel.org>
Subject: [PATCH net-next 1/3] r8169: replace BUG_ON with WARN in _rtl_eri_write
Date: Wed, 6 Jan 2021 14:28:00 +0100 [thread overview]
Message-ID: <619e6cc2-9253-fd1e-564a-eec944ee31e1@gmail.com> (raw)
In-Reply-To: <f89bf2f3-5324-b635-4253-8a8be316c15b@gmail.com>
Use WARN here to avoid stopping the system. In addition print the addr
and mask values that triggered the warning.
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 024042f37..9af048ad0 100644
--- a/drivers/net/ethernet/realtek/r8169_main.c
+++ b/drivers/net/ethernet/realtek/r8169_main.c
@@ -763,7 +763,7 @@ 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));
+ WARN(addr & 3 || !mask, "addr: 0x%x, mask: 0x%08x\n", addr, mask);
RTL_W32(tp, ERIDR, val);
r8168fp_adjust_ocp_cmd(tp, &cmd, type);
RTL_W32(tp, ERIAR, cmd);
--
2.30.0
next prev parent reply other threads:[~2021-01-06 13:30 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-06 13:26 [PATCH net-next 0/3] r8169: small improvements Heiner Kallweit
2021-01-06 13:28 ` Heiner Kallweit [this message]
2021-01-06 22:18 ` [PATCH net-next 1/3] r8169: replace BUG_ON with WARN in _rtl_eri_write Alexander Duyck
2021-01-06 23:02 ` Heiner Kallweit
2021-01-06 13:28 ` [PATCH net-next 2/3] r8169: improve rtl_ocp_reg_failure Heiner Kallweit
2021-01-06 13:29 ` [PATCH net-next 3/3] r8169: don't wakeup-enable device on shutdown if WOL is disabled Heiner Kallweit
2021-01-06 18:10 ` [PATCH net-next 0/3] r8169: small improvements Heiner Kallweit
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=619e6cc2-9253-fd1e-564a-eec944ee31e1@gmail.com \
--to=hkallweit1@gmail.com \
--cc=davem@davemloft.net \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=nic_swsd@realtek.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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.