提交 81fa2e2f 编写于 作者: R Remi Pommarel 提交者: Yang Yingliang

net: stmmac: dwmac1000: Disable ACS if enhanced descs are not used

[ Upstream commit b723bd933980f4956dabc8a8d84b3e83be8d094c ]

ACS (auto PAD/FCS stripping) removes FCS off 802.3 packets (LLC) so that
there is no need to manually strip it for such packets. The enhanced DMA
descriptors allow to flag LLC packets so that the receiving callback can
use that to strip FCS manually or not. On the other hand, normal
descriptors do not support that.

Thus in order to not truncate LLC packet ACS should be disabled when
using normal DMA descriptors.

Fixes: 47dd7a54 ("net: add support for STMicroelectronics Ethernet controllers.")
Signed-off-by: NRemi Pommarel <repk@triplefau.lt>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 6b4606b8
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
static void dwmac1000_core_init(struct mac_device_info *hw, static void dwmac1000_core_init(struct mac_device_info *hw,
struct net_device *dev) struct net_device *dev)
{ {
struct stmmac_priv *priv = netdev_priv(dev);
void __iomem *ioaddr = hw->pcsr; void __iomem *ioaddr = hw->pcsr;
u32 value = readl(ioaddr + GMAC_CONTROL); u32 value = readl(ioaddr + GMAC_CONTROL);
int mtu = dev->mtu; int mtu = dev->mtu;
...@@ -45,7 +46,7 @@ static void dwmac1000_core_init(struct mac_device_info *hw, ...@@ -45,7 +46,7 @@ static void dwmac1000_core_init(struct mac_device_info *hw,
* Broadcom tags can look like invalid LLC/SNAP packets and cause the * Broadcom tags can look like invalid LLC/SNAP packets and cause the
* hardware to truncate packets on reception. * hardware to truncate packets on reception.
*/ */
if (netdev_uses_dsa(dev)) if (netdev_uses_dsa(dev) || !priv->plat->enh_desc)
value &= ~GMAC_CONTROL_ACS; value &= ~GMAC_CONTROL_ACS;
if (mtu > 1500) if (mtu > 1500)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册