Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-09-21 11:53:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge "iommu: msm: Check for map/unmap errors strictly"

Browse source
This commit is contained in:
Linux Build Service Account 2015-12-22 04:46:48 -08:00 committed by Gerrit - the friendly Code Review server
parent 588e5765b3 fc3b32979e
commit c5067758e6
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/iommu/msm_iommu_pagetable.c
View file

@ -487,13 +487,18 @@ static int __msm_iommu_pagetable_map_range(struct msm_iommu_pt *pt,
ops->get_length(cookie, len), chunk_size);
if (chunk_size == SZ_4K) {
sl_4k(&sl_table[sl_offset], pa, pgprot4k);
ret = sl_4k(&sl_table[sl_offset], pa, pgprot4k);
if (ret)
goto fail;
sl_offset++;
/* Increment map count */
(*fl_pte_shadow)++;
} else {
BUG_ON(sl_offset + 16 > NUM_SL_PTE);
sl_64k(&sl_table[sl_offset], pa, pgprot64k);
ret = sl_64k(&sl_table[sl_offset], pa,
pgprot64k);
if (ret)
goto fail;
sl_offset += 16;
/* Increment map count */
*fl_pte_shadow += 16;
@ -536,6 +541,7 @@ void msm_iommu_pagetable_unmap_range(struct msm_iommu_pt *pt, unsigned long va,
u32 fl_offset;
u32 *sl_table;
u32 sl_start, sl_end;
u32 *temp;
int used;
BUG_ON(len & (SZ_4K - 1));
@ -556,6 +562,10 @@ void msm_iommu_pagetable_unmap_range(struct msm_iommu_pt *pt, unsigned long va,
sl_end = NUM_SL_PTE;
n_entries = sl_end - sl_start;
for (temp = sl_table + sl_start;
temp < sl_table + sl_end; temp++)
BUG_ON(!*temp);
memset(sl_table + sl_start, 0, n_entries * 4);
clean_pte(sl_table + sl_start, sl_table + sl_end,
pt->redirect);