All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eric Farman <farman@linux.ibm.com>
To: Cornelia Huck <cohuck@redhat.com>
Cc: Halil Pasic <pasic@linux.ibm.com>,
	Jason Herne <jjherne@linux.ibm.com>,
	Jared Rossi <jrossi@linux.ibm.com>,
	Eric Farman <farman@linux.ibm.com>,
	linux-s390@vger.kernel.org, kvm@vger.kernel.org
Subject: [RFC PATCH v2 6/9] vfio-ccw: Refactor IRQ handlers
Date: Thu,  6 Feb 2020 22:38:22 +0100	[thread overview]
Message-ID: <20200206213825.11444-7-farman@linux.ibm.com> (raw)
In-Reply-To: <20200206213825.11444-1-farman@linux.ibm.com>

To simplify future expansion.

Signed-off-by: Eric Farman <farman@linux.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
---

Notes:
    v1->v2:
     - Add Conny's r-b

 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 edec0fb7ace8..f3033f8fc96d 100644
--- a/drivers/s390/cio/vfio_ccw_ops.c
+++ b/drivers/s390/cio/vfio_ccw_ops.c
@@ -391,17 +391,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;
@@ -411,7 +415,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:
@@ -583,7 +594,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.17.1

  parent reply	other threads:[~2020-02-06 21:38 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-06 21:38 [RFC PATCH v2 0/9] s390x/vfio-ccw: Channel Path Handling Eric Farman
2020-02-06 21:38 ` [RFC PATCH v2 1/9] vfio-ccw: Introduce new helper functions to free/destroy regions Eric Farman
2020-02-06 21:38 ` [RFC PATCH v2 2/9] vfio-ccw: Register a chp_event callback for vfio-ccw Eric Farman
2020-02-14 12:11   ` Cornelia Huck
2020-02-14 16:35     ` Eric Farman
2020-03-24 15:58       ` Cornelia Huck
2020-03-26  2:09         ` Eric Farman
2020-03-26  6:47           ` Cornelia Huck
2020-03-26 11:54             ` Eric Farman
2020-02-06 21:38 ` [RFC PATCH v2 3/9] vfio-ccw: Refactor the unregister of the async regions Eric Farman
2020-02-06 21:38 ` [RFC PATCH v2 4/9] vfio-ccw: Introduce a new schib region Eric Farman
2020-02-14 12:32   ` Cornelia Huck
2020-02-14 14:29     ` Eric Farman
2020-02-06 21:38 ` [RFC PATCH v2 5/9] vfio-ccw: Introduce a new CRW region Eric Farman
2020-04-06 13:40   ` Cornelia Huck
2020-04-06 21:43     ` Eric Farman
2020-04-07  6:30       ` Cornelia Huck
2020-02-06 21:38 ` Eric Farman [this message]
2020-02-06 21:38 ` [RFC PATCH v2 7/9] vfio-ccw: Wire up the CRW irq and " Eric Farman
2020-02-14 13:34   ` Cornelia Huck
2020-02-14 16:24     ` Eric Farman
2020-03-24 16:34       ` Cornelia Huck
2020-03-26 18:51         ` Eric Farman
2020-04-06 13:52   ` Cornelia Huck
2020-04-06 22:11     ` Eric Farman
2020-02-06 21:38 ` [RFC PATCH v2 8/9] vfio-ccw: Add trace for CRW event Eric Farman
2020-02-06 21:38 ` [RFC PATCH v2 9/9] vfio-ccw: Remove inline get_schid() routine Eric Farman
2020-02-14 13:27   ` Cornelia Huck
2020-02-14 14:27     ` Eric Farman
2020-02-07  9:12 ` [RFC PATCH v2 0/9] s390x/vfio-ccw: Channel Path Handling Cornelia Huck
2020-02-07 13:26   ` Eric Farman

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=20200206213825.11444-7-farman@linux.ibm.com \
    --to=farman@linux.ibm.com \
    --cc=cohuck@redhat.com \
    --cc=jjherne@linux.ibm.com \
    --cc=jrossi@linux.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 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.