From: Lorenzo Bianconi <lorenzo.bianconi@oss.qualcomm.com>
To: Mohd Ayaan Anwar <mohd.anwar@oss.qualcomm.com>
Cc: Andrew Lunn <andrew+netdev@lunn.ch>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@kernel.org>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzk+dt@kernel.org>,
Conor Dooley <conor+dt@kernel.org>, Andrew Davis <afd@ti.com>,
Andrew Lunn <andrew@lunn.ch>,
Heiner Kallweit <hkallweit1@gmail.com>,
Russell King <linux@armlinux.org.uk>,
Richard Cochran <richardcochran@gmail.com>,
Bjorn Andersson <andersson@kernel.org>,
Konrad Dybcio <konradybcio@kernel.org>,
Alexandre Torgue <alexandre.torgue@foss.st.com>,
Giuseppe Cavallaro <peppe.cavallaro@st.com>,
Jose Abreu <joabreu@synopsys.com>,
Maxime Chevallier <maxime.chevallier@bootlin.com>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
netdev@vger.kernel.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH net-next v4 08/10] net: stmmac: qcom-ethqos: add per-platform NOC clock voting
Date: Wed, 18 Nov 2026 10:40:35 +0100 [thread overview]
Message-ID: <av1yk7P2_nNBvRMs@lore-qca> (raw)
In-Reply-To: <20261117-shikra_ethernet-v4-8-c41902e5f2fa@oss.qualcomm.com>
[-- Attachment #1: Type: text/plain, Size: 7327 bytes --]
> Some SoCs gate the EMAC DMA path behind dedicated AXI clocks. Add
> per-platform clock-name lists and configure them as a single
> multi-clock OPP. The OPP core programs every clock rate and propagates
> the required power state.
>
> Select PM_OPP because DWMAC_QCOM_ETHQOS calls PM OPP APIs for
> compatibles that describe AXI OPP clocks.
>
> No functional change for existing compatibles. This will help us when
> we add support for Shikra.
>
> Signed-off-by: Mohd Ayaan Anwar <mohd.anwar@oss.qualcomm.com>
Hi Mohd,
just a nit inline. Fixing it:
Reviewed-by: Lorenzo Bianconi <lorenzo.bianconi@oss.qualcomm.com>
Regards,
Lorenzo
> ---
> drivers/net/ethernet/stmicro/stmmac/Kconfig | 1 +
> .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 103 +++++++++++++++++++++
> 2 files changed, 104 insertions(+)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig
> index c6559e749c0c..15639666e837 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/Kconfig
> +++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig
> @@ -146,6 +146,7 @@ config DWMAC_QCOM_ETHQOS
> tristate "Qualcomm ETHQOS support"
> default ARCH_QCOM
> depends on OF && (ARCH_QCOM || COMPILE_TEST)
> + select PM_OPP
> help
> Support for the Qualcomm ETHQOS core.
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
> index bc443793539b..15385750b3e6 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
> @@ -6,6 +6,7 @@
> #include <linux/of_net.h>
> #include <linux/platform_device.h>
> #include <linux/pm_domain.h>
> +#include <linux/pm_opp.h>
> #include <linux/phy.h>
> #include <linux/phy/phy.h>
>
> @@ -102,6 +103,8 @@ struct ethqos_emac_driver_data {
> const char *link_clk_name;
> const struct dwmac4_addrs *dwmac4_addrs;
> bool needs_sgmii_loopback;
> + const char * const *noc_clk_names;
> + unsigned int num_noc_clks;
> /* Fixed PTP reference clock rate, used on SCMI platforms where
> * firmware does not implement the clock protocol allowing linux to
> * query it.
> @@ -119,6 +122,8 @@ struct qcom_ethqos {
> phy_interface_t phy_mode;
> struct dev_pm_domain_list *pds;
> const struct ethqos_emac_driver_data *data;
> + struct clk_bulk_data *noc_clks;
> + unsigned int num_noc_clks;
> };
>
> static u32 rgmii_readl(struct qcom_ethqos *ethqos, unsigned int offset)
> @@ -725,18 +730,61 @@ static int ethqos_mac_finish_serdes(struct net_device *ndev, void *priv,
> return ret;
> }
>
> +static int qcom_ethqos_set_opp(struct qcom_ethqos *ethqos)
is it clearer to have an utility routine to set a specific freq and then call it
with freq = ULONG_MAX? Something like:
static in t qcom_ethqos_set_opp(struct qcom_ethqos *ethqos, unsigned long *freq)
{
....
}
> +{
> + struct device *dev = ðqos->pdev->dev;
> + unsigned long freq = ULONG_MAX;
> + struct dev_pm_opp *opp;
> + int ret;
> +
> + opp = dev_pm_opp_find_freq_floor_indexed(dev, &freq, 0);
> + if (IS_ERR(opp)) {
> + ret = PTR_ERR(opp);
> + dev_err(dev, "Failed to find AXI NOC OPP: %d\n", ret);
> + return ret;
> + }
> +
> + ret = dev_pm_opp_set_opp(dev, opp);
> + dev_pm_opp_put(opp);
> +
> + return ret;
> +}
> +
> static int ethqos_clks_config(void *priv, bool enabled)
> {
> struct qcom_ethqos *ethqos = priv;
> int ret = 0;
>
> if (enabled) {
> + if (ethqos->num_noc_clks) {
> + ret = qcom_ethqos_set_opp(ethqos);
> + if (ret) {
> + dev_err(ðqos->pdev->dev,
> + "NOC OPP set failed: %d\n", ret);
> + return ret;
> + }
> + }
> +
> ret = clk_prepare_enable(ethqos->link_clk);
> if (ret) {
> dev_err(ðqos->pdev->dev, "link_clk enable failed\n");
> + if (ethqos->num_noc_clks)
> + dev_pm_opp_set_rate(ðqos->pdev->dev, 0);
> return ret;
> }
>
> + if (ethqos->num_noc_clks) {
> + ret = clk_bulk_prepare_enable(ethqos->num_noc_clks,
> + ethqos->noc_clks);
> + if (ret) {
> + dev_err(ðqos->pdev->dev,
> + "NOC clocks enable failed: %d\n", ret);
> + clk_disable_unprepare(ethqos->link_clk);
> + dev_pm_opp_set_rate(ðqos->pdev->dev, 0);
> + return ret;
> + }
> + }
> +
> /* Enable functional clock to prevent DMA reset to timeout due
> * to lacking PHY clock after the hardware block has been power
> * cycled. The actual configuration will be adjusted once
> @@ -745,7 +793,12 @@ static int ethqos_clks_config(void *priv, bool enabled)
> qcom_ethqos_set_sgmii_loopback(ethqos, true);
> ethqos_set_func_clk_en(ethqos);
> } else {
> + if (ethqos->num_noc_clks)
> + clk_bulk_disable_unprepare(ethqos->num_noc_clks,
> + ethqos->noc_clks);
> clk_disable_unprepare(ethqos->link_clk);
> + if (ethqos->num_noc_clks)
> + dev_pm_opp_set_rate(ðqos->pdev->dev, 0);
> }
>
> return ret;
> @@ -773,6 +826,52 @@ static void ethqos_ptp_clk_freq_config(struct stmmac_priv *priv)
> netdev_dbg(priv->dev, "PTP rate %lu\n", plat_dat->clk_ptp_rate);
> }
>
> +static void qcom_ethqos_noc_opp_cleanup(void *dev)
> +{
> + dev_pm_opp_set_rate(dev, 0);
> +}
> +
> +/* Some SoCs gate NOC access behind dedicated clocks. Acquire them here
> + * and set up an OPP table to vote for the required rate and power.
> + */
> +static int qcom_ethqos_init_noc_clks(struct qcom_ethqos *ethqos,
> + const struct ethqos_emac_driver_data *data)
> +{
> + struct dev_pm_opp_config config = {
> + .clk_names = data->noc_clk_names,
> + .config_clks = dev_pm_opp_config_clks_simple,
> + };
> + struct device *dev = ðqos->pdev->dev;
> + unsigned int i;
> + int ret;
> +
> + if (!data->num_noc_clks)
> + return 0;
> +
> + ethqos->noc_clks = devm_kcalloc(dev, data->num_noc_clks,
> + sizeof(*ethqos->noc_clks), GFP_KERNEL);
> + if (!ethqos->noc_clks)
> + return -ENOMEM;
> +
> + for (i = 0; i < data->num_noc_clks; i++)
> + ethqos->noc_clks[i].id = data->noc_clk_names[i];
> + ethqos->num_noc_clks = data->num_noc_clks;
> +
> + ret = devm_clk_bulk_get(dev, ethqos->num_noc_clks, ethqos->noc_clks);
> + if (ret)
> + return dev_err_probe(dev, ret, "Failed to get NOC clocks\n");
> +
> + ret = devm_pm_opp_set_config(dev, &config);
> + if (ret)
> + return dev_err_probe(dev, ret, "Failed to configure OPP clocks\n");
> +
> + ret = devm_pm_opp_of_add_table(dev);
> + if (ret)
> + return dev_err_probe(dev, ret, "Failed to add OPP table\n");
> +
> + return devm_add_action_or_reset(dev, qcom_ethqos_noc_opp_cleanup, dev);
> +}
> +
> static int ethqos_hlos_setup(struct qcom_ethqos *ethqos,
> struct plat_stmmacenet_data *plat_dat)
> {
> @@ -780,6 +879,10 @@ static int ethqos_hlos_setup(struct qcom_ethqos *ethqos,
> struct device *dev = &pdev->dev;
> int ret;
>
> + ret = qcom_ethqos_init_noc_clks(ethqos, ethqos->data);
> + if (ret)
> + return ret;
> +
> ethqos->rgmii_base = devm_platform_ioremap_resource_byname(pdev, "rgmii");
> if (IS_ERR(ethqos->rgmii_base))
> return dev_err_probe(dev, PTR_ERR(ethqos->rgmii_base),
>
> --
> 2.34.1
>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
next prev parent reply other threads:[~2026-11-18 9:40 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-11-17 8:45 [PATCH net-next v4 00/10] net: stmmac: qcom-ethqos: add Shikra EMAC support Mohd Ayaan Anwar
2026-11-17 8:45 ` [PATCH net-next v4 01/10] dt-bindings: net: ti,dp83867: add supply properties Mohd Ayaan Anwar
2026-11-17 8:45 ` [PATCH net-next v4 02/10] net: phy: dp83867: add regulator supply management Mohd Ayaan Anwar
2026-11-17 8:45 ` [PATCH net-next v4 03/10] dt-bindings: net: qcom,ethqos: add qcom,shikra-ethqos compatible Mohd Ayaan Anwar
2026-11-17 8:45 ` [PATCH net-next v4 04/10] net: stmmac: qcom-ethqos: convert ethqos_rgmii_macro_init() to void Mohd Ayaan Anwar
2026-11-17 8:45 ` [PATCH net-next v4 05/10] net: stmmac: qcom-ethqos: add DLL-bypass for PHY-managed RGMII delays Mohd Ayaan Anwar
2026-11-18 8:47 ` sashiko-bot
2026-11-17 8:45 ` [PATCH net-next v4 06/10] net: stmmac: qcom-ethqos: set initial RGMII link clock to lowest speed Mohd Ayaan Anwar
2026-11-18 9:13 ` Lorenzo Bianconi
2026-11-17 8:45 ` [PATCH net-next v4 07/10] net: stmmac: qcom-ethqos: share common GMAC4 address table Mohd Ayaan Anwar
2026-11-17 8:45 ` [PATCH net-next v4 08/10] net: stmmac: qcom-ethqos: add per-platform NOC clock voting Mohd Ayaan Anwar
2026-11-18 9:40 ` Lorenzo Bianconi [this message]
2026-11-17 8:45 ` [PATCH net-next v4 09/10] net: stmmac: qcom-ethqos: add Shikra EMAC support Mohd Ayaan Anwar
2026-11-18 9:43 ` Lorenzo Bianconi
2026-11-17 8:45 ` [PATCH net-next v4 10/10] net: stmmac: qcom-ethqos: add QCS615 " Mohd Ayaan Anwar
2026-11-18 8:47 ` sashiko-bot
2026-11-18 9:44 ` Lorenzo Bianconi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=av1yk7P2_nNBvRMs@lore-qca \
--to=lorenzo.bianconi@oss.qualcomm.com \
--cc=afd@ti.com \
--cc=alexandre.torgue@foss.st.com \
--cc=andersson@kernel.org \
--cc=andrew+netdev@lunn.ch \
--cc=andrew@lunn.ch \
--cc=conor+dt@kernel.org \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=edumazet@kernel.org \
--cc=hkallweit1@gmail.com \
--cc=joabreu@synopsys.com \
--cc=konradybcio@kernel.org \
--cc=krzk+dt@kernel.org \
--cc=kuba@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=linux@armlinux.org.uk \
--cc=maxime.chevallier@bootlin.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=mohd.anwar@oss.qualcomm.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=peppe.cavallaro@st.com \
--cc=richardcochran@gmail.com \
--cc=robh@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox