From patchwork Sat Feb 11 16:03:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 55843 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1558983wrn; Sat, 11 Feb 2023 08:15:22 -0800 (PST) X-Google-Smtp-Source: AK7set/0ToJseajnyoPPDz0EqoFyCGX6AHAMi3+wW3sR8LjtFniTkMnaLOhVGw753HEtfLDucaIF X-Received: by 2002:a05:6a20:7da6:b0:c2:fab0:3cac with SMTP id v38-20020a056a207da600b000c2fab03cacmr20064296pzj.0.1676132122368; Sat, 11 Feb 2023 08:15:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676132122; cv=none; d=google.com; s=arc-20160816; b=0kh/kRSeUjibSHSdv0bYk2tzIcEDom0XBA+BHNeg38LNBPGOs4TFUGva4HidUYfBvE N8e3vHjDUFDaHye/74bI+XabEqVsJdT632ha0KBAFIyzja1yctVvqXy+GYsbriU9QY50 d3n0mMgnIBfuPEM4VMEiHi5oGYeEH+9kLZxcEw9tL3/dfqfJRcBoHxFHSlvv9xIXnVsR L8u1Z3mG54bqKsTOsla+7PC7zx5S1cWLl9yxmuQhGdhFuFjRbtufxZsfmk4wNDtnIOrQ S9p/HvG/MaymfYBw6lXeXIXAMpKgVvb9ljRkQ3qOlbVDDN6omA28LotPN3dAIdQsWQFi ccKQ== 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=JwcrMfNgF63gIrZ/GkmsQ7CjfsIvdJXRwyJlJfugE+g=; b=MZKtNfv+zsNCvhXt+sC1d1yrwB5Q0Uretxiwtl80k+keMK3BJaHjEXoStNVDWlKOAl BzkuoWLi/igNu0qSdUnH52rqYRUqBJz+I8mgndr6UXH6IJvgYhkIfAawn4zytH9xKcdy 1nEfum4F8DfvGwIzXmNuQjgOoL5lnTvmkWc2WouBKzB9tZizKaw4XMRcQk12gphHBqEE ONrbP6hz+Ei3ZvTus8Efk2LdrDe4cBcDQ4KM4897xAvvP4+kFL75gm6mWiGD3MsVu/fM EZujhmDSuvn0yfqg9OPTlGG9/rn3a/gqmJo4mTwr8EJ7bTyOMJOr6D/xOHqM/Bow/vkj oI0g== 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 y13-20020a17090ad70d00b00230b4d17941si10736764pju.156.2023.02.11.08.15.08; Sat, 11 Feb 2023 08:15:22 -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 S229668AbjBKQF1 (ORCPT + 99 others); Sat, 11 Feb 2023 11:05:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229506AbjBKQF0 (ORCPT ); Sat, 11 Feb 2023 11:05:26 -0500 Received: from fudo.makrotopia.org (fudo.makrotopia.org [IPv6:2a07:2ec0:3002::71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 824A82CC66; Sat, 11 Feb 2023 08:05: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 1pQsN4-0004Mf-35; Sat, 11 Feb 2023 17:05:03 +0100 Date: Sat, 11 Feb 2023 16:03: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 v5 06/12] net: ethernet: mtk_eth_soc: reset PCS state Message-ID: <9983a2ee3f1e42b9515852e4faa590225ffcd521.1676128246.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?1757551916212952067?= X-GMAIL-MSGID: =?utf-8?q?1757551916212952067?= 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,