[PATCH 2/4] remoteproc: imx_dsp_rproc: Add softreset and dbgreset handling
shengjiu.wang at oss.nxp.com
shengjiu.wang at oss.nxp.com
Thu Oct 29 00:32:55 PDT 2026
From: Shengjiu Wang <shengjiu.wang at nxp.com>
Add `soft_rst` and `dbg_rst` members to `struct imx_dsp_rproc` as defined
in the DSP binding (they correspond to the softreset and dbgreset
controls).
In `imx_dsp_rproc_reset_ctrl_detect_mode` acquire the three reset controls
— runstall, softreset, and dbgreset, the latter two are optional.
Rewrite `imx8ulp_dsp_reset` to use the generic reset controller API
(`reset_control_assert` / `reset_control_deassert`) instead of direct
register writes. This change relies on the reset controller implementation
added in commit 5aac7afc752b ("reset: imx8mp-audiomix: Support i.MX8ULP SIM
LPAV").
With this new implementation the legacy `imx_dsp_rproc_mmio_*` functions
are no longer needed and can be removed.
Signed-off-by: Shengjiu Wang <shengjiu.wang at nxp.com>
---
drivers/remoteproc/imx_dsp_rproc.c | 76 +++++++++---------------------
1 file changed, 21 insertions(+), 55 deletions(-)
diff --git a/drivers/remoteproc/imx_dsp_rproc.c b/drivers/remoteproc/imx_dsp_rproc.c
index 96d619daf3f5..0b0042525ea2 100644
--- a/drivers/remoteproc/imx_dsp_rproc.c
+++ b/drivers/remoteproc/imx_dsp_rproc.c
@@ -108,8 +108,9 @@ enum imx_dsp_rp_mbox_messages {
/**
* struct imx_dsp_rproc - DSP remote processor state
- * @regmap: regmap handler
* @run_stall: reset control handle used for Run/Stall operation
+ * @soft_rst: reset control handle used for DSP core reset
+ * @dbg_rst: reset control handle used for DSP debug logic
* @rproc: rproc handler
* @dsp_dcfg: device configuration pointer
* @clks: clocks needed by this device
@@ -125,8 +126,9 @@ enum imx_dsp_rp_mbox_messages {
* @flags: control flags
*/
struct imx_dsp_rproc {
- struct regmap *regmap;
struct reset_control *run_stall;
+ struct reset_control *soft_rst;
+ struct reset_control *dbg_rst;
struct rproc *rproc;
const struct imx_dsp_rproc_dcfg *dsp_dcfg;
struct clk_bulk_data clks[DSP_RPROC_CLK_MAX];
@@ -243,20 +245,15 @@ static int imx8ulp_dsp_reset(struct imx_dsp_rproc *priv)
struct arm_smccc_res res;
/* Put DSP into reset and stall */
- regmap_update_bits(priv->regmap, IMX8ULP_SIM_LPAV_REG_SYSCTRL0,
- IMX8ULP_SYSCTRL0_DSP_RST, IMX8ULP_SYSCTRL0_DSP_RST);
- regmap_update_bits(priv->regmap, IMX8ULP_SIM_LPAV_REG_SYSCTRL0,
- IMX8ULP_SYSCTRL0_DSP_STALL,
- IMX8ULP_SYSCTRL0_DSP_STALL);
+ reset_control_assert(priv->soft_rst);
+ reset_control_assert(priv->run_stall);
/* Configure resources of DSP through TFA */
arm_smccc_smc(IMX8ULP_SIP_HIFI_XRDC, 0, 0, 0, 0, 0, 0, 0, &res);
/* Take the DSP out of reset and keep stalled for FW loading */
- regmap_update_bits(priv->regmap, IMX8ULP_SIM_LPAV_REG_SYSCTRL0,
- IMX8ULP_SYSCTRL0_DSP_RST, 0);
- regmap_update_bits(priv->regmap, IMX8ULP_SIM_LPAV_REG_SYSCTRL0,
- IMX8ULP_SYSCTRL0_DSP_DBG_RST, 0);
+ reset_control_deassert(priv->soft_rst);
+ reset_control_deassert(priv->dbg_rst);
return 0;
}
@@ -338,14 +335,6 @@ static int imx_dsp_rproc_handle_rsc(struct rproc *rproc, u32 rsc_type,
return RSC_HANDLED;
}
-static int imx_dsp_rproc_mmio_start(struct rproc *rproc)
-{
- struct imx_dsp_rproc *priv = rproc->priv;
- const struct imx_rproc_dcfg *dcfg = priv->dsp_dcfg->dcfg;
-
- return regmap_update_bits(priv->regmap, dcfg->src_reg, dcfg->src_mask, dcfg->src_start);
-}
-
static int imx_dsp_rproc_reset_ctrl_start(struct rproc *rproc)
{
struct imx_dsp_rproc *priv = rproc->priv;
@@ -391,14 +380,6 @@ static int imx_dsp_rproc_start(struct rproc *rproc)
return 0;
}
-static int imx_dsp_rproc_mmio_stop(struct rproc *rproc)
-{
- struct imx_dsp_rproc *priv = rproc->priv;
- const struct imx_rproc_dcfg *dcfg = priv->dsp_dcfg->dcfg;
-
- return regmap_update_bits(priv->regmap, dcfg->src_reg, dcfg->src_mask, dcfg->src_stop);
-}
-
static int imx_dsp_rproc_reset_ctrl_stop(struct rproc *rproc)
{
struct imx_dsp_rproc *priv = rproc->priv;
@@ -1024,23 +1005,6 @@ static int imx_dsp_attach_pm_domains(struct imx_dsp_rproc *priv)
return devm_pm_domain_attach_list(dev, NULL, &priv->pd_list);
}
-static int imx_dsp_rproc_mmio_detect_mode(struct rproc *rproc)
-{
- struct imx_dsp_rproc *priv = rproc->priv;
- struct device *dev = rproc->dev.parent;
- struct regmap *regmap;
-
- regmap = syscon_regmap_lookup_by_phandle(dev->of_node, "fsl,dsp-ctrl");
- if (IS_ERR(regmap)) {
- dev_err(dev, "failed to find syscon\n");
- return PTR_ERR(regmap);
- }
-
- priv->regmap = regmap;
-
- return 0;
-}
-
static int imx_dsp_rproc_reset_ctrl_detect_mode(struct rproc *rproc)
{
struct imx_dsp_rproc *priv = rproc->priv;
@@ -1052,6 +1016,18 @@ static int imx_dsp_rproc_reset_ctrl_detect_mode(struct rproc *rproc)
return PTR_ERR(priv->run_stall);
}
+ priv->soft_rst = devm_reset_control_get_optional_exclusive(dev, "softreset");
+ if (IS_ERR(priv->soft_rst)) {
+ dev_err(dev, "Failed to get DSP soft reset control\n");
+ return PTR_ERR(priv->soft_rst);
+ }
+
+ priv->dbg_rst = devm_reset_control_get_optional_exclusive(dev, "dbgreset");
+ if (IS_ERR(priv->dbg_rst)) {
+ dev_err(dev, "Failed to get DSP debug reset control\n");
+ return PTR_ERR(priv->dbg_rst);
+ }
+
return 0;
}
@@ -1316,12 +1292,6 @@ static const struct dev_pm_ops imx_dsp_rproc_pm_ops = {
RUNTIME_PM_OPS(imx_dsp_runtime_suspend, imx_dsp_runtime_resume, NULL)
};
-static const struct imx_rproc_plat_ops imx_dsp_rproc_ops_mmio = {
- .start = imx_dsp_rproc_mmio_start,
- .stop = imx_dsp_rproc_mmio_stop,
- .detect_mode = imx_dsp_rproc_mmio_detect_mode,
-};
-
static const struct imx_rproc_plat_ops imx_dsp_rproc_ops_reset_ctrl = {
.start = imx_dsp_rproc_reset_ctrl_start,
.stop = imx_dsp_rproc_reset_ctrl_stop,
@@ -1348,13 +1318,9 @@ static const struct imx_dsp_rproc_dcfg imx_dsp_rproc_cfg_imx8mp = {
/* Specific configuration for i.MX8ULP */
static const struct imx_rproc_dcfg dsp_rproc_cfg_imx8ulp = {
- .src_reg = IMX8ULP_SIM_LPAV_REG_SYSCTRL0,
- .src_mask = IMX8ULP_SYSCTRL0_DSP_STALL,
- .src_start = 0,
- .src_stop = IMX8ULP_SYSCTRL0_DSP_STALL,
.att = imx_dsp_rproc_att_imx8ulp,
.att_size = ARRAY_SIZE(imx_dsp_rproc_att_imx8ulp),
- .ops = &imx_dsp_rproc_ops_mmio,
+ .ops = &imx_dsp_rproc_ops_reset_ctrl,
};
static const struct imx_dsp_rproc_dcfg imx_dsp_rproc_cfg_imx8ulp = {
--
2.34.1
More information about the linux-arm-kernel
mailing list