All of lore.kernel.org
 help / color / mirror / Atom feed
From: Abel Vesa <abel.vesa@nxp.com>
To: Rob Herring <robh@kernel.org>, Shawn Guo <shawnguo@kernel.org>,
	Sascha Hauer <kernel@pengutronix.de>,
	Lucas Stach <l.stach@pengutronix.de>,
	Fabio Estevam <festevam@gmail.com>,
	Chanwoo Choi <cw00.choi@samsung.com>,
	Georgi Djakov <djakov@kernel.org>,
	Dong Aisheng <aisheng.dong@nxp.com>, Peng Fan <peng.fan@nxp.com>,
	Martin Kepplinger <martink@posteo.de>,
	devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-clk@vger.kernel.org,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Cc: NXP Linux Team <linux-imx@nxp.com>, Abel Vesa <abel.vesa@nxp.com>
Subject: [RFC 18/19] net: ethernet: fec_main: Add interconnect support
Date: Fri, 19 Feb 2021 18:00:15 +0200	[thread overview]
Message-ID: <1613750416-11901-19-git-send-email-abel.vesa@nxp.com> (raw)
In-Reply-To: <1613750416-11901-1-git-send-email-abel.vesa@nxp.com>

On probe, if the dts node contains a valid icc path, then look for the
fsl,icc-rate property and get the rate. Also set the icc bandwidth
for that path to the nominal rate needed for fec to function right.
Then enable and disable the path every time the fec is used or not.
This will result in reducing the clock speeds along the icc path
for each pl301 and NoC, but still meet the requirements for all the
other icc consumers.

Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
---
 drivers/net/ethernet/freescale/fec.h      |  3 +++
 drivers/net/ethernet/freescale/fec_main.c | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h
index 0602d5d5d2ee..7611492cb800 100644
--- a/drivers/net/ethernet/freescale/fec.h
+++ b/drivers/net/ethernet/freescale/fec.h
@@ -529,6 +529,9 @@ struct fec_enet_private {
 	unsigned int num_tx_queues;
 	unsigned int num_rx_queues;
 
+	struct icc_path *bus_path;
+	unsigned int bus_rate;
+
 	/* The saved address of a sent-in-place packet/buffer, for skfree(). */
 	struct fec_enet_priv_tx_q *tx_queue[FEC_ENET_MAX_TX_QS];
 	struct fec_enet_priv_rx_q *rx_queue[FEC_ENET_MAX_RX_QS];
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 3db882322b2b..0ed78b390098 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -47,6 +47,7 @@
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/irq.h>
+#include <linux/interconnect.h>
 #include <linux/clk.h>
 #include <linux/crc32.h>
 #include <linux/platform_device.h>
@@ -3572,6 +3573,18 @@ fec_probe(struct platform_device *pdev)
 	fep->pdev = pdev;
 	fep->dev_id = dev_id++;
 
+	fep->bus_path = devm_of_icc_get(&pdev->dev, "path");
+	if (IS_ERR(fep->bus_path)) {
+		return PTR_ERR(fep->bus_path);
+	} else if (fep->bus_path) {
+		if (of_property_read_u32(np, "fsl,icc-rate", &fep->bus_rate)) {
+			dev_err(&pdev->dev, "icc-rate missing\n");
+			return -EINVAL;
+		}
+
+		icc_set_bw(fep->bus_path, 0, fep->bus_rate);
+	}
+
 	platform_set_drvdata(pdev, ndev);
 
 	if ((of_machine_is_compatible("fsl,imx6q") ||
@@ -3826,6 +3839,8 @@ static int __maybe_unused fec_suspend(struct device *dev)
 	if (fep->clk_enet_out || fep->reg_phy)
 		fep->link = 0;
 
+	icc_disable(fep->bus_path);
+
 	return 0;
 }
 
@@ -3836,6 +3851,8 @@ static int __maybe_unused fec_resume(struct device *dev)
 	int ret;
 	int val;
 
+	icc_enable(fep->bus_path);
+
 	if (fep->reg_phy && !(fep->wol_flag & FEC_WOL_FLAG_ENABLE)) {
 		ret = regulator_enable(fep->reg_phy);
 		if (ret)
@@ -3884,6 +3901,7 @@ static int __maybe_unused fec_runtime_suspend(struct device *dev)
 	clk_disable_unprepare(fep->clk_ahb);
 	clk_disable_unprepare(fep->clk_ipg);
 
+	icc_disable(fep->bus_path);
 	return 0;
 }
 
@@ -3893,6 +3911,7 @@ static int __maybe_unused fec_runtime_resume(struct device *dev)
 	struct fec_enet_private *fep = netdev_priv(ndev);
 	int ret;
 
+	icc_enable(fep->bus_path);
 	ret = clk_prepare_enable(fep->clk_ahb);
 	if (ret)
 		return ret;
-- 
2.29.2


WARNING: multiple messages have this Message-ID (diff)
From: Abel Vesa <abel.vesa@nxp.com>
To: Rob Herring <robh@kernel.org>, Shawn Guo <shawnguo@kernel.org>,
	Sascha Hauer <kernel@pengutronix.de>,
	Lucas Stach <l.stach@pengutronix.de>,
	Fabio Estevam <festevam@gmail.com>,
	Chanwoo Choi <cw00.choi@samsung.com>,
	Georgi Djakov <djakov@kernel.org>,
	Dong Aisheng <aisheng.dong@nxp.com>, Peng Fan <peng.fan@nxp.com>,
	Martin Kepplinger <martink@posteo.de>,
	devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
	linux-clk@vger.kernel.org,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Cc: NXP Linux Team <linux-imx@nxp.com>, Abel Vesa <abel.vesa@nxp.com>
Subject: [RFC 18/19] net: ethernet: fec_main: Add interconnect support
Date: Fri, 19 Feb 2021 18:00:15 +0200	[thread overview]
Message-ID: <1613750416-11901-19-git-send-email-abel.vesa@nxp.com> (raw)
In-Reply-To: <1613750416-11901-1-git-send-email-abel.vesa@nxp.com>

On probe, if the dts node contains a valid icc path, then look for the
fsl,icc-rate property and get the rate. Also set the icc bandwidth
for that path to the nominal rate needed for fec to function right.
Then enable and disable the path every time the fec is used or not.
This will result in reducing the clock speeds along the icc path
for each pl301 and NoC, but still meet the requirements for all the
other icc consumers.

Signed-off-by: Abel Vesa <abel.vesa@nxp.com>
---
 drivers/net/ethernet/freescale/fec.h      |  3 +++
 drivers/net/ethernet/freescale/fec_main.c | 19 +++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/drivers/net/ethernet/freescale/fec.h b/drivers/net/ethernet/freescale/fec.h
index 0602d5d5d2ee..7611492cb800 100644
--- a/drivers/net/ethernet/freescale/fec.h
+++ b/drivers/net/ethernet/freescale/fec.h
@@ -529,6 +529,9 @@ struct fec_enet_private {
 	unsigned int num_tx_queues;
 	unsigned int num_rx_queues;
 
+	struct icc_path *bus_path;
+	unsigned int bus_rate;
+
 	/* The saved address of a sent-in-place packet/buffer, for skfree(). */
 	struct fec_enet_priv_tx_q *tx_queue[FEC_ENET_MAX_TX_QS];
 	struct fec_enet_priv_rx_q *rx_queue[FEC_ENET_MAX_RX_QS];
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 3db882322b2b..0ed78b390098 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -47,6 +47,7 @@
 #include <linux/bitops.h>
 #include <linux/io.h>
 #include <linux/irq.h>
+#include <linux/interconnect.h>
 #include <linux/clk.h>
 #include <linux/crc32.h>
 #include <linux/platform_device.h>
@@ -3572,6 +3573,18 @@ fec_probe(struct platform_device *pdev)
 	fep->pdev = pdev;
 	fep->dev_id = dev_id++;
 
+	fep->bus_path = devm_of_icc_get(&pdev->dev, "path");
+	if (IS_ERR(fep->bus_path)) {
+		return PTR_ERR(fep->bus_path);
+	} else if (fep->bus_path) {
+		if (of_property_read_u32(np, "fsl,icc-rate", &fep->bus_rate)) {
+			dev_err(&pdev->dev, "icc-rate missing\n");
+			return -EINVAL;
+		}
+
+		icc_set_bw(fep->bus_path, 0, fep->bus_rate);
+	}
+
 	platform_set_drvdata(pdev, ndev);
 
 	if ((of_machine_is_compatible("fsl,imx6q") ||
@@ -3826,6 +3839,8 @@ static int __maybe_unused fec_suspend(struct device *dev)
 	if (fep->clk_enet_out || fep->reg_phy)
 		fep->link = 0;
 
+	icc_disable(fep->bus_path);
+
 	return 0;
 }
 
@@ -3836,6 +3851,8 @@ static int __maybe_unused fec_resume(struct device *dev)
 	int ret;
 	int val;
 
+	icc_enable(fep->bus_path);
+
 	if (fep->reg_phy && !(fep->wol_flag & FEC_WOL_FLAG_ENABLE)) {
 		ret = regulator_enable(fep->reg_phy);
 		if (ret)
@@ -3884,6 +3901,7 @@ static int __maybe_unused fec_runtime_suspend(struct device *dev)
 	clk_disable_unprepare(fep->clk_ahb);
 	clk_disable_unprepare(fep->clk_ipg);
 
+	icc_disable(fep->bus_path);
 	return 0;
 }
 
@@ -3893,6 +3911,7 @@ static int __maybe_unused fec_runtime_resume(struct device *dev)
 	struct fec_enet_private *fep = netdev_priv(ndev);
 	int ret;
 
+	icc_enable(fep->bus_path);
 	ret = clk_prepare_enable(fep->clk_ahb);
 	if (ret)
 		return ret;
-- 
2.29.2


_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

  parent reply	other threads:[~2021-02-19 16:07 UTC|newest]

Thread overview: 70+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-19 15:59 [RFC 00/19] Rework support for i.MX8MQ interconnect with devfreq Abel Vesa
2021-02-19 15:59 ` Abel Vesa
2021-02-19 15:59 ` [RFC 01/19] clk: imx8mq: Replace critical with ignore_unused flag for dram_apb clock Abel Vesa
2021-02-19 15:59   ` Abel Vesa
2021-02-19 15:59 ` [RFC 02/19] dt-bindings: interconnect: imx8mq: Add missing pl301 and SAI ids Abel Vesa
2021-02-19 15:59   ` Abel Vesa
2021-03-05 23:10   ` Rob Herring
2021-03-05 23:10     ` Rob Herring
2021-02-19 16:00 ` [RFC 03/19] devfreq: imx-bus: Switch governor to powersave Abel Vesa
2021-02-19 16:00   ` Abel Vesa
2021-02-26 14:46   ` Chanwoo Choi
2021-02-26 14:46     ` Chanwoo Choi
2021-02-19 16:00 ` [RFC 04/19] devfreq: imx-bus: Decouple imx-bus from icc made Abel Vesa
2021-02-19 16:00   ` Abel Vesa
2021-02-26 16:52   ` Chanwoo Choi
2021-02-26 16:52     ` Chanwoo Choi
2021-02-19 16:00 ` [RFC 05/19] devfreq: imx8m-ddrc: Change governor to powersave Abel Vesa
2021-02-19 16:00   ` Abel Vesa
2021-02-26 14:47   ` Chanwoo Choi
2021-02-26 14:47     ` Chanwoo Choi
2021-03-09 13:40   ` Dong Aisheng
2021-03-09 13:40     ` Dong Aisheng
2021-02-19 16:00 ` [RFC 06/19] devfreq: imx8m-ddrc: Use the opps acquired from EL3 Abel Vesa
2021-02-19 16:00   ` Abel Vesa
2021-02-26 15:12   ` Chanwoo Choi
2021-02-26 15:12     ` Chanwoo Choi
2021-02-19 16:00 ` [RFC 07/19] devfreq: imx8m-ddrc: Add late system sleep PM ops Abel Vesa
2021-02-19 16:00   ` Abel Vesa
2021-02-26 15:23   ` Chanwoo Choi
2021-02-26 15:23     ` Chanwoo Choi
2021-02-19 16:00 ` [RFC 08/19] interconnect: imx: Switch from imx_icc_node_adj_desc to fsl,icc-id node assignment Abel Vesa
2021-02-19 16:00   ` [RFC 08/19] interconnect: imx: Switch from imx_icc_node_adj_desc to fsl, icc-id " Abel Vesa
2021-02-19 16:00 ` [RFC 09/19] interconnect: imx8: Remove the imx_icc_node_adj_desc Abel Vesa
2021-02-19 16:00   ` Abel Vesa
2021-02-19 16:00 ` [RFC 10/19] interconnect: imx8mq: Add the pl301_per_m and pl301_wakeup nodes and subnodes Abel Vesa
2021-02-19 16:00   ` Abel Vesa
2021-02-19 16:00 ` [RFC 11/19] interconnect: imx8mq: Add of_match_table Abel Vesa
2021-02-19 16:00   ` Abel Vesa
2021-02-19 16:00 ` [RFC 12/19] interconnect: imx: Add imx_icc_get_bw and imx_icc_aggregate functions Abel Vesa
2021-02-19 16:00   ` Abel Vesa
2021-02-19 16:00 ` [RFC 13/19] arm64: dts: imx8mq: Add fsl,icc-id property to ddrc node Abel Vesa
2021-02-19 16:00   ` Abel Vesa
2021-02-19 16:00 ` [RFC 14/19] arm64: dts: imx8mq: Add fsl,icc-id to noc node Abel Vesa
2021-02-19 16:00   ` Abel Vesa
2021-02-19 16:29   ` Abel Vesa
2021-02-19 16:29     ` Abel Vesa
2021-02-19 16:00 ` [RFC 15/19] arm64: dts: imx8mq: Add all pl301 nodes Abel Vesa
2021-02-19 16:00   ` Abel Vesa
2021-02-21 15:47   ` Krzysztof Kozlowski
2021-02-21 15:47     ` Krzysztof Kozlowski
2021-02-19 16:00 ` [RFC 16/19] arm64: dts: imx8mq: Add the interconnect node Abel Vesa
2021-02-19 16:00   ` Abel Vesa
2021-02-19 16:00 ` [RFC 17/19] arm64: dts: imx8mq: Add interconnect properties to icc consumer nodes Abel Vesa
2021-02-19 16:00   ` Abel Vesa
2021-02-19 16:00 ` Abel Vesa [this message]
2021-02-19 16:00   ` [RFC 18/19] net: ethernet: fec_main: Add interconnect support Abel Vesa
2021-02-19 16:00 ` [RFC 19/19] mmc: sdhci-esdhc-imx: " Abel Vesa
2021-02-19 16:00   ` Abel Vesa
2021-02-22 16:03 ` [RFC 00/19] Rework support for i.MX8MQ interconnect with devfreq Martin Kepplinger
2021-02-22 16:03   ` Martin Kepplinger
2021-02-23 17:20   ` Abel Vesa
2021-02-23 17:20     ` Abel Vesa
2021-02-25 12:13     ` Martin Kepplinger
2021-02-25 12:13       ` Martin Kepplinger
2021-03-09 11:43       ` Abel Vesa
2021-03-09 11:43         ` Abel Vesa
2021-03-24  8:03         ` Martin Kepplinger
2021-03-24  8:03           ` Martin Kepplinger
2021-02-26 23:04 ` Chanwoo Choi
2021-02-26 23:04   ` Chanwoo Choi

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=1613750416-11901-19-git-send-email-abel.vesa@nxp.com \
    --to=abel.vesa@nxp.com \
    --cc=aisheng.dong@nxp.com \
    --cc=cw00.choi@samsung.com \
    --cc=devicetree@vger.kernel.org \
    --cc=djakov@kernel.org \
    --cc=festevam@gmail.com \
    --cc=kernel@pengutronix.de \
    --cc=l.stach@pengutronix.de \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-clk@vger.kernel.org \
    --cc=linux-imx@nxp.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=martink@posteo.de \
    --cc=peng.fan@nxp.com \
    --cc=robh@kernel.org \
    --cc=shawnguo@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.