evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "iommu: io-pgtable-arm: Use correct bitmask for pgd entry"

Browse source
This commit is contained in:
Linux Build Service Account 2016-12-09 19:59:00 -08:00 • committed by Gerrit - the friendly Code Review server
commit 65c54e155a
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -69,9 +69,12 @@
#define ARM_LPAE_PGD_IDX(l,d) \ #define ARM_LPAE_PGD_IDX(l,d) \
((l) == ARM_LPAE_START_LVL(d) ? ilog2(ARM_LPAE_PAGES_PER_PGD(d)) : 0) ((l) == ARM_LPAE_START_LVL(d) ? ilog2(ARM_LPAE_PAGES_PER_PGD(d)) : 0)
#define ARM_LPAE_LVL_MASK(l, d) \
((l) == ARM_LPAE_START_LVL(d) ? (1 << (d)->pgd_bits) - 1 : \
(1 << (d)->bits_per_level) - 1)
#define ARM_LPAE_LVL_IDX(a,l,d) \ #define ARM_LPAE_LVL_IDX(a,l,d) \
(((u64)(a) >> ARM_LPAE_LVL_SHIFT(l,d)) & \ (((u64)(a) >> ARM_LPAE_LVL_SHIFT(l,d)) & \
((1 << ((d)->bits_per_level + ARM_LPAE_PGD_IDX(l,d))) - 1)) ARM_LPAE_LVL_MASK(l, d))
/* Calculate the block/page mapping size at level l for pagetable in d. */ /* Calculate the block/page mapping size at level l for pagetable in d. */
#define ARM_LPAE_BLOCK_SIZE(l,d) \ #define ARM_LPAE_BLOCK_SIZE(l,d) \
@ -197,6 +200,7 @@ struct arm_lpae_io_pgtable {
struct io_pgtable iop; struct io_pgtable iop;
int levels; int levels;
unsigned int pgd_bits;
size_t pgd_size; size_t pgd_size;
unsigned long pg_shift; unsigned long pg_shift;
unsigned long bits_per_level; unsigned long bits_per_level;
@ -913,6 +917,7 @@ arm_lpae_alloc_pgtable(struct io_pgtable_cfg *cfg)
/* Calculate the actual size of our pgd (without concatenation) */ /* Calculate the actual size of our pgd (without concatenation) */
pgd_bits = va_bits - (data->bits_per_level * (data->levels - 1)); pgd_bits = va_bits - (data->bits_per_level * (data->levels - 1));
data->pgd_bits = pgd_bits;
data->pgd_size = 1UL << (pgd_bits + ilog2(sizeof(arm_lpae_iopte))); data->pgd_size = 1UL << (pgd_bits + ilog2(sizeof(arm_lpae_iopte)));
data->iop.ops = (struct io_pgtable_ops) { data->iop.ops = (struct io_pgtable_ops) {