From patchwork Mon Feb 20 16:41:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 59564 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1407076wrn; Mon, 20 Feb 2023 08:45:29 -0800 (PST) X-Google-Smtp-Source: AK7set+uJsgoTYdboPKVHFnrzQxCDXMRCFTcka7JB5x3CR98qxv4+d/tStmT3g1F4ksfBGX/c3jL X-Received: by 2002:a17:907:9879:b0:8aa:1f89:122e with SMTP id ko25-20020a170907987900b008aa1f89122emr10437533ejc.39.1676911529699; Mon, 20 Feb 2023 08:45:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676911529; cv=none; d=google.com; s=arc-20160816; b=tg9A33NO/Q+m5E/bRtAfoWZ1Kdfi6CsC5o6ZmCEj4R7JQvolG4eVlX0WJwuitjNdE9 mnl4ULfvpaBQPIS703VwljqFqa3Bw85XK3TZVvRdOdE8BB30d2DEVubKPkIQsKJPOnUH 7zte5bhDD7iVyOtEftK5mnXgcVt7V2vYj9cbvuON/9zYjj1nOD+nPWSDCoLdl/w5A+fa C1GGF2DiLpTOPOvj1oZ6A4W15KXrS6tVs42HdewwT/Ohz1KbVdeMr6f31aonQTJFxKML AXMDjvtQbndZbI24Vm9AE79t4rMq9A86Eq78/ipIfbApl+9V1tB2a3ewquyyMWcOyZGj JUaw== 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=28mRmeBxm5oj5LDxbvtA9iVTfZONWzr6wXn7O1ZOMGo=; b=JDthBwtztQW35kID05a+twSnm5KFKLR5TeEMywnphuXiGqSwRDByAG9RY517GeIK0U HdpWoih4CtONblAmP/gyeO2DJAaMvGojVMT5TTPNr2/NYl0SDC3QkfikU6PqXhywf8cX rPXXOnM2F32cbC5nDFguKAaJQw5iQeNnJcU/oFbU4/aTjM0qoqiSBFUdm6ohkcgsJq90 9ir2PB2LcqcJrRw2pVe/T8lyvO+OlgjqQXhBGxou7A1uVL5gNHsSaddmEwgeP8ot9cip 43Tg30JYRA47CiA1gmKXfUqF/w7wvMv1cKBj0VAWGllCfdYR8zI0YKPcLirCr+8/fCVC XNCg== 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 vj16-20020a170907131000b008b19eb4252csi11651782ejb.511.2023.02.20.08.45.06; Mon, 20 Feb 2023 08:45:29 -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 S232303AbjBTQmg (ORCPT + 99 others); Mon, 20 Feb 2023 11:42:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53196 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232135AbjBTQmb (ORCPT ); Mon, 20 Feb 2023 11:42:31 -0500 Received: from fudo.makrotopia.org (fudo.makrotopia.org [IPv6:2a07:2ec0:3002::71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7004B206A9; Mon, 20 Feb 2023 08:41:57 -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 1pU9Ef-0002e8-28; Mon, 20 Feb 2023 17:41:53 +0100 Date: Mon, 20 Feb 2023 16:41:50 +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 06/12] net: ethernet: mtk_eth_soc: reset PCS state Message-ID: <292db34660c74fe37e6e46e659174078658b658a.1676910958.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?1758369184265986687?= X-GMAIL-MSGID: =?utf-8?q?1758369184265986687?= Reset PCS state when changing interface mode. Reviewed-by: Russell King (Oracle) Tested-by: Bjørn Mork 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 7014c02ba2d4d..142def8629c82 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h @@ -548,6 +548,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 d7ffaaeaf9ab5..d7e7352041a4f 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,