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

Commit dda7c2e4 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Joerg Roedel
Browse files

iommu/ipmmu-vmsa: Support 2MB mappings 



Add support for 2MB block mappings at the PMD level.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 9009f256

drivers/iommu/ipmmu-vmsa.c

+29 −3
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ static void ipmmu_free_pmds(pud_t *pud) 
	unsigned int i;



	for (i = 0; i < IPMMU_PTRS_PER_PMD; ++i) {

		if (pmd_none(*pmd))

		if (!pmd_table(*pmd))

			continue;



		ipmmu_free_ptes(pmd);
@@ -610,6 +610,18 @@ static int ipmmu_alloc_init_pte(struct ipmmu_vmsa_device *mmu, pmd_t *pmd, 
	return 0;

}



static int ipmmu_alloc_init_pmd(struct ipmmu_vmsa_device *mmu, pmd_t *pmd,

				unsigned long iova, unsigned long pfn,

				int prot)

{

	pmdval_t pmdval = ipmmu_page_prot(prot, PMD_TYPE_SECT);



	*pmd = pfn_pmd(pfn, __pgprot(pmdval));

	ipmmu_flush_pgtable(mmu, pmd, sizeof(*pmd));



	return 0;

}



static int ipmmu_handle_mapping(struct ipmmu_vmsa_domain *domain,

				unsigned long iova, phys_addr_t paddr,

				size_t size, int prot)
@@ -642,7 +654,18 @@ static int ipmmu_handle_mapping(struct ipmmu_vmsa_domain *domain, 
		goto done;

	}



	switch (size) {

	case SZ_2M:

		ret = ipmmu_alloc_init_pmd(mmu, pmd, iova, pfn, prot);

		break;

	case SZ_64K:

	case SZ_4K:

		ret = ipmmu_alloc_init_pte(mmu, pmd, iova, pfn, size, prot);

		break;

	default:

		ret = -EINVAL;

		break;

	}



done:

	spin_unlock_irqrestore(&domain->lock, flags);
@@ -792,6 +815,9 @@ static phys_addr_t ipmmu_iova_to_phys(struct iommu_domain *io_domain, 
	if (pmd_none(pmd))

		return 0;



	if (pmd_sect(pmd))

		return __pfn_to_phys(pmd_pfn(pmd)) | (iova & ~PMD_MASK);



	pte = *(pmd_page_vaddr(pmd) + pte_index(iova));

	if (pte_none(pte))

		return 0;
@@ -930,7 +956,7 @@ static struct iommu_ops ipmmu_ops = { 
	.iova_to_phys = ipmmu_iova_to_phys,

	.add_device = ipmmu_add_device,

	.remove_device = ipmmu_remove_device,

	.pgsize_bitmap = SZ_64K | SZ_4K,

	.pgsize_bitmap = SZ_2M | SZ_64K | SZ_4K,

};



/* -----------------------------------------------------------------------------