From: Finn Thain <fthain@telegraphics.com.au>
To: "David S. Miller" <davem@davemloft.net>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>,
Chris Zankel <chris@zankel.net>,
Laurent Vivier <laurent@vivier.eu>,
Geert Uytterhoeven <geert@linux-m68k.org>,
Eric Dumazet <eric.dumazet@gmail.com>,
Stephen Hemminger <stephen@networkplumber.org>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH net v3 07/12] net/sonic: Improve receive descriptor status flag check
Date: Thu, 23 Jan 2020 09:07:26 +1100 [thread overview]
Message-ID: <4edeb98033446fcb3e4966b0b856f1243235fa5f.1579730846.git.fthain@telegraphics.com.au> (raw)
In-Reply-To: <cover.1579730846.git.fthain@telegraphics.com.au>
After sonic_tx_timeout() calls sonic_init(), it can happen that
sonic_rx() will subsequently encounter a receive descriptor with no
flags set. Remove the comment that says that this can't happen.
When giving a receive descriptor to the SONIC, clear the descriptor
status field. That way, any rx descriptor with flags set can only be
a newly received packet.
Don't process a descriptor without the LPKT bit set. The buffer is
still in use by the SONIC.
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Tested-by: Stan Johnson <userm57@yahoo.com>
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
---
Changed since v2:
- Removed blank line.
---
drivers/net/ethernet/natsemi/sonic.c | 15 +++++----------
1 file changed, 5 insertions(+), 10 deletions(-)
diff --git a/drivers/net/ethernet/natsemi/sonic.c b/drivers/net/ethernet/natsemi/sonic.c
index 2cee702f49b8..9d2bddc4951b 100644
--- a/drivers/net/ethernet/natsemi/sonic.c
+++ b/drivers/net/ethernet/natsemi/sonic.c
@@ -434,7 +434,6 @@ static int index_from_addr(struct sonic_local *lp, dma_addr_t addr,
static void sonic_rx(struct net_device *dev)
{
struct sonic_local *lp = netdev_priv(dev);
- int status;
int entry = lp->cur_rx;
int prev_entry = lp->eol_rx;
@@ -445,9 +444,10 @@ static void sonic_rx(struct net_device *dev)
u16 bufadr_l;
u16 bufadr_h;
int pkt_len;
+ u16 status = sonic_rda_get(dev, entry, SONIC_RD_STATUS);
- status = sonic_rda_get(dev, entry, SONIC_RD_STATUS);
- if (status & SONIC_RCR_PRX) {
+ /* If the RD has LPKT set, the chip has finished with the RB */
+ if ((status & SONIC_RCR_PRX) && (status & SONIC_RCR_LPKT)) {
u32 addr = (sonic_rda_get(dev, entry,
SONIC_RD_PKTPTR_H) << 16) |
sonic_rda_get(dev, entry, SONIC_RD_PKTPTR_L);
@@ -495,10 +495,6 @@ static void sonic_rx(struct net_device *dev)
bufadr_h = (unsigned long)new_laddr >> 16;
sonic_rra_put(dev, i, SONIC_RR_BUFADR_L, bufadr_l);
sonic_rra_put(dev, i, SONIC_RR_BUFADR_H, bufadr_h);
- } else {
- /* This should only happen, if we enable accepting broken packets. */
- }
- if (status & SONIC_RCR_LPKT) {
/*
* this was the last packet out of the current receive buffer
* give the buffer back to the SONIC
@@ -511,12 +507,11 @@ static void sonic_rx(struct net_device *dev)
__func__);
SONIC_WRITE(SONIC_ISR, SONIC_INT_RBE); /* clear the flag */
}
- } else
- printk(KERN_ERR "%s: rx desc without RCR_LPKT. Shouldn't happen !?\n",
- dev->name);
+ }
/*
* give back the descriptor
*/
+ sonic_rda_put(dev, entry, SONIC_RD_STATUS, 0);
sonic_rda_put(dev, entry, SONIC_RD_IN_USE, 1);
prev_entry = entry;
--
2.24.1
next prev parent reply other threads:[~2020-01-22 22:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-22 22:07 [PATCH net v3 00/12] Fixes for SONIC ethernet driver Finn Thain
2020-01-22 22:07 ` [PATCH net v3 10/12] net/sonic: Fix command register usage Finn Thain
2020-01-22 22:07 ` [PATCH net v3 04/12] net/sonic: Fix interface error stats collection Finn Thain
2020-01-22 22:07 ` [PATCH net v3 08/12] net/sonic: Fix receive buffer replenishment Finn Thain
2020-01-22 22:07 ` [PATCH net v3 02/12] net/sonic: Clear interrupt flags immediately Finn Thain
2020-01-22 22:07 ` [PATCH net v3 06/12] net/sonic: Avoid needless receive descriptor EOL flag updates Finn Thain
2020-01-22 22:07 ` [PATCH net v3 03/12] net/sonic: Use MMIO accessors Finn Thain
2020-01-22 22:07 ` [PATCH net v3 11/12] net/sonic: Fix CAM initialization Finn Thain
2020-01-22 22:07 ` [PATCH net v3 12/12] net/sonic: Prevent tx watchdog timeout Finn Thain
2020-01-22 22:07 ` [PATCH net v3 09/12] net/sonic: Quiesce SONIC before re-initializing descriptor memory Finn Thain
2020-01-22 22:07 ` Finn Thain [this message]
2020-01-22 22:07 ` [PATCH net v3 01/12] net/sonic: Add mutual exclusion for accessing shared state Finn Thain
2020-01-22 22:07 ` [PATCH net v3 05/12] net/sonic: Fix receive buffer handling Finn Thain
2020-01-23 20:24 ` [PATCH net v3 00/12] Fixes for SONIC ethernet driver David Miller
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=4edeb98033446fcb3e4966b0b856f1243235fa5f.1579730846.git.fthain@telegraphics.com.au \
--to=fthain@telegraphics.com.au \
--cc=chris@zankel.net \
--cc=davem@davemloft.net \
--cc=eric.dumazet@gmail.com \
--cc=geert@linux-m68k.org \
--cc=laurent@vivier.eu \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=stephen@networkplumber.org \
--cc=tsbogend@alpha.franken.de \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).