From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DA60EC433FE for ; Tue, 18 Jan 2022 18:58:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=vKWDgBp0v8zgtVlzl3r6LiOVXVi6byBiR9fVQswE4Pk=; b=014t4g0rc/VOi9 c8ZSTTgT8BXzzsOptmBSXLO9AXAPXhsAUmiGEmy7pBijX+gwz351NeWvf9wpuFA28VWN7MG5UiWja 7aqiM1RG60ERk51KLMoEtMRabr7vO93vxr1L8CCOeJBdkWpFn63IgELL+pZbKuWJwzOdY719Oi1Lu B7CwHDEFl+UQSo4o5J/unM4vD3bNrpZ8N3tz/9azFvDnS8rgkAgfI4jJEyd77vxmhW8fXlGxQ+q5v ylZaxsAHEF/n5L5D2cnIyWfFwPKR708uKlwwqa/jlLP/7e8Kzk1fN385IiKXItVmv2yUwdu5PqjOo dSYu1lf3Px17O/XMye3Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1n9tfl-002hPl-K9; Tue, 18 Jan 2022 18:57:37 +0000 Received: from mail-pl1-x629.google.com ([2607:f8b0:4864:20::629]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1n9tfh-002hOh-R4 for linux-arm-kernel@lists.infradead.org; Tue, 18 Jan 2022 18:57:35 +0000 Received: by mail-pl1-x629.google.com with SMTP id u11so20097966plh.13 for ; Tue, 18 Jan 2022 10:57:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=dhKNR53q0AZ+CCJsVG7glKrCX7hIyhuD8l3gxdOBGJM=; b=wc1VhTyHyOap8tNcl1AAmiPCTgfxB1pSsPIPkiw6NaAM332lPpnpIhaORP/SYsZLf3 i4hwVPPXVe20Ad82lOOI0FzikfjvzDHo5dzURl1fcnwQIXZLU8/z6SniOvXBEFOCVeb+ H9ciqITZGwLXyIXffkrs8iSZvemWv996T9sKsTutnWRO+Ytq9OXQuszfIuzYEOJiT0Ix UjcghxA3iQ5Pwo6qGGmdrOqiyciHUhs3qn1wRktpz0IhsODgAwz+baGTyd0FWjxyOcmB 7ImCgVVCbd7IA+8NQRHIdxVoHytVI9dDmHR+w63IaCB2+z0taPm+K+P6B1a7TmQamX5z EETw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=dhKNR53q0AZ+CCJsVG7glKrCX7hIyhuD8l3gxdOBGJM=; b=yLziy8DQqXX4iIgzG8J65e7n+nkDE333NSK0FStzIonGhAa9DSNRGm/VYo9ZbCpV9T U/5/k0cPO251T3zSfe0634Jpp9rKL0PxkJc3/I+OVQOlIqAHy5LTzkr5r7rfGzyyZsAq VFhdMimO9UyBNQPYx0t1qIHl3ThV+0UJXclK+k/QCAjPdWP2AXvs7KSjXNZ+MU2FWHFU kkUB/Wi842ph9pMrHOiCjFxc9CYXo6LaOATX1N6FAlEGAfzVAFTPD0y1XLKlYgCKxdlN LMlgTIOCasepF+yNMO2fZlFDZ1ZcP/DzhglhqoQfB59+pKaF9knbiJLzUOmYR8xfZii3 cCUQ== X-Gm-Message-State: AOAM5336iIClL20P6QbU6weSrHo4bsEaMeEJmmLX8uN00C7gFuWQc4vy Dt1f16jZfApqOLOQUZMmhQm7pQ== X-Google-Smtp-Source: ABdhPJzr37hEsjF6XnuAJGXMgp1pwB9geIQOlOMmPqoLWG0VO6ecJ4oAriXmRdy17R39zSmGyuaRRQ== X-Received: by 2002:a17:902:a988:b0:149:f2ae:649a with SMTP id bh8-20020a170902a98800b00149f2ae649amr28679565plb.172.1642532252682; Tue, 18 Jan 2022 10:57:32 -0800 (PST) Received: from p14s (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id lw14sm3690723pjb.41.2022.01.18.10.57.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jan 2022 10:57:31 -0800 (PST) Date: Tue, 18 Jan 2022 11:57:29 -0700 From: Mathieu Poirier To: "Peng Fan (OSS)" Cc: bjorn.andersson@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-remoteproc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Peng Fan Subject: Re: [PATCH 6/9] remoteproc: imx_rproc: support attaching to i.MX8QXP M4 Message-ID: <20220118185729.GH1119324@p14s> References: <20220111033333.403448-1-peng.fan@oss.nxp.com> <20220111033333.403448-9-peng.fan@oss.nxp.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220111033333.403448-9-peng.fan@oss.nxp.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220118_105733_944586_5C22C816 X-CRM114-Status: GOOD ( 30.15 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Jan 11, 2022 at 11:33:30AM +0800, Peng Fan (OSS) wrote: > From: Peng Fan > > When M4 is kicked by SCFW, M4 runs in its own hardware partition, Linux > could only do IPC with M4, it could not start, stop, update image. > > When M4 crash reboot, it could notify Linux, so Linux could prepare to > reattach to M4 after M4 recovery. > > Signed-off-by: Peng Fan > --- > drivers/remoteproc/imx_rproc.c | 96 ++++++++++++++++++++++++++++++++++ > 1 file changed, 96 insertions(+) > > diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c > index 0e99a3ca6fbc..5f04aea2f6a1 100644 > --- a/drivers/remoteproc/imx_rproc.c > +++ b/drivers/remoteproc/imx_rproc.c > @@ -6,6 +6,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -59,6 +60,8 @@ > #define IMX_SIP_RPROC_STARTED 0x01 > #define IMX_SIP_RPROC_STOP 0x02 > > +#define IMX_SC_IRQ_GROUP_REBOOTED 5 > + > /** > * struct imx_rproc_mem - slim internal memory structure > * @cpu_addr: MPU virtual address of the memory region > @@ -90,6 +93,23 @@ struct imx_rproc { > struct workqueue_struct *workqueue; > void __iomem *rsc_table; > bool has_clk; > + struct imx_sc_ipc *ipc_handle; > + struct notifier_block proc_nb; > + u32 rproc_pt; > + u32 rsrc; There is no documentation for the above two fields and I have to guess what they do. > +}; > + > +static const struct imx_rproc_att imx_rproc_att_imx8qxp[] = { > + /* dev addr , sys addr , size , flags */ > + { 0x08000000, 0x08000000, 0x10000000, 0}, > + /* TCML/U */ > + { 0x1FFE0000, 0x34FE0000, 0x00040000, ATT_OWN | ATT_IOMEM }, > + /* OCRAM(Low 96KB) */ > + { 0x21000000, 0x00100000, 0x00018000, 0}, > + /* OCRAM */ > + { 0x21100000, 0x00100000, 0x00040000, 0}, > + /* DDR (Data) */ > + { 0x80000000, 0x80000000, 0x60000000, 0 }, > }; > > static const struct imx_rproc_att imx_rproc_att_imx8mn[] = { > @@ -236,6 +256,12 @@ static const struct imx_rproc_dcfg imx_rproc_cfg_imx8ulp = { > .method = IMX_RPROC_NONE, > }; > > +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_imx7ulp = { > .att = imx_rproc_att_imx7ulp, > .att_size = ARRAY_SIZE(imx_rproc_att_imx7ulp), > @@ -491,6 +517,11 @@ static int imx_rproc_attach(struct rproc *rproc) > return 0; > } > > +static int imx_rproc_detach(struct rproc *rproc) > +{ > + return 0; Is it possible to detach the remote processor from the application core? If not please write a comment that says so. And shouldn't this return some kind of error so that users don't think the operation was carried out successfully? I am out of time for today and as such will continue with this set tomorrow. Thanks, Mathieu > +} > + > static struct resource_table *imx_rproc_get_loaded_rsc_table(struct rproc *rproc, size_t *table_sz) > { > struct imx_rproc *priv = rproc->priv; > @@ -525,6 +556,7 @@ imx_rproc_elf_find_loaded_rsc_table(struct rproc *rproc, const struct firmware * > static const struct rproc_ops imx_rproc_ops = { > .prepare = imx_rproc_prepare, > .attach = imx_rproc_attach, > + .detach = imx_rproc_detach, > .start = imx_rproc_start, > .stop = imx_rproc_stop, > .kick = imx_rproc_kick, > @@ -671,6 +703,22 @@ static void imx_rproc_free_mbox(struct rproc *rproc) > mbox_free_channel(priv->rx_ch); > } > > +static int imx_rproc_partition_notify(struct notifier_block *nb, > + unsigned long event, void *group) > +{ > + struct imx_rproc *priv = container_of(nb, struct imx_rproc, proc_nb); > + > + /* Ignore other irqs */ > + if (!((event & BIT(priv->rproc_pt)) && (*(u8 *)group == IMX_SC_IRQ_GROUP_REBOOTED))) > + return 0; > + > + rproc_report_crash(priv->rproc, RPROC_WATCHDOG); > + > + pr_info("Patition%d reset!\n", priv->rproc_pt); > + > + return 0; > +} > + > static int imx_rproc_detect_mode(struct imx_rproc *priv) > { > struct regmap_config config = { .name = "imx-rproc" }; > @@ -680,6 +728,7 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv) > struct arm_smccc_res res; > int ret; > u32 val; > + u8 pt; > > switch (dcfg->method) { > case IMX_RPROC_NONE: > @@ -690,6 +739,52 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv) > if (res.a0) > priv->rproc->state = RPROC_DETACHED; > return 0; > + case IMX_RPROC_SCU_API: > + ret = imx_scu_get_handle(&priv->ipc_handle); > + if (ret) > + return ret; > + ret = of_property_read_u32(dev->of_node, "rsrc-id", &priv->rsrc); > + if (ret) { > + dev_err(dev, "no rsrc-id\n"); > + return ret; > + } > + > + /* > + * If Mcore resource is not owned by Acore partition, It is kicked by ROM, > + * and Linux could only do IPC with Mcore and nothing else. > + */ > + if (!imx_sc_rm_is_resource_owned(priv->ipc_handle, priv->rsrc)) { > + > + priv->has_clk = false; > + priv->rproc->self_recovery = true; > + priv->rproc->state = RPROC_DETACHED; > + > + /* Get partition id and enable irq in SCFW */ > + ret = imx_sc_rm_get_resource_owner(priv->ipc_handle, priv->rsrc, &pt); > + if (ret) { > + dev_err(dev, "not able to get resource owner\n"); > + return ret; > + } > + > + priv->rproc_pt = pt; > + priv->proc_nb.notifier_call = imx_rproc_partition_notify; > + > + ret = imx_scu_irq_register_notifier(&priv->proc_nb); > + if (ret) { > + dev_warn(dev, "register scu notifier failed.\n"); > + return ret; > + } > + > + ret = imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED, > + BIT(priv->rproc_pt), true); > + if (ret) { > + imx_scu_irq_unregister_notifier(&priv->proc_nb); > + dev_warn(dev, "Enable irq failed.\n"); > + return ret; > + } > + } > + > + return 0; > default: > break; > } > @@ -847,6 +942,7 @@ static const struct of_device_id imx_rproc_of_match[] = { > { .compatible = "fsl,imx8mm-cm4", .data = &imx_rproc_cfg_imx8mq }, > { .compatible = "fsl,imx8mn-cm7", .data = &imx_rproc_cfg_imx8mn }, > { .compatible = "fsl,imx8mp-cm7", .data = &imx_rproc_cfg_imx8mn }, > + { .compatible = "fsl,imx8qxp-cm4", .data = &imx_rproc_cfg_imx8qxp }, > { .compatible = "fsl,imx8ulp-cm33", .data = &imx_rproc_cfg_imx8ulp }, > {}, > }; > -- > 2.25.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel