From: Sherry Sun <sherry.sun@nxp.com>
To: Greg KH <gregkh@linuxfoundation.org>
Cc: "sudeep.dutt@intel.com" <sudeep.dutt@intel.com>,
"ashutosh.dixit@intel.com" <ashutosh.dixit@intel.com>,
"arnd@arndb.de" <arnd@arndb.de>,
"wang.yi59@zte.com.cn" <wang.yi59@zte.com.cn>,
"rikard.falkeborn@gmail.com" <rikard.falkeborn@gmail.com>,
"lee.jones@linaro.org" <lee.jones@linaro.org>,
"mst@redhat.com" <mst@redhat.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
dl-linux-imx <linux-imx@nxp.com>
Subject: RE: [PATCH 3/5] misc: vop: simply return the saved dma address instead of virt_to_phys
Date: Sun, 27 Sep 2020 07:23:47 +0000 [thread overview]
Message-ID: <VI1PR04MB49602F8604E8D5048058A20692340@VI1PR04MB4960.eurprd04.prod.outlook.com> (raw)
In-Reply-To: <20200925121729.GC2680110@kroah.com>
Hi Greg,
> -----Original Message-----
> On Fri, Sep 25, 2020 at 03:26:28PM +0800, Sherry Sun wrote:
> > For noncoherent platform, the device page and vring should allocated
> > by dma_alloc_coherent, when user space wants to get its physical
> > address, virt_to_phys cannot be used, should simply return the saved
> > device page dma address by get_dp_dma callback and the vring dma
> > address saved in mic_vqconfig.
> >
> > Signed-off-by: Sherry Sun <sherry.sun@nxp.com>
> > Signed-off-by: Joakim Zhang <qiangqing.zhang@nxp.com>
> > ---
> > drivers/misc/mic/bus/vop_bus.h | 2 ++
> > drivers/misc/mic/host/mic_boot.c | 8 ++++++++
> > drivers/misc/mic/vop/vop_vringh.c | 12 ++++++++++--
> > 3 files changed, 20 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/misc/mic/bus/vop_bus.h
> > b/drivers/misc/mic/bus/vop_bus.h index 4fa02808c1e2..d891eacae358
> > 100644
> > --- a/drivers/misc/mic/bus/vop_bus.h
> > +++ b/drivers/misc/mic/bus/vop_bus.h
> > @@ -75,6 +75,7 @@ struct vop_driver {
> > * node to add/remove/configure virtio devices.
> > * @get_dp: Get access to the virtio device page used by the self
> > * node to add/remove/configure virtio devices.
> > + * @get_dp_dma: Get dma address of the virtio device page.
> > * @send_intr: Send an interrupt to the peer node on a specified doorbell.
> > * @remap: Map a buffer with the specified DMA address and length.
> > * @unmap: Unmap a buffer previously mapped.
> > @@ -92,6 +93,7 @@ struct vop_hw_ops {
> > void (*ack_interrupt)(struct vop_device *vpdev, int num);
> > void __iomem * (*get_remote_dp)(struct vop_device *vpdev);
> > void * (*get_dp)(struct vop_device *vpdev);
> > + dma_addr_t (*get_dp_dma)(struct vop_device *vpdev);
> > void (*send_intr)(struct vop_device *vpdev, int db);
> > void __iomem * (*remap)(struct vop_device *vpdev,
> > dma_addr_t pa, size_t len);
> > diff --git a/drivers/misc/mic/host/mic_boot.c
> > b/drivers/misc/mic/host/mic_boot.c
> > index fb5b3989753d..ced03662cd8f 100644
> > --- a/drivers/misc/mic/host/mic_boot.c
> > +++ b/drivers/misc/mic/host/mic_boot.c
> > @@ -88,6 +88,13 @@ static void *__mic_get_dp(struct vop_device *vpdev)
> > return mdev->dp;
> > }
> >
> > +static dma_addr_t __mic_get_dp_dma(struct vop_device *vpdev) {
> > + struct mic_device *mdev = vpdev_to_mdev(&vpdev->dev);
> > +
> > + return mdev->dp_dma_addr;
> > +}
> > +
> > static void __iomem *__mic_get_remote_dp(struct vop_device *vpdev) {
> > return NULL;
> > @@ -119,6 +126,7 @@ static struct vop_hw_ops vop_hw_ops = {
> > .ack_interrupt = __mic_ack_interrupt,
> > .next_db = __mic_next_db,
> > .get_dp = __mic_get_dp,
> > + .get_dp_dma = __mic_get_dp_dma,
> > .get_remote_dp = __mic_get_remote_dp,
> > .send_intr = __mic_send_intr,
> > .remap = __mic_ioremap,
> > diff --git a/drivers/misc/mic/vop/vop_vringh.c
> > b/drivers/misc/mic/vop/vop_vringh.c
> > index fc8d8ff9ded3..aa2dd240c11e 100644
> > --- a/drivers/misc/mic/vop/vop_vringh.c
> > +++ b/drivers/misc/mic/vop/vop_vringh.c
> > @@ -1076,6 +1076,7 @@ vop_query_offset(struct vop_vdev *vdev,
> unsigned long offset,
> > unsigned long *size, unsigned long *pa) {
> > struct vop_device *vpdev = vdev->vpdev;
> > + struct mic_vqconfig *vqconfig = mic_vq_config(vdev->dd);
> > unsigned long start = MIC_DP_SIZE;
> > int i;
> >
> > @@ -1088,7 +1089,14 @@ vop_query_offset(struct vop_vdev *vdev,
> unsigned long offset,
> > * ....
> > */
> > if (!offset) {
> > - *pa = virt_to_phys(vpdev->hw_ops->get_dp(vpdev));
> > + if (vpdev->hw_ops->get_dp_dma)
> > + *pa = vpdev->hw_ops->get_dp_dma(vpdev);
> > + else {
> > + dev_err(vop_dev(vdev), "can't get device page
> physical address\n");
> > + WARN_ON(1);
>
> Don't crash kernels that have panic_on_warn set for things you can recover
> from.
>
Do you mean that we should avoid to use WARN_ON here?
> > + return -1;
>
> Use a real error value, do not make them up.
Ok, will change it. Thanks.
Best regards
Sherry
>
> thanks,
>
> greg k-h
next prev parent reply other threads:[~2020-09-27 7:23 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-25 7:26 [PATCH 0/5] Add noncoherent platform support for vop driver Sherry Sun
2020-09-25 7:26 ` [PATCH 1/5] misc: vop: change the way of allocating vring for noncoherent platform Sherry Sun
2020-09-25 12:16 ` Greg KH
2020-09-27 7:06 ` Sherry Sun
2020-09-26 7:50 ` Christoph Hellwig
2020-09-27 7:58 ` Sherry Sun
2020-09-28 6:09 ` Christoph Hellwig
2020-09-28 10:10 ` Sherry Sun
2020-09-25 7:26 ` [PATCH 2/5] misc: vop: change the way of allocating used ring Sherry Sun
2020-09-25 7:26 ` [PATCH 3/5] misc: vop: simply return the saved dma address instead of virt_to_phys Sherry Sun
2020-09-25 12:17 ` Greg KH
2020-09-27 7:23 ` Sherry Sun [this message]
2020-09-25 7:26 ` [PATCH 4/5] misc: vop: set VIRTIO_F_ACCESS_PLATFORM for nocoherent platform Sherry Sun
2020-09-25 12:16 ` Greg KH
2020-09-27 7:20 ` Sherry Sun
2020-09-26 7:51 ` Christoph Hellwig
2020-09-27 8:05 ` Sherry Sun
2020-09-28 6:09 ` Christoph Hellwig
2020-09-28 9:57 ` Sherry Sun
2020-09-25 7:26 ` [PATCH 5/5] misc: vop: mapping kernel memory to user space as noncached Sherry Sun
2020-09-25 11:25 ` [PATCH 0/5] Add noncoherent platform support for vop driver Arnd Bergmann
2020-09-27 5:07 ` Sherry Sun
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=VI1PR04MB49602F8604E8D5048058A20692340@VI1PR04MB4960.eurprd04.prod.outlook.com \
--to=sherry.sun@nxp.com \
--cc=arnd@arndb.de \
--cc=ashutosh.dixit@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=lee.jones@linaro.org \
--cc=linux-imx@nxp.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mst@redhat.com \
--cc=rikard.falkeborn@gmail.com \
--cc=sudeep.dutt@intel.com \
--cc=wang.yi59@zte.com.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).