From: Eric Auger <eric.auger@linaro.org> To: Sinan Kaya <okaya@codeaurora.org>, kvm@vger.kernel.org, timur@codeaurora.org, cov@codeaurora.org, jcm@redhat.com Cc: linux-acpi@vger.kernel.org, agross@codeaurora.org, linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Baptiste Reynal <b.reynal@virtualopensystems.com>, Alex Williamson <alex.williamson@redhat.com>, linux-kernel@vger.kernel.org Subject: Re: [PATCH V5 2/6] vfio: platform: move reset call to a common function Date: Mon, 23 May 2016 15:02:17 +0200 [thread overview] Message-ID: <5742FF59.6090108@linaro.org> (raw) In-Reply-To: <1463364819-477-3-git-send-email-okaya@codeaurora.org> Hi Sinan, On 05/16/2016 04:13 AM, Sinan Kaya wrote: > The reset call sequence seems to replicate itself multiple times > across the file. Grouping them together for maintenance reasons. > > Signed-off-by: Sinan Kaya <okaya@codeaurora.org> > --- > drivers/vfio/platform/vfio_platform_common.c | 31 ++++++++++++++-------------- > 1 file changed, 15 insertions(+), 16 deletions(-) > > diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c > index 08fd7c2..cb91dd3 100644 > --- a/drivers/vfio/platform/vfio_platform_common.c > +++ b/drivers/vfio/platform/vfio_platform_common.c > @@ -134,6 +134,18 @@ static void vfio_platform_regions_cleanup(struct vfio_platform_device *vdev) > kfree(vdev->regions); > } > > +static int vfio_platform_call_reset(struct vfio_platform_device *vdev) > +{ > + if (vdev->of_reset) { > + dev_info(vdev->device, "reset\n"); > + vdev->of_reset(vdev); > + return 0; you should return vdev->of_reset(vdev) to keep the existing VFIO_DEVICE_RESET ioctl behavior Once fixed, Reviewed-by: Eric Auger <eric.auger@linaro.org> Besides, but this goes beyond the scope of your series, maybe we should reconsider in the future what happens in case the reset fails on open/release. Best Regards Eric > + } > + > + dev_warn(vdev->device, "no reset function found!\n"); > + return -EINVAL; > +} > + > static void vfio_platform_release(void *device_data) > { > struct vfio_platform_device *vdev = device_data; > @@ -141,12 +153,7 @@ static void vfio_platform_release(void *device_data) > mutex_lock(&driver_lock); > > if (!(--vdev->refcnt)) { > - if (vdev->of_reset) { > - dev_info(vdev->device, "reset\n"); > - vdev->of_reset(vdev); > - } else { > - dev_warn(vdev->device, "no reset function found!\n"); > - } > + vfio_platform_call_reset(vdev); > vfio_platform_regions_cleanup(vdev); > vfio_platform_irq_cleanup(vdev); > } > @@ -175,12 +182,7 @@ static int vfio_platform_open(void *device_data) > if (ret) > goto err_irq; > > - if (vdev->of_reset) { > - dev_info(vdev->device, "reset\n"); > - vdev->of_reset(vdev); > - } else { > - dev_warn(vdev->device, "no reset function found!\n"); > - } > + vfio_platform_call_reset(vdev); > } > > vdev->refcnt++; > @@ -312,10 +314,7 @@ static long vfio_platform_ioctl(void *device_data, > return ret; > > } else if (cmd == VFIO_DEVICE_RESET) { > - if (vdev->of_reset) > - return vdev->of_reset(vdev); > - else > - return -EINVAL; > + return vfio_platform_call_reset(vdev); > } > > return -ENOTTY; >
WARNING: multiple messages have this Message-ID (diff)
From: eric.auger@linaro.org (Eric Auger) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH V5 2/6] vfio: platform: move reset call to a common function Date: Mon, 23 May 2016 15:02:17 +0200 [thread overview] Message-ID: <5742FF59.6090108@linaro.org> (raw) In-Reply-To: <1463364819-477-3-git-send-email-okaya@codeaurora.org> Hi Sinan, On 05/16/2016 04:13 AM, Sinan Kaya wrote: > The reset call sequence seems to replicate itself multiple times > across the file. Grouping them together for maintenance reasons. > > Signed-off-by: Sinan Kaya <okaya@codeaurora.org> > --- > drivers/vfio/platform/vfio_platform_common.c | 31 ++++++++++++++-------------- > 1 file changed, 15 insertions(+), 16 deletions(-) > > diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c > index 08fd7c2..cb91dd3 100644 > --- a/drivers/vfio/platform/vfio_platform_common.c > +++ b/drivers/vfio/platform/vfio_platform_common.c > @@ -134,6 +134,18 @@ static void vfio_platform_regions_cleanup(struct vfio_platform_device *vdev) > kfree(vdev->regions); > } > > +static int vfio_platform_call_reset(struct vfio_platform_device *vdev) > +{ > + if (vdev->of_reset) { > + dev_info(vdev->device, "reset\n"); > + vdev->of_reset(vdev); > + return 0; you should return vdev->of_reset(vdev) to keep the existing VFIO_DEVICE_RESET ioctl behavior Once fixed, Reviewed-by: Eric Auger <eric.auger@linaro.org> Besides, but this goes beyond the scope of your series, maybe we should reconsider in the future what happens in case the reset fails on open/release. Best Regards Eric > + } > + > + dev_warn(vdev->device, "no reset function found!\n"); > + return -EINVAL; > +} > + > static void vfio_platform_release(void *device_data) > { > struct vfio_platform_device *vdev = device_data; > @@ -141,12 +153,7 @@ static void vfio_platform_release(void *device_data) > mutex_lock(&driver_lock); > > if (!(--vdev->refcnt)) { > - if (vdev->of_reset) { > - dev_info(vdev->device, "reset\n"); > - vdev->of_reset(vdev); > - } else { > - dev_warn(vdev->device, "no reset function found!\n"); > - } > + vfio_platform_call_reset(vdev); > vfio_platform_regions_cleanup(vdev); > vfio_platform_irq_cleanup(vdev); > } > @@ -175,12 +182,7 @@ static int vfio_platform_open(void *device_data) > if (ret) > goto err_irq; > > - if (vdev->of_reset) { > - dev_info(vdev->device, "reset\n"); > - vdev->of_reset(vdev); > - } else { > - dev_warn(vdev->device, "no reset function found!\n"); > - } > + vfio_platform_call_reset(vdev); > } > > vdev->refcnt++; > @@ -312,10 +314,7 @@ static long vfio_platform_ioctl(void *device_data, > return ret; > > } else if (cmd == VFIO_DEVICE_RESET) { > - if (vdev->of_reset) > - return vdev->of_reset(vdev); > - else > - return -EINVAL; > + return vfio_platform_call_reset(vdev); > } > > return -ENOTTY; >
next prev parent reply other threads:[~2016-05-23 13:02 UTC|newest] Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-05-16 2:13 [PATCH V5 0/6] vfio, platform: add ACPI support Sinan Kaya 2016-05-16 2:13 ` Sinan Kaya 2016-05-16 2:13 ` [PATCH V5 1/6] vfio: platform: rename reset function Sinan Kaya 2016-05-16 2:13 ` Sinan Kaya 2016-05-16 2:13 ` Sinan Kaya 2016-05-23 12:52 ` Eric Auger 2016-05-23 12:52 ` Eric Auger 2016-05-16 2:13 ` [PATCH V5 2/6] vfio: platform: move reset call to a common function Sinan Kaya 2016-05-16 2:13 ` Sinan Kaya 2016-05-23 13:02 ` Eric Auger [this message] 2016-05-23 13:02 ` Eric Auger 2016-05-24 2:14 ` Sinan Kaya 2016-05-24 2:14 ` Sinan Kaya 2016-05-16 2:13 ` [PATCH V5 3/6] vfio: platform: determine reset capability Sinan Kaya 2016-05-16 2:13 ` Sinan Kaya 2016-05-16 2:13 ` Sinan Kaya 2016-05-23 13:16 ` Eric Auger 2016-05-23 13:16 ` Eric Auger 2016-05-16 2:13 ` [PATCH V5 4/6] vfio: platform: add support for ACPI probe Sinan Kaya 2016-05-16 2:13 ` Sinan Kaya 2016-05-23 13:18 ` Eric Auger 2016-05-23 13:18 ` Eric Auger 2016-05-24 2:18 ` Sinan Kaya 2016-05-24 2:18 ` Sinan Kaya 2016-06-07 16:33 ` Auger Eric 2016-06-07 16:33 ` Auger Eric 2016-06-07 16:33 ` Auger Eric 2016-05-16 2:13 ` [PATCH V5 5/6] vfio: platform: call _RST method when using ACPI Sinan Kaya 2016-05-16 2:13 ` Sinan Kaya 2016-05-23 14:41 ` Eric Auger 2016-05-23 14:41 ` Eric Auger 2016-05-24 2:23 ` Sinan Kaya 2016-05-24 2:23 ` Sinan Kaya 2016-05-23 15:21 ` Eric Auger 2016-05-23 15:21 ` Eric Auger 2016-05-24 2:25 ` Sinan Kaya 2016-05-24 2:25 ` Sinan Kaya 2016-05-16 2:13 ` [PATCH V5 6/6] vfio, platform: make reset driver a requirement by default Sinan Kaya 2016-05-16 2:13 ` Sinan Kaya 2016-05-23 15:20 ` Eric Auger 2016-05-23 15:20 ` Eric Auger
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=5742FF59.6090108@linaro.org \ --to=eric.auger@linaro.org \ --cc=agross@codeaurora.org \ --cc=alex.williamson@redhat.com \ --cc=b.reynal@virtualopensystems.com \ --cc=cov@codeaurora.org \ --cc=jcm@redhat.com \ --cc=kvm@vger.kernel.org \ --cc=linux-acpi@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=okaya@codeaurora.org \ --cc=timur@codeaurora.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.