Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a553170 authored by Alistair Popple's avatar Alistair Popple Committed by Benjamin Herrenschmidt
Browse files

powerpc/iommu: Add it_page_shift field to determine iommu page size 



This patch adds a it_page_shift field to struct iommu_table and
initiliases it to 4K for all platforms.

Signed-off-by: default avatarAlistair Popple <alistair@popple.id.au>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent e589a440

arch/powerpc/include/asm/iommu.h

+1 −0
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ struct iommu_table { 
	struct iommu_pool large_pool;

	struct iommu_pool pools[IOMMU_NR_POOLS];

	unsigned long *it_map;       /* A simple allocation bitmap for now */

	unsigned long  it_page_shift;/* table iommu page size */

#ifdef CONFIG_IOMMU_API

	struct iommu_group *it_group;

#endif

arch/powerpc/kernel/vio.c

+3 −2
Original line number Diff line number Diff line
@@ -1177,9 +1177,10 @@ static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev) 
			    &tbl->it_index, &offset, &size);



	/* TCE table size - measured in tce entries */

	tbl->it_size = size >> IOMMU_PAGE_SHIFT_4K;

	tbl->it_page_shift = IOMMU_PAGE_SHIFT_4K;

	tbl->it_size = size >> tbl->it_page_shift;

	/* offset for VIO should always be 0 */

	tbl->it_offset = offset >> IOMMU_PAGE_SHIFT_4K;

	tbl->it_offset = offset >> tbl->it_page_shift;

	tbl->it_busno = 0;

	tbl->it_type = TCE_VB;

	tbl->it_blocksize = 16;

arch/powerpc/platforms/cell/iommu.c

+5 −3
Original line number Diff line number Diff line
@@ -197,7 +197,7 @@ static int tce_build_cell(struct iommu_table *tbl, long index, long npages, 


	io_pte = (unsigned long *)tbl->it_base + (index - tbl->it_offset);



	for (i = 0; i < npages; i++, uaddr += IOMMU_PAGE_SIZE_4K)

	for (i = 0; i < npages; i++, uaddr += tbl->it_page_shift)

		io_pte[i] = base_pte | (__pa(uaddr) & CBE_IOPTE_RPN_Mask);



	mb();
@@ -487,8 +487,10 @@ cell_iommu_setup_window(struct cbe_iommu *iommu, struct device_node *np, 
	window->table.it_blocksize = 16;

	window->table.it_base = (unsigned long)iommu->ptab;

	window->table.it_index = iommu->nid;

	window->table.it_offset = (offset >> IOMMU_PAGE_SHIFT_4K) + pte_offset;

	window->table.it_size = size >> IOMMU_PAGE_SHIFT_4K;

	window->table.it_page_shift = IOMMU_PAGE_SHIFT_4K;

	window->table.it_offset =

		(offset >> window->table.it_page_shift) + pte_offset;

	window->table.it_size = size >> window->table.it_page_shift;



	iommu_init_table(&window->table, iommu->nid);

arch/powerpc/platforms/pasemi/iommu.c

+4 −1
Original line number Diff line number Diff line
@@ -138,8 +138,11 @@ static void iommu_table_iobmap_setup(void) 
	pr_debug(" -> %s\n", __func__);

	iommu_table_iobmap.it_busno = 0;

	iommu_table_iobmap.it_offset = 0;

	iommu_table_iobmap.it_page_shift = IOBMAP_PAGE_SHIFT;



	/* it_size is in number of entries */

	iommu_table_iobmap.it_size = 0x80000000 >> IOBMAP_PAGE_SHIFT;

	iommu_table_iobmap.it_size =

		0x80000000 >> iommu_table_iobmap.it_page_shift;



	/* Initialize the common IOMMU code */

	iommu_table_iobmap.it_base = (unsigned long)iob_l2_base;

arch/powerpc/platforms/powernv/pci.c

+2 −1
Original line number Diff line number Diff line
@@ -564,7 +564,8 @@ void pnv_pci_setup_iommu_table(struct iommu_table *tbl, 
{

	tbl->it_blocksize = 16;

	tbl->it_base = (unsigned long)tce_mem;

	tbl->it_offset = dma_offset >> IOMMU_PAGE_SHIFT_4K;

	tbl->it_page_shift = IOMMU_PAGE_SHIFT_4K;

	tbl->it_offset = dma_offset >> tbl->it_page_shift;

	tbl->it_index = 0;

	tbl->it_size = tce_size >> 3;

	tbl->it_busno = 0;