From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e23smtp07.au.ibm.com (e23smtp07.au.ibm.com [202.81.31.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 1568814008E for ; Mon, 21 Apr 2014 15:22:20 +1000 (EST) Received: from /spool/local by e23smtp07.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 21 Apr 2014 15:22:17 +1000 Received: from d23relay04.au.ibm.com (d23relay04.au.ibm.com [9.190.234.120]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id AD8502BB0040 for ; Mon, 21 Apr 2014 15:22:15 +1000 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay04.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s3L51PWX24641680 for ; Mon, 21 Apr 2014 15:01:25 +1000 Received: from d23av01.au.ibm.com (localhost [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s3L5MErq018311 for ; Mon, 21 Apr 2014 15:22:15 +1000 Date: Mon, 21 Apr 2014 13:22:13 +0800 From: Wei Yang To: Benjamin Herrenschmidt Subject: Re: [PATCH 2/2] powerpc/powernc: revert part of commit d905c5df(PPC: POWERNV: move iommu_add_device earlier) Message-ID: <20140421052213.GA24712@richard> References: <1398047119-6861-1-git-send-email-weiyang@linux.vnet.ibm.com> <1398047119-6861-2-git-send-email-weiyang@linux.vnet.ibm.com> <1398051452.19682.15.camel@pasglop> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <1398051452.19682.15.camel@pasglop> Cc: aik@au1.ibm.com, linuxppc-dev@lists.ozlabs.org, gwshan@linux.vnet.ibm.com Reply-To: Wei Yang List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , On Mon, Apr 21, 2014 at 01:37:32PM +1000, Benjamin Herrenschmidt wrote: >On Mon, 2014-04-21 at 10:25 +0800, Wei Yang wrote: >> Here is a draft call flow: >> >> pci_device_add >> pcibios_add_device >> pci_dma_dev_setup >> pnv_pci_dma_dev_setup >> pnv_pci_ioda_dma_dev_setup >> set_iommu_table_base_and_group <--- here >> device_add >> >> When set_iommu_table_base_and_group() is invoked int >> pnv_pci_ioda_dma_dev_setup(), the dev->kobj->sd is not initialized. The >> dev->kobj->sd is initialized in device_add(). >> >> After applying this patch, the error >> iommu_tce: 0003:05:00.0 has not been added, ret=-14 >> is cleared. >> >> This patch revert the change for pnv_pci_ioda_dma_dev_setup() from commit >> d905c5df(PPC: POWERNV: move iommu_add_device earlier). > >But in that case, is the group still set ? I think so. iommu_add_device() will be invoked when device_add() notify the pci bus. > >Alexey, is that correct ? > >Cheers, >Ben. > >> Signed-off-by: Wei Yang >> --- >> 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 fc4edda..b5d8f73 100644 >> --- a/arch/powerpc/platforms/powernv/pci-ioda.c >> +++ b/arch/powerpc/platforms/powernv/pci-ioda.c >> @@ -1425,7 +1425,7 @@ static void pnv_pci_ioda_dma_dev_setup(struct pnv_phb *phb, struct pci_dev *pdev >> >> pe = &phb->ioda.pe_array[pdn->pe_number]; >> WARN_ON(get_dma_ops(&pdev->dev) != &dma_iommu_ops); >> - set_iommu_table_base_and_group(&pdev->dev, &pe->tce32_table); >> + set_iommu_table_base(&pdev->dev, &pe->tce32_table); >> } >> >> static int pnv_pci_ioda_dma_set_mask(struct pnv_phb *phb, > -- Richard Yang Help you, Help me