[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/43] hw/vfio: set interrupts using pci irq wrappers
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL 08/43] hw/vfio: set interrupts using pci irq wrappers |
Date: |
Mon, 14 Oct 2013 17:58:17 +0300 |
From: Marcel Apfelbaum <address@hidden>
pci_set_irq and the other pci irq wrappers use
PCI_INTERRUPT_PIN config register to compute device
INTx pin to assert/deassert.
save INTX pin into the config register before calling
pci_set_irq
Signed-off-by: Marcel Apfelbaum <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
hw/misc/vfio.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/hw/misc/vfio.c b/hw/misc/vfio.c
index a1c08fb..9d02e49 100644
--- a/hw/misc/vfio.c
+++ b/hw/misc/vfio.c
@@ -297,7 +297,7 @@ static void vfio_intx_interrupt(void *opaque)
'A' + vdev->intx.pin);
vdev->intx.pending = true;
- qemu_set_irq(vdev->pdev.irq[vdev->intx.pin], 1);
+ pci_irq_assert(&vdev->pdev);
vfio_mmap_set_enabled(vdev, false);
if (vdev->intx.mmap_timeout) {
timer_mod(vdev->intx.mmap_timer,
@@ -315,7 +315,7 @@ static void vfio_eoi(VFIODevice *vdev)
vdev->host.bus, vdev->host.slot, vdev->host.function);
vdev->intx.pending = false;
- qemu_set_irq(vdev->pdev.irq[vdev->intx.pin], 0);
+ pci_irq_deassert(&vdev->pdev);
vfio_unmask_intx(vdev);
}
@@ -341,7 +341,7 @@ static void vfio_enable_intx_kvm(VFIODevice *vdev)
qemu_set_fd_handler(irqfd.fd, NULL, NULL, vdev);
vfio_mask_intx(vdev);
vdev->intx.pending = false;
- qemu_set_irq(vdev->pdev.irq[vdev->intx.pin], 0);
+ pci_irq_deassert(&vdev->pdev);
/* Get an eventfd for resample/unmask */
if (event_notifier_init(&vdev->intx.unmask, 0)) {
@@ -417,7 +417,7 @@ static void vfio_disable_intx_kvm(VFIODevice *vdev)
*/
vfio_mask_intx(vdev);
vdev->intx.pending = false;
- qemu_set_irq(vdev->pdev.irq[vdev->intx.pin], 0);
+ pci_irq_deassert(&vdev->pdev);
/* Tell KVM to stop listening for an INTx irqfd */
if (kvm_vm_ioctl(kvm_state, KVM_IRQFD, &irqfd)) {
@@ -488,6 +488,7 @@ static int vfio_enable_intx(VFIODevice *vdev)
vfio_disable_interrupts(vdev);
vdev->intx.pin = pin - 1; /* Pin A (1) -> irq[0] */
+ pci_config_set_interrupt_pin(vdev->pdev.config, pin);
#ifdef CONFIG_KVM
/*
@@ -547,7 +548,7 @@ static void vfio_disable_intx(VFIODevice *vdev)
vfio_disable_intx_kvm(vdev);
vfio_disable_irqindex(vdev, VFIO_PCI_INTX_IRQ_INDEX);
vdev->intx.pending = false;
- qemu_set_irq(vdev->pdev.irq[vdev->intx.pin], 0);
+ pci_irq_deassert(&vdev->pdev);
vfio_mmap_set_enabled(vdev, true);
fd = event_notifier_get_fd(&vdev->intx.interrupt);
--
MST
- [Qemu-devel] [PULL 00/43] pci, pc, acpi fixes, enhancements, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 01/43] memory: Change MemoryRegion priorities from unsigned to signed, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 02/43] docs/memory: Explictly state that MemoryRegion priority is signed, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 03/43] hw/pci: partially handle pci master abort, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 04/43] hw/core: Add interface to allocate and free a single IRQ, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 05/43] hw/pci: add pci wrappers for allocating and asserting irqs, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 06/43] hw/pci-bridge: set PCI_INTERRUPT_PIN register before shpc init, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 07/43] hw/vmxnet3: set interrupts using pci irq wrappers, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 08/43] hw/vfio: set interrupts using pci irq wrappers,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL 10/43] hw/pcie: AER and hot-plug events must use device's interrupt, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 09/43] hw: set interrupts using pci irq wrappers, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 11/43] hw/pci: removed irq field from PCIDevice, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 12/43] cleanup object.h: include error.h directly, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 13/43] qom: cleanup struct Error references, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 14/43] qom: add pointer to int property helpers, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 15/43] pci: fix up w64 size calculation helper, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 16/43] fw_cfg: interface to trigger callback on read, Michael S. Tsirkin, 2013/10/14
- [Qemu-devel] [PULL 17/43] loader: support for unmapped ROM blobs, Michael S. Tsirkin, 2013/10/14