aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/platforms/pseries/iommu.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/powerpc/platforms/pseries/iommu.c')
-rw-r--r--arch/powerpc/platforms/pseries/iommu.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index a80af6c20cba..1b7531ce0c0c 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -488,7 +488,7 @@ static void iommu_table_setparms(struct pci_controller *phb,
488 tbl->it_busno = phb->bus->number; 488 tbl->it_busno = phb->bus->number;
489 489
490 /* Units of tce entries */ 490 /* Units of tce entries */
491 tbl->it_offset = phb->dma_window_base_cur >> IOMMU_PAGE_SHIFT; 491 tbl->it_offset = phb->dma_window_base_cur >> IOMMU_PAGE_SHIFT_4K;
492 492
493 /* Test if we are going over 2GB of DMA space */ 493 /* Test if we are going over 2GB of DMA space */
494 if (phb->dma_window_base_cur + phb->dma_window_size > 0x80000000ul) { 494 if (phb->dma_window_base_cur + phb->dma_window_size > 0x80000000ul) {
@@ -499,7 +499,7 @@ static void iommu_table_setparms(struct pci_controller *phb,
499 phb->dma_window_base_cur += phb->dma_window_size; 499 phb->dma_window_base_cur += phb->dma_window_size;
500 500
501 /* Set the tce table size - measured in entries */ 501 /* Set the tce table size - measured in entries */
502 tbl->it_size = phb->dma_window_size >> IOMMU_PAGE_SHIFT; 502 tbl->it_size = phb->dma_window_size >> IOMMU_PAGE_SHIFT_4K;
503 503
504 tbl->it_index = 0; 504 tbl->it_index = 0;
505 tbl->it_blocksize = 16; 505 tbl->it_blocksize = 16;
@@ -540,8 +540,8 @@ static void iommu_table_setparms_lpar(struct pci_controller *phb,
540 tbl->it_base = 0; 540 tbl->it_base = 0;
541 tbl->it_blocksize = 16; 541 tbl->it_blocksize = 16;
542 tbl->it_type = TCE_PCI; 542 tbl->it_type = TCE_PCI;
543 tbl->it_offset = offset >> IOMMU_PAGE_SHIFT; 543 tbl->it_offset = offset >> IOMMU_PAGE_SHIFT_4K;
544 tbl->it_size = size >> IOMMU_PAGE_SHIFT; 544 tbl->it_size = size >> IOMMU_PAGE_SHIFT_4K;
545} 545}
546 546
547static void pci_dma_bus_setup_pSeries(struct pci_bus *bus) 547static void pci_dma_bus_setup_pSeries(struct pci_bus *bus)