From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com> To: 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, l.stach@pengutronix.de, 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, abelvesa@kernel.org, Peng Fan <peng.fan@nxp.com> Subject: [PATCH V2 4/9] interconnect: imx: fix max_node_id Date: Thu, 16 Jun 2022 15:33:15 +0800 [thread overview] Message-ID: <20220616073320.2203000-5-peng.fan@oss.nxp.com> (raw) In-Reply-To: <20220616073320.2203000-1-peng.fan@oss.nxp.com> From: Peng Fan <peng.fan@nxp.com> max_node_id not equal to the ARRAY_SIZE of node array, need increase 1, otherwise xlate will fail for the last entry. And rename max_node_id to num_nodes to reflect the reality. Fixes: f0d8048525d7d("interconnect: Add imx core driver") Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Peng Fan <peng.fan@nxp.com> --- drivers/interconnect/imx/imx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/interconnect/imx/imx.c b/drivers/interconnect/imx/imx.c index 249ca25d1d55..4406ec45fa90 100644 --- a/drivers/interconnect/imx/imx.c +++ b/drivers/interconnect/imx/imx.c @@ -234,16 +234,16 @@ int imx_icc_register(struct platform_device *pdev, struct device *dev = &pdev->dev; struct icc_onecell_data *data; struct icc_provider *provider; - int max_node_id; + int num_nodes; int ret; /* icc_onecell_data is indexed by node_id, unlike nodes param */ - max_node_id = get_max_node_id(nodes, nodes_count); - data = devm_kzalloc(dev, struct_size(data, nodes, max_node_id), + num_nodes = get_max_node_id(nodes, nodes_count) + 1; + data = devm_kzalloc(dev, struct_size(data, nodes, num_nodes), GFP_KERNEL); if (!data) return -ENOMEM; - data->num_nodes = max_node_id; + data->num_nodes = num_nodes; provider = devm_kzalloc(dev, sizeof(*provider), GFP_KERNEL); if (!provider) -- 2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com> To: 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, l.stach@pengutronix.de, 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, abelvesa@kernel.org, Peng Fan <peng.fan@nxp.com> Subject: [PATCH V2 4/9] interconnect: imx: fix max_node_id Date: Thu, 16 Jun 2022 15:33:15 +0800 [thread overview] Message-ID: <20220616073320.2203000-5-peng.fan@oss.nxp.com> (raw) In-Reply-To: <20220616073320.2203000-1-peng.fan@oss.nxp.com> From: Peng Fan <peng.fan@nxp.com> max_node_id not equal to the ARRAY_SIZE of node array, need increase 1, otherwise xlate will fail for the last entry. And rename max_node_id to num_nodes to reflect the reality. Fixes: f0d8048525d7d("interconnect: Add imx core driver") Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Peng Fan <peng.fan@nxp.com> --- drivers/interconnect/imx/imx.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/interconnect/imx/imx.c b/drivers/interconnect/imx/imx.c index 249ca25d1d55..4406ec45fa90 100644 --- a/drivers/interconnect/imx/imx.c +++ b/drivers/interconnect/imx/imx.c @@ -234,16 +234,16 @@ int imx_icc_register(struct platform_device *pdev, struct device *dev = &pdev->dev; struct icc_onecell_data *data; struct icc_provider *provider; - int max_node_id; + int num_nodes; int ret; /* icc_onecell_data is indexed by node_id, unlike nodes param */ - max_node_id = get_max_node_id(nodes, nodes_count); - data = devm_kzalloc(dev, struct_size(data, nodes, max_node_id), + num_nodes = get_max_node_id(nodes, nodes_count) + 1; + data = devm_kzalloc(dev, struct_size(data, nodes, num_nodes), GFP_KERNEL); if (!data) return -ENOMEM; - data->num_nodes = max_node_id; + data->num_nodes = num_nodes; provider = devm_kzalloc(dev, sizeof(*provider), GFP_KERNEL); if (!provider) -- 2.25.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2022-06-16 7:32 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-06-16 7:33 [PATCH V2 0/9] interconnect: support i.MX8MP Peng Fan (OSS) 2022-06-16 7:33 ` Peng Fan (OSS) 2022-06-16 7:33 ` [PATCH V2 1/9] dt-bindings: interconnect: imx8m: Add bindings for imx8mp noc Peng Fan (OSS) 2022-06-16 7:33 ` Peng Fan (OSS) 2022-06-27 22:18 ` Rob Herring 2022-06-27 22:18 ` Rob Herring 2022-06-16 7:33 ` [PATCH V2 2/9] dt-bindings: interconnect: add fsl,imx8mp.h Peng Fan (OSS) 2022-06-16 7:33 ` Peng Fan (OSS) 2022-06-27 22:19 ` Rob Herring 2022-06-27 22:19 ` Rob Herring 2022-06-16 7:33 ` [PATCH V2 3/9] interconnect: add device managed bulk API Peng Fan (OSS) 2022-06-16 7:33 ` Peng Fan (OSS) 2022-06-16 7:33 ` Peng Fan (OSS) [this message] 2022-06-16 7:33 ` [PATCH V2 4/9] interconnect: imx: fix max_node_id Peng Fan (OSS) 2022-06-16 7:33 ` [PATCH V2 5/9] interconnect: imx: set src node Peng Fan (OSS) 2022-06-16 7:33 ` Peng Fan (OSS) 2022-06-16 7:33 ` [PATCH V2 6/9] interconnect: imx: introduce imx_icc_provider Peng Fan (OSS) 2022-06-16 7:33 ` Peng Fan (OSS) 2022-06-16 7:33 ` [PATCH V2 7/9] interconnect: imx: set of_node for interconnect provider Peng Fan (OSS) 2022-06-16 7:33 ` Peng Fan (OSS) 2022-06-29 15:08 ` Lucas Stach 2022-06-29 15:08 ` Lucas Stach 2022-06-29 17:32 ` Laurent Pinchart 2022-06-29 17:32 ` Laurent Pinchart 2022-07-03 8:43 ` Peng Fan (OSS) 2022-07-03 8:43 ` Peng Fan (OSS) 2022-07-02 12:48 ` Peng Fan 2022-07-02 12:48 ` Peng Fan 2022-06-16 7:33 ` [PATCH V2 8/9] interconnect: imx: configure NoC mode/prioriry/ext_control Peng Fan (OSS) 2022-06-16 7:33 ` Peng Fan (OSS) 2022-06-28 17:57 ` Georgi Djakov 2022-06-28 17:57 ` Georgi Djakov 2022-07-02 12:41 ` Peng Fan 2022-07-02 12:41 ` Peng Fan 2022-06-29 15:14 ` Lucas Stach 2022-06-29 15:14 ` Lucas Stach 2022-07-02 12:50 ` Peng Fan 2022-07-02 12:50 ` Peng Fan 2022-06-16 7:33 ` [PATCH V2 9/9] interconnect: imx: Add platform driver for imx8mp Peng Fan (OSS) 2022-06-16 7:33 ` Peng Fan (OSS) 2022-06-28 17:58 ` Georgi Djakov 2022-06-28 17:58 ` Georgi Djakov 2022-06-29 15:17 ` Lucas Stach 2022-06-29 15:17 ` Lucas Stach 2022-07-02 12:51 ` Peng Fan 2022-07-02 12:51 ` Peng Fan
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=20220616073320.2203000-5-peng.fan@oss.nxp.com \ --to=peng.fan@oss.nxp.com \ --cc=Markus.Niebel@ew.tq-group.com \ --cc=abailon@baylibre.com \ --cc=abel.vesa@nxp.com \ --cc=abelvesa@kernel.org \ --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=l.stach@pengutronix.de \ --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=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: linkBe 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.