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 D233BC433FE for ; Wed, 12 Oct 2022 22:07:27 +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=78Jwc0sBnb3lgvYiL9EBr/scBD6YhpPnkGVbXumgTUA=; b=WRs6jjVeSiss0q BtV3MkN3rGW+A16kwX3EnK1dP9y2BR3DHTexmnB7IiExxK10MaTNA9cUgiNHpiZ4iVFU2JYg41Oqm lAI0iMsbpqjay43nkhq6hVD06BsRYz5h9Oe5E1QjzdIroDtqbP2RzDF/elo23wg14uOs1blwKNu2Y 5S0kDsMWZUY+4VoX8f2n3pt3X/7SU3Th2pHdJX4XJv/bGRZDrAmWvkEAGc7bXtpJdFYO3piZ9CQKA ydZGl3uO/SeqsVYUIEuENhyQsTUM7HZA30GxomT7FWqOuO97C9VYplwzCUcXtoVgk1UFeZLpUx9+K wsdu5rTpBwCyLUyxVtdg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oijrv-009V3j-Du; Wed, 12 Oct 2022 22:06:27 +0000 Received: from mail-pl1-x630.google.com ([2607:f8b0:4864:20::630]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oijrr-009V22-ML for linux-arm-kernel@lists.infradead.org; Wed, 12 Oct 2022 22:06:25 +0000 Received: by mail-pl1-x630.google.com with SMTP id l4so131611plb.8 for ; Wed, 12 Oct 2022 15:06:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=PINm7DlHkRfCIR9Bkun6rWqrRKKna4XtFs22k189M0s=; b=mjh54rp5bz+CCsGBHXCvnfH/jZ/ERfZBhQxCBtvaPNyQgpQXSvi4dePgi1aoRsENtO Yj4XAl1SgSSXy/PxUANCOwty3gvL6iY965kUdS7wU7EfeecwrDEc2qK+GKX/Grjlc60q re1WH8oZl0eVL6lSCxbJosN7wU4WCCs8+38BErdMJLTcIoFk2wytjIMQChy64muezU8e LwUF3UCw/B29XsdkHsSE/6jvl3Ey+IOuHZdQ5y1knUbUl5oewxC+dvGnqYLsYlep36Pi tQaBqdlA6JFg4TxTiSztzKWr3VHedAJv3MrLsdBn0nXeL9NDMlnqpC6rHswbclmRCq3o kasg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=PINm7DlHkRfCIR9Bkun6rWqrRKKna4XtFs22k189M0s=; b=wI4DqjMKqrAFvBcYAayReCtclbTw5jdMRTypOnsvpYeWRboZjb0uRXrukKbD5O1muo oxn+yHdnL6uRjKGH5CVlOyd23gB3t3De/uma35PYuwj/N0XHuMv80Y/xLMaSLeYRkfvo LDO8KHgOViYIvhMCqhOGjjUhnKTmoegRMKflutDowjA/HKHgCXCw4hzY2s84jiME58b8 CRiKLW2DU2UyGpgsekgUcpmCbEDpkcjPv2iVyOt+0aSdrQN9f29HNkCuEs8PsSlokQkO 34t4gJJqnzKMthlG5kcRN4v0100d1cE3pbNfFzsevOPgsXNy9KZWXdWEwIZy+57n1h9u QCZA== X-Gm-Message-State: ACrzQf1/q8Swo4KGgWu5VQkTKXEzFU44tGJoRiJSjtN9ArzVq/7LW0c5 HMTPb/xtWHJAAkjH4SRmqMPIJg== X-Google-Smtp-Source: AMsMyM5xX4d+J7aWaTWHRpdFvy0S00JxLqimXDS1GoqNST1+1HMvZ36ke+ifgi7AMGdrgc2vg9jRcg== X-Received: by 2002:a17:90b:1d4d:b0:20a:794a:f6e7 with SMTP id ok13-20020a17090b1d4d00b0020a794af6e7mr7525463pjb.151.1665612380886; Wed, 12 Oct 2022 15:06:20 -0700 (PDT) Received: from p14s (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id x67-20020a623146000000b00562adc8b6d3sm318530pfx.193.2022.10.12.15.06.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Oct 2022 15:06:20 -0700 (PDT) Date: Wed, 12 Oct 2022 16:06:17 -0600 From: Mathieu Poirier To: "Peng Fan (OSS)" Cc: andersson@kernel.org, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, linux-remoteproc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Peng Fan Subject: Re: [PATCH V6 5/7] remoteproc: imx_rproc: support i.MX8QM Message-ID: <20221012220617.GC1196937@p14s> References: <20220929061704.1571746-1-peng.fan@oss.nxp.com> <20220929061704.1571746-6-peng.fan@oss.nxp.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220929061704.1571746-6-peng.fan@oss.nxp.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20221012_150623_761233_CA1A74C5 X-CRM114-Status: GOOD ( 27.03 ) 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 Thu, Sep 29, 2022 at 02:17:02PM +0800, Peng Fan (OSS) wrote: > From: Peng Fan > > Most logic are same as i.MX8QXP, but i.MX8QM has two general purpose > M4 cores, the two cores runs independently and they has different resource s/has/have > id, different start address from SCFW view. > > Signed-off-by: Peng Fan With the above: Reviewed-by: Mathieu Poirier > --- > drivers/remoteproc/imx_rproc.c | 47 +++++++++++++++++++++++++++++++--- > 1 file changed, 44 insertions(+), 3 deletions(-) > > diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c > index 7d2e11aed0aa..8175c4c9aa22 100644 > --- a/drivers/remoteproc/imx_rproc.c > +++ b/drivers/remoteproc/imx_rproc.c > @@ -3,6 +3,7 @@ > * Copyright (c) 2017 Pengutronix, Oleksij Rempel > */ > > +#include > #include > #include > #include > @@ -75,10 +76,13 @@ struct imx_rproc_mem { > size_t size; > }; > > -/* att flags */ > +/* att flags: lower 16 bits specifying core, higher 16 bits for flags */ > /* M4 own area. Can be mapped at probe */ > -#define ATT_OWN BIT(1) > -#define ATT_IOMEM BIT(2) > +#define ATT_OWN BIT(31) > +#define ATT_IOMEM BIT(30) > + > +#define ATT_CORE_MASK 0xffff > +#define ATT_CORE(I) BIT((I)) > > static int imx_rproc_detach_pd(struct rproc *rproc); > > @@ -101,6 +105,7 @@ struct imx_rproc { > u32 rsrc_id; /* resource id */ > u32 entry; /* cpu start address */ > int num_pd; > + u32 core_index; > struct device **pd_dev; > struct device_link **pd_dev_link; > }; > @@ -131,6 +136,19 @@ static const struct imx_rproc_att imx_rproc_att_imx93[] = { > { 0xD0000000, 0xa0000000, 0x10000000, 0 }, > }; > > +static const struct imx_rproc_att imx_rproc_att_imx8qm[] = { > + /* dev addr , sys addr , size , flags */ > + { 0x08000000, 0x08000000, 0x10000000, 0}, > + /* TCML */ > + { 0x1FFE0000, 0x34FE0000, 0x00020000, ATT_OWN | ATT_IOMEM | ATT_CORE(0)}, > + { 0x1FFE0000, 0x38FE0000, 0x00020000, ATT_OWN | ATT_IOMEM | ATT_CORE(1)}, > + /* TCMU */ > + { 0x20000000, 0x35000000, 0x00020000, ATT_OWN | ATT_IOMEM | ATT_CORE(0)}, > + { 0x20000000, 0x39000000, 0x00020000, ATT_OWN | ATT_IOMEM | ATT_CORE(1)}, > + /* DDR (Data) */ > + { 0x80000000, 0x80000000, 0x60000000, 0 }, > +}; > + > static const struct imx_rproc_att imx_rproc_att_imx8qxp[] = { > { 0x08000000, 0x08000000, 0x10000000, 0 }, > /* TCML/U */ > @@ -281,6 +299,12 @@ static const struct imx_rproc_dcfg imx_rproc_cfg_imx8mq = { > .method = IMX_RPROC_MMIO, > }; > > +static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qm = { > + .att = imx_rproc_att_imx8qm, > + .att_size = ARRAY_SIZE(imx_rproc_att_imx8qm), > + .method = IMX_RPROC_SCU_API, > +}; > + > static const struct imx_rproc_dcfg imx_rproc_cfg_imx8qxp = { > .att = imx_rproc_att_imx8qxp, > .att_size = ARRAY_SIZE(imx_rproc_att_imx8qxp), > @@ -397,6 +421,17 @@ static int imx_rproc_da_to_sys(struct imx_rproc *priv, u64 da, > for (i = 0; i < dcfg->att_size; i++) { > const struct imx_rproc_att *att = &dcfg->att[i]; > > + /* > + * Ignore entries not belong to current core: > + * i.MX8QM has dual general M4_[0,1] cores, M4_0's own entries > + * has "ATT_CORE(0) & BIT(0)" true, M4_1's own entries has > + * "ATT_CORE(1) & BIT(1)" true. > + */ > + if (att->flags & ATT_CORE_MASK) { > + if (!((BIT(priv->core_index)) & (att->flags & ATT_CORE_MASK))) > + continue; > + } > + > if (da >= att->da && da + len < att->da + att->size) { > unsigned int offset = da - att->da; > > @@ -844,6 +879,11 @@ static int imx_rproc_detect_mode(struct imx_rproc *priv) > return ret; > } > > + if (priv->rsrc_id == IMX_SC_R_M4_1_PID0) > + priv->core_index = 1; > + else > + priv->core_index = 0; > + > /* > * 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. > @@ -1040,6 +1080,7 @@ static const struct of_device_id imx_rproc_of_match[] = { > { .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,imx8qm-cm4", .data = &imx_rproc_cfg_imx8qm }, > { .compatible = "fsl,imx8ulp-cm33", .data = &imx_rproc_cfg_imx8ulp }, > { .compatible = "fsl,imx93-cm33", .data = &imx_rproc_cfg_imx93 }, > {}, > -- > 2.37.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel