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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 11FBDC433FE for ; Wed, 19 Jan 2022 18:04:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1356622AbiASSES (ORCPT ); Wed, 19 Jan 2022 13:04:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356621AbiASSES (ORCPT ); Wed, 19 Jan 2022 13:04:18 -0500 Received: from mail-pj1-x102f.google.com (mail-pj1-x102f.google.com [IPv6:2607:f8b0:4864:20::102f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F1A7EC06161C for ; Wed, 19 Jan 2022 10:04:17 -0800 (PST) Received: by mail-pj1-x102f.google.com with SMTP id o64so3176310pjo.2 for ; Wed, 19 Jan 2022 10:04:17 -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=DQ8qY4OyOkFvaykGyjwGKL6pcDR4EejouSObBAhGz24=; b=auF8WjonDn3tEyolyKygoNil+sWIDVBM3Jz2kvvsd5VGc6ahPn9M9S9fvSnmBb1cZM B45mmEYDAnmh1Z7VlN2JporKbxsES+MciXVQgbmwgXRj8ozsnzdak8PklbNoQWy4B9+a d24F0nsRs4ZpSbdqA2/V11XOScJr2XCbZQf+XqtZwovX9oKxZ9hQuLUuJczM+EOYBA0B r2A4iOVjNy6q3qZKTs8Uwe0qKJE0nlP4Ghi0CkROotR41SRTJqDhVjYgAhQmJWsq2z/M MJl5ijyxGrdUAB1/01ugOtihqBx6amNsIj2WRuBJnKOXqjU16brOyyayQvQAF98DLo/s AuzA== 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=DQ8qY4OyOkFvaykGyjwGKL6pcDR4EejouSObBAhGz24=; b=XobxOR+QDcdDF28RyOSQSm/Ks9sB7THbxeeG9EqTVzCMfq2mHgrSdaax9ig5NimM5p SpsmqORjUuNxz/eSWFWBEWCR5z3qP8IK7a0z3Rlwl+WDNRNB2X9S2q9fXi8eMHYUMyw4 qHKDotkASfVLN+9sEzWN6MhPjhxuwh1Hquvp3CNDsTNvVr2t3wtRa8KqRBBizKKKn+Xj AUivlgJjMSc/Ok0W6NDIgYktkqki8/Lfwit684Db9rLznbRamMYbIBfusrxF5SiMyloO AsEt1/zkoCr9HMdQn7aQUtfd/htoxePeDgaEilFUPirNL8PTFKFOJHTkoWjFGieivsmw EayQ== X-Gm-Message-State: AOAM5312Ji9mzT5v1A5w82oAlsL0kuk4EAQK4546HSJdpWwEpwTKgSOg 6GbmQBz8zJTBzNKzLSb+Z+qlZNlLRRZk7Q== X-Google-Smtp-Source: ABdhPJzxYYgWRLoPej+cu61u98Z6DWO4YwVT4TQ7TZxlmhxEmai9xgKuqDSyRp4wJ4Ge+lyx4fuWZA== X-Received: by 2002:a17:90b:4d8a:: with SMTP id oj10mr5693610pjb.226.1642615457370; Wed, 19 Jan 2022 10:04:17 -0800 (PST) Received: from p14s (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id d32sm345607pgb.46.2022.01.19.10.04.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jan 2022 10:04:16 -0800 (PST) Date: Wed, 19 Jan 2022 11:04:13 -0700 From: Mathieu Poirier To: Peng Fan Cc: "Peng Fan (OSS)" , "bjorn.andersson@linaro.org" , "shawnguo@kernel.org" , "s.hauer@pengutronix.de" , "kernel@pengutronix.de" , "festevam@gmail.com" , dl-linux-imx , "linux-remoteproc@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH 6/9] remoteproc: imx_rproc: support attaching to i.MX8QXP M4 Message-ID: <20220119180413.GB1282028@p14s> References: <20220111033333.403448-1-peng.fan@oss.nxp.com> <20220111033333.403448-9-peng.fan@oss.nxp.com> <20220118185729.GH1119324@p14s> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org On Wed, Jan 19, 2022 at 02:28:31AM +0000, Peng Fan wrote: > > Subject: Re: [PATCH 6/9] remoteproc: imx_rproc: support attaching to > > i.MX8QXP M4 > > > > 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. > > Fix in V2. > > > > > > +}; > > > + > > > +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. > > No from my understanding. > > And shouldn't this return some > > kind of error so that users don't think the operation was carried out > > successfully? > > No. This is to match patch 3/9 to support M-core self recovery. After M-core > crash reboot, remoteproc framework just detach and re-attach. Right, but by returning 0 in imx_rproc_detach() issueing something like: # echo detach > /sys/class/remoteproc/remoteproc0/state will return without an error message, leading users to believe the remote processor has been detached. Returning an error code like -EINVAL would tell users the operation was not completed successfully. More comments to come shortly... > > > > > I am out of time for today and as such will continue with this set tomorrow. > > Thanks for you reviewing the patchset. > > Thanks, > Peng. > > > > > 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 > > > 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 0DFD4C433EF for ; Wed, 19 Jan 2022 18:05:35 +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=Vr/JNtjIf8ZWxUrh1o5LFKci0qHuIdHegzLYmEN7aJM=; b=i2VfHcmL8OQP4c KhhWbRoaFr3GOhgAQQBGOe9LCmfZjlE2ZC435bEzF6Sj8eYiIfrmU/UoS5YT9c1JuLh+WtzIZKOMu 0ojWHLQXDV0oo09ThffJAVMuVcAhrj8IISqYb2/w0F8FKxzJLd01rH9lG2Dd+dYTqznLDshIfeS2W 556Tx+UMZQIElQriUKbiZnRLxRXJWCiLY8WoSydr+jaQLVFyqtpKMG8znyDoKScLQYH3FS0lbBC27 PfaR4X7jjq211u/zG/bRWDmlVKnOOtjWafkzlXE8mwpCuQ7ewyrO1HFC/eyXSM7PhktG1zRJcT1CG bA00y5Nn33tbi6l1ccQg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nAFJm-006iM5-VX; Wed, 19 Jan 2022 18:04:23 +0000 Received: from mail-pj1-x1030.google.com ([2607:f8b0:4864:20::1030]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nAFJi-006iJh-IU for linux-arm-kernel@lists.infradead.org; Wed, 19 Jan 2022 18:04:20 +0000 Received: by mail-pj1-x1030.google.com with SMTP id o3so3176403pjs.1 for ; Wed, 19 Jan 2022 10:04:17 -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=DQ8qY4OyOkFvaykGyjwGKL6pcDR4EejouSObBAhGz24=; b=auF8WjonDn3tEyolyKygoNil+sWIDVBM3Jz2kvvsd5VGc6ahPn9M9S9fvSnmBb1cZM B45mmEYDAnmh1Z7VlN2JporKbxsES+MciXVQgbmwgXRj8ozsnzdak8PklbNoQWy4B9+a d24F0nsRs4ZpSbdqA2/V11XOScJr2XCbZQf+XqtZwovX9oKxZ9hQuLUuJczM+EOYBA0B r2A4iOVjNy6q3qZKTs8Uwe0qKJE0nlP4Ghi0CkROotR41SRTJqDhVjYgAhQmJWsq2z/M MJl5ijyxGrdUAB1/01ugOtihqBx6amNsIj2WRuBJnKOXqjU16brOyyayQvQAF98DLo/s AuzA== 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=DQ8qY4OyOkFvaykGyjwGKL6pcDR4EejouSObBAhGz24=; b=2/npOsSiANzzRSA56+9TylIixY4BK6Y44nqXZRw19xbcn5yY6sSxFDtR4yN5E5NQxq kLznNgBCbEWu56PhM4QrAjNgLRWODw/96Qk1omUp/+wta8uTJ1sQrSFxqc34cmYs82/v etWCHkCS/BBler7fn9StOpfHMVGWB7qwTF56zmK/7ZRJxgmmk7Folieq2OBoKoso2IG2 EHTpIYGzy0e3iTVrtiHYotRUP2to1xpZtVNlx7RNywwVugq0P0nTBmSA3QY48I3rJQss W5l4sUrbAvmC4rkHT9N+fZDRy1cJt7+76/louqIjvZ27WGZXoqeiDZyEZ+I819LUv4iY YbgQ== X-Gm-Message-State: AOAM530y7QBgxsXxL8JWIu9ubAAMTleh0+wV59B9Sy8A8V7Gl84lXWHJ YU2AgSs27oNucVNSLZfOQPOnzw== X-Google-Smtp-Source: ABdhPJzxYYgWRLoPej+cu61u98Z6DWO4YwVT4TQ7TZxlmhxEmai9xgKuqDSyRp4wJ4Ge+lyx4fuWZA== X-Received: by 2002:a17:90b:4d8a:: with SMTP id oj10mr5693610pjb.226.1642615457370; Wed, 19 Jan 2022 10:04:17 -0800 (PST) Received: from p14s (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id d32sm345607pgb.46.2022.01.19.10.04.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Jan 2022 10:04:16 -0800 (PST) Date: Wed, 19 Jan 2022 11:04:13 -0700 From: Mathieu Poirier To: Peng Fan Cc: "Peng Fan (OSS)" , "bjorn.andersson@linaro.org" , "shawnguo@kernel.org" , "s.hauer@pengutronix.de" , "kernel@pengutronix.de" , "festevam@gmail.com" , dl-linux-imx , "linux-remoteproc@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH 6/9] remoteproc: imx_rproc: support attaching to i.MX8QXP M4 Message-ID: <20220119180413.GB1282028@p14s> References: <20220111033333.403448-1-peng.fan@oss.nxp.com> <20220111033333.403448-9-peng.fan@oss.nxp.com> <20220118185729.GH1119324@p14s> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220119_100418_655451_8AC98DB9 X-CRM114-Status: GOOD ( 41.22 ) 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 Wed, Jan 19, 2022 at 02:28:31AM +0000, Peng Fan wrote: > > Subject: Re: [PATCH 6/9] remoteproc: imx_rproc: support attaching to > > i.MX8QXP M4 > > > > 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. > > Fix in V2. > > > > > > +}; > > > + > > > +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. > > No from my understanding. > > And shouldn't this return some > > kind of error so that users don't think the operation was carried out > > successfully? > > No. This is to match patch 3/9 to support M-core self recovery. After M-core > crash reboot, remoteproc framework just detach and re-attach. Right, but by returning 0 in imx_rproc_detach() issueing something like: # echo detach > /sys/class/remoteproc/remoteproc0/state will return without an error message, leading users to believe the remote processor has been detached. Returning an error code like -EINVAL would tell users the operation was not completed successfully. More comments to come shortly... > > > > > I am out of time for today and as such will continue with this set tomorrow. > > Thanks for you reviewing the patchset. > > Thanks, > Peng. > > > > > 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