From patchwork Tue Mar 7 15:53:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 65660 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:570d:b0:a1:2e52:cf23 with SMTP id h13csp1988544dyk; Tue, 7 Mar 2023 08:07:51 -0800 (PST) X-Google-Smtp-Source: AK7set9XrqfuyveX4DbsipLZG3XSVVY5nx8abrC2RTTUSkKRsFM68+dcGIs4N9AwytBVAmzTuI3z X-Received: by 2002:a05:6a20:7290:b0:b8:a0e1:2739 with SMTP id o16-20020a056a20729000b000b8a0e12739mr15920493pzk.3.1678205271018; Tue, 07 Mar 2023 08:07:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678205271; cv=none; d=google.com; s=arc-20160816; b=miSpAyANHSUCByhWG65IMh/xjddxpaYUhr8bTU+AQl3h7N7oiaracCe3JU28TPd8xa 7ugxwxIYExiShZoAi4a+r87wAyAkmstqGw2gRQfPzCl1CeQvMH163ac3uPif3/4SOe93 C5BArEbHamtYs3+Yr3IkwiYiGy023bbZewpmsqBpva3BIivB2AqULEHhY2wYA09iPt82 VPTay4BU1RHR6bgGDPNWkwxjYt2cNbFzfE1aSFDkvxQy4y+QxoFH4E1fh7dQZ/oF2/w2 8aeBGUUwqQD1VJbl5iLtRhqjHdDYETVFwjkYTg2NDZHsDGgmY/JsEWSgU7o+H0TpcSYt /jqA== 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=VQIOvAkga7eRdRpnIVF5HFXgOq5Q7NPQnbgGqfjIH0c=; b=ipqfawcyXpOa2HdxtwvYNrmpk1fu6lEojFRj16WpGdstJXnKvUrUQZAQvmTG7dlzYw NK6iO1RlnPHrKdNm6kaohu/Lzeh7i7khtdvCMYJ9P1fMdy3kuPEEKM57HcWMl0h5o955 GGK5pnwsfVYH0g+a2yVBla58Mk03xarrQphufuxylR4nr82yOP+DvdWE/jmvL40tDQEN J9a37CR97jr3XsBw0z+W4sT7TdsAaPfMDyQ6qMNP6w57+wTPWI+qKqPwhWJFuMq0E1CX +oqvHkF4vIZwrHVh7OSCZTglKGx40AOCvfiC8XMleoDA7cdiLP51KSe+hITACfVq4wxC e5tw== 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 8-20020a630308000000b005032da21acasi13050249pgd.204.2023.03.07.08.07.37; Tue, 07 Mar 2023 08:07:50 -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 S231617AbjCGP4K (ORCPT + 99 others); Tue, 7 Mar 2023 10:56:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231468AbjCGPzn (ORCPT ); Tue, 7 Mar 2023 10:55:43 -0500 Received: from fudo.makrotopia.org (fudo.makrotopia.org [IPv6:2a07:2ec0:3002::71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 452548C822; Tue, 7 Mar 2023 07:55:15 -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 1pZZeh-0001pm-00; Tue, 07 Mar 2023 16:55:11 +0100 Date: Tue, 7 Mar 2023 15:53:34 +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 , Vladimir Oltean Cc: Jianhui Zhao , =?iso-8859-1?q?Bj=F8rn?= Mork , Frank Wunderlich , Alexander Couzens Subject: [PATCH net-next v12 06/18] net: ethernet: mtk_eth_soc: reset PCS state Message-ID: <0105ba8db974bca74846d605b18dcf948a7ab3d9.1678201958.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?1759725770046806782?= X-GMAIL-MSGID: =?utf-8?q?1759725770046806782?= Reset the internal PCS state machine when changing interface mode. This prevents confusing the state machine when changing interface modes, e.g. from SGMII to 2500Base-X or vice-versa. Reviewed-by: Russell King (Oracle) Tested-by: Bjørn Mork Signed-off-by: Daniel Golle Tested-by: Frank Wunderlich --- 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,