From: Cornelia Huck <cohuck@redhat.com>
To: Heiko Carstens <heiko.carstens@de.ibm.com>,
Vasily Gorbik <gor@linux.ibm.com>,
Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Eric Farman <farman@linux.ibm.com>,
Halil Pasic <pasic@linux.ibm.com>,
linux-s390@vger.kernel.org, kvm@vger.kernel.org,
Cornelia Huck <cohuck@redhat.com>
Subject: [PULL 07/10] vfio-ccw: Refactor IRQ handlers
Date: Mon, 25 May 2020 11:41:12 +0200 [thread overview]
Message-ID: <20200525094115.222299-8-cohuck@redhat.com> (raw)
In-Reply-To: <20200525094115.222299-1-cohuck@redhat.com>
From: Eric Farman <farman@linux.ibm.com>
To simplify future expansion.
Signed-off-by: Eric Farman <farman@linux.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Message-Id: <20200505122745.53208-6-farman@linux.ibm.com>
Signed-off-by: Cornelia Huck <cohuck@redhat.com>
---
drivers/s390/cio/vfio_ccw_ops.c | 23 +++++++++++++++++------
1 file changed, 17 insertions(+), 6 deletions(-)
diff --git a/drivers/s390/cio/vfio_ccw_ops.c b/drivers/s390/cio/vfio_ccw_ops.c
index 22988d67b6bb..c3a74ab7bb86 100644
--- a/drivers/s390/cio/vfio_ccw_ops.c
+++ b/drivers/s390/cio/vfio_ccw_ops.c
@@ -387,17 +387,21 @@ static int vfio_ccw_mdev_get_region_info(struct vfio_region_info *info,
static int vfio_ccw_mdev_get_irq_info(struct vfio_irq_info *info)
{
- if (info->index != VFIO_CCW_IO_IRQ_INDEX)
+ switch (info->index) {
+ case VFIO_CCW_IO_IRQ_INDEX:
+ info->count = 1;
+ info->flags = VFIO_IRQ_INFO_EVENTFD;
+ break;
+ default:
return -EINVAL;
-
- info->count = 1;
- info->flags = VFIO_IRQ_INFO_EVENTFD;
+ }
return 0;
}
static int vfio_ccw_mdev_set_irqs(struct mdev_device *mdev,
uint32_t flags,
+ uint32_t index,
void __user *data)
{
struct vfio_ccw_private *private;
@@ -407,7 +411,14 @@ static int vfio_ccw_mdev_set_irqs(struct mdev_device *mdev,
return -EINVAL;
private = dev_get_drvdata(mdev_parent_dev(mdev));
- ctx = &private->io_trigger;
+
+ switch (index) {
+ case VFIO_CCW_IO_IRQ_INDEX:
+ ctx = &private->io_trigger;
+ break;
+ default:
+ return -EINVAL;
+ }
switch (flags & VFIO_IRQ_SET_DATA_TYPE_MASK) {
case VFIO_IRQ_SET_DATA_NONE:
@@ -579,7 +590,7 @@ static ssize_t vfio_ccw_mdev_ioctl(struct mdev_device *mdev,
return ret;
data = (void __user *)(arg + minsz);
- return vfio_ccw_mdev_set_irqs(mdev, hdr.flags, data);
+ return vfio_ccw_mdev_set_irqs(mdev, hdr.flags, hdr.index, data);
}
case VFIO_DEVICE_RESET:
return vfio_ccw_mdev_reset(mdev);
--
2.25.4
next prev parent reply other threads:[~2020-05-25 9:41 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-25 9:41 [PULL 00/10] vfio-ccw patches for 5.8 Cornelia Huck
2020-05-25 9:41 ` [PULL 01/10] vfio-ccw: Enable transparent CCW IPL from DASD Cornelia Huck
2020-05-25 9:41 ` [PULL 02/10] vfio-ccw: document possible errors Cornelia Huck
2020-05-25 9:41 ` [PULL 03/10] vfio-ccw: Introduce new helper functions to free/destroy regions Cornelia Huck
2020-05-25 9:41 ` [PULL 04/10] vfio-ccw: Register a chp_event callback for vfio-ccw Cornelia Huck
2020-05-25 9:41 ` [PULL 05/10] vfio-ccw: Refactor the unregister of the async regions Cornelia Huck
2020-05-25 9:41 ` [PULL 06/10] vfio-ccw: Introduce a new schib region Cornelia Huck
2020-05-25 9:41 ` Cornelia Huck [this message]
2020-05-25 9:41 ` [PULL 08/10] vfio-ccw: Introduce a new CRW region Cornelia Huck
2020-06-02 13:13 ` Cornelia Huck
2020-06-02 14:46 ` Eric Farman
2020-06-02 15:34 ` Cornelia Huck
2020-05-25 9:41 ` [PULL 09/10] vfio-ccw: Wire up the CRW irq and " Cornelia Huck
2020-05-25 9:41 ` [PULL 10/10] vfio-ccw: Add trace for CRW event Cornelia Huck
2020-05-28 12:42 ` [PULL 00/10] vfio-ccw patches for 5.8 Vasily Gorbik
2020-05-28 14:22 ` Cornelia Huck
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=20200525094115.222299-8-cohuck@redhat.com \
--to=cohuck@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=farman@linux.ibm.com \
--cc=gor@linux.ibm.com \
--cc=heiko.carstens@de.ibm.com \
--cc=kvm@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=pasic@linux.ibm.com \
/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