From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>
Subject: [PATCH 08/16] net/e1000: Improve Rx descriptor handling in e1000_poll()
Date: Wed, 6 Feb 2019 17:22:06 -0800 [thread overview]
Message-ID: <20190207012214.5060-9-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20190207012214.5060-1-andrew.smirnov@gmail.com>
Drop explicit volatile specifier as well as endianness conversion by
changing the code to use appropriate read*() IO accessors.
While at it if fix incorrect width used for "status" (8 vs 32) and
"len" (16 vs 32).
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
---
drivers/net/e1000/main.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/net/e1000/main.c b/drivers/net/e1000/main.c
index f13b48e0c..b8222c7ae 100644
--- a/drivers/net/e1000/main.c
+++ b/drivers/net/e1000/main.c
@@ -3391,11 +3391,10 @@ static void e1000_configure_rx(struct e1000_hw *hw)
static int e1000_poll(struct eth_device *edev)
{
struct e1000_hw *hw = edev->priv;
- volatile struct e1000_rx_desc *rd = &hw->rx_base[hw->rx_last];
- uint32_t len;
+ struct e1000_rx_desc *rd = &hw->rx_base[hw->rx_last];
- if (le32_to_cpu(rd->status) & E1000_RXD_STAT_DD) {
- len = le32_to_cpu(rd->length);
+ if (readb(&rd->status) & E1000_RXD_STAT_DD) {
+ const uint16_t len = readw(&rd->length);
dma_sync_single_for_cpu(hw->packet_dma, len,
DMA_FROM_DEVICE);
--
2.20.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2019-02-07 1:22 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-07 1:21 [PATCH 00/16] E1000 driver AArch64 related fixes Andrey Smirnov
2019-02-07 1:21 ` [PATCH 01/16] ARM: Select HAS_DMA for AArch64 Andrey Smirnov
2019-02-07 1:22 ` [PATCH 02/16] include: Import io-64-nonatomic-*.h from Linux Andrey Smirnov
2019-02-07 1:22 ` [PATCH 03/16] net/e1000: Don't use coherent memory for Rx buffer Andrey Smirnov
2019-02-07 1:22 ` [PATCH 04/16] net/e1000: Convert e1000_transmit to use dma_map_single() Andrey Smirnov
2019-02-07 1:22 ` [PATCH 05/16] net/e1000: Fix debug print warning Andrey Smirnov
2019-02-07 1:22 ` [PATCH 06/16] net/e1000: Fix incorrect "Rx ready" check Andrey Smirnov
2019-02-07 1:22 ` [PATCH 07/16] net/e1000: Get rid of pointer arithmetic in e1000_poll Andrey Smirnov
2019-02-07 1:22 ` Andrey Smirnov [this message]
2019-02-07 1:22 ` [PATCH 09/16] net/e1000: Remove pointer arithmetic in e1000_transmit() Andrey Smirnov
2019-02-07 1:22 ` [PATCH 10/16] net/e1000: Improve Tx descriptor handling in e1000_transmit Andrey Smirnov
2019-02-07 1:22 ` [PATCH 11/16] net/e1000: Make use of readl_poll_timeout() in e1000_transmit() Andrey Smirnov
2019-02-07 1:22 ` [PATCH 12/16] net/e1000: Rename fill_rx() to e1000_fill_rx() Andrey Smirnov
2019-02-07 1:22 ` [PATCH 13/16] net/e1000: Remove pointer arithmetic from e1000_fill_rx() Andrey Smirnov
2019-02-07 1:22 ` [PATCH 14/16] net/e1000: Consolidate next index calculation code Andrey Smirnov
2019-02-07 1:22 ` [PATCH 15/16] net/e1000: Improve RX buffer handling in e1000_fill_rx() Andrey Smirnov
2019-02-07 1:22 ` [PATCH 16/16] net/e1000: Do not hardcode TDBAH and RDBAH to 0 Andrey Smirnov
2019-02-11 7:48 ` [PATCH 00/16] E1000 driver AArch64 related fixes Sascha Hauer
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=20190207012214.5060-9-andrew.smirnov@gmail.com \
--to=andrew.smirnov@gmail.com \
--cc=barebox@lists.infradead.org \
/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