Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Peng Fan <peng.fan@nxp.com>
To:     bjorn.andersson@linaro.org, mathieu.poirier@linaro.org,
        o.rempel@pengutronix.de, robh+dt@kernel.org
Cc:     linux-remoteproc@vger.kernel.org, linux-kernel@vger.kernel.org,
        shawnguo@kernel.org, s.hauer@pengutronix.de, kernel@pengutronix.de,
        festevam@gmail.com, linux-imx@nxp.com,
        linux-arm-kernel@lists.infradead.org, Peng Fan <peng.fan@nxp.com>,
        Richard Zhu <hongxing.zhu@nxp.com>
Subject: [PATCH V2 4/7] remoteproc: imx_rproc: use devm_ioremap
Date:   Sun, 27 Sep 2020 14:41:28 +0800
Message-Id: <20200927064131.24101-5-peng.fan@nxp.com>
In-Reply-To: <20200927064131.24101-1-peng.fan@nxp.com>
References: <20200927064131.24101-1-peng.fan@nxp.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from linux-1xn6.ap.freescale.net (119.31.174.71) by SG2PR04CA0178.apcprd04.prod.outlook.com (2603:1096:4:14::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3412.20 via Frontend Transport; Sun, 27 Sep 2020 06:15:37 +0000
X-Mailer: git-send-email 2.28.0
X-Originating-IP: [119.31.174.71]
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: 4ce5f486-4ff1-46ff-67d0-08d862acc2ab
X-MS-TrafficTypeDiagnostic: DB7PR04MB4633:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <DB7PR04MB46331706F1C21AEBFEFB280E88340@DB7PR04MB4633.eurprd04.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:660;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: GR6VDWtohUMF0SxMOKJvEW30GgUmuQX2pExXiI3lLi+7lhFsYmn4SDOhxa+9MDsZjZ5Ir3VJttPoZ9OtJ7nVUNWvVpJHojTFNX1mblRxeUwKhcr/IS8CEcMP76AUEpg8MvDnAHSDlN7b6RdNdEmJeJM5KNeYcDquK+sgn3bE9ObA5btJigqIyBviRc75hghNUD2fVemjp+4ddYfFDDlH4ghIuO/BZRvaFIdKMl6M580G8w1efIG6aGu+7fgBvkBChZ93Pd+DMq5PbXjKa/zPXWDwtVzc4P1xV9HwCZsOFB/ismHperRPPOHOr6/XdTIbFRZeSCRsZlI+xOJHhxxRpDTFJS0KCr3LY3poJuJcV667yAM9M/7GR8fNBbarfzyX
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DB6PR0402MB2760.eurprd04.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(366004)(376002)(346002)(39860400002)(136003)(396003)(16526019)(186003)(52116002)(7416002)(6666004)(6486002)(54906003)(316002)(36756003)(1076003)(44832011)(5660300002)(4326008)(8676002)(2906002)(86362001)(26005)(956004)(478600001)(8936002)(66946007)(6506007)(6512007)(2616005)(66556008)(83380400001)(66476007);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: z/n3/HYegAA03bh7l5Bx/SPPUb+IcjYqjgMYj6aWVXENdRPiP6t6KuTV0rbpOiV3mAZN/Jw3t6bVCq9Ht3Sw+TzuwiODX9zKq0xMOulcaX/uOfBshOZK7th/kMHL9Eqjc4MFxKcJDpa9J5URnuMKfpj7TLsVsJjpI4L994zxf9X/RG5BB47pWNC7NTRB4hSaPcWmUVIULNE2auRYfZpiX7fTJsKtJT0G0GztUHHpd+PxbJsgraQO2ly7Os6QrvZSSIzUKgVfQq9OHf2xM0N7O5xrBVm7jQe05wbeX1SUC/PH1YydtVlOMKV86r3C7sIQ2NLgrVJcjdiH50P6Y9IZlQ7FWXi4gENGIGbEFVWBqoNTs2IWCwlWGsugYIjC0m+OeRZb02kNKnZqx1YZsq2J98UeGVOxAKHDHb2co6BD2b7rW+d3FdvFgEeZH7Fyjm8MR+qk7C34mLrhdB19IcFA82fOgQEWNb2cm0eH8XPBwcnudWgwrYKVwgRBcocDMdX7ZWf5rtrGWovgbWYMz190D603f0SSaGxIHClDT3KWZIv1TB8lvCPYjKO4HpTtodJCi2HEI444As+dn7wxzkJzezHu7qbiSxUDfE8qdiyAX8mkhQs98FenGYLwiG7WVrEPRW4v6ZUSTFlVQoW+w3EOog==
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4ce5f486-4ff1-46ff-67d0-08d862acc2ab
X-MS-Exchange-CrossTenant-AuthSource: DB6PR0402MB2760.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Sep 2020 06:15:41.6123
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 1MLPjEJtaMWzJxyCJp75x6Eozf1cJEalBMVAlFhlBfcN3UCwAh0/Ur4UCevYC3qTOQfGDOYWUbNSixzCRVPYUw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR04MB4633
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

We might need to map an region multiple times, becaue the region might
be shared between remote processors, such i.MX8QM with dual M4 cores.
So use devm_ioremap, not devm_ioremap_resource.

Reviewed-by: Oleksij Rempel <o.rempel@pengutronix.de>
Reviewed-by: Richard Zhu <hongxing.zhu@nxp.com>
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
 drivers/remoteproc/imx_rproc.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c
index aa5fbd0c7768..48ce09e857ee 100644
--- a/drivers/remoteproc/imx_rproc.c
+++ b/drivers/remoteproc/imx_rproc.c
@@ -298,9 +298,10 @@ static int imx_rproc_addr_init(struct imx_rproc *priv,
 		if (b >= IMX7D_RPROC_MEM_MAX)
 			break;
 
-		priv->mem[b].cpu_addr = devm_ioremap_resource(&pdev->dev, &res);
+		/* Not use resource version, because we might share region*/
+		priv->mem[b].cpu_addr = devm_ioremap(&pdev->dev, res.start, resource_size(&res));
 		if (IS_ERR(priv->mem[b].cpu_addr)) {
-			dev_err(dev, "devm_ioremap_resource failed\n");
+			dev_err(dev, "devm_ioremap %pR failed\n", &res);
 			err = PTR_ERR(priv->mem[b].cpu_addr);
 			return err;
 		}
-- 
2.28.0