Skip to content

Commit 424f22b

Browse files
iuliana-prodanmathieupoirier
authored andcommitted
remoteproc: imx_dsp_rproc: Rename macro to reflect multiple contexts
Rename WAIT_FW_READY to WAIT_FW_CONFIRMATION and FEATURE_DONT_WAIT_FW_READY to FEATURE_SKIP_FW_CONFIRMATION. This way, the term CONFIRMATION covers: - waiting for firmware to confirm it is ready to start; - waiting for any other confirmation from firmware. Signed-off-by: Iuliana Prodan <iuliana.prodan@nxp.com> Reviewed-by: Frank Li <Frank.Li@nxp.com> Reviewed-by: Daniel Baluta <daniel.baluta@nxp.com> Link: https://lore.kernel.org/r/20251204122825.756106-2-iuliana.prodan@oss.nxp.com Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
1 parent d62e0e9 commit 424f22b

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

drivers/remoteproc/imx_dsp_rproc.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,15 @@ MODULE_PARM_DESC(no_mailboxes,
3838

3939
/* Flag indicating that the remote is up and running */
4040
#define REMOTE_IS_READY BIT(0)
41-
/* Flag indicating that the host should wait for a firmware-ready response */
42-
#define WAIT_FW_READY BIT(1)
41+
/* Flag indicating that the host should wait for a firmware-confirmation response */
42+
#define WAIT_FW_CONFIRMATION BIT(1)
4343
#define REMOTE_READY_WAIT_MAX_RETRIES 500
4444

4545
/*
4646
* This flag is set in the DSP resource table's features field to indicate
47-
* that the firmware requires the host NOT to wait for a FW_READY response.
47+
* that the firmware requires the host NOT to wait for a FW_CONFIRMATION response.
4848
*/
49-
#define FEATURE_DONT_WAIT_FW_READY BIT(0)
49+
#define FEATURE_SKIP_FW_CONFIRMATION BIT(0)
5050

5151
/* att flags */
5252
/* DSP own area */
@@ -287,7 +287,7 @@ static int imx_dsp_rproc_ready(struct rproc *rproc)
287287
* @avail: available space in the resource table
288288
*
289289
* Parse the DSP-specific resource entry and update flags accordingly.
290-
* If the WAIT_FW_READY feature is set, the host must wait for the firmware
290+
* If the WAIT_FW_CONFIRMATION feature is set, the host must wait for the firmware
291291
* to signal readiness before proceeding with execution.
292292
*
293293
* Return: RSC_HANDLED if processed successfully, RSC_IGNORED otherwise.
@@ -322,7 +322,7 @@ static int imx_dsp_rproc_handle_rsc(struct rproc *rproc, u32 rsc_type,
322322

323323
/*
324324
* For now, in struct fw_rsc_imx_dsp, version 0,
325-
* only FEATURE_DONT_WAIT_FW_READY is valid.
325+
* only FEATURE_SKIP_FW_CONFIRMATION is valid.
326326
*
327327
* When adding new features, please upgrade version.
328328
*/
@@ -332,8 +332,8 @@ static int imx_dsp_rproc_handle_rsc(struct rproc *rproc, u32 rsc_type,
332332
return RSC_IGNORED;
333333
}
334334

335-
if (imx_dsp_rsc->features & FEATURE_DONT_WAIT_FW_READY)
336-
priv->flags &= ~WAIT_FW_READY;
335+
if (imx_dsp_rsc->features & FEATURE_SKIP_FW_CONFIRMATION)
336+
priv->flags &= ~WAIT_FW_CONFIRMATION;
337337

338338
return RSC_HANDLED;
339339
}
@@ -385,7 +385,7 @@ static int imx_dsp_rproc_start(struct rproc *rproc)
385385
return ret;
386386
}
387387

388-
if (priv->flags & WAIT_FW_READY)
388+
if (priv->flags & WAIT_FW_CONFIRMATION)
389389
return imx_dsp_rproc_ready(rproc);
390390

391391
return 0;
@@ -1131,8 +1131,8 @@ static int imx_dsp_rproc_probe(struct platform_device *pdev)
11311131
priv = rproc->priv;
11321132
priv->rproc = rproc;
11331133
priv->dsp_dcfg = dsp_dcfg;
1134-
/* By default, host waits for fw_ready reply */
1135-
priv->flags |= WAIT_FW_READY;
1134+
/* By default, host waits for fw_confirmation reply */
1135+
priv->flags |= WAIT_FW_CONFIRMATION;
11361136

11371137
if (no_mailboxes)
11381138
imx_dsp_rproc_mbox_init = imx_dsp_rproc_mbox_no_alloc;

0 commit comments

Comments
 (0)