From patchwork Fri Feb 3 07:01:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 52330 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp685456wrn; Thu, 2 Feb 2023 23:05:27 -0800 (PST) X-Google-Smtp-Source: AK7set9CKICpdjTHQi1A2E4ItBPWmhX/PPGEdeiYFLAiNtHCRjRElKldul+nIIkbGxTCXxXVAEAi X-Received: by 2002:a62:3383:0:b0:593:af5d:7c2f with SMTP id z125-20020a623383000000b00593af5d7c2fmr8496737pfz.11.1675407926929; Thu, 02 Feb 2023 23:05:26 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675407926; cv=none; d=google.com; s=arc-20160816; b=n/RkapAdKNcQ6MCAc2LRsb8+SBXubt+k/NYkPGIuK6aAD488D5n36HoGCKmAlOz5Vx X0bf33Pil/gdGgZZwEio3Hq6BNhI+hxykGVH942VNtRoBzKRaiBc+SM1d/D6ct10LAql 2fWhm7q7zgClthA65/BqrXumB18Z+T9BmoP9LIyE/PgtIl7Ifx0zVjkUVrrmbvqxdML7 zCzsU3oqwG7nkk9hBaHxAUF7qJCCp3PJVelw5dURhU75trAmtL1LKuICwLIieB7a4LQm Ij/npiRq9Fzyq8rSFRKdEUsQLSOrdLLOdHvGHxobOcxDryh49blsAcIDPnRl0xf4xHqP PbDQ== 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-disposition:mime-version :references:message-id:subject:cc:to:from:date; bh=AXy5FXuuubRPoECY2VDgm4FrS9+BDZj/2jy1HxAGUzE=; b=kwXIfN8KRh8VxTBXhYgBtVQmRBp26tmOSNDIKYOLUDKrix2/AWHr0fQ1xFuGNenDBB wNNtlLCdQowCstfoLSMozGyJtb21NIwxuEdztgdzwK+aaRISeqAkuFhYmJ31+gpdYsIz AGcV2k+DVm8qUUjI4YrmiyUGgzpD+lo0o6W+WW35n3civTECoA00HgyrCw4Ci8a4If7C OP8/j+eDuZlmRBPH/1g6E97UkUJNo45LKE7VZ/NQkIMSrpkACTBzZoPprZ3C2Lo3deje BqJQlaUKyaee5mDovAnPReOTxeiba8GZg3n3F6EAPDS0J764QEwcD0hbAF+GdovT+XSb /l/Q== 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 r7-20020a056a00216700b0058d9266a507si1571599pff.376.2023.02.02.23.05.14; Thu, 02 Feb 2023 23:05:26 -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 S232145AbjBCHDc (ORCPT + 99 others); Fri, 3 Feb 2023 02:03:32 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232102AbjBCHD1 (ORCPT ); Fri, 3 Feb 2023 02:03:27 -0500 Received: from fudo.makrotopia.org (fudo.makrotopia.org [IPv6:2a07:2ec0:3002::71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1DD9220068; Thu, 2 Feb 2023 23:03:12 -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 1pNq6I-0000pB-1A; Fri, 03 Feb 2023 08:03:10 +0100 Date: Fri, 3 Feb 2023 07:01:28 +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 3/9] net: ethernet: mtk_eth_soc: reset PCS state Message-ID: <5f07845b710e8464cd9509387f1fcdc6baeb5cb9.1675407169.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?1756792542409548710?= X-GMAIL-MSGID: =?utf-8?q?1756792542409548710?= Reset PCS state when changing interface mode. Signed-off-by: Daniel Golle --- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 4 ++++ drivers/net/ethernet/mediatek/mtk_sgmii.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h index 724815ae18a0..d39717582a85 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h @@ -546,6 +546,10 @@ #define SGMII_SEND_AN_ERROR_EN BIT(11) #define SGMII_IF_MODE_MASK GENMASK(5, 1) +/* Register to reset SGMII design */ +#define SGMII_RESERVED_0 0x34 +#define SGMII_SW_RESET BIT(0) + /* Register to set SGMII speed, ANA RG_ Control Signals III*/ #define SGMSYS_ANA_RG_CS3 0x2028 #define RG_PHY_SPEED_MASK (BIT(2) | BIT(3)) diff --git a/drivers/net/ethernet/mediatek/mtk_sgmii.c b/drivers/net/ethernet/mediatek/mtk_sgmii.c index 0fe403db23c9..f3cf66a23e72 100644 --- a/drivers/net/ethernet/mediatek/mtk_sgmii.c +++ b/drivers/net/ethernet/mediatek/mtk_sgmii.c @@ -88,6 +88,10 @@ static int mtk_pcs_config(struct phylink_pcs *pcs, unsigned int mode, regmap_update_bits(mpcs->regmap, SGMSYS_QPHY_PWR_STATE_CTRL, SGMII_PHYA_PWD, SGMII_PHYA_PWD); + /* Reset SGMII PCS state */ + regmap_update_bits(mpcs->regmap, SGMII_RESERVED_0, + SGMII_SW_RESET, SGMII_SW_RESET); + if (mpcs->flags & MTK_SGMII_FLAG_PN_SWAP) regmap_update_bits(mpcs->regmap, SGMSYS_QPHY_WRAP_CTRL, SGMII_PN_SWAP_MASK,