aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorMichael Ellerman <michael@ellerman.id.au>2008-02-29 02:33:22 -0500
committerArnd Bergmann <arnd@arndb.de>2008-03-03 02:03:14 -0500
commitf9660e8a6c16e17935777cdee5194842904c2d72 (patch)
tree3ac6fcb11e44db0f5e9da62ddd06735ce4515c1f /arch
parentf3c1ed9720ec62626bbf3e0c3648568c131978e2 (diff)
[POWERPC] Clearup cell IOMMU fixed mapping terminology
It's called the fixed mapping, not the static mapping. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/platforms/cell/iommu.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index edab631a8dcb..bbe838996470 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -549,7 +549,7 @@ static void cell_dma_dev_setup_iommu(struct device *dev)
549 archdata->dma_data = &window->table; 549 archdata->dma_data = &window->table;
550} 550}
551 551
552static void cell_dma_dev_setup_static(struct device *dev); 552static void cell_dma_dev_setup_fixed(struct device *dev);
553 553
554static void cell_dma_dev_setup(struct device *dev) 554static void cell_dma_dev_setup(struct device *dev)
555{ 555{
@@ -557,7 +557,7 @@ static void cell_dma_dev_setup(struct device *dev)
557 557
558 /* Order is important here, these are not mutually exclusive */ 558 /* Order is important here, these are not mutually exclusive */
559 if (get_dma_ops(dev) == &dma_iommu_fixed_ops) 559 if (get_dma_ops(dev) == &dma_iommu_fixed_ops)
560 cell_dma_dev_setup_static(dev); 560 cell_dma_dev_setup_fixed(dev);
561 else if (get_pci_dma_ops() == &dma_iommu_ops) 561 else if (get_pci_dma_ops() == &dma_iommu_ops)
562 cell_dma_dev_setup_iommu(dev); 562 cell_dma_dev_setup_iommu(dev);
563 else if (get_pci_dma_ops() == &dma_direct_ops) 563 else if (get_pci_dma_ops() == &dma_direct_ops)
@@ -858,7 +858,7 @@ static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask)
858 return 0; 858 return 0;
859} 859}
860 860
861static void cell_dma_dev_setup_static(struct device *dev) 861static void cell_dma_dev_setup_fixed(struct device *dev)
862{ 862{
863 struct dev_archdata *archdata = &dev->archdata; 863 struct dev_archdata *archdata = &dev->archdata;
864 u64 addr; 864 u64 addr;
@@ -894,7 +894,7 @@ static void cell_iommu_setup_fixed_ptab(struct cbe_iommu *iommu,
894 for (i = fbase; i < fbase + fsize; i++, uaddr += IOMMU_PAGE_SIZE) { 894 for (i = fbase; i < fbase + fsize; i++, uaddr += IOMMU_PAGE_SIZE) {
895 /* Don't touch the dynamic region */ 895 /* Don't touch the dynamic region */
896 if (i >= dbase && i < (dbase + dsize)) { 896 if (i >= dbase && i < (dbase + dsize)) {
897 pr_debug("iommu: static/dynamic overlap, skipping\n"); 897 pr_debug("iommu: fixed/dynamic overlap, skipping\n");
898 continue; 898 continue;
899 } 899 }
900 io_pte[i] = base_pte | (__pa(uaddr) & IOPTE_RPN_Mask); 900 io_pte[i] = base_pte | (__pa(uaddr) & IOPTE_RPN_Mask);