On Thu, Apr 08, 2021 at 09:54:55AM +0800, peng.fan@xxxxxxxxxxx wrote:
> From: Peng Fan <peng.fan@xxxxxxx>
>
> Parse fsl,auto-boot to indicate whether need remoteproc framework
> auto boot or not.
>
> When remote processor is booted before Linux Kernel up, do not parse
> fsl,auto-boot. So add an entry to store the working mode of remote
> processor. Currently only IMX_RPROC_NORMAL, IMX_RPROC_EARLY_BOOT.
>
> Signed-off-by: Peng Fan <peng.fan@xxxxxxx>
> ---
> drivers/remoteproc/imx_rproc.c | 20 +++++++++++++++++++-
> 1 file changed, 19 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
> index ca17f520d904..c576e12d3817 100644
> --- a/drivers/remoteproc/imx_rproc.c
> +++ b/drivers/remoteproc/imx_rproc.c
> @@ -83,6 +83,16 @@ struct imx_rproc_dcfg {
> size_t att_size;
> };
>
> +enum imx_rproc_mode {
> + /* Linux load/kick remote core */
> + IMX_RPROC_NORMAL,
> + /*
> + * remote core booted before kicking Linux, and remote core
> + * could be stopped & restarted by Linux
> + */
> + IMX_RPROC_EARLY_BOOT,
> +};
> +
As far as I can see a new mode to track the state of the remote processor is not
needed. rproc->state can do that for you.
> struct imx_rproc {
> struct device *dev;
> struct regmap *regmap;
> @@ -96,6 +106,7 @@ struct imx_rproc {
> struct work_struct rproc_work;
> struct workqueue_struct *workqueue;
> void __iomem *rsc_table;
> + enum imx_rproc_mode mode;
> };
>
> static const struct imx_rproc_att imx_rproc_att_imx8mq[] = {
> @@ -565,14 +576,18 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv)
> int ret;
> u32 val;
>
> + priv->mode = IMX_RPROC_NORMAL;
> +
> ret = regmap_read(priv->regmap, dcfg->src_reg, &val);
> if (ret) {
> dev_err(dev, "Failed to read src\n");
> return ret;
> }
>
> - if (!(val & dcfg->src_stop))
> + if (!(val & dcfg->src_stop)) {
> + priv->mode = IMX_RPROC_EARLY_BOOT;
> priv->rproc->state = RPROC_DETACHED;
> + }
>
> return 0;
> }
> @@ -654,6 +669,9 @@ static int imx_rproc_probe(struct platform_device *pdev)
>
> INIT_WORK(&priv->rproc_work, imx_rproc_vq_work);
>
> + if (priv->mode == IMX_RPROC_NORMAL)
> + rproc->auto_boot = of_property_read_bool(np, "fsl,auto-boot");
> +
if (rproc->state == RPROC_DETACHED)
> ret = rproc_add(rproc);
> if (ret) {
> dev_err(dev, "rproc_add failed\n");
> --
> 2.30.0
>
