diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2014-12-02 14:35:27 +0200 |
|---|---|---|
| committer | Michael S. Tsirkin <mst@redhat.com> | 2014-12-09 21:42:00 +0200 |
| commit | af535722f8f2ff057dc676ca3f0a99612cd6b02e (patch) | |
| tree | cbb10af471c6287b04ebfd474befe9b4bd66e1d5 /drivers/virtio/virtio_pci.c | |
| parent | d71a6fc6b97fba1de999c6f0fab5c75544afab76 (diff) | |
| download | op-kernel-dev-af535722f8f2ff057dc676ca3f0a99612cd6b02e.zip op-kernel-dev-af535722f8f2ff057dc676ca3f0a99612cd6b02e.tar.gz | |
virtio_pci: add isr field
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>
Diffstat (limited to 'drivers/virtio/virtio_pci.c')
| -rw-r--r-- | drivers/virtio/virtio_pci.c | 7 |
1 files changed, 6 insertions, 1 deletions
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); |
