Commit 934d0048 authored by Michael Weiser's avatar Michael Weiser Committed by David S. Miller

net: ethernet: sun4i-emac: Read rxhdr in CPU byte-order

The EMAC EMAC_RX_IO_DATA_REG data register is dual-purpose: On one hand
it is used to move actual packet data off the wire. This will be in
wire-format and accepted as such by higher layers such as IP. Therefore
it is correctly read as-is (i.e. raw) using readsl.

On the other hand it provides metadata about incoming transfers to the
driver such as length and checksum validation status. This data is
little-endian, always and it is interpreted by the driver. Therefore it
needs to be swapped to CPU endianness to make sense to the driver. This
is already done for the "receive header" but not rxhdr.

Read rxhdr using readl in order for sun4i-emac to work correctly when
running a big-endian kernel.
Signed-off-by: default avatarMichael Weiser <michael.weiser@gmx.de>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b8ca3387
...@@ -592,8 +592,7 @@ static void emac_rx(struct net_device *dev) ...@@ -592,8 +592,7 @@ static void emac_rx(struct net_device *dev)
/* A packet ready now & Get status/length */ /* A packet ready now & Get status/length */
good_packet = true; good_packet = true;
emac_inblk_32bit(db->membase + EMAC_RX_IO_DATA_REG, rxhdr = readl(db->membase + EMAC_RX_IO_DATA_REG);
&rxhdr, sizeof(rxhdr));
if (netif_msg_rx_status(db)) if (netif_msg_rx_status(db))
dev_dbg(db->dev, "rxhdr: %x\n", *((int *)(&rxhdr))); dev_dbg(db->dev, "rxhdr: %x\n", *((int *)(&rxhdr)));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment