From patchwork Mon Feb 20 16:42:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 59563 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1406849wrn; Mon, 20 Feb 2023 08:45:01 -0800 (PST) X-Google-Smtp-Source: AK7set/2QFvBsoAruEwZdgeSm1BOU31u1wAys9ysIbbOPR7ub3mcloRxt5Su0kBcHlfUt43YvjqI X-Received: by 2002:a17:907:76f3:b0:878:50f7:a35a with SMTP id kg19-20020a17090776f300b0087850f7a35amr9544705ejc.72.1676911501555; Mon, 20 Feb 2023 08:45:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676911501; cv=none; d=google.com; s=arc-20160816; b=BiTb0lfwqo0gUCebyEEy0QnEZclqQ7haPqVKZ9ZsTu4BlE+VABwjBY38bwrDaZ6j2U GyPVKPRBDXNWCzJ6o6liuuB+pmRzmO+K0Qf6AnneD3Io8xzrSMjOkQodbHT9OlnjDFqH crPRknLlFW2mCWldKcojwA+/Un+7SM08LlfDeiQRbSnPcoKj+jkExyLWDX5Z8urGkuTW BCmPxqmD4twFAcuzPoxVdHfWjFQFMi7uHAU2uxEPzdRQ1SogUMruoe7nk/k9csGDQeI5 DTJaM30TKFqPdI1vKvsiIxJmjzxXUcNkN8iQiyo98HPqm8j14ykEFaMtJgI3bffyXvey 3tQg== 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=yIJhkgUeEbGRzTyrvrUWrkzh4+bHkrTF3btp48vmNYg=; b=hW//VbSe+jPzWPVwwDJ8NBrOgRtntM+HgnWKSgtUteMSSTSc+zaUwonGb4UhpDvHLm OF07DcuYXPdRW72TH7HpnDAXLohx+XnQAODRxCse5F+LSQjfO5P1BE87Hjd0b+73/fWZ Flao7IhmuuXdoBPEu9nr8L/K+hZjHFTWfeCUCj7SoMT87fYVyz6zSYzCYms3r83iEbIH 9g2xFY7kTqXDCRVdAloyCnFcnORPfYHwLngDZHRv+SaEY8D/1dOaL1L6i9Vbt8EibQfU IkCiToE375tBQu74/Eu22kHVsxHV5PfEWVYgyQGOwPb3PSuVwUTq617m/hL1zoJVf5+U l/8Q== 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 uh17-20020a170906b39100b008cc615ffc40si5907537ejc.797.2023.02.20.08.44.38; Mon, 20 Feb 2023 08:45:01 -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 S232049AbjBTQnF (ORCPT + 99 others); Mon, 20 Feb 2023 11:43:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232353AbjBTQm6 (ORCPT ); Mon, 20 Feb 2023 11:42:58 -0500 Received: from fudo.makrotopia.org (fudo.makrotopia.org [IPv6:2a07:2ec0:3002::71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 798B820577; Mon, 20 Feb 2023 08:42:22 -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 1pU9F3-0002eP-1V; Mon, 20 Feb 2023 17:42:17 +0100 Date: Mon, 20 Feb 2023 16:42:13 +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 v9 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?1758369154518610272?= X-GMAIL-MSGID: =?utf-8?q?1758369154518610272?= Also set bit 12 which disabled the RX FIFO 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)