From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EAFA6C18E5B for ; Tue, 17 Mar 2020 11:17:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B9E4020663 for ; Tue, 17 Mar 2020 11:17:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584443835; bh=kgGuoJjHO/MyoafybOuLhsR0hGAVHxo8y/T7jI7eyFY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=grQqBR2LR3Abq+ZllInwwYDA3vEzLLV+GyWcz4+OUWPYDALwxufyMim7k8EOzTRb4 y0V478pZtPhrkPymcNzcsRWD6PdpexhyJ1BrYVp9hX7hFZhhGvUNknqM97F2zI/MCK jhnsN6ObRzmRO2gsyZLnrbNlYVj+qMMZaOnLiLdE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725962AbgCQLHl (ORCPT ); Tue, 17 Mar 2020 07:07:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:49388 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728762AbgCQLHk (ORCPT ); Tue, 17 Mar 2020 07:07:40 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4DF37206EC; Tue, 17 Mar 2020 11:07:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584443259; bh=kgGuoJjHO/MyoafybOuLhsR0hGAVHxo8y/T7jI7eyFY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O0PtSH+ftu1cRFSdrNOOrJFYHZTB5ZRJ7lYnHq+AGjnzKMxPYlqpit9NiD6cY795f AbbGqu/aPVYUvL2E6iTEg4wZbh1X39JdpqkNEQNEnEhTQ+z2rLRRx7WVdHuWNGAAzF PAxmZRObEa6kiaaO/IxKLmv08deCrOy9E18Se2bU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Remi Pommarel , "David S. Miller" Subject: [PATCH 5.5 027/151] net: stmmac: dwmac1000: Disable ACS if enhanced descs are not used Date: Tue, 17 Mar 2020 11:53:57 +0100 Message-Id: <20200317103328.645986941@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200317103326.593639086@linuxfoundation.org> References: <20200317103326.593639086@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Remi Pommarel [ 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: 47dd7a540b8a0 ("net: add support for STMicroelectronics Ethernet controllers.") Signed-off-by: Remi Pommarel Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac1000_core.c @@ -24,6 +24,7 @@ static void dwmac1000_core_init(struct mac_device_info *hw, struct net_device *dev) { + struct stmmac_priv *priv = netdev_priv(dev); void __iomem *ioaddr = hw->pcsr; u32 value = readl(ioaddr + GMAC_CONTROL); int mtu = dev->mtu; @@ -35,7 +36,7 @@ static void dwmac1000_core_init(struct m * Broadcom tags can look like invalid LLC/SNAP packets and cause the * hardware to truncate packets on reception. */ - if (netdev_uses_dsa(dev)) + if (netdev_uses_dsa(dev) || !priv->plat->enh_desc) value &= ~GMAC_CONTROL_ACS; if (mtu > 1500)