OSDN Git Service

net: cpsw: avoid alignment faults by taking NET_IP_ALIGN into account
authorArd Biesheuvel <ardb@kernel.org>
Tue, 18 Jan 2022 10:22:04 +0000 (11:22 +0100)
committerDavid S. Miller <davem@davemloft.net>
Wed, 19 Jan 2022 14:19:19 +0000 (14:19 +0000)
commit1771afd47430f5e95c9c3a2e3a8a63e67402d3fe
treeb8f50eae6e63e42b7ee1963f36461be8ff7ac106
parentdded08927ca3c31a5c37f8e7f95fe98770475dd4
net: cpsw: avoid alignment faults by taking NET_IP_ALIGN into account

Both versions of the CPSW driver declare a CPSW_HEADROOM_NA macro that
takes NET_IP_ALIGN into account, but fail to use it appropriately when
storing incoming packets in memory. This results in the IPv4 source and
destination addresses to appear misaligned in memory, which causes
aligment faults that need to be fixed up in software.

So let's switch from CPSW_HEADROOM to CPSW_HEADROOM_NA where needed.
This gets rid of any alignment faults on the RX path on a Beaglebone
White.

Fixes: 9ed4050c0d75 ("net: ethernet: ti: cpsw: add XDP support")
Cc: Grygorii Strashko <grygorii.strashko@ti.com>
Cc: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/ti/cpsw.c
drivers/net/ethernet/ti/cpsw_new.c
drivers/net/ethernet/ti/cpsw_priv.c