From: Lucas Stach <l.stach@pengutronix.de>
To: "Peng Fan (OSS)" <peng.fan@oss.nxp.com>,
djakov@kernel.org, shawnguo@kernel.org, s.hauer@pengutronix.de,
festevam@gmail.com, robh+dt@kernel.org,
krzysztof.kozlowski+dt@linaro.org, abel.vesa@nxp.com,
abailon@baylibre.com, laurent.pinchart@ideasonboard.com,
marex@denx.de, paul.elder@ideasonboard.com,
Markus.Niebel@ew.tq-group.com, aford173@gmail.com
Cc: kernel@pengutronix.de, linux-pm@vger.kernel.org,
devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, linux-imx@nxp.com,
Peng Fan <peng.fan@nxp.com>
Subject: Re: [PATCH 4/8] soc: imx: add icc paths for i.MX8MP media blk ctrl
Date: Wed, 29 Jun 2022 17:40:26 +0200 [thread overview]
Message-ID: <bf8289b9223a135c26363c27c2f5e35baa448032.camel@pengutronix.de> (raw)
In-Reply-To: <20220601094537.3390127-5-peng.fan@oss.nxp.com>
Am Mittwoch, dem 01.06.2022 um 17:45 +0800 schrieb Peng Fan (OSS):
> From: Peng Fan <peng.fan@nxp.com>
>
> Add interconnect paths for i.MX8MP media blk ctrl
>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> ---
> arch/arm64/boot/dts/freescale/imx8mp.dtsi | 1 +
> drivers/soc/imx/imx8m-blk-ctrl.c | 31 +++++++++++++++++++++++
> 2 files changed, 32 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/freescale/imx8mp.dtsi b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
> index d9542dfff83f..2a1c6ff37e03 100644
> --- a/arch/arm64/boot/dts/freescale/imx8mp.dtsi
> +++ b/arch/arm64/boot/dts/freescale/imx8mp.dtsi
> @@ -4,6 +4,7 @@
> */
>
> #include <dt-bindings/clock/imx8mp-clock.h>
> +#include <dt-bindings/interconnect/fsl,imx8mp.h>
> #include <dt-bindings/power/imx8mp-power.h>
> #include <dt-bindings/gpio/gpio.h>
> #include <dt-bindings/input/input.h>
> diff --git a/drivers/soc/imx/imx8m-blk-ctrl.c b/drivers/soc/imx/imx8m-blk-ctrl.c
> index 7f49385ed2f8..423cac0c9cb6 100644
> --- a/drivers/soc/imx/imx8m-blk-ctrl.c
> +++ b/drivers/soc/imx/imx8m-blk-ctrl.c
> @@ -5,6 +5,7 @@
> */
>
> #include <linux/device.h>
> +#include <linux/interconnect.h>
> #include <linux/module.h>
> #include <linux/of_device.h>
> #include <linux/platform_device.h>
> @@ -37,6 +38,8 @@ struct imx8m_blk_ctrl_domain_data {
> const char *name;
> const char * const *clk_names;
> int num_clks;
> + const char * const *path_names;
> + int num_paths;
> const char *gpc_name;
> u32 rst_mask;
> u32 clk_mask;
> @@ -52,11 +55,13 @@ struct imx8m_blk_ctrl_domain_data {
> };
>
> #define DOMAIN_MAX_CLKS 4
> +#define DOMAIN_MAX_PATHS 4
>
> struct imx8m_blk_ctrl_domain {
> struct generic_pm_domain genpd;
> const struct imx8m_blk_ctrl_domain_data *data;
> struct clk_bulk_data clks[DOMAIN_MAX_CLKS];
> + struct icc_bulk_data paths[DOMAIN_MAX_PATHS];
> struct device *power_dev;
> struct imx8m_blk_ctrl *bc;
> };
> @@ -117,6 +122,10 @@ static int imx8m_blk_ctrl_power_on(struct generic_pm_domain *genpd)
> if (data->mipi_phy_rst_mask)
> regmap_set_bits(bc->regmap, BLK_MIPI_RESET_DIV, data->mipi_phy_rst_mask);
>
> + ret = icc_bulk_set_bw(data->num_paths, domain->paths);
> + if (ret)
> + dev_err(bc->dev, "failed to set icc bw\n");
> +
> /* disable upstream clocks */
> clk_bulk_disable_unprepare(data->num_clks, domain->clks);
>
> @@ -228,6 +237,18 @@ static int imx8m_blk_ctrl_probe(struct platform_device *pdev)
> for (j = 0; j < data->num_clks; j++)
> domain->clks[j].id = data->clk_names[j];
>
> + for (j = 0; j < data->num_paths; j++) {
> + domain->paths[j].name = data->path_names[j];
> + domain->paths[j].avg_bw = INT_MAX;
> + domain->paths[j].peak_bw = INT_MAX;
> + }
> +
> + ret = devm_of_icc_bulk_get(dev, data->num_paths, domain->paths);
> + if (ret) {
> + dev_err_probe(dev, ret, "failed to get noc entries\n");
I don't like that this introduces a new requirement to the kernel
config and DT, which is a backwards compat breaking change. Now one
could argue that the NoC configuration is pretty critical and should
not be skipped, but it has the potential to break currently working
systems.
I think it would be better do a
if (ret != -EPROBE_DEFER)
dev_warn_once(dev, "Could not get interconnect paths, NoC will stay unconfigured!\n");
here and ignore the error to allow the blk-ctrl to probe even if the
interconnect paths couldn't be found due to lacking kernel config or
DT.
Regards,
Lucas
> + goto cleanup_pds;
> + }
> +
> ret = devm_clk_bulk_get(dev, data->num_clks, domain->clks);
> if (ret) {
> dev_err_probe(dev, ret, "failed to get clock\n");
> @@ -647,6 +668,8 @@ static const struct imx8m_blk_ctrl_domain_data imx8mp_media_blk_ctl_domain_data[
> .gpc_name = "lcdif1",
> .rst_mask = BIT(4) | BIT(5) | BIT(23),
> .clk_mask = BIT(4) | BIT(5) | BIT(23),
> + .path_names = (const char *[]){"lcdif-rd", "lcdif-wr"},
> + .num_paths = 2,
> },
> [IMX8MP_MEDIABLK_PD_ISI] = {
> .name = "mediablk-isi",
> @@ -655,6 +678,8 @@ static const struct imx8m_blk_ctrl_domain_data imx8mp_media_blk_ctl_domain_data[
> .gpc_name = "isi",
> .rst_mask = BIT(6) | BIT(7),
> .clk_mask = BIT(6) | BIT(7),
> + .path_names = (const char *[]){"isi0", "isi1", "isi2"},
> + .num_paths = 3,
> },
> [IMX8MP_MEDIABLK_PD_MIPI_CSI2_2] = {
> .name = "mediablk-mipi-csi2-2",
> @@ -672,6 +697,8 @@ static const struct imx8m_blk_ctrl_domain_data imx8mp_media_blk_ctl_domain_data[
> .gpc_name = "lcdif2",
> .rst_mask = BIT(11) | BIT(12) | BIT(24),
> .clk_mask = BIT(11) | BIT(12) | BIT(24),
> + .path_names = (const char *[]){"lcdif-rd", "lcdif-wr"},
> + .num_paths = 2,
> },
> [IMX8MP_MEDIABLK_PD_ISP] = {
> .name = "mediablk-isp",
> @@ -680,6 +707,8 @@ static const struct imx8m_blk_ctrl_domain_data imx8mp_media_blk_ctl_domain_data[
> .gpc_name = "isp",
> .rst_mask = BIT(16) | BIT(17) | BIT(18),
> .clk_mask = BIT(16) | BIT(17) | BIT(18),
> + .path_names = (const char *[]){"isp0", "isp1"},
> + .num_paths = 2,
> },
> [IMX8MP_MEDIABLK_PD_DWE] = {
> .name = "mediablk-dwe",
> @@ -688,6 +717,8 @@ static const struct imx8m_blk_ctrl_domain_data imx8mp_media_blk_ctl_domain_data[
> .gpc_name = "dwe",
> .rst_mask = BIT(19) | BIT(20) | BIT(21),
> .clk_mask = BIT(19) | BIT(20) | BIT(21),
> + .path_names = (const char *[]){"dwe"},
> + .num_paths = 1,
> },
> [IMX8MP_MEDIABLK_PD_MIPI_DSI_2] = {
> .name = "mediablk-mipi-dsi-2",
next prev parent reply other threads:[~2022-06-29 15:40 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-01 9:45 [PATCH 0/8] Add interconnect for i.MX8MP blk ctrl Peng Fan (OSS)
2022-06-01 9:45 ` [PATCH 1/8] dt-bindings: soc: imx: add interconnect property for i.MX8MP media " Peng Fan (OSS)
2022-06-01 11:52 ` Krzysztof Kozlowski
2022-06-04 21:39 ` Laurent Pinchart
2022-06-13 1:03 ` Peng Fan
2022-06-01 9:45 ` [PATCH 2/8] dt-bindings: soc: imx: add interconnect property for i.MX8MP hdmi " Peng Fan (OSS)
2022-06-01 11:52 ` Krzysztof Kozlowski
2022-06-01 9:45 ` [PATCH 3/8] dt-bindings: soc: imx: add interconnect property for i.MX8MP hsio " Peng Fan (OSS)
2022-06-01 11:52 ` Krzysztof Kozlowski
2022-06-01 9:45 ` [PATCH 4/8] soc: imx: add icc paths for i.MX8MP media " Peng Fan (OSS)
2022-06-04 21:44 ` Laurent Pinchart
2022-06-13 1:17 ` Peng Fan
2022-06-29 15:40 ` Lucas Stach [this message]
2022-07-02 12:56 ` Peng Fan
2022-06-01 9:45 ` [PATCH 5/8] soc: imx: add icc paths for i.MX8MP hsio/hdmi " Peng Fan (OSS)
2022-06-01 9:45 ` [PATCH 6/8] arm64: dts: imx8mp: add NoC node Peng Fan (OSS)
2022-06-29 15:21 ` Lucas Stach
2022-07-02 12:52 ` Peng Fan
2022-06-01 9:45 ` [PATCH 7/8] arm64: dts: imx8mp: add interconnects for media blk ctrl Peng Fan (OSS)
2022-06-01 9:45 ` [PATCH 8/8] arm64: dts: imx8mp: add interconnect for hsio " Peng Fan (OSS)
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=bf8289b9223a135c26363c27c2f5e35baa448032.camel@pengutronix.de \
--to=l.stach@pengutronix.de \
--cc=Markus.Niebel@ew.tq-group.com \
--cc=abailon@baylibre.com \
--cc=abel.vesa@nxp.com \
--cc=aford173@gmail.com \
--cc=devicetree@vger.kernel.org \
--cc=djakov@kernel.org \
--cc=festevam@gmail.com \
--cc=kernel@pengutronix.de \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=marex@denx.de \
--cc=paul.elder@ideasonboard.com \
--cc=peng.fan@nxp.com \
--cc=peng.fan@oss.nxp.com \
--cc=robh+dt@kernel.org \
--cc=s.hauer@pengutronix.de \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).