From patchwork Mon Feb 13 21:36:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 56571 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2590244wrn; Mon, 13 Feb 2023 13:40:58 -0800 (PST) X-Google-Smtp-Source: AK7set8f7+aQjRXnoa6EFoO9Z2UHYg7ucjiTq+F44y26HB454KBkCy4ZWFLIdZvJzub6mJ0/qvmN X-Received: by 2002:a17:906:7c13:b0:8aa:c261:f2a5 with SMTP id t19-20020a1709067c1300b008aac261f2a5mr20156811ejo.12.1676324458358; Mon, 13 Feb 2023 13:40:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676324458; cv=none; d=google.com; s=arc-20160816; b=kNiP+Zdp8wCbFp6aJzpTqw1qwGFejnw6qv6zVghEbNhBIBmF+rb950H7dEXMKdeA4q UNenZNTFzBshZWXN8ngyOxIi6jAobQ+WFtWXIJaIkIUgjt8dSzNb4p9z/pgdNL1FHsHB fIJc0Lvvp1aQuDCWq9XUp0Y+XZUNdVlouzrrxvyK0lf330vpFFuMBPXAaGPUBlJnNf7N rTHCfajaf6YzYX6WTzPwcIqGY3I2kjOUbTLIiNI3IPws7jkhDOQy/vTFAD+nxDwfID0N N1G0VdTiD8ToDSLCpsFF/SVJFy3rh10j2Tg/OyntiRSxIiidC1zjevVDDw7qIXZSs1fs 2X7A== 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=yfXHZm0LRFXYMvZ/wl3amWXVolplTKYNSqUGCRrK3NQ=; b=JxITe+Xqpx7KcUw6qmrhEjXN947Gmje2rihaAhcS3V1C64WpxbS5olkqNBY+dpmKj/ bPjw4klpxrxO/mnqqv74+ufJcGcyGitYlRfp/2YZn0C+EynCggIogrXqJEyc3Xi4gnML hqWlusrleJ7Dt5hiEozivFctq2BB3E+upxZVALDSmxXh1NOofLNBEmlfwzMdBCBz5SSH QCa9SdM1r+VyM23akni5I0RLKaayAyQ5d79e9xsFXdd85IpixJi3d+tfIe0KIG99x+TA HW83xAavJr1QR3NcJThU+0U0yXtrY5IU9pgZjC/64sCXdJnKz/GH55g3fEKg52pG8X5p Y2ng== 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 uj32-20020a170907c9a000b0087f1daeb101si14590398ejc.312.2023.02.13.13.40.34; Mon, 13 Feb 2023 13:40:58 -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 S230455AbjBMViK (ORCPT + 99 others); Mon, 13 Feb 2023 16:38:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229615AbjBMViI (ORCPT ); Mon, 13 Feb 2023 16:38:08 -0500 Received: from fudo.makrotopia.org (fudo.makrotopia.org [IPv6:2a07:2ec0:3002::71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2DC18273B; Mon, 13 Feb 2023 13:37:49 -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 1pRgWB-0006im-0K; Mon, 13 Feb 2023 22:37:47 +0100 Date: Mon, 13 Feb 2023 21:36:08 +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 v6 08/12] net: ethernet: mtk_eth_soc: fix RX data corruption issue Message-ID: <5cebc721047a0c48bf789767857eea15616d214b.1676323692.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?1757753595367597674?= X-GMAIL-MSGID: =?utf-8?q?1757753595367597674?= 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] This fixes issues with <= 1G speed where we could previously observe about 30% packet loss while the bad packet counter was increasing. Unfortunately the meaning of bit 12 is not documented anywhere in SDK code or datasheets. [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)