From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Return-Path: Date: Tue, 14 Apr 2020 11:46:44 -0600 From: Mathieu Poirier Subject: Re: [PATCH v2 3/3] remoteproc: imx_rproc: memory regions Message-ID: <20200414174644.GD24061@xps15> References: <20200304142628.8471-1-NShubin@topcon.com> <20200406113310.3041-1-nikita.shubin@maquefel.me> <20200406113310.3041-4-nikita.shubin@maquefel.me> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200406113310.3041-4-nikita.shubin@maquefel.me> To: nikita.shubin@maquefel.me Cc: Nikita Shubin , Ohad Ben-Cohen , Bjorn Andersson , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , linux-remoteproc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org List-ID: On Mon, Apr 06, 2020 at 02:33:10PM +0300, nikita.shubin@maquefel.me wrote: > Add support for carveout memory regions required for vdev vring's and > buffer. > > Search in device tree and allocate memory regions like for ocram: > > vdev0vring0: vdev0vring0@00920000 { > compatible = "shared-dma-pool"; > reg = <0x00920000 0x2000>; > no-map; > }; > > vdev0vring1: vdev0vring1@00922000 { > compatible = "shared-dma-pool"; > reg = <0x00922000 0x2000>; > no-map; > }; > > vdev0buffer: vdev0buffer@00924000 { > compatible = "shared-dma-pool"; > reg = <0x00924000 0x4000>; > no-map; > }; > > imx7d-cm4 { > compatible = "fsl,imx7d-cm4"; > memory-region = <&ocram>, <&vdev0vring0>, <&vdev0vring1>, \ > <&vdev0buffer>; > } > > vdev0vring0, vdev0vring1, vdev0buffer are required for virtio > functioning. > > Signed-off-by: Nikita Shubin > --- > drivers/remoteproc/imx_rproc.c | 119 ++++++++++++++++++++++++++++++++- > 1 file changed, 118 insertions(+), 1 deletion(-) > > diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c > index d2bede4ccb70..cdcff2bd2867 100644 > --- a/drivers/remoteproc/imx_rproc.c > +++ b/drivers/remoteproc/imx_rproc.c > @@ -11,6 +11,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -238,6 +239,29 @@ static int imx_rproc_da_to_sys(struct imx_rproc *priv, u64 da, > return -ENOENT; > } > > +static int imx_rproc_sys_to_da(struct imx_rproc *priv, u64 sys, > + int len, u64 *da) > +{ > + const struct imx_rproc_dcfg *dcfg = priv->dcfg; > + int i; > + > + /* parse address translation table */ > + for (i = 0; i < dcfg->att_size; i++) { > + const struct imx_rproc_att *att = &dcfg->att[i]; > + > + if (sys >= att->sa && sys + len <= att->sa + att->size) { > + unsigned int offset = sys - att->sa; > + > + *da = att->da + offset; > + return 0; > + } > + } > + > + dev_warn(priv->dev, "Translation failed: sys = 0x%llx len = 0x%x\n", > + sys, len); > + return -ENOENT; > +} > + > static void *imx_rproc_da_to_va(struct rproc *rproc, u64 da, int len) > { > struct imx_rproc *priv = rproc->priv; > @@ -372,16 +396,109 @@ static void imx_rproc_kick(struct rproc *rproc, int vqid) > err = mbox_send_message(ddata->mb[i].chan, &vqid); > if (err < 0) > dev_err(&rproc->dev, "%s: failed (%s, err:%d)\n", > - __func__, ddata->mb[i].name, err); > + __func__, ddata->mb[i].name, err); > return; > } > } > > +static int imx_rproc_mem_alloc(struct rproc *rproc, > + struct rproc_mem_entry *mem) > +{ > + struct device *dev = rproc->dev.parent; > + void *va; > + > + dev_dbg(dev, "map memory: %pa+%x\n", &mem->dma, mem->len); > + va = ioremap_wc(mem->dma, mem->len); > + if (IS_ERR_OR_NULL(va)) { > + dev_err(dev, "Unable to map memory region: %pa+%x\n", > + &mem->dma, mem->len); > + return -ENOMEM; > + } > + > + /* Update memory entry va */ > + mem->va = va; > + > + return 0; > +} > + > +static int imx_rproc_mem_release(struct rproc *rproc, > + struct rproc_mem_entry *mem) > +{ > + dev_dbg(rproc->dev.parent, "unmap memory: %pa\n", &mem->dma); > + iounmap(mem->va); > + > + return 0; > +} > + > +static int imx_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw) > +{ > + struct imx_rproc *priv = rproc->priv; > + struct device *dev = rproc->dev.parent; > + struct device_node *np = dev->of_node; > + struct of_phandle_iterator it; > + struct rproc_mem_entry *mem = 0; > + struct reserved_mem *rmem; > + u64 da; > + int index = 0; > + > + /* Register associated reserved memory regions */ > + of_phandle_iterator_init(&it, np, "memory-region", NULL, 0); This will likely clash with the parsing done in imx_rproc_addr_init(), and the parsing in there will also clash with what is done below... I advise you to register carvouts in imx_rproc_addr_init() as you parse the rest of the memory regions. Thanks, Mathieu > + while (of_phandle_iterator_next(&it) == 0) { > + rmem = of_reserved_mem_lookup(it.node); > + if (!rmem) { > + dev_err(dev, "unable to acquire memory-region\n"); > + return -EINVAL; > + } > + > + /* > + * Let's assume all data in device tree is from > + * CPU A7 point of view then we should translate > + * rmem->base into M4 da > + */ > + if (imx_rproc_sys_to_da(priv, rmem->base, rmem->size, &da)) { > + dev_err(dev, "memory region not valid %pa\n", > + &rmem->base); > + return -EINVAL; > + } > + > + if (strcmp(it.node->name, "vdev0buffer")) { > + /* Register memory region */ > + mem = rproc_mem_entry_init(dev, NULL, > + (dma_addr_t)rmem->base, > + rmem->size, da, > + imx_rproc_mem_alloc, > + imx_rproc_mem_release, > + it.node->name); > + > + if (mem) > + rproc_coredump_add_segment(rproc, da, > + rmem->size); > + } else { > + mem = rproc_of_resm_mem_entry_init(dev, index, > + rmem->size, > + rmem->base, > + it.node->name); > + } > + > + if (!mem) > + return -ENOMEM; > + > + rproc_add_carveout(rproc, mem); > + index++; > + } > + > + return rproc_elf_load_rsc_table(rproc, fw); > +} > + > static const struct rproc_ops imx_rproc_ops = { > .start = imx_rproc_start, > .stop = imx_rproc_stop, > .da_to_va = imx_rproc_da_to_va, > .kick = imx_rproc_kick, > + .load = rproc_elf_load_segments, > + .parse_fw = imx_rproc_parse_fw, > + .find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table, > + .sanity_check = rproc_elf_sanity_check, > .get_boot_addr = rproc_elf_get_boot_addr, > }; > > -- > 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 X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44783C2BA19 for ; Tue, 14 Apr 2020 17:46:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1F1572075E for ; Tue, 14 Apr 2020 17:46:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="YtNO9P2n" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2502600AbgDNRqv (ORCPT ); Tue, 14 Apr 2020 13:46:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41142 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S2502565AbgDNRqs (ORCPT ); Tue, 14 Apr 2020 13:46:48 -0400 Received: from mail-pj1-x1043.google.com (mail-pj1-x1043.google.com [IPv6:2607:f8b0:4864:20::1043]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2039FC061A0C for ; Tue, 14 Apr 2020 10:46:48 -0700 (PDT) Received: by mail-pj1-x1043.google.com with SMTP id o1so4693074pjs.4 for ; Tue, 14 Apr 2020 10:46:48 -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:user-agent; bh=uUqCLEUu2H6lIfzOkbWN7RXqGhP5oga/oBPmYfH4Jc4=; b=YtNO9P2nJRzVJ8hBQ5mtlbfJJloopvXLHBin+Ugrh/GQ81x0Cihhmo+01EpwxacrTZ LdLoIM5B3npC8XH+Ww9P9u3bg3PnWa+x7Ch7IUyiBFQKSc7c8CSRS15byzf3cJQP1MG/ 1Rpk21q0DdVF+HhHZ0OVvb624Lkv5N2A2x48bAiljEl6wohdfLdCtN4w2aWNXfucQVFJ ldxKUlND6Qk4k07NbHnsBLiI/p8oMQNHsiY4vaa71yBMfGY1qbyARBTAbm+IfkIKy+5p 5VVhupJNQjGE927s4hGvN5fXAYSUvrLdYDeU3NjBPgp3VwxvFCCP14lprV6FPuY/NMt8 4o5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=uUqCLEUu2H6lIfzOkbWN7RXqGhP5oga/oBPmYfH4Jc4=; b=QYVbAmlcBaOgVG/7Ahq5FMsiLyOgqET2ui3RJlENgc1wiJ7tpjvgeVsHlBCuDqDyJX yuVgqJcwPRJZt04bVddytFhzd6R2Nfmq6OaVDC68qInGb7C2Dk3+Skp0/6cyP8oxCFWU tUMRhB4WGQ+wxQzZ/Iky8PREZZIfLjTZ04PCg/9ugkbd2qZdA3oucVieXq1miUPzEc6t CAmZtqg4AyXN7TnZqrbAtJPj5yt6GlIMe9rklOA+UZs2Gn7JkAbV6RUudaIFGWQ8WHEU fC7L0com3bsZ0cyhxU4FoifNSf+dO0E/NH93FSrrc6AfYOgD/SskbgY8+N2qZUv64f5T i0wQ== X-Gm-Message-State: AGi0PubanV/PQFWRgYwC34nSjs1cuPzwYKadfyNvdoWJHFxmPOdkVMp0 SmoGWlhuX4zIOA0FGwnWC49m+w== X-Google-Smtp-Source: APiQypLLGfXEXNefPbevmRPO8sLymk0b/mFL5I49TZUSnnbR2+/ON5Bg4/ow29/RTFxpi8SAsxbUqg== X-Received: by 2002:a17:902:8641:: with SMTP id y1mr1073499plt.27.1586886407636; Tue, 14 Apr 2020 10:46:47 -0700 (PDT) Received: from xps15 (S0106002369de4dac.cg.shawcable.net. [68.147.8.254]) by smtp.gmail.com with ESMTPSA id m14sm10565619pgk.56.2020.04.14.10.46.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Apr 2020 10:46:46 -0700 (PDT) Date: Tue, 14 Apr 2020 11:46:44 -0600 From: Mathieu Poirier To: nikita.shubin@maquefel.me Cc: Nikita Shubin , Ohad Ben-Cohen , Bjorn Andersson , Shawn Guo , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , NXP Linux Team , linux-remoteproc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v2 3/3] remoteproc: imx_rproc: memory regions Message-ID: <20200414174644.GD24061@xps15> References: <20200304142628.8471-1-NShubin@topcon.com> <20200406113310.3041-1-nikita.shubin@maquefel.me> <20200406113310.3041-4-nikita.shubin@maquefel.me> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200406113310.3041-4-nikita.shubin@maquefel.me> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-remoteproc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-remoteproc@vger.kernel.org Message-ID: <20200414174644.D15psFsLJTytvOp9YV2s3t9fGQIuRP2tcVjK_uBXSew@z> On Mon, Apr 06, 2020 at 02:33:10PM +0300, nikita.shubin@maquefel.me wrote: > Add support for carveout memory regions required for vdev vring's and > buffer. > > Search in device tree and allocate memory regions like for ocram: > > vdev0vring0: vdev0vring0@00920000 { > compatible = "shared-dma-pool"; > reg = <0x00920000 0x2000>; > no-map; > }; > > vdev0vring1: vdev0vring1@00922000 { > compatible = "shared-dma-pool"; > reg = <0x00922000 0x2000>; > no-map; > }; > > vdev0buffer: vdev0buffer@00924000 { > compatible = "shared-dma-pool"; > reg = <0x00924000 0x4000>; > no-map; > }; > > imx7d-cm4 { > compatible = "fsl,imx7d-cm4"; > memory-region = <&ocram>, <&vdev0vring0>, <&vdev0vring1>, \ > <&vdev0buffer>; > } > > vdev0vring0, vdev0vring1, vdev0buffer are required for virtio > functioning. > > Signed-off-by: Nikita Shubin > --- > drivers/remoteproc/imx_rproc.c | 119 ++++++++++++++++++++++++++++++++- > 1 file changed, 118 insertions(+), 1 deletion(-) > > diff --git a/drivers/remoteproc/imx_rproc.c b/drivers/remoteproc/imx_rproc.c > index d2bede4ccb70..cdcff2bd2867 100644 > --- a/drivers/remoteproc/imx_rproc.c > +++ b/drivers/remoteproc/imx_rproc.c > @@ -11,6 +11,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -238,6 +239,29 @@ static int imx_rproc_da_to_sys(struct imx_rproc *priv, u64 da, > return -ENOENT; > } > > +static int imx_rproc_sys_to_da(struct imx_rproc *priv, u64 sys, > + int len, u64 *da) > +{ > + const struct imx_rproc_dcfg *dcfg = priv->dcfg; > + int i; > + > + /* parse address translation table */ > + for (i = 0; i < dcfg->att_size; i++) { > + const struct imx_rproc_att *att = &dcfg->att[i]; > + > + if (sys >= att->sa && sys + len <= att->sa + att->size) { > + unsigned int offset = sys - att->sa; > + > + *da = att->da + offset; > + return 0; > + } > + } > + > + dev_warn(priv->dev, "Translation failed: sys = 0x%llx len = 0x%x\n", > + sys, len); > + return -ENOENT; > +} > + > static void *imx_rproc_da_to_va(struct rproc *rproc, u64 da, int len) > { > struct imx_rproc *priv = rproc->priv; > @@ -372,16 +396,109 @@ static void imx_rproc_kick(struct rproc *rproc, int vqid) > err = mbox_send_message(ddata->mb[i].chan, &vqid); > if (err < 0) > dev_err(&rproc->dev, "%s: failed (%s, err:%d)\n", > - __func__, ddata->mb[i].name, err); > + __func__, ddata->mb[i].name, err); > return; > } > } > > +static int imx_rproc_mem_alloc(struct rproc *rproc, > + struct rproc_mem_entry *mem) > +{ > + struct device *dev = rproc->dev.parent; > + void *va; > + > + dev_dbg(dev, "map memory: %pa+%x\n", &mem->dma, mem->len); > + va = ioremap_wc(mem->dma, mem->len); > + if (IS_ERR_OR_NULL(va)) { > + dev_err(dev, "Unable to map memory region: %pa+%x\n", > + &mem->dma, mem->len); > + return -ENOMEM; > + } > + > + /* Update memory entry va */ > + mem->va = va; > + > + return 0; > +} > + > +static int imx_rproc_mem_release(struct rproc *rproc, > + struct rproc_mem_entry *mem) > +{ > + dev_dbg(rproc->dev.parent, "unmap memory: %pa\n", &mem->dma); > + iounmap(mem->va); > + > + return 0; > +} > + > +static int imx_rproc_parse_fw(struct rproc *rproc, const struct firmware *fw) > +{ > + struct imx_rproc *priv = rproc->priv; > + struct device *dev = rproc->dev.parent; > + struct device_node *np = dev->of_node; > + struct of_phandle_iterator it; > + struct rproc_mem_entry *mem = 0; > + struct reserved_mem *rmem; > + u64 da; > + int index = 0; > + > + /* Register associated reserved memory regions */ > + of_phandle_iterator_init(&it, np, "memory-region", NULL, 0); This will likely clash with the parsing done in imx_rproc_addr_init(), and the parsing in there will also clash with what is done below... I advise you to register carvouts in imx_rproc_addr_init() as you parse the rest of the memory regions. Thanks, Mathieu > + while (of_phandle_iterator_next(&it) == 0) { > + rmem = of_reserved_mem_lookup(it.node); > + if (!rmem) { > + dev_err(dev, "unable to acquire memory-region\n"); > + return -EINVAL; > + } > + > + /* > + * Let's assume all data in device tree is from > + * CPU A7 point of view then we should translate > + * rmem->base into M4 da > + */ > + if (imx_rproc_sys_to_da(priv, rmem->base, rmem->size, &da)) { > + dev_err(dev, "memory region not valid %pa\n", > + &rmem->base); > + return -EINVAL; > + } > + > + if (strcmp(it.node->name, "vdev0buffer")) { > + /* Register memory region */ > + mem = rproc_mem_entry_init(dev, NULL, > + (dma_addr_t)rmem->base, > + rmem->size, da, > + imx_rproc_mem_alloc, > + imx_rproc_mem_release, > + it.node->name); > + > + if (mem) > + rproc_coredump_add_segment(rproc, da, > + rmem->size); > + } else { > + mem = rproc_of_resm_mem_entry_init(dev, index, > + rmem->size, > + rmem->base, > + it.node->name); > + } > + > + if (!mem) > + return -ENOMEM; > + > + rproc_add_carveout(rproc, mem); > + index++; > + } > + > + return rproc_elf_load_rsc_table(rproc, fw); > +} > + > static const struct rproc_ops imx_rproc_ops = { > .start = imx_rproc_start, > .stop = imx_rproc_stop, > .da_to_va = imx_rproc_da_to_va, > .kick = imx_rproc_kick, > + .load = rproc_elf_load_segments, > + .parse_fw = imx_rproc_parse_fw, > + .find_loaded_rsc_table = rproc_elf_find_loaded_rsc_table, > + .sanity_check = rproc_elf_sanity_check, > .get_boot_addr = rproc_elf_get_boot_addr, > }; > > -- > 2.25.1 >