From: Frank Li <Frank.li@nxp.com>
To: Peng Fan <peng.fan@nxp.com>
Cc: Bjorn Andersson <andersson@kernel.org>,
Mathieu Poirier <mathieu.poirier@linaro.org>,
Shawn Guo <shawnguo@kernel.org>,
Sascha Hauer <s.hauer@pengutronix.de>,
Pengutronix Kernel Team <kernel@pengutronix.de>,
Fabio Estevam <festevam@gmail.com>,
Daniel Baluta <daniel.baluta@nxp.com>,
Hiago De Franco <hiago.franco@toradex.com>,
linux-remoteproc@vger.kernel.org, imx@lists.linux.dev,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 2/6] remoteproc: imx_rproc: Move imx_rproc_dcfg closer to imx_rproc_of_match
Date: Mon, 8 Sep 2025 10:55:36 -0400 [thread overview]
Message-ID: <aL7uaGSF1+yiy+qe@lizhi-Precision-Tower-5810> (raw)
In-Reply-To: <20250908-imx-rproc-cleanup-v1-2-e838cb14436c@nxp.com>
On Mon, Sep 08, 2025 at 09:07:35PM +0800, Peng Fan wrote:
> Move the imx_rproc_dcfg structure definitions closer to imx_rproc_of_match
> to prepare for adding start/stop/detect_mode ops for each i.MX variant.
>
> This relocation avoids the need to declare function prototypes such as
> 'static int imx_rproc_xtr_mbox_init(struct rproc *rproc, bool tx_block)'
> at the beginning of the file, improving code organization and readability.
>
> No functional changes.
>
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
> ---
> drivers/remoteproc/imx_rproc.c | 158 ++++++++++++++++++++---------------------
> 1 file changed, 79 insertions(+), 79 deletions(-)
>
> diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
> index 5cdc5045e57566e817170ed3c708dad6108d2e46..af7b69d750deed734668cb413b29378e5ca7c64e 100644
> --- a/drivers/remoteproc/imx_rproc.c
> +++ b/drivers/remoteproc/imx_rproc.c
> @@ -285,85 +285,6 @@ static const struct imx_rproc_att imx_rproc_att_imx6sx[] = {
> { 0x80000000, 0x80000000, 0x60000000, 0 },
> };
>
> -static const struct imx_rproc_dcfg imx_rproc_cfg_imx8mn_mmio = {
> - .src_reg = IMX7D_SRC_SCR,
> - .src_mask = IMX7D_M4_RST_MASK,
> - .src_start = IMX7D_M4_START,
> - .src_stop = IMX8M_M7_STOP,
> - .gpr_reg = IMX8M_GPR22,
> - .gpr_wait = IMX8M_GPR22_CM7_CPUWAIT,
> - .att = imx_rproc_att_imx8mn,
> - .att_size = ARRAY_SIZE(imx_rproc_att_imx8mn),
> - .method = IMX_RPROC_MMIO,
> -};
> -
> -static const struct imx_rproc_dcfg imx_rproc_cfg_imx8mn = {
> - .att = imx_rproc_att_imx8mn,
> - .att_size = ARRAY_SIZE(imx_rproc_att_imx8mn),
> - .method = IMX_RPROC_SMC,
> -};
> -
> -static const struct imx_rproc_dcfg imx_rproc_cfg_imx8mq = {
> - .src_reg = IMX7D_SRC_SCR,
> - .src_mask = IMX7D_M4_RST_MASK,
> - .src_start = IMX7D_M4_START,
> - .src_stop = IMX7D_M4_STOP,
> - .att = imx_rproc_att_imx8mq,
> - .att_size = ARRAY_SIZE(imx_rproc_att_imx8mq),
> - .method = IMX_RPROC_MMIO,
> -};
> -
> -static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qm = {
> - .att = imx_rproc_att_imx8qm,
> - .att_size = ARRAY_SIZE(imx_rproc_att_imx8qm),
> - .method = IMX_RPROC_SCU_API,
> -};
> -
> -static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp = {
> - .att = imx_rproc_att_imx8qxp,
> - .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp),
> - .method = IMX_RPROC_SCU_API,
> -};
> -
> -static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp = {
> - .att = imx_rproc_att_imx8ulp,
> - .att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp),
> - .method = IMX_RPROC_NONE,
> -};
> -
> -static const struct imx_rproc_dcfg imx_rproc_cfg_imx7ulp = {
> - .att = imx_rproc_att_imx7ulp,
> - .att_size = ARRAY_SIZE(imx_rproc_att_imx7ulp),
> - .method = IMX_RPROC_NONE,
> - .flags = IMX_RPROC_NEED_SYSTEM_OFF,
> -};
> -
> -static const struct imx_rproc_dcfg imx_rproc_cfg_imx7d = {
> - .src_reg = IMX7D_SRC_SCR,
> - .src_mask = IMX7D_M4_RST_MASK,
> - .src_start = IMX7D_M4_START,
> - .src_stop = IMX7D_M4_STOP,
> - .att = imx_rproc_att_imx7d,
> - .att_size = ARRAY_SIZE(imx_rproc_att_imx7d),
> - .method = IMX_RPROC_MMIO,
> -};
> -
> -static const struct imx_rproc_dcfg imx_rproc_cfg_imx6sx = {
> - .src_reg = IMX6SX_SRC_SCR,
> - .src_mask = IMX6SX_M4_RST_MASK,
> - .src_start = IMX6SX_M4_START,
> - .src_stop = IMX6SX_M4_STOP,
> - .att = imx_rproc_att_imx6sx,
> - .att_size = ARRAY_SIZE(imx_rproc_att_imx6sx),
> - .method = IMX_RPROC_MMIO,
> -};
> -
> -static const struct imx_rproc_dcfg imx_rproc_cfg_imx93 = {
> - .att = imx_rproc_att_imx93,
> - .att_size = ARRAY_SIZE(imx_rproc_att_imx93),
> - .method = IMX_RPROC_SMC,
> -};
> -
> static int imx_rproc_start(struct rproc *rproc)
> {
> struct imx_rproc *priv = rproc->priv;
> @@ -1222,6 +1143,85 @@ static void imx_rproc_remove(struct platform_device *pdev)
> destroy_workqueue(priv->workqueue);
> }
>
> +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8mn_mmio = {
> + .src_reg = IMX7D_SRC_SCR,
> + .src_mask = IMX7D_M4_RST_MASK,
> + .src_start = IMX7D_M4_START,
> + .src_stop = IMX8M_M7_STOP,
> + .gpr_reg = IMX8M_GPR22,
> + .gpr_wait = IMX8M_GPR22_CM7_CPUWAIT,
> + .att = imx_rproc_att_imx8mn,
> + .att_size = ARRAY_SIZE(imx_rproc_att_imx8mn),
> + .method = IMX_RPROC_MMIO,
> +};
> +
> +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8mn = {
> + .att = imx_rproc_att_imx8mn,
> + .att_size = ARRAY_SIZE(imx_rproc_att_imx8mn),
> + .method = IMX_RPROC_SMC,
> +};
> +
> +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8mq = {
> + .src_reg = IMX7D_SRC_SCR,
> + .src_mask = IMX7D_M4_RST_MASK,
> + .src_start = IMX7D_M4_START,
> + .src_stop = IMX7D_M4_STOP,
> + .att = imx_rproc_att_imx8mq,
> + .att_size = ARRAY_SIZE(imx_rproc_att_imx8mq),
> + .method = IMX_RPROC_MMIO,
> +};
> +
> +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qm = {
> + .att = imx_rproc_att_imx8qm,
> + .att_size = ARRAY_SIZE(imx_rproc_att_imx8qm),
> + .method = IMX_RPROC_SCU_API,
> +};
> +
> +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp = {
> + .att = imx_rproc_att_imx8qxp,
> + .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp),
> + .method = IMX_RPROC_SCU_API,
> +};
> +
> +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp = {
> + .att = imx_rproc_att_imx8ulp,
> + .att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp),
> + .method = IMX_RPROC_NONE,
> +};
> +
> +static const struct imx_rproc_dcfg imx_rproc_cfg_imx7ulp = {
> + .att = imx_rproc_att_imx7ulp,
> + .att_size = ARRAY_SIZE(imx_rproc_att_imx7ulp),
> + .method = IMX_RPROC_NONE,
> + .flags = IMX_RPROC_NEED_SYSTEM_OFF,
> +};
> +
> +static const struct imx_rproc_dcfg imx_rproc_cfg_imx7d = {
> + .src_reg = IMX7D_SRC_SCR,
> + .src_mask = IMX7D_M4_RST_MASK,
> + .src_start = IMX7D_M4_START,
> + .src_stop = IMX7D_M4_STOP,
> + .att = imx_rproc_att_imx7d,
> + .att_size = ARRAY_SIZE(imx_rproc_att_imx7d),
> + .method = IMX_RPROC_MMIO,
> +};
> +
> +static const struct imx_rproc_dcfg imx_rproc_cfg_imx6sx = {
> + .src_reg = IMX6SX_SRC_SCR,
> + .src_mask = IMX6SX_M4_RST_MASK,
> + .src_start = IMX6SX_M4_START,
> + .src_stop = IMX6SX_M4_STOP,
> + .att = imx_rproc_att_imx6sx,
> + .att_size = ARRAY_SIZE(imx_rproc_att_imx6sx),
> + .method = IMX_RPROC_MMIO,
> +};
> +
> +static const struct imx_rproc_dcfg imx_rproc_cfg_imx93 = {
> + .att = imx_rproc_att_imx93,
> + .att_size = ARRAY_SIZE(imx_rproc_att_imx93),
> + .method = IMX_RPROC_SMC,
> +};
> +
> static const struct of_device_id imx_rproc_of_match[] = {
> { .compatible = "fsl,imx7ulp-cm4", .data = &imx_rproc_cfg_imx7ulp },
> { .compatible = "fsl,imx7d-cm4", .data = &imx_rproc_cfg_imx7d },
>
> --
> 2.37.1
>
next prev parent reply other threads:[~2025-09-08 14:55 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-08 13:07 [PATCH 0/6] remoteproc: imx_proc: Simplify driver by removing the switch-case Peng Fan
2025-09-08 13:07 ` [PATCH 1/6] remoteproc: imx_rproc: Introduce start/stop/detect_mode ops for imx_rproc_dcfg Peng Fan
2025-09-08 14:54 ` Frank Li
2025-09-08 13:07 ` [PATCH 2/6] remoteproc: imx_rproc: Move imx_rproc_dcfg closer to imx_rproc_of_match Peng Fan
2025-09-08 14:55 ` Frank Li [this message]
2025-09-08 13:07 ` [PATCH 3/6] remoteproc: imx_rproc: Simplify IMX_RPROC_MMIO switch case Peng Fan
2025-09-08 14:57 ` Frank Li
2025-09-08 13:07 ` [PATCH 4/6] remoteproc: imx_rproc: Simplify IMX_RPROC_SCU_API " Peng Fan
2025-09-08 14:59 ` Frank Li
2025-09-08 13:07 ` [PATCH 5/6] remoteproc: imx_rproc: Simplify IMX_RPROC_SMC " Peng Fan
2025-09-08 15:02 ` Frank Li
2025-09-08 13:07 ` [PATCH 6/6] remoteproc: imx_rproc: Clean up after ops introduction Peng Fan
2025-09-08 15:03 ` Frank Li
2025-09-09 3:52 ` Peng Fan
2025-09-09 16:15 ` Mathieu Poirier
2025-09-09 3:53 ` [PATCH 0/6] remoteproc: imx_proc: Simplify driver by removing the switch-case Peng Fan
2025-09-09 12:08 ` Daniel Baluta
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=aL7uaGSF1+yiy+qe@lizhi-Precision-Tower-5810 \
--to=frank.li@nxp.com \
--cc=andersson@kernel.org \
--cc=daniel.baluta@nxp.com \
--cc=festevam@gmail.com \
--cc=hiago.franco@toradex.com \
--cc=imx@lists.linux.dev \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-remoteproc@vger.kernel.org \
--cc=mathieu.poirier@linaro.org \
--cc=peng.fan@nxp.com \
--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
all inboxes | Powered by JetHome®