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

Commit 96cc6381 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "iommu: msm: prefetch issue workaround not needed for LPAE"

parents 67a06d8e 701bf806

drivers/iommu/msm_iommu_pagetable_lpae.c

+2 −3
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ 
#define NUM_FL_PTE      4   /* First level */

#define NUM_SL_PTE      512 /* Second level */

#define NUM_TL_PTE      512 /* Third level */

#define GUARD_PTE       2



#define PTE_SIZE	8
@@ -192,7 +191,7 @@ static inline u64 *make_second_level_tbl(s32 redirect, u64 *fl_pte) 
		goto fail;

	}

	memset(sl, 0, SZ_4K);

	clean_pte(sl, sl + NUM_SL_PTE + GUARD_PTE, redirect);

	clean_pte(sl, sl + NUM_SL_PTE, redirect);



	/* Leave APTable bits 0 to let next level decide access permissinons */

	*fl_pte = (((phys_addr_t)__pa(sl)) & FLSL_BASE_MASK) | FLSL_TYPE_TABLE;
@@ -210,7 +209,7 @@ static inline u64 *make_third_level_tbl(s32 redirect, u64 *sl_pte) 
		goto fail;

	}

	memset(tl, 0, SZ_4K);

	clean_pte(tl, tl + NUM_TL_PTE + GUARD_PTE, redirect);

	clean_pte(tl, tl + NUM_TL_PTE, redirect);



	/* Leave APTable bits 0 to let next level decide access permissions */

	*sl_pte = (((phys_addr_t)__pa(tl)) & FLSL_BASE_MASK) | FLSL_TYPE_TABLE;