On Thu, Sep 18, 2025 at 07:51:17PM +0800, Peng Fan wrote:
> Refactor the detach logic to support platform-specific implementations via
> the dcfg->ops->detach callback. Allow finer control over detach behavior
> depending on the remote processor management method, and make it easier
> to add detach support for new SoCs.
>
> The previous hardcoded SCU API detach logic is now moved into a dedicated
> imx_rproc_scu_api_detach() function, and registered via the plat ops
> structure. The generic imx_rproc_detach() now delegates to the
> platform-specific handler if available.
>
> Also, the dcfg->method check with IMX_RPROC_SCU_API is removed.
>
> No functional changes.
>
> Signed-off-by: Peng Fan <peng....@nxp.com>
Reviewed-by: Frank Li <frank...@nxp.com>
> ---
> drivers/remoteproc/imx_rproc.c | 18 +++++++++++++-----
> drivers/remoteproc/imx_rproc.h | 1 +
> 2 files changed, 14 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
> index
> 71617b20f9d0ae698e7f655aae22e8895434f32c..74c958d44611b66e024180d69d71daac5a2f9e76
> 100644
> --- a/drivers/remoteproc/imx_rproc.c
> +++ b/drivers/remoteproc/imx_rproc.c
> @@ -575,13 +575,9 @@ static int imx_rproc_attach(struct rproc *rproc)
> return imx_rproc_xtr_mbox_init(rproc, true);
> }
>
> -static int imx_rproc_detach(struct rproc *rproc)
> +static int imx_rproc_scu_api_detach(struct rproc *rproc)
> {
> struct imx_rproc *priv = rproc->priv;
> - const struct imx_rproc_dcfg *dcfg = priv->dcfg;
> -
> - if (dcfg->method != IMX_RPROC_SCU_API)
> - return -EOPNOTSUPP;
>
> if (imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc_id))
> return -EOPNOTSUPP;
> @@ -591,6 +587,17 @@ static int imx_rproc_detach(struct rproc *rproc)
> return 0;
> }
>
> +static int imx_rproc_detach(struct rproc *rproc)
> +{
> + struct imx_rproc *priv = rproc->priv;
> + const struct imx_rproc_dcfg *dcfg = priv->dcfg;
> +
> + if (!dcfg->ops || !dcfg->ops->detach)
> + return -EOPNOTSUPP;
> +
> + return dcfg->ops->detach(rproc);
> +}
> +
> static struct resource_table *imx_rproc_get_loaded_rsc_table(struct rproc
> *rproc, size_t *table_sz)
> {
> struct imx_rproc *priv = rproc->priv;
> @@ -1152,6 +1159,7 @@ static const struct imx_rproc_plat_ops
> imx_rproc_ops_mmio = {
> static const struct imx_rproc_plat_ops imx_rproc_ops_scu_api = {
> .start = imx_rproc_scu_api_start,
> .stop = imx_rproc_scu_api_stop,
> + .detach = imx_rproc_scu_api_detach,
> .detect_mode = imx_rproc_scu_api_detect_mode,
> };
>
> diff --git a/drivers/remoteproc/imx_rproc.h b/drivers/remoteproc/imx_rproc.h
> index
> a9cba623560c85ea37e47401c392c06dada500aa..aeed08bdfb5619c7afd7201589f417cfd6745818
> 100644
> --- a/drivers/remoteproc/imx_rproc.h
> +++ b/drivers/remoteproc/imx_rproc.h
> @@ -35,6 +35,7 @@ enum imx_rproc_method {
> struct imx_rproc_plat_ops {
> int (*start)(struct rproc *rproc);
> int (*stop)(struct rproc *rproc);
> + int (*detach)(struct rproc *rproc);
> int (*detect_mode)(struct rproc *rproc);
> };
>
>
> --
> 2.37.1
>
