Message ID | 20231121-net-phy-reset-once-v1-1-37c960b6336c@redhat.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp945263vqb; Tue, 21 Nov 2023 14:11:20 -0800 (PST) X-Google-Smtp-Source: AGHT+IFoBctz0KONrokn0PKf9BuiVZbYMjBOu5IaXo0oDyuXxJ4ateXgtoIMT4sWVBE2QxBN6ucw X-Received: by 2002:a05:6a00:1d8d:b0:6cb:88c2:83b3 with SMTP id z13-20020a056a001d8d00b006cb88c283b3mr645841pfw.0.1700604679806; Tue, 21 Nov 2023 14:11:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700604679; cv=none; d=google.com; s=arc-20160816; b=In0QJIqGNa9sPx4m32EshhmbQ6l5x6Rb3Cm7urS6gxujQcvTip/zWpHoWC4I0Pq3i1 I2JTHW/M1MtnB6WNaO0YZefZ43UHmSra/MlsGrsDrUmr9e4j2ediB/l5yYvHQdZXvJ2R yk/ggrIHQed5NNbIngj763LvCzYdxQbeDQ8cYS7EKihXiqmhBhv2pIf7ttRrgji4+XQm UVFvrpxIJTdRA2ZjWxOXTVLeYKUF5PHKa0emaLDqK8VYTAqwJDRSfW5rRfzIO35iWG8e yGtFOpHoh6JN0HhaoDygMk3uauWdTxT/UDRNaflC5qnOdyKeYTdCnjxbSoHNPrzKodfr qrCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:message-id:content-transfer-encoding :mime-version:subject:date:from:dkim-signature; bh=gdwjKLBCPHbhmKdp+NaAgsF4FPxnedN47CRRapavUMU=; fh=hN8F6+hNgqazGdVXaA0AT2jmZ1zYc5IbrbV0QoeSvCM=; b=X0slMSuCaupt+vvgr7J6Q8cZMxHMHsUvpRVZVSINn5GuwfN+tChO4CXT1ZiOtkpkvh b4vYWF2tgOVqPCpTSZj667jFR+WxWSAR6BontdrCLxoQziEBiuY4fxLhhjx7cNGF6Aa3 NL7jnCjr3uPOlpPlxb5Nddd3dxTi/olEZIXMsTFg96j17Idi5fj+V56kVqkBihqXliJS IgxPxXXQKIjsUSQp/sbuLmeLgNNoJ+0rBS+MqLpOoQG6sayKIb12QaNKKlRnksSjUQE4 vdtaBalCySBatdYJOf0MM/MgfIpwz7Fq08rH1wmKSa+S5doxmBOd9LNG6aqQ70z8njWq Es0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=P8n8hB8X; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from agentk.vger.email (agentk.vger.email. [2620:137:e000::3:2]) by mx.google.com with ESMTPS id y29-20020a056a00181d00b006cb75e0f91bsi7125263pfa.45.2023.11.21.14.11.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 14:11:19 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) client-ip=2620:137:e000::3:2; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=P8n8hB8X; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:2 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 19BA5802EE73; Tue, 21 Nov 2023 14:11:17 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234536AbjKUWLG (ORCPT <rfc822;ouuuleilei@gmail.com> + 99 others); Tue, 21 Nov 2023 17:11:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38730 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234313AbjKUWLC (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 21 Nov 2023 17:11:02 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1F7D6194 for <linux-kernel@vger.kernel.org>; Tue, 21 Nov 2023 14:10:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1700604658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gdwjKLBCPHbhmKdp+NaAgsF4FPxnedN47CRRapavUMU=; b=P8n8hB8XASfj9wNNqBMB+G4g/Kj+C9KpOgYZ+Fm7o2VTPe3rPbZk24eM0osJK2SOICIc+N 5gSgRUKTSZLJSKsHBYe4mMa/+6cw1LAhMuVKr3slh3/X3iS31KJnKTBZ4roc/wD+3X1y90 PpZjYnT4R4xd+qif+QqUmLoqOXECn/g= Received: from mail-yb1-f199.google.com (mail-yb1-f199.google.com [209.85.219.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-263-kGY4MumHOveW-lvnKMNNHg-1; Tue, 21 Nov 2023 17:10:57 -0500 X-MC-Unique: kGY4MumHOveW-lvnKMNNHg-1 Received: by mail-yb1-f199.google.com with SMTP id 3f1490d57ef6-da03390793fso7400888276.3 for <linux-kernel@vger.kernel.org>; Tue, 21 Nov 2023 14:10:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700604656; x=1701209456; h=cc:to:message-id:content-transfer-encoding:mime-version:subject :date:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=gdwjKLBCPHbhmKdp+NaAgsF4FPxnedN47CRRapavUMU=; b=PvdbXTySzsXI/iswX75bHblPL6KntzlpCrPJPDiVAbJDt/1ksLW0B5hqAFBZVXRAJK HYDcmW3kL+UEWTSz/uknKzQWP2Lf0lQO9qsFYFIphSa1vkCd4R4Bg731oAsNp20tKY+G jIZaPjRnXChVg54TohWKYPNYW6PpQ5d/XPYCOwwOKsXGpMBJ/Ei79gSigpLvw8hnG/iZ SIx4AXYmoFc6gwk8Ih03xDhXQG2aXw+xYRC0d9VwA1YiSc6OqHYcDk7a59pJDJsQ33wh LJ7OzoxMrM8+Vko1N8kUmNHJmvLGwa0QWUQ7nU9voolXJV62imkSg0JNPLXkxSSSL33i 8btQ== X-Gm-Message-State: AOJu0YzjqA5Tn+QjAaNwwA5TW4Prm+eGRIbQ2SpbNg6VgdB+IKJtAUga dYMxYICOeNADsdAqYg0TzQM2/+bk+gCQFz7J/3RUBzA6d8vQ8d8URVzF1H940ZxBThKAXoOp7bH iv5vx0ITBlPpC/3UYZUxo5hoH X-Received: by 2002:a25:6a42:0:b0:daf:936f:4547 with SMTP id f63-20020a256a42000000b00daf936f4547mr324092ybc.19.1700604656380; Tue, 21 Nov 2023 14:10:56 -0800 (PST) X-Received: by 2002:a25:6a42:0:b0:daf:936f:4547 with SMTP id f63-20020a256a42000000b00daf936f4547mr324079ybc.19.1700604656021; Tue, 21 Nov 2023 14:10:56 -0800 (PST) Received: from [192.168.1.165] ([2600:1700:1ff0:d0e0::37]) by smtp.gmail.com with ESMTPSA id c19-20020a056214071300b00670fd658739sm4321099qvz.38.2023.11.21.14.10.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 14:10:55 -0800 (PST) From: Andrew Halaney <ahalaney@redhat.com> Date: Tue, 21 Nov 2023 16:10:37 -0600 Subject: [PATCH net-next] net: phy: mdio_device: Reset device only when necessary MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20231121-net-phy-reset-once-v1-1-37c960b6336c@redhat.com> X-B4-Tracking: v=1; b=H4sIANwqXWUC/x2MQQ6DMAwEvxL5jCXsXNp+BXFAdAFfDEpQlQrl7 025zUize1FGMmR6hYsSPpZt9ybSBZq3yVewvZuT9hpFVNhx8rF9OSE32n0GCzRqfD50Qk9teCQ sVu7Tgf69o5w01voDrFYUdW4AAAA= To: Andrew Lunn <andrew@lunn.ch>, Heiner Kallweit <hkallweit1@gmail.com>, Russell King <linux@armlinux.org.uk>, "David S. Miller" <davem@davemloft.net>, Eric Dumazet <edumazet@google.com>, Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com> Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Sagar Cheluvegowda <quic_scheluve@quicinc.com>, Andrew Halaney <ahalaney@redhat.com> X-Mailer: b4 0.12.3 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Tue, 21 Nov 2023 14:11:17 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783213252997099248 X-GMAIL-MSGID: 1783213252997099248 |
Series |
[net-next] net: phy: mdio_device: Reset device only when necessary
|
|
Commit Message
Andrew Halaney
Nov. 21, 2023, 10:10 p.m. UTC
Currently the phy reset sequence is as shown below for a
devicetree described mdio phy on boot:
1. Assert the phy_device's reset as part of registering
2. Deassert the phy_device's reset as part of registering
3. Deassert the phy_device's reset as part of phy_probe
4. Deassert the phy_device's reset as part of phy_hw_init
The extra two deasserts include waiting the deassert delay afterwards,
which is adding unnecessary delay.
Here's some snipped tracing output using the following command line
params "trace_event=gpio:* trace_options=stacktrace" illustrating
the reset handling and where its coming from:
/* Assert */
systemd-udevd-283 [002] ..... 6.780434: gpio_value: 544 set 0
systemd-udevd-283 [002] ..... 6.783849: <stack trace>
=> gpiod_set_raw_value_commit
=> gpiod_set_value_nocheck
=> gpiod_set_value_cansleep
=> mdio_device_reset
=> mdiobus_register_device
=> phy_device_register
=> fwnode_mdiobus_phy_device_register
=> fwnode_mdiobus_register_phy
=> __of_mdiobus_register
=> stmmac_mdio_register
=> stmmac_dvr_probe
=> stmmac_pltfr_probe
=> devm_stmmac_pltfr_probe
=> qcom_ethqos_probe
=> platform_probe
/* Deassert */
systemd-udevd-283 [002] ..... 6.802480: gpio_value: 544 set 1
systemd-udevd-283 [002] ..... 6.805886: <stack trace>
=> gpiod_set_raw_value_commit
=> gpiod_set_value_nocheck
=> gpiod_set_value_cansleep
=> mdio_device_reset
=> phy_device_register
=> fwnode_mdiobus_phy_device_register
=> fwnode_mdiobus_register_phy
=> __of_mdiobus_register
=> stmmac_mdio_register
=> stmmac_dvr_probe
=> stmmac_pltfr_probe
=> devm_stmmac_pltfr_probe
=> qcom_ethqos_probe
=> platform_probe
/* Deassert */
systemd-udevd-283 [002] ..... 6.882601: gpio_value: 544 set 1
systemd-udevd-283 [002] ..... 6.886014: <stack trace>
=> gpiod_set_raw_value_commit
=> gpiod_set_value_nocheck
=> gpiod_set_value_cansleep
=> mdio_device_reset
=> phy_probe
=> really_probe
=> __driver_probe_device
=> driver_probe_device
=> __device_attach_driver
=> bus_for_each_drv
=> __device_attach
=> device_initial_probe
=> bus_probe_device
=> device_add
=> phy_device_register
=> fwnode_mdiobus_phy_device_register
=> fwnode_mdiobus_register_phy
=> __of_mdiobus_register
=> stmmac_mdio_register
=> stmmac_dvr_probe
=> stmmac_pltfr_probe
=> devm_stmmac_pltfr_probe
=> qcom_ethqos_probe
=> platform_probe
/* Deassert */
NetworkManager-477 [000] ..... 7.023144: gpio_value: 544 set 1
NetworkManager-477 [000] ..... 7.026596: <stack trace>
=> gpiod_set_raw_value_commit
=> gpiod_set_value_nocheck
=> gpiod_set_value_cansleep
=> mdio_device_reset
=> phy_init_hw
=> phy_attach_direct
=> phylink_fwnode_phy_connect
=> __stmmac_open
=> stmmac_open
There's a lot of paths where the device is getting its reset
asserted and deasserted. Let's track the state and only actually
do the assert/deassert when it changes.
Reported-by: Sagar Cheluvegowda <quic_scheluve@quicinc.com>
Signed-off-by: Andrew Halaney <ahalaney@redhat.com>
---
This patch isn't the prettiest thing in the world, but the myriad of
call paths that lead to touching the reset gpio is proving daunting to
me. I originally tried to remove some of the reset calls in various
places, but after staring at the different call paths I decided this was
safer, I am not confident I covered all the corner cases when going
about this by removing the extra phy_device_reset/mdio_device_reset
calls.
---
drivers/net/phy/mdio_device.c | 5 +++++
include/linux/mdio.h | 1 +
2 files changed, 6 insertions(+)
---
base-commit: 07b677953b9dca02928be323e2db853511305fa9
change-id: 20231121-net-phy-reset-once-1e2323982ae0
Best regards,
Comments
On Tue, Nov 21, 2023 at 04:10:37PM -0600, Andrew Halaney wrote: > Currently the phy reset sequence is as shown below for a > devicetree described mdio phy on boot: > > 1. Assert the phy_device's reset as part of registering > 2. Deassert the phy_device's reset as part of registering > 3. Deassert the phy_device's reset as part of phy_probe > 4. Deassert the phy_device's reset as part of phy_hw_init > > The extra two deasserts include waiting the deassert delay afterwards, > which is adding unnecessary delay. > > Here's some snipped tracing output using the following command line > params "trace_event=gpio:* trace_options=stacktrace" illustrating > the reset handling and where its coming from: > > /* Assert */ > systemd-udevd-283 [002] ..... 6.780434: gpio_value: 544 set 0 > systemd-udevd-283 [002] ..... 6.783849: <stack trace> > => gpiod_set_raw_value_commit > => gpiod_set_value_nocheck > => gpiod_set_value_cansleep > => mdio_device_reset > => mdiobus_register_device > => phy_device_register > => fwnode_mdiobus_phy_device_register > => fwnode_mdiobus_register_phy > => __of_mdiobus_register > => stmmac_mdio_register > => stmmac_dvr_probe > => stmmac_pltfr_probe > => devm_stmmac_pltfr_probe > => qcom_ethqos_probe > => platform_probe > > /* Deassert */ > systemd-udevd-283 [002] ..... 6.802480: gpio_value: 544 set 1 > systemd-udevd-283 [002] ..... 6.805886: <stack trace> > => gpiod_set_raw_value_commit > => gpiod_set_value_nocheck > => gpiod_set_value_cansleep > => mdio_device_reset > => phy_device_register > => fwnode_mdiobus_phy_device_register > => fwnode_mdiobus_register_phy > => __of_mdiobus_register > => stmmac_mdio_register > => stmmac_dvr_probe > => stmmac_pltfr_probe > => devm_stmmac_pltfr_probe > => qcom_ethqos_probe > => platform_probe > > /* Deassert */ > systemd-udevd-283 [002] ..... 6.882601: gpio_value: 544 set 1 > systemd-udevd-283 [002] ..... 6.886014: <stack trace> > => gpiod_set_raw_value_commit > => gpiod_set_value_nocheck > => gpiod_set_value_cansleep > => mdio_device_reset > => phy_probe > => really_probe > => __driver_probe_device > => driver_probe_device > => __device_attach_driver > => bus_for_each_drv > => __device_attach > => device_initial_probe > => bus_probe_device > => device_add > => phy_device_register > => fwnode_mdiobus_phy_device_register > => fwnode_mdiobus_register_phy > => __of_mdiobus_register > => stmmac_mdio_register > => stmmac_dvr_probe > => stmmac_pltfr_probe > => devm_stmmac_pltfr_probe > => qcom_ethqos_probe > => platform_probe > > /* Deassert */ > NetworkManager-477 [000] ..... 7.023144: gpio_value: 544 set 1 > NetworkManager-477 [000] ..... 7.026596: <stack trace> > => gpiod_set_raw_value_commit > => gpiod_set_value_nocheck > => gpiod_set_value_cansleep > => mdio_device_reset > => phy_init_hw > => phy_attach_direct > => phylink_fwnode_phy_connect > => __stmmac_open > => stmmac_open > > There's a lot of paths where the device is getting its reset > asserted and deasserted. Let's track the state and only actually > do the assert/deassert when it changes. This only talks about GPIOs. There is also support for a linux reset controller. It is getting turned on/off as many times. You should mention this. Now, lets compare the GPIO and the reset controller: static int mdiobus_register_gpiod(struct mdio_device *mdiodev) { /* Deassert the optional reset signal */ mdiodev->reset_gpio = gpiod_get_optional(&mdiodev->dev, "reset", GPIOD_OUT_LOW); if (IS_ERR(mdiodev->reset_gpio)) return PTR_ERR(mdiodev->reset_gpio); if (mdiodev->reset_gpio) gpiod_set_consumer_name(mdiodev->reset_gpio, "PHY reset"); return 0; } static int mdiobus_register_reset(struct mdio_device *mdiodev) { struct reset_control *reset; reset = reset_control_get_optional_exclusive(&mdiodev->dev, "phy"); if (IS_ERR(reset)) return PTR_ERR(reset); mdiodev->reset_ctrl = reset; return 0; } For the GPIO controller, its clear what state it is in, because the get call sets it to GPIOD_OUT_LOW. The reset controller however does not have a clear state, we just get a reference to it. But: in mdiobus_register_device() we have: err = mdiobus_register_reset(mdiodev); if (err) return err; /* Assert the reset signal */ mdio_device_reset(mdiodev, 1); suggesting the reset controller might have the opposite state to the GPIO? > diff --git a/drivers/net/phy/mdio_device.c b/drivers/net/phy/mdio_device.c > index 044828d081d2..d2b9e62edaaa 100644 > --- a/drivers/net/phy/mdio_device.c > +++ b/drivers/net/phy/mdio_device.c > @@ -122,6 +122,9 @@ void mdio_device_reset(struct mdio_device *mdiodev, int value) > if (!mdiodev->reset_gpio && !mdiodev->reset_ctrl) > return; > > + if (mdiodev->reset_state == value) > + return; > + mdiodev is set to all 0 at creation time, and the GPIO is also set to LOW when we get it. However, what about the reset controller? I think it would be better to initialize reset_state to -1, indicating we have no idea what the state is, and always perform the first reset to ensure we are into a know state for both GPIO and the reset controller. Andrew
diff --git a/drivers/net/phy/mdio_device.c b/drivers/net/phy/mdio_device.c index 044828d081d2..d2b9e62edaaa 100644 --- a/drivers/net/phy/mdio_device.c +++ b/drivers/net/phy/mdio_device.c @@ -122,6 +122,9 @@ void mdio_device_reset(struct mdio_device *mdiodev, int value) if (!mdiodev->reset_gpio && !mdiodev->reset_ctrl) return; + if (mdiodev->reset_state == value) + return; + if (mdiodev->reset_gpio) gpiod_set_value_cansleep(mdiodev->reset_gpio, value); @@ -135,6 +138,8 @@ void mdio_device_reset(struct mdio_device *mdiodev, int value) d = value ? mdiodev->reset_assert_delay : mdiodev->reset_deassert_delay; if (d) fsleep(d); + + mdiodev->reset_state = value; } EXPORT_SYMBOL(mdio_device_reset); diff --git a/include/linux/mdio.h b/include/linux/mdio.h index 007fd9c3e4b6..79ceee3c8673 100644 --- a/include/linux/mdio.h +++ b/include/linux/mdio.h @@ -38,6 +38,7 @@ struct mdio_device { /* Bus address of the MDIO device (0-31) */ int addr; int flags; + int reset_state; struct gpio_desc *reset_gpio; struct reset_control *reset_ctrl; unsigned int reset_assert_delay;