From patchwork Wed Mar 1 19:55: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: 63059 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp3837432wrd; Wed, 1 Mar 2023 11:59:32 -0800 (PST) X-Google-Smtp-Source: AK7set8l4OZBGirwjCxInNY3aYDkDDQrXlyuUz2Xuw3a1zEc9f8tckrFaLgylk15y48VYMBk7AFY X-Received: by 2002:a17:906:5601:b0:888:b764:54e5 with SMTP id f1-20020a170906560100b00888b76454e5mr7024908ejq.71.1677700772017; Wed, 01 Mar 2023 11:59:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677700772; cv=none; d=google.com; s=arc-20160816; b=sLOC5ZX0B7Kb1MaFmkqj7iwRCIXgJo3qzNHZ/a7OiAzrQiYFrYOtHfZcAmub7oLMW4 qgc+Tgb9U5fHTywt56vNoLt1JYb/B/NQArjLGDrlIZIlPhHm4W8gWu/e9FUNYKFQcdHH 0FFKJBeIchsmzl/kFPgQqeMlLoJdyt7L85kwBpSpRlJ7bQWSXq9XNp4DHThOimdcPhsK q5dxCgpnlMGc2bWpzu/mRubt/IttzuVjp/PHJlsSP/aZDMVB+pUNRULDW4sFnzRKUbyQ f/X/D60yYrvtbSHFQhj8uQQ/hMjmMXvN1jK/y6/1aemX2NfKmfLjIjYgjeCNaEKhmemb BhFw== 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=xWlhkkROj8vERphsF7a+jhL2mecP1JhwwrKz2E+NPBo=; b=tJZWlISACP12doPXhz3/bbdPvv3b0P7KEh3P1H3GZsvzzVlT+fYWSpPNru4cInHNiP LywXVtp548y6fbnoKSw8BkJneWXDNAmC7WMr/Jn8YrAYa10TBTsZkGEWQ08q3rciOBOx W+GsfBOI/pxjDFzjSgvchCz3wA4532EN22DtpeV9X1XlPwvPbg9uYUS2utiV+rVtOXQi Z0iQ2lr5klNqxp2BCCD1G683pXq3sinVzPd8nJX+tok76MdAlLPlCQvf09hXNzNv0HG1 QJIbJoxDhXqp1psCW5lzGF8eGqLbETkRgDvAuj5G510fM/vyGWHJMqJkVzSTKIV5HhNk p+sw== 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 o22-20020a1709061b1600b008b2a99b17fbsi2693826ejg.205.2023.03.01.11.59.08; Wed, 01 Mar 2023 11:59:31 -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 S229463AbjCATzo (ORCPT + 99 others); Wed, 1 Mar 2023 14:55:44 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229851AbjCATzd (ORCPT ); Wed, 1 Mar 2023 14:55:33 -0500 Received: from fudo.makrotopia.org (fudo.makrotopia.org [IPv6:2a07:2ec0:3002::71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9575E4DE31; Wed, 1 Mar 2023 11:55:11 -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 1pXSXd-0007Kk-34; Wed, 01 Mar 2023 20:55:10 +0100 Date: Wed, 1 Mar 2023 19:55:05 +0000 From: Daniel Golle To: devicetree@vger.kernel.org, Rob Herring , Krzysztof Kozlowski , 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: [RFC PATCH v11 08/12] net: ethernet: mtk_eth_soc: fix RX data corruption issue Message-ID: <9a788bb6984c836e63a7ecbdadff11a723769c37.1677699407.git.daniel@makrotopia.org> 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?1759196764605712965?= X-GMAIL-MSGID: =?utf-8?q?1759196764605712965?= Also set bit 12 which disabled the RX FIDO clear function 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] This fixes issues with <= 1G speed where we could previously observe about 30% packet loss while the bad packet counter was increasing. [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 | 3 ++- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c index 030d87c42bd42..ed32a511adc30 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -616,7 +616,8 @@ static int mtk_mac_finish(struct phylink_config *config, unsigned int mode, 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 | - MAC_MCR_BACKOFF_EN | MAC_MCR_BACKPR_EN | MAC_MCR_FORCE_LINK; + MAC_MCR_BACKOFF_EN | MAC_MCR_BACKPR_EN | MAC_MCR_FORCE_LINK | + MAC_MCR_RX_FIFO_CLR_DIS; /* Only update control register when needed! */ if (mcr_new != mcr_cur) diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h index 142def8629c82..529c95c481b73 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_RX_FIFO_CLR_DIS BIT(12) #define MAC_MCR_BACKOFF_EN BIT(9) #define MAC_MCR_BACKPR_EN BIT(8) #define MAC_MCR_FORCE_RX_FC BIT(5)