From patchwork Fri Feb 17 14:54:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 58633 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp930086wrn; Fri, 17 Feb 2023 06:58:01 -0800 (PST) X-Google-Smtp-Source: AK7set/t1aaSfTw9u/Ci/UibQqoGolUjj/2qxed/K8TV4M80xV1JxMZCqzA739rRMwTQfh/NMhVk X-Received: by 2002:a05:6a21:6d8e:b0:c7:8779:4167 with SMTP id wl14-20020a056a216d8e00b000c787794167mr2090188pzb.30.1676645880869; Fri, 17 Feb 2023 06:58:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676645880; cv=none; d=google.com; s=arc-20160816; b=ihitA5YskQ1HN6zZrTYnMqjkMcoQ/JFQFqPeOkTv4zlRLKDQSQGLWi0mWgCjqpxug5 WyFN6meUyOTs04TYTRWdyPKKwfwP1UDUsScUv+gu5bFxtpFGuh6xYwCtUJFXZqyrmfMx OxrY0U+CpkP9/YgIjAIH3vSZpU8l7RtEFxRIX2+Sdtu572/EN9b5IVx2XJ2PiNkcdVd1 BQhjV6zXb9uxe7sB+6xHYFsIkoS0h8eKlnSuRESdKKDt/9s3b/pZmCag3twLbuc9Uh+B CbQhx1UfO6PvzMYzg424wKIbZ0ixkBh//370eWfb97LeldMTUAsZCMnvc8EuTalediG4 KqDg== 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=4JjxbCESk1BRtIFXblfbk1hdguMjNEs60poiKiMLC6c=; b=Mrkef2NJuKDPJthg6a/ypy/5zC8ber1kW1jWUFYel4uUbJORDhO/0XLkCTxRDVr+OC u+aACPiUrEf56/eKioH/b7kjRUBE3eM8DaCEhdYES7zu9PQLvu3KUMiyLt6U0HJIkYDq FzahtlmsjdFINMbXCzbmqf8BPWqm9R1MRdi49ZC5td7I9gEu46AutbXGv2AnGh7gbmF5 7aPN6mRTY+ftNKlm2Ow8lvnn/xFO3Kd8jYzMpUp/Jf/5lfByt8K5sod8NJ5gRxrEQLs/ Swdy0ySjn/aS9WXDrHLIPy15s+pWf5MQW9AHKqPLecZOD6/iWMDaxBTE8u9uDHflEFpz Tm/w== 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 k16-20020a6568d0000000b004fadb22ea88si5156005pgt.569.2023.02.17.06.57.48; Fri, 17 Feb 2023 06:58:00 -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 S230051AbjBQO4a (ORCPT + 99 others); Fri, 17 Feb 2023 09:56:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230083AbjBQO4P (ORCPT ); Fri, 17 Feb 2023 09:56:15 -0500 Received: from fudo.makrotopia.org (fudo.makrotopia.org [IPv6:2a07:2ec0:3002::71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C742E6EBAD; Fri, 17 Feb 2023 06:55:52 -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 1pT29N-0005Kd-1t; Fri, 17 Feb 2023 15:55:49 +0100 Date: Fri, 17 Feb 2023 14:54:14 +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 v8 06/12] net: ethernet: mtk_eth_soc: reset PCS state 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?1758090631530297027?= X-GMAIL-MSGID: =?utf-8?q?1758090631530297027?= 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 7014c02ba2d4..142def8629c8 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 d7ffaaeaf9ab..d7e7352041a4 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,