Skip to content

Commit 9314006

Browse files
rmurphy-armjoergroedel
authored andcommitted
iommu/exynos: Rename update_pte()
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 <[email protected]> Acked-by: Marek Szyprowski <[email protected]> Signed-off-by: Robin Murphy <[email protected]> Link: https://lore.kernel.org/r/829bb5dc18e734870b75db673ddce86e7e37fc73.1594727968.git.robin.murphy@arm.com Signed-off-by: Joerg Roedel <[email protected]>
1 parent 9ebcfad commit 9314006

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/iommu/exynos-iommu.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ static struct platform_driver exynos_sysmmu_driver __refdata = {
721721
}
722722
};
723723

724-
static inline void update_pte(sysmmu_pte_t *ent, sysmmu_pte_t val)
724+
static inline void exynos_iommu_set_pte(sysmmu_pte_t *ent, sysmmu_pte_t val)
725725
{
726726
dma_sync_single_for_cpu(dma_dev, virt_to_phys(ent), sizeof(*ent),
727727
DMA_TO_DEVICE);
@@ -933,7 +933,7 @@ static sysmmu_pte_t *alloc_lv2entry(struct exynos_iommu_domain *domain,
933933
if (!pent)
934934
return ERR_PTR(-ENOMEM);
935935

936-
update_pte(sent, mk_lv1ent_page(virt_to_phys(pent)));
936+
exynos_iommu_set_pte(sent, mk_lv1ent_page(virt_to_phys(pent)));
937937
kmemleak_ignore(pent);
938938
*pgcounter = NUM_LV2ENTRIES;
939939
handle = dma_map_single(dma_dev, pent, LV2TABLE_SIZE,
@@ -994,7 +994,7 @@ static int lv1set_section(struct exynos_iommu_domain *domain,
994994
*pgcnt = 0;
995995
}
996996

997-
update_pte(sent, mk_lv1ent_sect(paddr, prot));
997+
exynos_iommu_set_pte(sent, mk_lv1ent_sect(paddr, prot));
998998

999999
spin_lock(&domain->lock);
10001000
if (lv1ent_page_zero(sent)) {
@@ -1018,7 +1018,7 @@ static int lv2set_page(sysmmu_pte_t *pent, phys_addr_t paddr, size_t size,
10181018
if (WARN_ON(!lv2ent_fault(pent)))
10191019
return -EADDRINUSE;
10201020

1021-
update_pte(pent, mk_lv2ent_spage(paddr, prot));
1021+
exynos_iommu_set_pte(pent, mk_lv2ent_spage(paddr, prot));
10221022
*pgcnt -= 1;
10231023
} else { /* size == LPAGE_SIZE */
10241024
int i;
@@ -1150,7 +1150,7 @@ static size_t exynos_iommu_unmap(struct iommu_domain *iommu_domain,
11501150
}
11511151

11521152
/* workaround for h/w bug in System MMU v3.3 */
1153-
update_pte(ent, ZERO_LV2LINK);
1153+
exynos_iommu_set_pte(ent, ZERO_LV2LINK);
11541154
size = SECT_SIZE;
11551155
goto done;
11561156
}
@@ -1171,7 +1171,7 @@ static size_t exynos_iommu_unmap(struct iommu_domain *iommu_domain,
11711171
}
11721172

11731173
if (lv2ent_small(ent)) {
1174-
update_pte(ent, 0);
1174+
exynos_iommu_set_pte(ent, 0);
11751175
size = SPAGE_SIZE;
11761176
domain->lv2entcnt[lv1ent_offset(iova)] += 1;
11771177
goto done;

0 commit comments

Comments
 (0)