From patchwork Wed Feb 15 21:02:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 57735 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp421527wrn; Wed, 15 Feb 2023 13:13:54 -0800 (PST) X-Google-Smtp-Source: AK7set9JW6BRL4U26QBoJwEdrLvDRK9QQ38AgAxST62AM3AQNeX91MzDZVz1mW/7QJtpcmBB/G8s X-Received: by 2002:a17:906:4496:b0:8b1:3bfe:efdf with SMTP id y22-20020a170906449600b008b13bfeefdfmr4063054ejo.24.1676495634307; Wed, 15 Feb 2023 13:13:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676495634; cv=none; d=google.com; s=arc-20160816; b=qPhYqdXI4sBwfnHT88xWVX5G//Qyefna+IeoAUW5fXJ9gQJaInlQ/i7ydhKUHDVPpo MiPRK4Xehl7wzoP0ZtLaCANdv8b/VxM+3C2XvzKWakZPpLNcBovZ9YEzpDxmhasPYpXs Jf2bZwY4mMnYx5daXmSurkzwh6O/8plpwHSArMRUT/BtkXTkkvCpnTacXOf2u0h8k7G8 yqULseyac2OhmLaQrU/0FG1WmBwlD8730DUpHavXs78K5g53C5IuyOF0apbM+6m2ciPh daJsfRbp0hZRO9Hbn0JYydBbJAKtjxnmhtEaBh4hqnvLQ08Xs8QtNwJ8CTw4gn2bjsFD Ellg== 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=uOQbBg4sWRAJCsYrDMNJzsH/Bif60MFHQcfHvIGAQow=; b=k+OYwIpiAYdN3keHcfvVPudMA7nNzFkhP3WbKfNiWlLERq8MtYyy+VeSJi1hgXzq/H +0OMH6q1PPIRKyrOD16oqwZ6UHcJ4qBrtUlYBNXGPBIpYKBKnkSqlXzk7JF3e8hbHXVG KGn/8f7L6k+9w+q20JKQMB6MTlwfhKTdz+nFAw0i//gOKq3hSQvoRzwSriEZwP+x9J68 hl2HGn6Fjgy3Loul7uLkmDuYRUW2qNdeYL7jD5+nfgp2TZ/d17BBCy3HtCas39yFQvHs vuJoyeSJdFS/270KCL3b46hmgffijoRD9KUwQBIF66DmWN69lJlFM561JaTB5dPAkUuK 4kdg== 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 ms32-20020a170907622000b0084c3a089f39si21981586ejc.350.2023.02.15.13.13.07; Wed, 15 Feb 2023 13:13:54 -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 S230342AbjBOVGc (ORCPT + 99 others); Wed, 15 Feb 2023 16:06:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59262 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230124AbjBOVGM (ORCPT ); Wed, 15 Feb 2023 16:06:12 -0500 Received: from fudo.makrotopia.org (fudo.makrotopia.org [IPv6:2a07:2ec0:3002::71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0489C22780; Wed, 15 Feb 2023 13:04:13 -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 1pSOwi-0003fG-1X; Wed, 15 Feb 2023 22:04:08 +0100 Date: Wed, 15 Feb 2023 21:02:33 +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 v7 08/12] net: ethernet: mtk_eth_soc: fix RX data corruption issue Message-ID: <99ff14a24a40924d4924be1b4c53e7b1bd9d0b21.1676491901.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?1757933085930606528?= X-GMAIL-MSGID: =?utf-8?q?1757933085930606528?= 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 030d87c42bd4..ed32a511adc3 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 142def8629c8..529c95c481b7 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)