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 C9C57CCFA18 for ; Tue, 11 Nov 2025 19:59:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ppIGzdNlcQ4hGd6U91MH/chK5fFWENz3dCBS8X1zfUI=; b=skadMfvhw1qXBwLPesLycDE2LN I7kZUKDSosc1yBjYaA8halvpMLk4npJEol0bxrSs+rb+EoPqf1sK+C85i2iu7dLdFlsW9Netog6Z/ O7SHjER0bcBHN2Y5/KiHGj0OD4F2+fE6m5jLNMKliaf11nfDHcCT2fWJUhH25bGUOT4uJbOc6pFET /M6lt4wY/xqEhUMzkf0+bf61/Ch95wJnDwai2Bj1KEZszn/hsfQpDiMWjf8ed6NOy0Dcq/aD0WcIv eqJNrD2VQHCaevDl6OYm5MPNfFNckKuaDDDXd4uwwfl5z02IwAOTWxbayVMUvXTd815nkX/EtHlK7 zhohlNZw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1vIuWb-00000007iFY-3Yit; Tue, 11 Nov 2025 19:59:33 +0000 Received: from sea.source.kernel.org ([172.234.252.31]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1vIuWU-00000007iF5-39Ss for linux-arm-kernel@lists.infradead.org; Tue, 11 Nov 2025 19:59:32 +0000 Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 8B2394433A; Tue, 11 Nov 2025 19:59:25 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 25E44C113D0; Tue, 11 Nov 2025 19:59:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1762891165; bh=IzsCrxoWkvmYEZ4ghCqFYq5pTRswFZeTxYkS4jB0wR8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=FRYLT4zU5kJGRKG4wQHb3iJKI3LgEJRXYk3GMS4Am7ALG/Mdz90ivc6aR4PCObvzt WdYh1YJegVIVmXdZzeMOTnvqKz+kwgqLX9C4b50IijHMlEGyiZCJXYgBGgXJ3kIQLj +zbMXeWJbMUzZdJpWdxxzG8SRgt5yFcmckH/8Ay/yOk7FydRIZPux04WHu/iq3hzVq pUs/PiRAkoUf+VyMrVNwcgrGV/6GaGMT7zHDjBjvk6tRO5cwsBPo7pkJae/ywbgwxg 4a+a/3zvCSgpCm+1M3T7Cc48GB7CRMPTMflKctkb9+WY2oTRZu6afsASGLesK1cPC0 RS933hsVKmBYQ== Date: Tue, 11 Nov 2025 13:59:23 -0600 From: Rob Herring To: Mathieu Poirier Cc: Bjorn Andersson , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Geert Uytterhoeven , Magnus Damm , Patrice Chotard , Maxime Coquelin , Alexandre Torgue , Arnaud Pouliquen , Peng Fan , linux-remoteproc@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-renesas-soc@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com Subject: Re: [PATCH v6] remoteproc: Use of_reserved_mem_region_* functions for "memory-region" Message-ID: <20251111195923.GA3629535-robh@kernel.org> References: <20251031175926.1465360-1-robh@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20251111_115926_873749_389627F2 X-CRM114-Status: GOOD ( 36.81 ) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Nov 11, 2025 at 10:38:05AM -0700, Mathieu Poirier wrote: > Hi Rob, > > Please see may comment for st_remoteproc.c > > On Fri, Oct 31, 2025 at 12:59:22PM -0500, Rob Herring (Arm) wrote: > > Use the newly added of_reserved_mem_region_to_resource() and > > of_reserved_mem_region_count() functions to handle "memory-region" > > properties. > > > > The error handling is a bit different in some cases. Often > > "memory-region" is optional, so failed lookup is not an error. But then > > an error in of_reserved_mem_lookup() is treated as an error. However, > > that distinction is not really important. Either the region is available > > and usable or it is not. So now, it is just > > of_reserved_mem_region_to_resource() which is checked for an error. > > > > Acked-by: Arnaud Pouliquen > > Tested-by: Peng Fan # i.MX93-11x11-EVK for imx_rproc.c > > Reviewed-by: Geert Uytterhoeven # rcar > > Signed-off-by: Rob Herring (Arm) > > --- > > v6: > > - Rebase on v6.18-rc1 > > - The error in v5 was fixed in v6.17 commit aea70964b5a7 > > ("of: reserved_mem: Add missing IORESOURCE_MEM flag on resources") > > > > v5: > > - Drop some inadvertent whitespace changes in qcom_q6v5_pas.c and ti_k3. > > - Fix error handling in adsp_alloc_memory_region() > > - Drop unreachable returns after 'while (1)' loops > > > > v4: > > - Rebase on v6.17-rc1. qcom_q6v5_pas.c conflicted needing s/adsp/pas/ > > > > v3: > > - Rebase on v6.16-rc1. Move TI K3 changes to new common file. > > - Fix double increment of "i" in xlnx_r5 > > > > v2: > > - Use strstarts instead of strcmp for resource names as they include > > the unit-address. > > - Drop the unit-address from resource name for imx and st drivers > > --- > > drivers/remoteproc/imx_dsp_rproc.c | 47 +++++++---------- > > drivers/remoteproc/imx_rproc.c | 70 ++++++++++--------------- > > drivers/remoteproc/qcom_q6v5_adsp.c | 24 ++++----- > > drivers/remoteproc/qcom_q6v5_mss.c | 60 +++++++-------------- > > drivers/remoteproc/qcom_q6v5_pas.c | 69 +++++++++--------------- > > drivers/remoteproc/qcom_q6v5_wcss.c | 25 ++++----- > > drivers/remoteproc/qcom_wcnss.c | 23 ++++---- > > drivers/remoteproc/rcar_rproc.c | 38 +++++--------- > > drivers/remoteproc/st_remoteproc.c | 41 +++++++-------- > > drivers/remoteproc/stm32_rproc.c | 46 +++++++--------- > > drivers/remoteproc/ti_k3_common.c | 28 ++++------ > > drivers/remoteproc/xlnx_r5_remoteproc.c | 53 +++++++------------ > > 12 files changed, 199 insertions(+), 325 deletions(-) > > > > diff --git a/drivers/remoteproc/imx_dsp_rproc.c b/drivers/remoteproc/imx_dsp_rproc.c > > index 6e78a01755c7..477e4245a426 100644 > > --- a/drivers/remoteproc/imx_dsp_rproc.c > > +++ b/drivers/remoteproc/imx_dsp_rproc.c > > @@ -689,11 +689,9 @@ static int imx_dsp_rproc_add_carveout(struct imx_dsp_rproc *priv) > > struct rproc *rproc = priv->rproc; > > struct device *dev = rproc->dev.parent; > > struct device_node *np = dev->of_node; > > - struct of_phandle_iterator it; > > struct rproc_mem_entry *mem; > > - struct reserved_mem *rmem; > > void __iomem *cpu_addr; > > - int a; > > + int a, i = 0; > > u64 da; > > > > /* Remap required addresses */ > > @@ -724,49 +722,40 @@ static int imx_dsp_rproc_add_carveout(struct imx_dsp_rproc *priv) > > rproc_add_carveout(rproc, mem); > > } > > > > - of_phandle_iterator_init(&it, np, "memory-region", NULL, 0); > > - while (of_phandle_iterator_next(&it) == 0) { > > + while (1) { > > + int err; > > + struct resource res; > > + > > + err = of_reserved_mem_region_to_resource(np, i++, &res); > > + if (err) > > + return 0; > > + > > /* > > * Ignore the first memory region which will be used vdev buffer. > > * No need to do extra handlings, rproc_add_virtio_dev will handle it. > > */ > > - if (!strcmp(it.node->name, "vdev0buffer")) > > + if (strstarts(res.name, "vdev0buffer")) > > continue; > > > > - rmem = of_reserved_mem_lookup(it.node); > > - if (!rmem) { > > - of_node_put(it.node); > > - dev_err(dev, "unable to acquire memory-region\n"); > > + if (imx_dsp_rproc_sys_to_da(priv, res.start, resource_size(&res), &da)) > > return -EINVAL; > > - } > > > > - if (imx_dsp_rproc_sys_to_da(priv, rmem->base, rmem->size, &da)) { > > - of_node_put(it.node); > > - return -EINVAL; > > - } > > - > > - cpu_addr = devm_ioremap_wc(dev, rmem->base, rmem->size); > > + cpu_addr = devm_ioremap_resource_wc(dev, &res); > > if (!cpu_addr) { > > - of_node_put(it.node); > > - dev_err(dev, "failed to map memory %p\n", &rmem->base); > > + dev_err(dev, "failed to map memory %pR\n", &res); > > return -ENOMEM; > > } > > > > /* Register memory region */ > > - mem = rproc_mem_entry_init(dev, (void __force *)cpu_addr, (dma_addr_t)rmem->base, > > - rmem->size, da, NULL, NULL, it.node->name); > > - > > - if (mem) { > > - rproc_coredump_add_segment(rproc, da, rmem->size); > > - } else { > > - of_node_put(it.node); > > + mem = rproc_mem_entry_init(dev, (void __force *)cpu_addr, (dma_addr_t)res.start, > > + resource_size(&res), da, NULL, NULL, > > + "%.*s", strchrnul(res.name, '@') - res.name, res.name); > > + if (!mem) > > return -ENOMEM; > > - } > > > > + rproc_coredump_add_segment(rproc, da, resource_size(&res)); > > rproc_add_carveout(rproc, mem); > > } > > - > > - return 0; > > } > > > > /* Prepare function for rproc_ops */ > > diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c > > index bb25221a4a89..eb133a6622bc 100644 > > --- a/drivers/remoteproc/imx_rproc.c > > +++ b/drivers/remoteproc/imx_rproc.c > > @@ -490,50 +490,44 @@ static int imx_rproc_prepare(struct rproc *rproc) > > { > > struct imx_rproc *priv = rproc->priv; > > struct device_node *np = priv->dev->of_node; > > - struct of_phandle_iterator it; > > struct rproc_mem_entry *mem; > > - struct reserved_mem *rmem; > > + int i = 0; > > u32 da; > > > > /* Register associated reserved memory regions */ > > - of_phandle_iterator_init(&it, np, "memory-region", NULL, 0); > > - while (of_phandle_iterator_next(&it) == 0) { > > + while (1) { > > + int err; > > + struct resource res; > > + > > + err = of_reserved_mem_region_to_resource(np, i++, &res); > > + if (err) > > + return 0; > > + > > /* > > * Ignore the first memory region which will be used vdev buffer. > > * No need to do extra handlings, rproc_add_virtio_dev will handle it. > > */ > > - if (!strcmp(it.node->name, "vdev0buffer")) > > + if (strstarts(res.name, "vdev0buffer")) > > continue; > > > > - if (!strcmp(it.node->name, "rsc-table")) > > + if (strstarts(res.name, "rsc-table")) > > continue; > > > > - rmem = of_reserved_mem_lookup(it.node); > > - if (!rmem) { > > - of_node_put(it.node); > > - dev_err(priv->dev, "unable to acquire memory-region\n"); > > - return -EINVAL; > > - } > > - > > /* No need to translate pa to da, i.MX use same map */ > > - da = rmem->base; > > + da = res.start; > > > > /* Register memory region */ > > - mem = rproc_mem_entry_init(priv->dev, NULL, (dma_addr_t)rmem->base, rmem->size, da, > > + mem = rproc_mem_entry_init(priv->dev, NULL, (dma_addr_t)res.start, > > + resource_size(&res), da, > > imx_rproc_mem_alloc, imx_rproc_mem_release, > > - it.node->name); > > - > > - if (mem) { > > - rproc_coredump_add_segment(rproc, da, rmem->size); > > - } else { > > - of_node_put(it.node); > > + "%.*s", strchrnul(res.name, '@') - res.name, > > + res.name); > > + if (!mem) > > return -ENOMEM; > > - } > > > > + rproc_coredump_add_segment(rproc, da, resource_size(&res)); > > rproc_add_carveout(rproc, mem); > > } > > - > > - return 0; > > } > > > > static int imx_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw) > > @@ -664,47 +658,37 @@ static int imx_rproc_addr_init(struct imx_rproc *priv, > > } > > > > /* memory-region is optional property */ > > - nph = of_count_phandle_with_args(np, "memory-region", NULL); > > + nph = of_reserved_mem_region_count(np); > > if (nph <= 0) > > return 0; > > > > /* remap optional addresses */ > > for (a = 0; a < nph; a++) { > > - struct device_node *node; > > struct resource res; > > > > - node = of_parse_phandle(np, "memory-region", a); > > - if (!node) > > - continue; > > - /* Not map vdevbuffer, vdevring region */ > > - if (!strncmp(node->name, "vdev", strlen("vdev"))) { > > - of_node_put(node); > > - continue; > > - } > > - err = of_address_to_resource(node, 0, &res); > > + err = of_reserved_mem_region_to_resource(np, a, &res); > > if (err) { > > dev_err(dev, "unable to resolve memory region\n"); > > - of_node_put(node); > > return err; > > } > > > > - if (b >= IMX_RPROC_MEM_MAX) { > > - of_node_put(node); > > + /* Not map vdevbuffer, vdevring region */ > > + if (strstarts(res.name, "vdev")) > > + continue; > > + > > + if (b >= IMX_RPROC_MEM_MAX) > > break; > > - } > > > > /* Not use resource version, because we might share region */ > > - priv->mem[b].cpu_addr = devm_ioremap_wc(&pdev->dev, res.start, resource_size(&res)); > > + priv->mem[b].cpu_addr = devm_ioremap_resource_wc(&pdev->dev, &res); > > if (!priv->mem[b].cpu_addr) { > > dev_err(dev, "failed to remap %pr\n", &res); > > - of_node_put(node); > > return -ENOMEM; > > } > > priv->mem[b].sys_addr = res.start; > > priv->mem[b].size = resource_size(&res); > > - if (!strcmp(node->name, "rsc-table")) > > + if (!strcmp(res.name, "rsc-table")) > > priv->rsc_table = priv->mem[b].cpu_addr; > > - of_node_put(node); > > b++; > > } > > > > diff --git a/drivers/remoteproc/qcom_q6v5_adsp.c b/drivers/remoteproc/qcom_q6v5_adsp.c > > index e98b7e03162c..d3933a66ed3d 100644 > > --- a/drivers/remoteproc/qcom_q6v5_adsp.c > > +++ b/drivers/remoteproc/qcom_q6v5_adsp.c > > @@ -625,26 +625,20 @@ static int adsp_init_mmio(struct qcom_adsp *adsp, > > > > static int adsp_alloc_memory_region(struct qcom_adsp *adsp) > > { > > - struct reserved_mem *rmem = NULL; > > - struct device_node *node; > > - > > - node = of_parse_phandle(adsp->dev->of_node, "memory-region", 0); > > - if (node) > > - rmem = of_reserved_mem_lookup(node); > > - of_node_put(node); > > + int ret; > > + struct resource res; > > > > - if (!rmem) { > > + ret = of_reserved_mem_region_to_resource(adsp->dev->of_node, 0, &res); > > + if (ret) { > > dev_err(adsp->dev, "unable to resolve memory-region\n"); > > - return -EINVAL; > > + return ret; > > } > > > > - adsp->mem_phys = adsp->mem_reloc = rmem->base; > > - adsp->mem_size = rmem->size; > > - adsp->mem_region = devm_ioremap_wc(adsp->dev, > > - adsp->mem_phys, adsp->mem_size); > > + adsp->mem_phys = adsp->mem_reloc = res.start; > > + adsp->mem_size = resource_size(&res); > > + adsp->mem_region = devm_ioremap_resource_wc(adsp->dev, &res); > > if (!adsp->mem_region) { > > - dev_err(adsp->dev, "unable to map memory region: %pa+%zx\n", > > - &rmem->base, adsp->mem_size); > > + dev_err(adsp->dev, "unable to map memory region: %pR\n", &res); > > return -EBUSY; > > } > > > > diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c > > index 3087d895b87f..91940977ca89 100644 > > --- a/drivers/remoteproc/qcom_q6v5_mss.c > > +++ b/drivers/remoteproc/qcom_q6v5_mss.c > > @@ -1970,8 +1970,8 @@ static int q6v5_init_reset(struct q6v5 *qproc) > > static int q6v5_alloc_memory_region(struct q6v5 *qproc) > > { > > struct device_node *child; > > - struct reserved_mem *rmem; > > - struct device_node *node; > > + struct resource res; > > + int ret; > > > > /* > > * In the absence of mba/mpss sub-child, extract the mba and mpss > > @@ -1979,71 +1979,49 @@ static int q6v5_alloc_memory_region(struct q6v5 *qproc) > > */ > > child = of_get_child_by_name(qproc->dev->of_node, "mba"); > > if (!child) { > > - node = of_parse_phandle(qproc->dev->of_node, > > - "memory-region", 0); > > + ret = of_reserved_mem_region_to_resource(qproc->dev->of_node, 0, &res); > > } else { > > - node = of_parse_phandle(child, "memory-region", 0); > > + ret = of_reserved_mem_region_to_resource(child, 0, &res); > > of_node_put(child); > > } > > > > - if (!node) { > > - dev_err(qproc->dev, "no mba memory-region specified\n"); > > - return -EINVAL; > > - } > > - > > - rmem = of_reserved_mem_lookup(node); > > - of_node_put(node); > > - if (!rmem) { > > + if (ret) { > > dev_err(qproc->dev, "unable to resolve mba region\n"); > > - return -EINVAL; > > + return ret; > > } > > > > - qproc->mba_phys = rmem->base; > > - qproc->mba_size = rmem->size; > > + qproc->mba_phys = res.start; > > + qproc->mba_size = resource_size(&res); > > > > if (!child) { > > - node = of_parse_phandle(qproc->dev->of_node, > > - "memory-region", 1); > > + ret = of_reserved_mem_region_to_resource(qproc->dev->of_node, 1, &res); > > } else { > > child = of_get_child_by_name(qproc->dev->of_node, "mpss"); > > - node = of_parse_phandle(child, "memory-region", 0); > > + ret = of_reserved_mem_region_to_resource(child, 0, &res); > > of_node_put(child); > > } > > > > - if (!node) { > > - dev_err(qproc->dev, "no mpss memory-region specified\n"); > > - return -EINVAL; > > - } > > - > > - rmem = of_reserved_mem_lookup(node); > > - of_node_put(node); > > - if (!rmem) { > > + if (ret) { > > dev_err(qproc->dev, "unable to resolve mpss region\n"); > > - return -EINVAL; > > + return ret; > > } > > > > - qproc->mpss_phys = qproc->mpss_reloc = rmem->base; > > - qproc->mpss_size = rmem->size; > > + qproc->mpss_phys = qproc->mpss_reloc = res.start; > > + qproc->mpss_size = resource_size(&res); > > > > if (!child) { > > - node = of_parse_phandle(qproc->dev->of_node, "memory-region", 2); > > + ret = of_reserved_mem_region_to_resource(qproc->dev->of_node, 2, &res); > > } else { > > child = of_get_child_by_name(qproc->dev->of_node, "metadata"); > > - node = of_parse_phandle(child, "memory-region", 0); > > + ret = of_reserved_mem_region_to_resource(child, 0, &res); > > of_node_put(child); > > } > > > > - if (!node) > > + if (ret) > > return 0; > > > > - rmem = of_reserved_mem_lookup(node); > > - if (!rmem) { > > - dev_err(qproc->dev, "unable to resolve metadata region\n"); > > - return -EINVAL; > > - } > > - > > - qproc->mdata_phys = rmem->base; > > - qproc->mdata_size = rmem->size; > > + qproc->mdata_phys = res.start; > > + qproc->mdata_size = resource_size(&res); > > > > return 0; > > } > > diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c > > index 158bcd6cc85c..7bac843ce406 100644 > > --- a/drivers/remoteproc/qcom_q6v5_pas.c > > +++ b/drivers/remoteproc/qcom_q6v5_pas.c > > @@ -547,53 +547,37 @@ static void qcom_pas_pds_detach(struct qcom_pas *pas, struct device **pds, size_ > > > > static int qcom_pas_alloc_memory_region(struct qcom_pas *pas) > > { > > - struct reserved_mem *rmem; > > - struct device_node *node; > > - > > - node = of_parse_phandle(pas->dev->of_node, "memory-region", 0); > > - if (!node) { > > - dev_err(pas->dev, "no memory-region specified\n"); > > - return -EINVAL; > > - } > > + struct resource res; > > + int ret; > > > > - rmem = of_reserved_mem_lookup(node); > > - of_node_put(node); > > - if (!rmem) { > > + ret = of_reserved_mem_region_to_resource(pas->dev->of_node, 0, &res); > > + if (ret) { > > dev_err(pas->dev, "unable to resolve memory-region\n"); > > - return -EINVAL; > > + return ret; > > } > > > > - pas->mem_phys = pas->mem_reloc = rmem->base; > > - pas->mem_size = rmem->size; > > - pas->mem_region = devm_ioremap_wc(pas->dev, pas->mem_phys, pas->mem_size); > > + pas->mem_phys = pas->mem_reloc = res.start; > > + pas->mem_size = resource_size(&res); > > + pas->mem_region = devm_ioremap_resource_wc(pas->dev, &res); > > if (!pas->mem_region) { > > - dev_err(pas->dev, "unable to map memory region: %pa+%zx\n", > > - &rmem->base, pas->mem_size); > > + dev_err(pas->dev, "unable to map memory region: %pR\n", &res); > > return -EBUSY; > > } > > > > if (!pas->dtb_pas_id) > > return 0; > > > > - node = of_parse_phandle(pas->dev->of_node, "memory-region", 1); > > - if (!node) { > > - dev_err(pas->dev, "no dtb memory-region specified\n"); > > - return -EINVAL; > > - } > > - > > - rmem = of_reserved_mem_lookup(node); > > - of_node_put(node); > > - if (!rmem) { > > + ret = of_reserved_mem_region_to_resource(pas->dev->of_node, 1, &res); > > + if (ret) { > > dev_err(pas->dev, "unable to resolve dtb memory-region\n"); > > - return -EINVAL; > > + return ret; > > } > > > > - pas->dtb_mem_phys = pas->dtb_mem_reloc = rmem->base; > > - pas->dtb_mem_size = rmem->size; > > - pas->dtb_mem_region = devm_ioremap_wc(pas->dev, pas->dtb_mem_phys, pas->dtb_mem_size); > > + pas->dtb_mem_phys = pas->dtb_mem_reloc = res.start; > > + pas->dtb_mem_size = resource_size(&res); > > + pas->dtb_mem_region = devm_ioremap_resource_wc(pas->dev, &res); > > if (!pas->dtb_mem_region) { > > - dev_err(pas->dev, "unable to map dtb memory region: %pa+%zx\n", > > - &rmem->base, pas->dtb_mem_size); > > + dev_err(pas->dev, "unable to map dtb memory region: %pR\n", &res); > > return -EBUSY; > > } > > > > @@ -603,7 +587,6 @@ static int qcom_pas_alloc_memory_region(struct qcom_pas *pas) > > static int qcom_pas_assign_memory_region(struct qcom_pas *pas) > > { > > struct qcom_scm_vmperm perm[MAX_ASSIGN_COUNT]; > > - struct device_node *node; > > unsigned int perm_size; > > int offset; > > int ret; > > @@ -612,17 +595,15 @@ static int qcom_pas_assign_memory_region(struct qcom_pas *pas) > > return 0; > > > > for (offset = 0; offset < pas->region_assign_count; ++offset) { > > - struct reserved_mem *rmem = NULL; > > - > > - node = of_parse_phandle(pas->dev->of_node, "memory-region", > > - pas->region_assign_idx + offset); > > - if (node) > > - rmem = of_reserved_mem_lookup(node); > > - of_node_put(node); > > - if (!rmem) { > > + struct resource res; > > + > > + ret = of_reserved_mem_region_to_resource(pas->dev->of_node, > > + pas->region_assign_idx + offset, > > + &res); > > + if (ret) { > > dev_err(pas->dev, "unable to resolve shareable memory-region index %d\n", > > offset); > > - return -EINVAL; > > + return ret; > > } > > > > if (pas->region_assign_shared) { > > @@ -637,8 +618,8 @@ static int qcom_pas_assign_memory_region(struct qcom_pas *pas) > > perm_size = 1; > > } > > > > - pas->region_assign_phys[offset] = rmem->base; > > - pas->region_assign_size[offset] = rmem->size; > > + pas->region_assign_phys[offset] = res.start; > > + pas->region_assign_size[offset] = resource_size(&res); > > pas->region_assign_owners[offset] = BIT(QCOM_SCM_VMID_HLOS); > > > > ret = qcom_scm_assign_mem(pas->region_assign_phys[offset], > > diff --git a/drivers/remoteproc/qcom_q6v5_wcss.c b/drivers/remoteproc/qcom_q6v5_wcss.c > > index 07c88623f597..ca748e3bcc7f 100644 > > --- a/drivers/remoteproc/qcom_q6v5_wcss.c > > +++ b/drivers/remoteproc/qcom_q6v5_wcss.c > > @@ -873,27 +873,22 @@ static int q6v5_wcss_init_mmio(struct q6v5_wcss *wcss, > > > > static int q6v5_alloc_memory_region(struct q6v5_wcss *wcss) > > { > > - struct reserved_mem *rmem = NULL; > > - struct device_node *node; > > struct device *dev = wcss->dev; > > + struct resource res; > > + int ret; > > > > - node = of_parse_phandle(dev->of_node, "memory-region", 0); > > - if (node) > > - rmem = of_reserved_mem_lookup(node); > > - of_node_put(node); > > - > > - if (!rmem) { > > + ret = of_reserved_mem_region_to_resource(dev->of_node, 0, &res); > > + if (ret) { > > dev_err(dev, "unable to acquire memory-region\n"); > > - return -EINVAL; > > + return ret; > > } > > > > - wcss->mem_phys = rmem->base; > > - wcss->mem_reloc = rmem->base; > > - wcss->mem_size = rmem->size; > > - wcss->mem_region = devm_ioremap_wc(dev, wcss->mem_phys, wcss->mem_size); > > + wcss->mem_phys = res.start; > > + wcss->mem_reloc = res.start; > > + wcss->mem_size = resource_size(&res); > > + wcss->mem_region = devm_ioremap_resource_wc(dev, &res); > > if (!wcss->mem_region) { > > - dev_err(dev, "unable to map memory region: %pa+%pa\n", > > - &rmem->base, &rmem->size); > > + dev_err(dev, "unable to map memory region: %pR\n", &res); > > return -EBUSY; > > } > > > > diff --git a/drivers/remoteproc/qcom_wcnss.c b/drivers/remoteproc/qcom_wcnss.c > > index 2c7e519a2254..14005fb049a2 100644 > > --- a/drivers/remoteproc/qcom_wcnss.c > > +++ b/drivers/remoteproc/qcom_wcnss.c > > @@ -526,25 +526,20 @@ static int wcnss_request_irq(struct qcom_wcnss *wcnss, > > > > static int wcnss_alloc_memory_region(struct qcom_wcnss *wcnss) > > { > > - struct reserved_mem *rmem = NULL; > > - struct device_node *node; > > - > > - node = of_parse_phandle(wcnss->dev->of_node, "memory-region", 0); > > - if (node) > > - rmem = of_reserved_mem_lookup(node); > > - of_node_put(node); > > + struct resource res; > > + int ret; > > > > - if (!rmem) { > > + ret = of_reserved_mem_region_to_resource(wcnss->dev->of_node, 0, &res); > > + if (ret) { > > dev_err(wcnss->dev, "unable to resolve memory-region\n"); > > - return -EINVAL; > > + return ret; > > } > > > > - wcnss->mem_phys = wcnss->mem_reloc = rmem->base; > > - wcnss->mem_size = rmem->size; > > - wcnss->mem_region = devm_ioremap_wc(wcnss->dev, wcnss->mem_phys, wcnss->mem_size); > > + wcnss->mem_phys = wcnss->mem_reloc = res.start; > > + wcnss->mem_size = resource_size(&res); > > + wcnss->mem_region = devm_ioremap_resource_wc(wcnss->dev, &res); > > if (!wcnss->mem_region) { > > - dev_err(wcnss->dev, "unable to map memory region: %pa+%zx\n", > > - &rmem->base, wcnss->mem_size); > > + dev_err(wcnss->dev, "unable to map memory region: %pR\n", &res); > > return -EBUSY; > > } > > > > diff --git a/drivers/remoteproc/rcar_rproc.c b/drivers/remoteproc/rcar_rproc.c > > index 921d853594f4..3c25625f966d 100644 > > --- a/drivers/remoteproc/rcar_rproc.c > > +++ b/drivers/remoteproc/rcar_rproc.c > > @@ -52,46 +52,36 @@ static int rcar_rproc_prepare(struct rproc *rproc) > > { > > struct device *dev = rproc->dev.parent; > > struct device_node *np = dev->of_node; > > - struct of_phandle_iterator it; > > struct rproc_mem_entry *mem; > > - struct reserved_mem *rmem; > > + int i = 0; > > u32 da; > > > > /* Register associated reserved memory regions */ > > - of_phandle_iterator_init(&it, np, "memory-region", NULL, 0); > > - while (of_phandle_iterator_next(&it) == 0) { > > - > > - rmem = of_reserved_mem_lookup(it.node); > > - if (!rmem) { > > - of_node_put(it.node); > > - dev_err(&rproc->dev, > > - "unable to acquire memory-region\n"); > > - return -EINVAL; > > - } > > + while (1) { > > + struct resource res; > > + int ret; > > + > > + ret = of_reserved_mem_region_to_resource(np, i++, &res); > > + if (ret) > > + return 0; > > > > - if (rmem->base > U32_MAX) { > > - of_node_put(it.node); > > + if (res.start > U32_MAX) > > return -EINVAL; > > - } > > > > /* No need to translate pa to da, R-Car use same map */ > > - da = rmem->base; > > + da = res.start; > > mem = rproc_mem_entry_init(dev, NULL, > > - rmem->base, > > - rmem->size, da, > > + res.start, > > + resource_size(&res), da, > > rcar_rproc_mem_alloc, > > rcar_rproc_mem_release, > > - it.node->name); > > + res.name); > > > > - if (!mem) { > > - of_node_put(it.node); > > + if (!mem) > > return -ENOMEM; > > - } > > > > rproc_add_carveout(rproc, mem); > > } > > - > > - return 0; > > } > > > > static int rcar_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw) > > diff --git a/drivers/remoteproc/st_remoteproc.c b/drivers/remoteproc/st_remoteproc.c > > index e6566a9839dc..043348366926 100644 > > --- a/drivers/remoteproc/st_remoteproc.c > > +++ b/drivers/remoteproc/st_remoteproc.c > > @@ -120,40 +120,37 @@ static int st_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw) > > struct device *dev = rproc->dev.parent; > > struct device_node *np = dev->of_node; > > struct rproc_mem_entry *mem; > > - struct reserved_mem *rmem; > > - struct of_phandle_iterator it; > > - int index = 0; > > - > > - of_phandle_iterator_init(&it, np, "memory-region", NULL, 0); > > - while (of_phandle_iterator_next(&it) == 0) { > > - rmem = of_reserved_mem_lookup(it.node); > > - if (!rmem) { > > - of_node_put(it.node); > > - dev_err(dev, "unable to acquire memory-region\n"); > > - return -EINVAL; > > - } > > + int index = 0, mr = 0; > > + > > + while (1) { > > + struct resource res; > > + int ret; > > + > > + ret = of_reserved_mem_region_to_resource(np, mr++, &res); > > + if (ret) > > + return 0; > > The original code calls rproc_elf_load_rsc_table() [1] after iterating through > the memory region, something that won't happen with the above. Indeed. it needs the following incremental change. It is slightly different in that rproc_elf_load_rsc_table() is not called if 'memory-region' is missing, but the binding says that's required. 8<-------------------------------------------------- diff --git a/drivers/remoteproc/st_remoteproc.c b/drivers/remoteproc/st_remoteproc.c index 043348366926..cb09c244fdb5 100644 --- a/drivers/remoteproc/st_remoteproc.c +++ b/drivers/remoteproc/st_remoteproc.c @@ -120,15 +120,19 @@ static int st_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw) struct device *dev = rproc->dev.parent; struct device_node *np = dev->of_node; struct rproc_mem_entry *mem; - int index = 0, mr = 0; + int index = 0; while (1) { struct resource res; int ret; - ret = of_reserved_mem_region_to_resource(np, mr++, &res); - if (ret) - return 0; + ret = of_reserved_mem_region_to_resource(np, index, &res); + if (ret) { + if (index) + break; + else + return ret; + } /* No need to map vdev buffer */ if (!strstarts(res.name, "vdev0buffer")) {