A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 04:42:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

iommu: Fixup selftests

Browse source 
Commit fb3f251037 ("iommu/arm-smmu: Merge all IOMMU changes from msm-4.19
to msm-lahaina") added some enhanced selftest functions for io-pgtable-arm
and io-pgtable-fast but they still had older APIs for the IOMMU
operations.

Change-Id: Ic0dedbad3ce8339bc471afb83113b47cd169d5cc
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
This commit is contained in:
Jordan Crouse 2019-12-03 11:03:55 -07:00
commit 3a2abcbc85
2 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
drivers/iommu/io-pgtable-arm.c
View file

@ -1581,8 +1581,8 @@ static int __init arm_lpae_run_map_sg_tests(struct io_pgtable_cfg *cfg,
for_each_sg(table.sgl, sg, table.nents, k)
sg_set_page(sg, page, chunk_size, 0);
mapped = ops->map_sg(ops, iova, table.sgl, table.nents,
IOMMU_READ | IOMMU_WRITE, &unused);
mapped = arm_lpae_map_sg(ops, iova, table.sgl, table.nents,
IOMMU_READ | IOMMU_WRITE, &unused);
if (mapped != total_size)
return __FAIL(ops, fmt);
@ -1602,7 +1602,7 @@ static int __init arm_lpae_run_map_sg_tests(struct io_pgtable_cfg *cfg,
iova += chunk_size;
}
if (ops->unmap(ops, 0, total_size) != total_size)
if (ops->unmap(ops, 0, total_size, NULL) != total_size)
return __FAIL(ops, fmt);
if (arm_lpae_range_has_mapping(ops, 0, SZ_2G))
@ -1705,7 +1705,7 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
if (ops->iova_to_phys(ops, iova + 42) != (iova + 42))
return __FAIL(ops, i);
if (ops->unmap(ops, iova, size) != size)
if (ops->unmap(ops, iova, size, NULL) != size)
return __FAIL(ops, i);
iova += SZ_1G;
@ -1733,7 +1733,7 @@ static int __init arm_lpae_run_tests(struct io_pgtable_cfg *cfg)
return __FAIL(ops, i);
/* unmap both mappings at once */
if (ops->unmap(ops, iova, SZ_2M + SZ_4K) !=
if (ops->unmap(ops, iova, SZ_2M + SZ_4K, NULL) !=
(SZ_2M + SZ_4K))
return __FAIL(ops, i);

35
drivers/iommu/io-pgtable-fast.c
View file

@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
* Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
* Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
*/
#define pr_fmt(fmt) "io-pgtable-fast: " fmt
@ -223,7 +223,7 @@ void av8l_fast_clear_stale_ptes(struct io_pgtable_ops *ops, bool skip_sync)
if (!(*pmdp & AV8L_FAST_PTE_VALID)) {
*pmdp = 0;
if (!skip_sync)
__av8l_clean_range(pmdp, pmdp + 1);
av8l_clean_range(ops, pmdp, pmdp + 1);
}
pmdp++;
}
@ -648,22 +648,23 @@ static void dummy_tlb_flush_all(void *cookie)
WARN_ON(cookie != cfg_cookie);
}
static void dummy_tlb_add_flush(unsigned long iova, size_t size, size_t granule,
bool leaf, void *cookie)
{
WARN_ON(cookie != cfg_cookie);
WARN_ON(!(size & cfg_cookie->pgsize_bitmap));
}
static void dummy_tlb_sync(void *cookie)
static void dummy_tlb_flush(unsigned long iova, size_t size, size_t granule,
void *cookie)
{
WARN_ON(cookie != cfg_cookie);
}
static struct iommu_gather_ops dummy_tlb_ops __initdata = {
static void dummy_tlb_add_page(struct iommu_iotlb_gather *gather,
unsigned long iova, size_t granule, void *cookie)
{
dummy_tlb_flush(iova, granule, granule, cookie);
}
static struct iommu_flush_ops dummy_tlb_ops __initdata = {
.tlb_flush_all = dummy_tlb_flush_all,
.tlb_add_flush = dummy_tlb_add_flush,
.tlb_sync = dummy_tlb_sync,
.tlb_flush_walk = dummy_tlb_flush,
.tlb_flush_leaf = dummy_tlb_flush,
.tlb_add_page = dummy_tlb_add_page,
};
/*
@ -728,7 +729,7 @@ static int __init av8l_fast_positive_testing(void)
/* unmap it all */
for (iova = 0; iova < max; iova += SZ_4K) {
if (WARN_ON(ops->unmap(ops, iova, SZ_4K) != SZ_4K))
if (WARN_ON(ops->unmap(ops, iova, SZ_4K, NULL) != SZ_4K))
failed++;
}
@ -749,7 +750,7 @@ static int __init av8l_fast_positive_testing(void)
/* unmap it all with 8K unmap calls */
for (iova = 0; iova < max; iova += SZ_8K) {
if (WARN_ON(ops->unmap(ops, iova, SZ_8K) != SZ_8K))
if (WARN_ON(ops->unmap(ops, iova, SZ_8K, NULL) != SZ_8K))
failed++;
}
@ -770,7 +771,7 @@ static int __init av8l_fast_positive_testing(void)
/* unmap it all */
for (iova = 0; iova < max; iova += SZ_16K) {
if (WARN_ON(ops->unmap(ops, iova, SZ_16K) != SZ_16K))
if (WARN_ON(ops->unmap(ops, iova, SZ_16K, NULL) != SZ_16K))
failed++;
}
@ -790,7 +791,7 @@ static int __init av8l_fast_positive_testing(void)
failed++;
/* unmap it all at once */
if (WARN_ON(ops->unmap(ops, 0, max) != max))
if (WARN_ON(ops->unmap(ops, 0, max, NULL) != max))
failed++;
free_io_pgtable_ops(ops);