Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e7654c1e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/virt/kvm/kvm 

Pull a couple of KVM fixes from Avi Kivity:
 "One is an adjustment for an irq layer change that affected device
  assignment, the other a one-liner ppc fix."

* git://git.kernel.org/pub/scm/virt/kvm/kvm:
  powerpc/kvm: Fix "PR" KVM implementation of H_CEDE
  KVM: Fix device assignment threaded irq handler
parents 91f68c89 37e41afa

arch/powerpc/kvm/book3s_pr_papr.c

+1 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ int kvmppc_h_pr(struct kvm_vcpu *vcpu, unsigned long cmd) 
	case H_PUT_TCE:

		return kvmppc_h_pr_put_tce(vcpu);

	case H_CEDE:

		vcpu->arch.shared->msr |= MSR_EE;

		kvm_vcpu_block(vcpu);

		clear_bit(KVM_REQ_UNHALT, &vcpu->requests);

		vcpu->stat.halt_wakeup++;

virt/kvm/assigned-dev.c

+13 −2
Original line number Diff line number Diff line
@@ -334,6 +334,11 @@ static int assigned_device_enable_host_intx(struct kvm *kvm, 
}



#ifdef __KVM_HAVE_MSI

static irqreturn_t kvm_assigned_dev_msi(int irq, void *dev_id)

{

	return IRQ_WAKE_THREAD;

}



static int assigned_device_enable_host_msi(struct kvm *kvm,

					   struct kvm_assigned_dev_kernel *dev)

{
@@ -346,7 +351,7 @@ static int assigned_device_enable_host_msi(struct kvm *kvm, 
	}



	dev->host_irq = dev->dev->irq;

	if (request_threaded_irq(dev->host_irq, NULL,

	if (request_threaded_irq(dev->host_irq, kvm_assigned_dev_msi,

				 kvm_assigned_dev_thread_msi, 0,

				 dev->irq_name, dev)) {

		pci_disable_msi(dev->dev);
@@ -358,6 +363,11 @@ static int assigned_device_enable_host_msi(struct kvm *kvm, 
#endif



#ifdef __KVM_HAVE_MSIX

static irqreturn_t kvm_assigned_dev_msix(int irq, void *dev_id)

{

	return IRQ_WAKE_THREAD;

}



static int assigned_device_enable_host_msix(struct kvm *kvm,

					    struct kvm_assigned_dev_kernel *dev)

{
@@ -374,7 +384,8 @@ static int assigned_device_enable_host_msix(struct kvm *kvm, 


	for (i = 0; i < dev->entries_nr; i++) {

		r = request_threaded_irq(dev->host_msix_entries[i].vector,

					 NULL, kvm_assigned_dev_thread_msix,

					 kvm_assigned_dev_msix,

					 kvm_assigned_dev_thread_msix,

					 0, dev->irq_name, dev);

		if (r)

			goto err;