From patchwork Fri Feb 10 23:39:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 55648 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1235910wrn; Fri, 10 Feb 2023 15:43:03 -0800 (PST) X-Google-Smtp-Source: AK7set97MdtLRoB4nFO+xlD9rvWkVH8mRNjK9N3vXaJT54nnyiFt2rDpPK839WXtcB6L0DTcX0AA X-Received: by 2002:a17:907:10c2:b0:879:ab3:2864 with SMTP id rv2-20020a17090710c200b008790ab32864mr18305967ejb.24.1676072583009; Fri, 10 Feb 2023 15:43:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676072582; cv=none; d=google.com; s=arc-20160816; b=TO/Rk4B7PTOs/B7xx5jM2CKyEl0CXyLrArWdVtx3p59/qMUaUICrV+WU+dQwmZC4+b Y8oNRIbkpWaKYqO8BkEg/dWcKPeiMPfx92PcS/3/YDcgD5YISa+5WzEvPyXPdbTyJ10h B+MLybhI5GBBT5BSfrI0NmT2yKujOzN0k67jrX4YcWEyrceG02jFwG/e6Ii+6IO1GnOK +++A1eSO7zRoVlYhjXSMEr/GecgIzfA2bSPhpzhbPp67Gw9axfSBwxIw5rPiOcipKM0V pfZcGZFB/fOzrln3UHnj0AppKwwiQ+2G5tuP0QybbzG7XtfCcCTYRMghaN3/yKX3FPkt NX7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-transfer-encoding :content-disposition:mime-version:references:message-id:subject:cc :to:from:date; bh=XoqAvgryegCD9SEb96oXs7sYN4tmck2a+Qfli6dYbPY=; b=Z9evO7hgaLMh/nNLPnB0UbfmHG8eQdRl/I7magkU4swvpMVrl/XZ6PUssro/Ism2M8 Hl8JyV+7XcWZ8WY39oGlxTvGjyHaQfZwoXCsjHuSSzwIF77nJ2T/BiEdIjh0iUv1LPdo Ga8SSlGZ4UtMXG+D0dS1KeOT6Wc2YLX8KFevl6fnIyBi+Q0y2U8Wb6gI8o5eCNJ/Zf1L 0EJr+B3Xp02TSt8OLuipGpsYPE2n3Ry9hpCjaNvEjGj2d3YFwD5R3KNIJ7eIl6sFN5eO KSJVNxIsmFr6FndqKyxUS2FoUSD2c5UYQ5Iqr0U7f5cUuTypzlYYCCr6NbdZVAzhSU1K d03w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f19-20020a170906739300b0087bd2c8a4e0si7509318ejl.971.2023.02.10.15.42.39; Fri, 10 Feb 2023 15:43:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229787AbjBJXl3 (ORCPT + 99 others); Fri, 10 Feb 2023 18:41:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49580 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229874AbjBJXl1 (ORCPT ); Fri, 10 Feb 2023 18:41:27 -0500 Received: from fudo.makrotopia.org (fudo.makrotopia.org [IPv6:2a07:2ec0:3002::71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82764840E0; Fri, 10 Feb 2023 15:40:54 -0800 (PST) Received: from local by fudo.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.96) (envelope-from ) id 1pQd0Y-0004E9-2Q; Sat, 11 Feb 2023 00:40:46 +0100 Date: Fri, 10 Feb 2023 23:39:05 +0000 From: Daniel Golle To: netdev@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Russell King , Heiner Kallweit , Lorenzo Bianconi , Mark Lee , John Crispin , Felix Fietkau , AngeloGioacchino Del Regno , Matthias Brugger , DENG Qingfang , Landen Chao , Sean Wang , Paolo Abeni , Jakub Kicinski , Eric Dumazet , "David S. Miller" , Vladimir Oltean , Florian Fainelli , Andrew Lunn Cc: Jianhui Zhao , =?iso-8859-1?q?Bj=F8rn?= Mork Subject: [PATCH v4 08/12] net: ethernet: mtk_eth_soc: fix RX data corruption issue Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757489484791345409?= X-GMAIL-MSGID: =?utf-8?q?1757489484791345409?= Also set bit 12 when setting up MAC MCR, as MediaTek SDK did the same change stating: "If without this patch, kernel might receive invalid packets that are corrupted by GMAC."[1] [1]: https://git01.mediatek.com/plugins/gitiles/openwrt/feeds/mtk-openwrt-feeds/+/d8a2975939a12686c4a95c40db21efdc3f821f63 Tested-by: Bjørn Mork Signed-off-by: Daniel Golle --- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 2 +- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c index 030d87c42bd4..fa61eefe0a61 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -615,7 +615,7 @@ static int mtk_mac_finish(struct phylink_config *config, unsigned int mode, /* Setup gmac */ mcr_cur = mtk_r32(mac->hw, MTK_MAC_MCR(mac->id)); mcr_new = mcr_cur; - mcr_new |= MAC_MCR_IPG_CFG | MAC_MCR_FORCE_MODE | + mcr_new |= MAC_MCR_IPG_CFG | MAC_MCR_BIT_12 | MAC_MCR_FORCE_MODE | MAC_MCR_BACKOFF_EN | MAC_MCR_BACKPR_EN | MAC_MCR_FORCE_LINK; /* Only update control register when needed! */ diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h index 142def8629c8..084d07c96c04 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h @@ -404,6 +404,7 @@ #define MAC_MCR_FORCE_MODE BIT(15) #define MAC_MCR_TX_EN BIT(14) #define MAC_MCR_RX_EN BIT(13) +#define MAC_MCR_BIT_12 BIT(12) #define MAC_MCR_BACKOFF_EN BIT(9) #define MAC_MCR_BACKPR_EN BIT(8) #define MAC_MCR_FORCE_RX_FC BIT(5)