LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: Rusty Russell <rusty@rustcorp.com.au>,
	virtualization@lists.linux-foundation.org
Subject: [PATCH v2 01/10] virtio_pci: add isr field
Date: Mon, 8 Dec 2014 17:16:35 +0200	[thread overview]
Message-ID: <1418051779-27748-2-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1418051779-27748-1-git-send-email-mst@redhat.com>

Use isr field instead of direct access to ioaddr.
This way generalizes easily to virtio 1.0.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 drivers/virtio/virtio_pci.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/virtio/virtio_pci.c b/drivers/virtio/virtio_pci.c
index 9be59d9..ee1b54c 100644
--- a/drivers/virtio/virtio_pci.c
+++ b/drivers/virtio/virtio_pci.c
@@ -40,6 +40,9 @@ struct virtio_pci_device
 	/* the IO mapping for the PCI config space */
 	void __iomem *ioaddr;
 
+	/* the IO mapping for ISR operation */
+	void __iomem *isr;
+
 	/* a list of queues so we can dispatch IRQs */
 	spinlock_t lock;
 	struct list_head virtqueues;
@@ -248,7 +251,7 @@ static irqreturn_t vp_interrupt(int irq, void *opaque)
 
 	/* reading the ISR has the effect of also clearing it so it's very
 	 * important to save off the value. */
-	isr = ioread8(vp_dev->ioaddr + VIRTIO_PCI_ISR);
+	isr = ioread8(vp_dev->isr);
 
 	/* It's definitely not us if the ISR was not high */
 	if (!isr)
@@ -719,6 +722,8 @@ static int virtio_pci_probe(struct pci_dev *pci_dev,
 		goto out_req_regions;
 	}
 
+	vp_dev->isr = vp_dev->ioaddr + VIRTIO_PCI_ISR;
+
 	pci_set_drvdata(pci_dev, vp_dev);
 	pci_set_master(pci_dev);
 
-- 
MST


  reply	other threads:[~2014-12-08 15:16 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-12-08 15:16 [PATCH v2 00/10] virtio_pci: split out legacy device support Michael S. Tsirkin
2014-12-08 15:16 ` Michael S. Tsirkin [this message]
2014-12-08 15:16 ` [PATCH v2 02/10] virtio_pci: fix coding style for structs Michael S. Tsirkin
2014-12-08 15:16 ` [PATCH v2 03/10] virtio_pci: free up vq->priv Michael S. Tsirkin
2014-12-08 15:16 ` [PATCH v2 04/10] virtio_pci: use priv for vq notification Michael S. Tsirkin
2014-12-08 15:16 ` [PATCH v2 05/10] virtio_pci: delete vqs indirectly Michael S. Tsirkin
2014-12-08 15:16 ` [PATCH v2 06/10] virtio_pci: setup " Michael S. Tsirkin
2014-12-08 15:16 ` [PATCH v2 07/10] virtio_pci: setup config vector indirectly Michael S. Tsirkin
2014-12-08 15:16 ` [PATCH v2 08/10] virtio_pci: split out legacy device support Michael S. Tsirkin
2014-12-08 15:16 ` [PATCH v2 09/10] virtio_pci: update file descriptions and copyright Michael S. Tsirkin
2014-12-08 15:16 ` [PATCH v2 10/10] virtio_pci: rename virtio_pci -> virtio_pci_common Michael S. Tsirkin

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=1418051779-27748-2-git-send-email-mst@redhat.com \
    --to=mst@redhat.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rusty@rustcorp.com.au \
    --cc=virtualization@lists.linux-foundation.org \
    --subject='Re: [PATCH v2 01/10] virtio_pci: add isr field' \
    /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

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).