diff options
| author | Andrey Smirnov <andrew.smirnov@gmail.com> | 2019-02-06 17:22:13 -0800 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-02-11 08:47:46 +0100 |
| commit | deec75514d975265e5e18e3bc62a43a4a3fa4174 (patch) | |
| tree | da7f5eee9177ee7f91f9bfdc72204fdc722b9b58 /drivers/net/e1000 | |
| parent | bf0c10d3b76e9ebfc787d5f4768e58f812fcdd00 (diff) | |
| download | barebox-deec75514d975265e5e18e3bc62a43a4a3fa4174.tar.gz barebox-deec75514d975265e5e18e3bc62a43a4a3fa4174.tar.xz | |
net/e1000: Improve RX buffer handling in e1000_fill_rx()
Drop explicit "volatile" specifier for struct e1000_rx_desc, "bla"
variable as well as explicit endiannes fix, by using little endian IO
accessors (readl, writel, etc.)
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net/e1000')
| -rw-r--r-- | drivers/net/e1000/main.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/net/e1000/main.c b/drivers/net/e1000/main.c index 01330f5a51..c6b6906ce3 100644 --- a/drivers/net/e1000/main.c +++ b/drivers/net/e1000/main.c @@ -3205,18 +3205,17 @@ static int e1000_bd_next_index(int index) static void e1000_fill_rx(struct e1000_hw *hw) { - volatile struct e1000_rx_desc *rd = &hw->rx_base[hw->rx_tail]; - volatile u32 *bla; - int i; + struct e1000_rx_desc *rd = &hw->rx_base[hw->rx_tail]; hw->rx_last = hw->rx_tail; hw->rx_tail = e1000_bd_next_index(hw->rx_tail); - bla = (void *)rd; - for (i = 0; i < 4; i++) - *bla++ = 0; - - rd->buffer_addr = cpu_to_le64(hw->packet_dma); + writeq(hw->packet_dma, &rd->buffer_addr); + writew(0, &rd->length); + writew(0, &rd->csum); + writeb(0, &rd->status); + writeb(0, &rd->errors); + writew(0, &rd->special); e1000_write_reg(hw, E1000_RDT, hw->rx_tail); } |