From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sheng Yang Subject: [PATCH 10/10] KVM: MSI to INTx translate Date: Thu, 30 Oct 2008 16:20:18 +0800 Message-ID: <1225354818-16963-11-git-send-email-sheng@linux.intel.com> References: <1225354818-16963-1-git-send-email-sheng@linux.intel.com> Cc: kvm@vger.kernel.org, Sheng Yang To: Avi Kivity Return-path: Received: from mga01.intel.com ([192.55.52.88]:22872 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753311AbYJ3IWc (ORCPT ); Thu, 30 Oct 2008 04:22:32 -0400 In-Reply-To: <1225354818-16963-1-git-send-email-sheng@linux.intel.com> Sender: kvm-owner@vger.kernel.org List-ID: Now we use MSI as default one Signed-off-by: Sheng Yang --- virt/kvm/kvm_main.c | 50 +++++++++++++++++++++++++++----------------------- 1 files changed, 27 insertions(+), 23 deletions(-) diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 0f851ef..34b5d2f 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c @@ -233,6 +233,8 @@ static int assigned_device_update_intx(struct kvm *kvm, struct kvm_assigned_dev_kernel *adev, struct kvm_assigned_irq *airq) { + BUG_ON(!!adev->irq_requested_type & KVM_ASSIGNED_DEV_HOST_MSI); + adev->guest_irq = airq->guest_irq; adev->ack_notifier.gsi = airq->guest_irq; @@ -240,11 +242,6 @@ static int assigned_device_update_intx(struct kvm *kvm, return 0; if (irqchip_in_kernel(kvm)) { - if (adev->irq_requested_type & KVM_ASSIGNED_DEV_HOST_MSI) { - free_irq(adev->host_irq, (void *)kvm); - pci_disable_msi(adev->dev); - } - if (!capable(CAP_SYS_RAWIO)) return -EPERM; @@ -272,31 +269,32 @@ static int assigned_device_update_msi(struct kvm *kvm, struct kvm_assigned_dev_kernel *adev, struct kvm_assigned_irq *airq) { - int r; + BUG_ON(!!adev->irq_requested_type & KVM_ASSIGNED_DEV_HOST_INTX); - adev->guest_msi_addr = airq->guest_msi_addr; - adev->guest_msi_data = airq->guest_msi_data; - adev->ack_notifier.gsi = -1; + if (airq->flags & KVM_DEV_IRQ_ASSIGN_ENABLE_MSI) { + adev->irq_requested_type |= KVM_ASSIGNED_DEV_GUEST_MSI; + adev->irq_requested_type &= ~KVM_ASSIGNED_DEV_GUEST_INTX; + adev->guest_msi_addr = airq->guest_msi_addr; + adev->guest_msi_data = airq->guest_msi_data; + adev->ack_notifier.gsi = -1; + } else { + adev->irq_requested_type |= KVM_ASSIGNED_DEV_GUEST_INTX; + adev->irq_requested_type &= ~KVM_ASSIGNED_DEV_GUEST_MSI; + adev->guest_irq = airq->guest_irq; + adev->ack_notifier.gsi = airq->guest_irq; + } if (adev->irq_requested_type & KVM_ASSIGNED_DEV_HOST_MSI) return 0; if (irqchip_in_kernel(kvm)) { - if (adev->irq_requested_type & KVM_ASSIGNED_DEV_HOST_INTX) - free_irq(adev->host_irq, (void *)adev); - - r = pci_enable_msi(adev->dev); - if (r) - return r; - adev->host_irq = adev->dev->irq; if (request_irq(adev->host_irq, kvm_assigned_dev_intr, 0, "kvm_assigned_msi_device", (void *)adev)) return -EIO; } - adev->irq_requested_type = KVM_ASSIGNED_DEV_GUEST_MSI | - KVM_ASSIGNED_DEV_HOST_MSI; + adev->irq_requested_type |= KVM_ASSIGNED_DEV_HOST_MSI; return 0; } @@ -333,10 +331,15 @@ static int kvm_vm_ioctl_assign_irq(struct kvm *kvm, goto out_release; else match->irq_source_id = r; + + /* Determine host device irq type, we can know the + * result from dev->msi_enabled */ + pci_enable_msi(match->dev); } } - if (assigned_irq->flags & KVM_DEV_IRQ_ASSIGN_ENABLE_MSI) { + if (match->dev->msi_enabled) { + /* Device support MSI */ r = assigned_device_update_msi(kvm, match, assigned_irq); if (r) { printk(KERN_WARNING "kvm: failed to enable " @@ -344,9 +347,10 @@ static int kvm_vm_ioctl_assign_irq(struct kvm *kvm, goto out_release; } } else if (assigned_irq->host_irq == 0 && match->dev->irq == 0) { - /* Host device IRQ 0 means don't support INTx */ - printk(KERN_WARNING "kvm: wait device to enable MSI!\n"); - r = 0; + /* Device only support MSI but can't enable */ + printk(KERN_WARNING "kvm: failed to enable MSI device!\n"); + r = -ENOTTY; + goto out_release; } else { /* Non-sharing INTx mode */ r = assigned_device_update_intx(kvm, match, assigned_irq); -- 1.5.4.5