[RFC PATCH 07/11] ppc/iommu: do not need to check for dma_window == NULL

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Nishanth Aravamudan
Date: Friday, October 8, 2010 - 10:33 am

The block in pci_dma_dev_setup_pSeriesLP for dma_window == NULL can be
removed because we will only teminate the loop if we had already allocated
a iommu table for that node or we found a window.  While there may be
no window for the device, the intresting part is if we are reusing a
table or creating it for the first device under it.

Signed-off-by: Milton Miller <miltonm@bga.com>
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
---
 arch/powerpc/platforms/pseries/iommu.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index 0ae5a60..9d564b9 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -530,12 +530,6 @@ static void pci_dma_dev_setup_pSeriesLP(struct pci_dev *dev)
 	}
 	pr_debug("  parent is %s\n", pdn->full_name);
 
-	if (dma_window == NULL) {
-		pr_debug("  no dma window for device, linking to parent\n");
-		set_iommu_table_base(&dev->dev, PCI_DN(pdn)->iommu_table);
-		return;
-	}
-
 	pci = PCI_DN(pdn);
 	if (!pci->iommu_table) {
 		tbl = kzalloc_node(sizeof(struct iommu_table), GFP_KERNEL,
-- 
1.7.1

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[RFC PATCH 00/11] ppc: enable dynamic dma window support, Nishanth Aravamudan, (Fri Oct 8, 10:33 am)
[RFC PATCH 01/11] macio: ensure all dma routines get copie ..., Nishanth Aravamudan, (Fri Oct 8, 10:33 am)
[RFC PATCH 02/11] ppc: allow direct and iommu to coexist, Nishanth Aravamudan, (Fri Oct 8, 10:33 am)
[RFC PATCH 03/11] ppc: Create ops to choose between direct ..., Nishanth Aravamudan, (Fri Oct 8, 10:33 am)
[RFC PATCH 04/11] ppc: add memory_hotplug_max, Nishanth Aravamudan, (Fri Oct 8, 10:33 am)
[RFC PATCH 05/11] ppc: do not search for dma-window proper ..., Nishanth Aravamudan, (Fri Oct 8, 10:33 am)
[RFC PATCH 06/11] ppc: checking for pdn-&gt;parent is redundant, Nishanth Aravamudan, (Fri Oct 8, 10:33 am)
[RFC PATCH 07/11] ppc/iommu: do not need to check for dma_ ..., Nishanth Aravamudan, (Fri Oct 8, 10:33 am)
[RFC PATCH 08/11] ppc/iommu: remove unneeded pci_dma_bus_s ..., Nishanth Aravamudan, (Fri Oct 8, 10:33 am)
[RFC PATCH 09/11] ppc/iommu: pass phb only to iommu_table_ ..., Nishanth Aravamudan, (Fri Oct 8, 10:33 am)
[RFC PATCH 10/11] ppc/iommu: add routines to pseries iommu ..., Nishanth Aravamudan, (Fri Oct 8, 10:33 am)
[RFC PATCH 11/11] ppc: add dynamic dma window support, Nishanth Aravamudan, (Fri Oct 8, 10:33 am)
Re: [RFC PATCH 02/11] ppc: allow direct and iommu to coexist, Benjamin Herrenschmidt, (Fri Oct 8, 4:38 pm)
Re: [RFC PATCH 03/11] ppc: Create ops to choose between di ..., Benjamin Herrenschmidt, (Fri Oct 8, 4:43 pm)
Re: [RFC PATCH 03/11] ppc: Create ops to choose between di ..., Benjamin Herrenschmidt, (Fri Oct 8, 4:44 pm)
Re: [RFC PATCH 03/11] ppc: Create ops to choose between di ..., Benjamin Herrenschmidt, (Sun Oct 10, 4:41 pm)