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

Commit 31f077dc authored by Tushar Dave's avatar Tushar Dave Committed by David S. Miller
Browse files

sparc64: Initialize iommu_map_table and iommu_pool 



Like legacy IOMMU, use common iommu_map_table and iommu_pool for ATU.
This change initializes iommu_map_table and iommu_pool for ATU.

Signed-off-by: default avatarTushar Dave <tushar.n.dave@oracle.com>
Reviewed-by: default avatarchris hyser <chris.hyser@oracle.com>
Reviewed-by: default avatarSowmini Varadhan <sowmini.varadhan@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f0248c15

arch/sparc/include/asm/iommu_64.h

+2 −0
Original line number Diff line number Diff line
@@ -45,8 +45,10 @@ struct atu_ranges { 
struct atu {

	struct	atu_ranges	*ranges;

	struct	atu_iotsb	*iotsb;

	struct	iommu_map_table	tbl;

	u64			base;

	u64			size;

	u64			dma_addr_mask;

};



struct iommu {

arch/sparc/kernel/pci_sun4v.c

+19 −0
Original line number Diff line number Diff line
@@ -644,6 +644,8 @@ static int pci_sun4v_atu_init(struct pci_pbm_info *pbm) 
	struct atu *atu = pbm->iommu->atu;

	unsigned long err;

	const u64 *ranges;

	u64 map_size, num_iotte;

	u64 dma_mask;

	const u32 *page_size;

	int len;
@@ -682,6 +684,23 @@ static int pci_sun4v_atu_init(struct pci_pbm_info *pbm) 
		return err;

	}



	/* Create ATU iommu map.

	 * One bit represents one iotte in IOTSB table.

	 */

	dma_mask = (roundup_pow_of_two(atu->size) - 1UL);

	num_iotte = atu->size / IO_PAGE_SIZE;

	map_size = num_iotte / 8;

	atu->tbl.table_map_base = atu->base;

	atu->dma_addr_mask = dma_mask;

	atu->tbl.map = kzalloc(map_size, GFP_KERNEL);

	if (!atu->tbl.map)

		return -ENOMEM;



	iommu_tbl_pool_init(&atu->tbl, num_iotte, IO_PAGE_SHIFT,

			    NULL, false /* no large_pool */,

			    0 /* default npools */,

			    false /* want span boundary checking */);



	return 0;

}