Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751484AbbENEPP (ORCPT ); Thu, 14 May 2015 00:15:15 -0400 Received: from e23smtp09.au.ibm.com ([202.81.31.142]:42861 "EHLO e23smtp09.au.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750713AbbENEPM (ORCPT ); Thu, 14 May 2015 00:15:12 -0400 Date: Thu, 14 May 2015 14:14:06 +1000 From: Gavin Shan To: Alexey Kardashevskiy Cc: linuxppc-dev@lists.ozlabs.org, David Gibson , Benjamin Herrenschmidt , Paul Mackerras , Alex Williamson , Gavin Shan , Wei Yang , linux-kernel@vger.kernel.org Subject: Re: [PATCH kernel v10 24/34] powerpc/powernv/ioda2: Rework iommu_table creation Message-ID: <20150514041405.GA18464@gwshan> Reply-To: Gavin Shan References: <1431358763-24371-1-git-send-email-aik@ozlabs.ru> <1431358763-24371-25-git-send-email-aik@ozlabs.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1431358763-24371-25-git-send-email-aik@ozlabs.ru> User-Agent: Mutt/1.5.23 (2014-03-12) X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15051404-0033-0000-0000-0000017AF97B Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2718 Lines: 83 On Tue, May 12, 2015 at 01:39:13AM +1000, Alexey Kardashevskiy wrote: >This moves iommu_table creation to the beginning to make following changes >easier to review. This starts using table parameters from the iommu_table >struct. > >This should cause no behavioural change. > >Signed-off-by: Alexey Kardashevskiy >Reviewed-by: David Gibson Reviewed-by: Gavin Shan Thanks, Gavin >--- >Changes: >v9: >* updated commit log and did minor cleanup >--- > arch/powerpc/platforms/powernv/pci-ioda.c | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > >diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c >index e3c784d..9b80b74 100644 >--- a/arch/powerpc/platforms/powernv/pci-ioda.c >+++ b/arch/powerpc/platforms/powernv/pci-ioda.c >@@ -2074,13 +2074,23 @@ static void pnv_pci_ioda2_setup_dma_pe(struct pnv_phb *phb, > addr = page_address(tce_mem); > memset(addr, 0, tce_table_size); > >+ /* Setup linux iommu table */ >+ pnv_pci_setup_iommu_table(tbl, addr, tce_table_size, 0, >+ IOMMU_PAGE_SHIFT_4K); >+ >+ tbl->it_ops = &pnv_ioda2_iommu_ops; >+ iommu_init_table(tbl, phb->hose->node); >+#ifdef CONFIG_IOMMU_API >+ pe->table_group.ops = &pnv_pci_ioda2_ops; >+#endif >+ > /* > * Map TCE table through TVT. The TVE index is the PE number > * shifted by 1 bit for 32-bits DMA space. > */ > rc = opal_pci_map_pe_dma_window(phb->opal_id, pe->pe_number, >- pe->pe_number << 1, 1, __pa(addr), >- tce_table_size, 0x1000); >+ pe->pe_number << 1, 1, __pa(tbl->it_base), >+ tbl->it_size << 3, 1ULL << tbl->it_page_shift); > if (rc) { > pe_err(pe, "Failed to configure 32-bit TCE table," > " err %ld\n", rc); >@@ -2089,20 +2099,10 @@ static void pnv_pci_ioda2_setup_dma_pe(struct pnv_phb *phb, > > pnv_pci_ioda2_tvt_invalidate(pe); > >- /* Setup linux iommu table */ >- pnv_pci_setup_iommu_table(tbl, addr, tce_table_size, 0, >- IOMMU_PAGE_SHIFT_4K); >- > /* OPAL variant of PHB3 invalidated TCEs */ > if (pe->tce_inval_reg) > tbl->it_type |= (TCE_PCI_SWINV_CREATE | TCE_PCI_SWINV_FREE); > >- tbl->it_ops = &pnv_ioda2_iommu_ops; >- iommu_init_table(tbl, phb->hose->node); >-#ifdef CONFIG_IOMMU_API >- pe->table_group.ops = &pnv_pci_ioda2_ops; >-#endif >- > if (pe->flags & PNV_IODA_PE_DEV) { > /* > * Setting table base here only for carrying iommu_group >-- >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/