From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754991Ab2BAErN (ORCPT ); Tue, 31 Jan 2012 23:47:13 -0500 Received: from ozlabs.org ([203.10.76.45]:50080 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753271Ab2BAErK (ORCPT ); Tue, 31 Jan 2012 23:47:10 -0500 From: David Gibson To: dwmw2@infradead.org, iommu@lists.linux-foundation.org Cc: aik@ozlabs.ru, benh@kernel.crashing.org, qemu-devel@nongnu.org, alex.williamson@redhat.com, joerg.roedel@amd.com, kvm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] device_isolation: Support isolation on POWER p5ioc2 bridges Date: Wed, 1 Feb 2012 15:46:53 +1100 Message-Id: <1328071614-8320-3-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 1.7.8.3 In-Reply-To: <1328071614-8320-1-git-send-email-david@gibson.dropbear.id.au> References: <1328071614-8320-1-git-send-email-david@gibson.dropbear.id.au> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch adds code to the code for the powernv platform to create and populate isolation groups on hardware using the p5ioc2 PCI host bridge used on some IBM POWER systems. Signed-off-by: Alexey Kardashevskiy Signed-off-by: David Gibson --- arch/powerpc/platforms/powernv/pci-p5ioc2.c | 14 +++++++++++++- arch/powerpc/platforms/powernv/pci.h | 3 +++ 2 files changed, 16 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/platforms/powernv/pci-p5ioc2.c b/arch/powerpc/platforms/powernv/pci-p5ioc2.c index 2649677..e5bb3a6 100644 --- a/arch/powerpc/platforms/powernv/pci-p5ioc2.c +++ b/arch/powerpc/platforms/powernv/pci-p5ioc2.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include @@ -88,10 +89,21 @@ static void pnv_pci_init_p5ioc2_msis(struct pnv_phb *phb) { } static void __devinit pnv_pci_p5ioc2_dma_dev_setup(struct pnv_phb *phb, struct pci_dev *pdev) { - if (phb->p5ioc2.iommu_table.it_map == NULL) + if (phb->p5ioc2.iommu_table.it_map == NULL) { iommu_init_table(&phb->p5ioc2.iommu_table, phb->hose->node); +#ifdef CONFIG_DEVICE_ISOLATION + phb->p5ioc2.di_group = kzalloc(sizeof(*(phb->p5ioc2.di_group)), + GFP_KERNEL); + BUG_ON(!phb->p5ioc2.di_group || + (device_isolation_group_init(phb->p5ioc2.di_group, + "p5ioc2:%llx", phb->opal_id) < 0)); +#endif + } set_iommu_table_base(&pdev->dev, &phb->p5ioc2.iommu_table); +#ifdef CONFIG_DEVICE_ISOLATION + device_isolation_dev_add(phb->p5ioc2.di_group, &pdev->dev); +#endif } static void __init pnv_pci_init_p5ioc2_phb(struct device_node *np, diff --git a/arch/powerpc/platforms/powernv/pci.h b/arch/powerpc/platforms/powernv/pci.h index 8bc4796..64ede1e 100644 --- a/arch/powerpc/platforms/powernv/pci.h +++ b/arch/powerpc/platforms/powernv/pci.h @@ -87,6 +87,9 @@ struct pnv_phb { union { struct { struct iommu_table iommu_table; +#ifdef CONFIG_DEVICE_ISOLATION + struct device_isolation_group *di_group; +#endif } p5ioc2; struct { -- 1.7.8.3