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 08B67C43334 for ; Tue, 28 Jun 2022 17:27:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233044AbiF1R1z (ORCPT ); Tue, 28 Jun 2022 13:27:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42814 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233010AbiF1R1u (ORCPT ); Tue, 28 Jun 2022 13:27:50 -0400 Received: from mail-pg1-x52a.google.com (mail-pg1-x52a.google.com [IPv6:2607:f8b0:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EC77A3A1B2 for ; Tue, 28 Jun 2022 10:27:49 -0700 (PDT) Received: by mail-pg1-x52a.google.com with SMTP id 9so12829579pgd.7 for ; Tue, 28 Jun 2022 10:27:49 -0700 (PDT) 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=osgld0pzQy4iTsusCsWDaWoG0N8IqLVBxYU5+GF9/J4=; b=utePYlHH3nRgmww4DbnonjD9OWHAYpU9JCXYlTStomKuNGt03UXXfjWbV/btUimeIl 4vXRaoRj5qZEhNWLDBZk1A6RKFYmaiMYLpx8H+FTO+YjxWJ4ZlX+auWvTO0avF+sI3XG a2n3iQsWVarA5wPuoq4V2g2XByCWSFuSCKeIEYhLIjQ5vqjgtU+aPgbMSJgr2x4nuFSi 929UEcvtBDNyEF29CAHTwr7OJRWl9QEBbN+intjof9KKw1cwh5PC8FkPYupXrpMf+BAd 8cxcwEzFClhA3QQcpl9HBRR1HXafcgAFoo7vwIHvqT8qQ97LFR1RTzdP/TIpq9oHuzvE +IKw== 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=osgld0pzQy4iTsusCsWDaWoG0N8IqLVBxYU5+GF9/J4=; b=pLUFFCroWMCTWdMPXa0ikWxUnT8Lg1Q5ASH8Fsm/mPDo3+bFhPi1cWAKDgtzt3TfHC D6aBuiwmBcs97myrqxZLRAPFQ+V+CYhjy+X4EpcKUiESPLFcGr37/h1GaVwBgE/SUws8 Rc9GLGjwuIDgBzqLgq/j9hnEXu0NoJsr5e4pZW8levfNEakQ2vP79abprnrrGkFTw0RT 8tVkt7/9hHPc88cqztTf114Fma6dfGDJ/NOawwq66XLimBXpLv+qPlFjizEXDu14mSZv wS1yc8KBBkF4imj+49B6I/Jy+h5+6eXQzUz0cz1qNnVZ7+Jmc4xs/9Wnfpe1THfgfuwJ 8lbA== X-Gm-Message-State: AJIora8kMHtbpnCWuk/7pf22M/CU3ng/Fa4pDPX+6JhO28NEvl5Qdmru m1Xg5KhNHK9R8iEyxbd+EtXgEA== X-Google-Smtp-Source: AGRyM1vwRc7KhbpvgRIHUN/TFthYtddimgoYRgo4Bh9++Wof7fy0wsL7BW/PKLLQ2pmhpnQ4b/higg== X-Received: by 2002:a63:1360:0:b0:410:702f:d1d4 with SMTP id 32-20020a631360000000b00410702fd1d4mr7989478pgt.625.1656437269373; Tue, 28 Jun 2022 10:27:49 -0700 (PDT) Received: from p14s (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id r7-20020a17090a690700b001ec9f9fe028sm86860pjj.46.2022.06.28.10.27.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jun 2022 10:27:48 -0700 (PDT) Date: Tue, 28 Jun 2022 11:27:46 -0600 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, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, devicetree@vger.kernel.org, Peng Fan Subject: Re: [PATCH V3 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4 Message-ID: <20220628172746.GB1942439@p14s> References: <20220517064937.4033441-1-peng.fan@oss.nxp.com> <20220517064937.4033441-4-peng.fan@oss.nxp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220517064937.4033441-4-peng.fan@oss.nxp.com> Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org Hi Peng, On Tue, May 17, 2022 at 02:49:34PM +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. > > We disable recovery reboot when M4 is managed by SCFW, because > remoteproc core still not support M4 auto-recovery without loading > image. > > Signed-off-by: Peng Fan > --- > drivers/remoteproc/imx_rproc.c | 88 ++++++++++++++++++++++++++++++++++ > 1 file changed, 88 insertions(+) > > diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c > index 4a3352821b1d..2e751fc90760 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 > @@ -89,6 +92,10 @@ struct imx_rproc { > struct work_struct rproc_work; > struct workqueue_struct *workqueue; > void __iomem *rsc_table; > + struct imx_sc_ipc *ipc_handle; > + struct notifier_block rproc_nb; > + u32 rproc_pt; /* partition id */ > + u32 rsrc_id; /* resource id */ > }; > > static const struct imx_rproc_att imx_rproc_att_imx93[] = { > @@ -117,6 +124,18 @@ static const struct imx_rproc_att imx_rproc_att_imx93[] = { > { 0xD0000000, 0xa0000000, 0x10000000, 0 }, > }; > > +static const struct imx_rproc_att imx_rproc_att_imx8qxp[] = { > + { 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[] = { > /* dev addr , sys addr , size , flags */ > /* ITCM */ > @@ -255,6 +274,12 @@ static const struct imx_rproc_dcfg imx_rproc_cfg_imx8mq = { > .method = IMX_RPROC_MMIO, > }; > > +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_imx8ulp = { > .att = imx_rproc_att_imx8ulp, > .att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp), > @@ -683,6 +708,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, rproc_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("Partition%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" }; > @@ -692,6 +733,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: > @@ -702,6 +744,51 @@ 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, "fsl,resource-id", &priv->rsrc_id); > + if (ret) { > + dev_err(dev, "No fsl,resource-id property\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_id)) > + return 0; > + > + priv->rproc->state = RPROC_DETACHED; > + priv->rproc->recovery_disabled = true; > + > + /* Get partition id and enable irq in SCFW */ > + ret = imx_sc_rm_get_resource_owner(priv->ipc_handle, priv->rsrc_id, &pt); > + if (ret) { > + dev_err(dev, "not able to get resource owner\n"); > + return ret; > + } > + > + priv->rproc_pt = pt; > + priv->rproc_nb.notifier_call = imx_rproc_partition_notify; > + > + ret = imx_scu_irq_register_notifier(&priv->rproc_nb); > + if (ret) { > + dev_warn(dev, "register scu notifier failed.\n"); > + return ret; > + } I woul have expected to see imx_scu_irq_register_notifier() being called when the driver is removed and in the probe() error path. More comments to come. Thanks, Mathieu > + > + ret = imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED, BIT(priv->rproc_pt), > + true); > + if (ret) { > + imx_scu_irq_unregister_notifier(&priv->rproc_nb); > + dev_warn(dev, "Enable irq failed.\n"); > + return ret; > + } > + > + return 0; > default: > break; > } > @@ -855,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 }, > { .compatible = "fsl,imx93-cm33", .data = &imx_rproc_cfg_imx93 }, > {}, > -- > 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 2EAA7C43334 for ; Tue, 28 Jun 2022 17:28:53 +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=mmUwiLcfLQJLv5IR4VtWVRRzhX/fuZ0ZaIbsHBBqj1o=; b=QbLrd7dJcQetJK f86FlyJFAAliVnUncDAEPBxeeWvTWRASEm0MjP9hPGy7vN87lmIzvkfnwoMf9ZLWTygCSS35sUqB9 G+DjTakaxbo+ugBsNTHai6f7EzKgJCQI24sHw6wiiatlL4haIk8gL/2DIwlkOzNHLAQzYJ0NgCm76 W/rTruTAvyBPptjcptc05gr2dfH+Uq8GjNzL6+e1z4f+90BX+9rKLoFtEa0iv56Sp6iWNQ0Y+SoaK ESRba98k2Y9jPZV9YHEQoCI5MjYgvXT7ScAB6cV8KE0YVn9ux185HcVJeb2NCc/PsL7pIvMt9qseo t7V19OJSJboB2yPEcwWQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1o6F0E-007Oox-Sn; Tue, 28 Jun 2022 17:27:55 +0000 Received: from mail-pf1-x42e.google.com ([2607:f8b0:4864:20::42e]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1o6F0B-007Oo2-Df for linux-arm-kernel@lists.infradead.org; Tue, 28 Jun 2022 17:27:53 +0000 Received: by mail-pf1-x42e.google.com with SMTP id 136so7505060pfy.10 for ; Tue, 28 Jun 2022 10:27:49 -0700 (PDT) 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=osgld0pzQy4iTsusCsWDaWoG0N8IqLVBxYU5+GF9/J4=; b=utePYlHH3nRgmww4DbnonjD9OWHAYpU9JCXYlTStomKuNGt03UXXfjWbV/btUimeIl 4vXRaoRj5qZEhNWLDBZk1A6RKFYmaiMYLpx8H+FTO+YjxWJ4ZlX+auWvTO0avF+sI3XG a2n3iQsWVarA5wPuoq4V2g2XByCWSFuSCKeIEYhLIjQ5vqjgtU+aPgbMSJgr2x4nuFSi 929UEcvtBDNyEF29CAHTwr7OJRWl9QEBbN+intjof9KKw1cwh5PC8FkPYupXrpMf+BAd 8cxcwEzFClhA3QQcpl9HBRR1HXafcgAFoo7vwIHvqT8qQ97LFR1RTzdP/TIpq9oHuzvE +IKw== 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=osgld0pzQy4iTsusCsWDaWoG0N8IqLVBxYU5+GF9/J4=; b=aNpBnFiA4ssenj4m+C/4UgAQidnAbB4oMvxDaUAS/I7GWvi/1C1wzgGTqW5quQ3ots 1mIvWZrOjVTfwHUEYIP3xDWBgsj6lxsAhIPfNdQyWVe4WFItr/xfWT7hdOqYU4m0uOvo O6pT4o+fQnJkkTR7MYzVNXCdcysPttRIYSu2IlO/yePXEa1ITAG1NjYCtMI8YY57Pem6 WvGZBOItRy9RPuC1uvvUIkT9LX4F5WFFCaT1DbKkwSs33J039vwYMtmxva8uO4mBtS/p 6UZPPPvdc9E5sY2mS0rd/BKSGYTAZe07eE32g+IuIvI4vzi86x8Vf1OAsfb8fq7nPqtX 74vw== X-Gm-Message-State: AJIora8NXKi2kuHHj09L0wzVOITMWTpGrqNDcoKPeykoV8NCQbq89ipJ w0+eoAQFK5my7079+4LgzmekQQ== X-Google-Smtp-Source: AGRyM1vwRc7KhbpvgRIHUN/TFthYtddimgoYRgo4Bh9++Wof7fy0wsL7BW/PKLLQ2pmhpnQ4b/higg== X-Received: by 2002:a63:1360:0:b0:410:702f:d1d4 with SMTP id 32-20020a631360000000b00410702fd1d4mr7989478pgt.625.1656437269373; Tue, 28 Jun 2022 10:27:49 -0700 (PDT) Received: from p14s (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id r7-20020a17090a690700b001ec9f9fe028sm86860pjj.46.2022.06.28.10.27.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Jun 2022 10:27:48 -0700 (PDT) Date: Tue, 28 Jun 2022 11:27:46 -0600 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, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, devicetree@vger.kernel.org, Peng Fan Subject: Re: [PATCH V3 3/6] remoteproc: imx_rproc: support attaching to i.MX8QXP M4 Message-ID: <20220628172746.GB1942439@p14s> References: <20220517064937.4033441-1-peng.fan@oss.nxp.com> <20220517064937.4033441-4-peng.fan@oss.nxp.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220517064937.4033441-4-peng.fan@oss.nxp.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220628_102751_524386_8836843B X-CRM114-Status: GOOD ( 29.57 ) 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 Hi Peng, On Tue, May 17, 2022 at 02:49:34PM +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. > > We disable recovery reboot when M4 is managed by SCFW, because > remoteproc core still not support M4 auto-recovery without loading > image. > > Signed-off-by: Peng Fan > --- > drivers/remoteproc/imx_rproc.c | 88 ++++++++++++++++++++++++++++++++++ > 1 file changed, 88 insertions(+) > > diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c > index 4a3352821b1d..2e751fc90760 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 > @@ -89,6 +92,10 @@ struct imx_rproc { > struct work_struct rproc_work; > struct workqueue_struct *workqueue; > void __iomem *rsc_table; > + struct imx_sc_ipc *ipc_handle; > + struct notifier_block rproc_nb; > + u32 rproc_pt; /* partition id */ > + u32 rsrc_id; /* resource id */ > }; > > static const struct imx_rproc_att imx_rproc_att_imx93[] = { > @@ -117,6 +124,18 @@ static const struct imx_rproc_att imx_rproc_att_imx93[] = { > { 0xD0000000, 0xa0000000, 0x10000000, 0 }, > }; > > +static const struct imx_rproc_att imx_rproc_att_imx8qxp[] = { > + { 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[] = { > /* dev addr , sys addr , size , flags */ > /* ITCM */ > @@ -255,6 +274,12 @@ static const struct imx_rproc_dcfg imx_rproc_cfg_imx8mq = { > .method = IMX_RPROC_MMIO, > }; > > +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_imx8ulp = { > .att = imx_rproc_att_imx8ulp, > .att_size = ARRAY_SIZE(imx_rproc_att_imx8ulp), > @@ -683,6 +708,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, rproc_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("Partition%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" }; > @@ -692,6 +733,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: > @@ -702,6 +744,51 @@ 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, "fsl,resource-id", &priv->rsrc_id); > + if (ret) { > + dev_err(dev, "No fsl,resource-id property\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_id)) > + return 0; > + > + priv->rproc->state = RPROC_DETACHED; > + priv->rproc->recovery_disabled = true; > + > + /* Get partition id and enable irq in SCFW */ > + ret = imx_sc_rm_get_resource_owner(priv->ipc_handle, priv->rsrc_id, &pt); > + if (ret) { > + dev_err(dev, "not able to get resource owner\n"); > + return ret; > + } > + > + priv->rproc_pt = pt; > + priv->rproc_nb.notifier_call = imx_rproc_partition_notify; > + > + ret = imx_scu_irq_register_notifier(&priv->rproc_nb); > + if (ret) { > + dev_warn(dev, "register scu notifier failed.\n"); > + return ret; > + } I woul have expected to see imx_scu_irq_register_notifier() being called when the driver is removed and in the probe() error path. More comments to come. Thanks, Mathieu > + > + ret = imx_scu_irq_group_enable(IMX_SC_IRQ_GROUP_REBOOTED, BIT(priv->rproc_pt), > + true); > + if (ret) { > + imx_scu_irq_unregister_notifier(&priv->rproc_nb); > + dev_warn(dev, "Enable irq failed.\n"); > + return ret; > + } > + > + return 0; > default: > break; > } > @@ -855,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 }, > { .compatible = "fsl,imx93-cm33", .data = &imx_rproc_cfg_imx93 }, > {}, > -- > 2.25.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel