Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751110AbbFLGVk (ORCPT ); Fri, 12 Jun 2015 02:21:40 -0400 Received: from e23smtp05.au.ibm.com ([202.81.31.147]:58331 "EHLO e23smtp05.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750781AbbFLGVi (ORCPT ); Fri, 12 Jun 2015 02:21:38 -0400 From: Alexey Kardashevskiy To: linuxppc-dev@lists.ozlabs.org Cc: Alexey Kardashevskiy , Benjamin Herrenschmidt , David Gibson , Gavin Shan , Michael Ellerman , Paul Mackerras , linux-kernel@vger.kernel.org Subject: [PATCH kernel] powerpc/powernv/ioda2: Add devices only from buses which belong to PE Date: Fri, 12 Jun 2015 16:19:17 +1000 Message-Id: <1434089957-27135-1-git-send-email-aik@ozlabs.ru> X-Mailer: git-send-email 2.4.0.rc3.8.gfb3e7d5 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15061206-0017-0000-0000-000001619207 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1577 Lines: 41 The existing code puts all devices from a root PE to the same IOMMU group. However it is a possible situation when subordinate buses belong to separate PEs, in this case devices from these subordinate buses should be added to lower level PE rather to the root PE. This limits pnv_ioda_setup_bus_dma() invocation to only PEs which own all subordinate buses. Suggested-by: Gavin Shan Signed-off-by: Alexey Kardashevskiy --- This would be nice to have together with the DDW patchset. This does not fix anything DDW patchset did, it fixes IOMMU groups management which is essential for the whole feature to work. --- arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c index a0b00c1..3b1dc79 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c @@ -1702,7 +1702,7 @@ static void pnv_ioda_setup_bus_dma(struct pnv_ioda_pe *pe, set_iommu_table_base(&dev->dev, pe->table_group.tables[0]); iommu_add_device(&dev->dev); - if (dev->subordinate) + if ((pe->flags & PNV_IODA_PE_BUS_ALL) && dev->subordinate) pnv_ioda_setup_bus_dma(pe, dev->subordinate); } } -- 2.4.0.rc3.8.gfb3e7d5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/