From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751999AbcAVGso (ORCPT ); Fri, 22 Jan 2016 01:48:44 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:34678 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752332AbcAVGsd (ORCPT ); Fri, 22 Jan 2016 01:48:33 -0500 Subject: Re: [PATCH kernel] vfio: Only check for bus IOMMU when NOIOMMU is selected To: linuxppc-dev@lists.ozlabs.org References: <1453444494-46900-1-git-send-email-aik@ozlabs.ru> Cc: Alex Williamson , kvm@vger.kernel.org, linux-kernel@vger.kernel.org From: Alexey Kardashevskiy Message-ID: <56A1D0BC.6030405@ozlabs.ru> Date: Fri, 22 Jan 2016 17:48:28 +1100 User-Agent: Mozilla/5.0 (X11; Linux i686 on x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.0 MIME-Version: 1.0 In-Reply-To: <1453444494-46900-1-git-send-email-aik@ozlabs.ru> Content-Type: text/plain; charset=koi8-r; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 01/22/2016 05:34 PM, Alexey Kardashevskiy wrote: > Recent change 03a76b60 "vfio: Include No-IOMMU mode" disabled VFIO > on systems which do not implement iommu_ops for the PCI bus even though > there is an VFIO IOMMU driver for it such as SPAPR TCE driver for > PPC64/powernv platform. > > This moves iommu_present() call under #ifdef CONFIG_VFIO_NOIOMMU as > it is done in the rest of the file to re-enable VFIO on powernv. > > Signed-off-by: Alexey Kardashevskiy > --- > drivers/vfio/vfio.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c > index 82f25cc..3f8060e 100644 > --- a/drivers/vfio/vfio.c > +++ b/drivers/vfio/vfio.c > @@ -343,7 +343,6 @@ static struct vfio_group *vfio_create_group(struct iommu_group *iommu_group, > atomic_set(&group->opened, 0); > group->iommu_group = iommu_group; > group->noiommu = !iommu_present; > - Agrh. Unrelated change, repost? > group->nb.notifier_call = vfio_iommu_group_notifier; > > /* > @@ -767,7 +766,11 @@ int vfio_add_group_dev(struct device *dev, > > group = vfio_group_get_from_iommu(iommu_group); > if (!group) { > +#ifdef CONFIG_VFIO_NOIOMMU > group = vfio_create_group(iommu_group, iommu_present(dev->bus)); > +#else > + group = vfio_create_group(iommu_group, true); > +#endif > if (IS_ERR(group)) { > iommu_group_put(iommu_group); > return PTR_ERR(group); > -- Alexey