From patchwork Tue Feb 21 11:41:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 59892 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1814817wrn; Tue, 21 Feb 2023 03:43:30 -0800 (PST) X-Google-Smtp-Source: AK7set/JPgNpOciMrv6HvFqzG2oz/KAlCU6POoCLykWA0u2rD3YaD5CMA+ywwR1xAE7TMLk8pvYy X-Received: by 2002:a17:907:a801:b0:8aa:c0a4:2aa5 with SMTP id vo1-20020a170907a80100b008aac0a42aa5mr12857714ejc.16.1676979810756; Tue, 21 Feb 2023 03:43:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676979810; cv=none; d=google.com; s=arc-20160816; b=Dhz1G1DSsoU+bnuB6hYXeBY7KRkqmqL7beUMMoWnJnGEHP+tm1j2DKJP80AF1rIRk3 x2Lp2tZXJNIUlLh9XbmOfEdtXCtn7uPdMHtWOMbWmTKZXGNhjMT+J7Dcitv9B2ymXn2q UUoTLLbBtAzsGK/Bdiy1O0FgMtEI5qvHLNA0YgiP/K+Dk6hzA61g8hd7dS8HaGLyKoK8 gfooVd4HZ0Hx4XFrtBeG/Y2geLC7yF6OcuWmFWpTK7/7Z7UkRgl6Jqe6miqS/Kt9aUvH 7kd5xnqyAMWw5+lgw505f6jm1gSumzC9q4ojtizJmeT4PaJgnyerZOoqOQ9jrHWM9FB+ gJQw== 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=YkL86u62nexvTwKMnnf2ExR7sew/X6i7wWLDjIhUzCLYrMphA+6W7DBvWb68DnYWlx JksNPkd9gZoRhCGuVH46Xl2G6YEnCkJ7IiKzolGDgz6R0Ge98g+LZJ30IJ2ciEmFE1kg 7lHraZzkwbOOjdN0BO7+0z0frog0iKHZsviH9iiTVS6k4sLU8J6bA5xjEvP2y+oKVwOw LLGmnMBjEw7kOOTsFWr57akZBW68oleMTbT25T51ssbLirQHNyPK4ezt4zZ8HoQyeoyc kXeQH6arRgwXp80AgrPdi5k1eZDuItpqNOhc8FGNonNWGGf1jkI3RS2xBfbyrb+QJusl xo1Q== 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 gk3-20020a17090790c300b008be6648db8asi11051502ejb.408.2023.02.21.03.43.06; Tue, 21 Feb 2023 03:43:30 -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 S234271AbjBULmh (ORCPT + 99 others); Tue, 21 Feb 2023 06:42:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234234AbjBULmf (ORCPT ); Tue, 21 Feb 2023 06:42:35 -0500 Received: from fudo.makrotopia.org (fudo.makrotopia.org [IPv6:2a07:2ec0:3002::71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8D09327D64; Tue, 21 Feb 2023 03:42:04 -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 1pUR1y-0001Pb-2z; Tue, 21 Feb 2023 12:41:59 +0100 Date: Tue, 21 Feb 2023 11:41:54 +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 net-next v10 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?1758440781993099325?= X-GMAIL-MSGID: =?utf-8?q?1758440781993099325?= 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,