diff options
Diffstat (limited to 'arch/powerpc/platforms/powernv/pci.c')
-rw-r--r-- | arch/powerpc/platforms/powernv/pci.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/platforms/powernv/pci.c b/arch/powerpc/platforms/powernv/pci.c index b6cb9966f100..4dff552aa4e4 100644 --- a/arch/powerpc/platforms/powernv/pci.c +++ b/arch/powerpc/platforms/powernv/pci.c | |||
@@ -628,11 +628,11 @@ static void pnv_tce_free_rm(struct iommu_table *tbl, long index, long npages) | |||
628 | 628 | ||
629 | void pnv_pci_setup_iommu_table(struct iommu_table *tbl, | 629 | void pnv_pci_setup_iommu_table(struct iommu_table *tbl, |
630 | void *tce_mem, u64 tce_size, | 630 | void *tce_mem, u64 tce_size, |
631 | u64 dma_offset) | 631 | u64 dma_offset, unsigned page_shift) |
632 | { | 632 | { |
633 | tbl->it_blocksize = 16; | 633 | tbl->it_blocksize = 16; |
634 | tbl->it_base = (unsigned long)tce_mem; | 634 | tbl->it_base = (unsigned long)tce_mem; |
635 | tbl->it_page_shift = IOMMU_PAGE_SHIFT_4K; | 635 | tbl->it_page_shift = page_shift; |
636 | tbl->it_offset = dma_offset >> tbl->it_page_shift; | 636 | tbl->it_offset = dma_offset >> tbl->it_page_shift; |
637 | tbl->it_index = 0; | 637 | tbl->it_index = 0; |
638 | tbl->it_size = tce_size >> 3; | 638 | tbl->it_size = tce_size >> 3; |
@@ -657,7 +657,7 @@ static struct iommu_table *pnv_pci_setup_bml_iommu(struct pci_controller *hose) | |||
657 | if (WARN_ON(!tbl)) | 657 | if (WARN_ON(!tbl)) |
658 | return NULL; | 658 | return NULL; |
659 | pnv_pci_setup_iommu_table(tbl, __va(be64_to_cpup(basep)), | 659 | pnv_pci_setup_iommu_table(tbl, __va(be64_to_cpup(basep)), |
660 | be32_to_cpup(sizep), 0); | 660 | be32_to_cpup(sizep), 0, IOMMU_PAGE_SHIFT_4K); |
661 | iommu_init_table(tbl, hose->node); | 661 | iommu_init_table(tbl, hose->node); |
662 | iommu_register_group(tbl, pci_domain_nr(hose->bus), 0); | 662 | iommu_register_group(tbl, pci_domain_nr(hose->bus), 0); |
663 | 663 | ||