iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iommu/exynos: Rename update_pte()

Browse Source 
The name "update_pte" is a little too generic, and can end up clashing
with architecture pagetable code leaked out of common mm headers. Rename
it to something more appropriately namespaced.

Reported-by: kernel test robot <lkp@intel.com>
Acked-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Robin Murphy <robin.murphy@arm.com>

Link: https://lore.kernel.org/r/829bb5dc18e734870b75db673ddce86e7e37fc73.1594727968.git.robin.murphy@arm.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
Robin Murphy 2020-07-14 12:59:28 +01:00 committed by Joerg Roedel
parent 9ebcfadb06
commit 9314006dc3
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/iommu/exynos-iommu.c
View File

@ -721,7 +721,7 @@ static struct platform_driver exynos_sysmmu_driver __refdata = {
} }
}; };
static inline void update_pte(sysmmu_pte_t *ent, sysmmu_pte_t val) static inline void exynos_iommu_set_pte(sysmmu_pte_t *ent, sysmmu_pte_t val)
{ {
dma_sync_single_for_cpu(dma_dev, virt_to_phys(ent), sizeof(*ent), dma_sync_single_for_cpu(dma_dev, virt_to_phys(ent), sizeof(*ent),
DMA_TO_DEVICE); DMA_TO_DEVICE);
@ -933,7 +933,7 @@ static sysmmu_pte_t *alloc_lv2entry(struct exynos_iommu_domain *domain,
if (!pent) if (!pent)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
update_pte(sent, mk_lv1ent_page(virt_to_phys(pent))); exynos_iommu_set_pte(sent, mk_lv1ent_page(virt_to_phys(pent)));
kmemleak_ignore(pent); kmemleak_ignore(pent);
*pgcounter = NUM_LV2ENTRIES; *pgcounter = NUM_LV2ENTRIES;
handle = dma_map_single(dma_dev, pent, LV2TABLE_SIZE, handle = dma_map_single(dma_dev, pent, LV2TABLE_SIZE,
@ -994,7 +994,7 @@ static int lv1set_section(struct exynos_iommu_domain *domain,
*pgcnt = 0; *pgcnt = 0;
} }
update_pte(sent, mk_lv1ent_sect(paddr, prot)); exynos_iommu_set_pte(sent, mk_lv1ent_sect(paddr, prot));
spin_lock(&domain->lock); spin_lock(&domain->lock);
if (lv1ent_page_zero(sent)) { if (lv1ent_page_zero(sent)) {
@ -1018,7 +1018,7 @@ static int lv2set_page(sysmmu_pte_t *pent, phys_addr_t paddr, size_t size,
if (WARN_ON(!lv2ent_fault(pent))) if (WARN_ON(!lv2ent_fault(pent)))
return -EADDRINUSE; return -EADDRINUSE;
update_pte(pent, mk_lv2ent_spage(paddr, prot)); exynos_iommu_set_pte(pent, mk_lv2ent_spage(paddr, prot));
*pgcnt -= 1; *pgcnt -= 1;
} else { /* size == LPAGE_SIZE */ } else { /* size == LPAGE_SIZE */
int i; int i;
@ -1150,7 +1150,7 @@ static size_t exynos_iommu_unmap(struct iommu_domain *iommu_domain,
} }
/* workaround for h/w bug in System MMU v3.3 */ /* workaround for h/w bug in System MMU v3.3 */
update_pte(ent, ZERO_LV2LINK); exynos_iommu_set_pte(ent, ZERO_LV2LINK);
size = SECT_SIZE; size = SECT_SIZE;
goto done; goto done;
} }
@ -1171,7 +1171,7 @@ static size_t exynos_iommu_unmap(struct iommu_domain *iommu_domain,
} }
if (lv2ent_small(ent)) { if (lv2ent_small(ent)) {
update_pte(ent, 0); exynos_iommu_set_pte(ent, 0);
size = SPAGE_SIZE; size = SPAGE_SIZE;
domain->lv2entcnt[lv1ent_offset(iova)] += 1; domain->lv2entcnt[lv1ent_offset(iova)] += 1;
goto done; goto done;