From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934094AbcIEOHX (ORCPT ); Mon, 5 Sep 2016 10:07:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51322 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934046AbcIEOHW (ORCPT ); Mon, 5 Sep 2016 10:07:22 -0400 Subject: Re: [PART2 PATCH v7 00/12] iommu/AMD: Introduce IOMMU AVIC support To: Joerg Roedel References: <1471978363-13756-1-git-send-email-Suravee.Suthikulpanit@amd.com> <52953cac-29a0-6fd9-f366-5ebdae4ba28d@redhat.com> <20160905135744.GR1437@8bytes.org> Cc: alex.williamson@redhat.com, Suravee Suthikulpanit , rkrcmar@redhat.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, sherry.hurwitz@amd.com From: Paolo Bonzini Message-ID: <6139c032-52be-0e02-ef54-aadc76e2beeb@redhat.com> Date: Mon, 5 Sep 2016 16:07:16 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2.0 MIME-Version: 1.0 In-Reply-To: <20160905135744.GR1437@8bytes.org> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 05 Sep 2016 14:07:21 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 05/09/2016 15:57, Joerg Roedel wrote: > Hi Paolo, > > On Fri, Sep 02, 2016 at 12:46:28PM +0200, Paolo Bonzini wrote: >> Joerg, if there's no other issues, could you apply the first 9 patches >> to a branch based on 4.8-rc1 or similar, so that I can pull it into the >> KVM tree? > > Find the branch at > > git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git x86/amd-avic Pulled (I assume you will merge this into your iommu tree as well, so that any conflicts are solved entirely on your side) and applied Suravee's other 3 patches with this fixup on the third: diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 98b5d1261e02..db77c1ca9e76 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -4484,7 +4484,7 @@ get_pi_vcpu_info(struct kvm *kvm, struct kvm_kernel_irq_routing_entry *e, struct kvm_lapic_irq irq; struct kvm_vcpu *vcpu = NULL; - kvm_set_msi_irq(e, &irq); + kvm_set_msi_irq(kvm, e, &irq); if (!kvm_intr_is_single_vcpu(kvm, &irq, &vcpu)) { pr_debug("SVM: %s: use legacy intr remap mode for irq %u\n", Thanks! Paolo