| Message ID | 20190612095521.4703-1-cleger@kalray.eu (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | remoteproc: recopy parent dma_pfn_offset for vdev | expand |
Hi Clement, > -----Original Message----- > From: linux-remoteproc-owner@vger.kernel.org <linux-remoteproc- > owner@vger.kernel.org> On Behalf Of Clement Leger > Sent: mercredi 12 juin 2019 11:55 > To: Ohad Ben-Cohen <ohad@wizery.com>; Bjorn Andersson > <bjorn.andersson@linaro.org>; linux-remoteproc <linux- > remoteproc@vger.kernel.org> > Cc: Clement Leger <cleger@kalray.eu> > Subject: [PATCH] remoteproc: recopy parent dma_pfn_offset for vdev > > When preparing the subdevice for the vdev, also copy dma_pfn_offset > since this is used for sub device dma allocations. Without that, there > is incoherency between the parent dma settings and the childs one, > potentially leading to dma_alloc_coherent failure (due to phys_to_dma > using dma_pfn_offset for translation). Thanks for this correction. Could you please add fixes in message commit Fixes: 086d08725d34 ("remoteproc: create vdev subdevice with specific dma memory pool") Else Acked-by: Loic Pallardy <loic.pallardy@st.com> Regards, Loic > --- > drivers/remoteproc/remoteproc_core.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/remoteproc/remoteproc_core.c > b/drivers/remoteproc/remoteproc_core.c > index 263e9c9614a8..3b56ca043231 100644 > --- a/drivers/remoteproc/remoteproc_core.c > +++ b/drivers/remoteproc/remoteproc_core.c > @@ -520,6 +520,7 @@ static int rproc_handle_vdev(struct rproc *rproc, > struct fw_rsc_vdev *rsc, > /* Initialise vdev subdevice */ > snprintf(name, sizeof(name), "vdev%dbuffer", rvdev->index); > rvdev->dev.parent = rproc->dev.parent; > + rvdev->dev.dma_pfn_offset = rproc->dev.parent->dma_pfn_offset; > rvdev->dev.release = rproc_rvdev_release; > dev_set_name(&rvdev->dev, "%s#%s", dev_name(rvdev- > >dev.parent), name); > dev_set_drvdata(&rvdev->dev, rvdev); > -- > 2.15.0.276.g89ea799
On Wed 12 Jun 02:55 PDT 2019, Clement Leger wrote: > When preparing the subdevice for the vdev, also copy dma_pfn_offset > since this is used for sub device dma allocations. Without that, there > is incoherency between the parent dma settings and the childs one, > potentially leading to dma_alloc_coherent failure (due to phys_to_dma > using dma_pfn_offset for translation). Hi Clement, This looks reasonable, but I can't merge it without your Signed-off-by. Can you please resubmit the change, with the Fixes: and Loic's ack? Regards, Bjorn > --- > drivers/remoteproc/remoteproc_core.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c > index 263e9c9614a8..3b56ca043231 100644 > --- a/drivers/remoteproc/remoteproc_core.c > +++ b/drivers/remoteproc/remoteproc_core.c > @@ -520,6 +520,7 @@ static int rproc_handle_vdev(struct rproc *rproc, struct fw_rsc_vdev *rsc, > /* Initialise vdev subdevice */ > snprintf(name, sizeof(name), "vdev%dbuffer", rvdev->index); > rvdev->dev.parent = rproc->dev.parent; > + rvdev->dev.dma_pfn_offset = rproc->dev.parent->dma_pfn_offset; > rvdev->dev.release = rproc_rvdev_release; > dev_set_name(&rvdev->dev, "%s#%s", dev_name(rvdev->dev.parent), name); > dev_set_drvdata(&rvdev->dev, rvdev); > -- > 2.15.0.276.g89ea799 >
diff --git a/drivers/remoteproc/remoteproc_core.c b/drivers/remoteproc/remoteproc_core.c index 263e9c9614a8..3b56ca043231 100644 --- a/drivers/remoteproc/remoteproc_core.c +++ b/drivers/remoteproc/remoteproc_core.c @@ -520,6 +520,7 @@ static int rproc_handle_vdev(struct rproc *rproc, struct fw_rsc_vdev *rsc, /* Initialise vdev subdevice */ snprintf(name, sizeof(name), "vdev%dbuffer", rvdev->index); rvdev->dev.parent = rproc->dev.parent; + rvdev->dev.dma_pfn_offset = rproc->dev.parent->dma_pfn_offset; rvdev->dev.release = rproc_rvdev_release; dev_set_name(&rvdev->dev, "%s#%s", dev_name(rvdev->dev.parent), name); dev_set_drvdata(&rvdev->dev, rvdev);