diff options
| author | Will Deacon | 2013-11-05 16:55:04 +0100 |
|---|---|---|
| committer | Will Deacon | 2013-12-16 20:30:30 +0100 |
| commit | 06f983dd571f564bdd3eb2ac4c33002034ea7810 (patch) | |
| tree | 967ab27cf5a731bfd4df4b6a862443887ae86054 /drivers/iommu/arm-smmu.c | |
| parent | iommu/arm-smmu: add devices attached to the SMMU to an IOMMU group (diff) | |
| download | kernel-qcow2-linux-06f983dd571f564bdd3eb2ac4c33002034ea7810.tar.gz kernel-qcow2-linux-06f983dd571f564bdd3eb2ac4c33002034ea7810.tar.xz kernel-qcow2-linux-06f983dd571f564bdd3eb2ac4c33002034ea7810.zip | |
iommu/arm-smmu: use VA_BITS to determine arm64 virtual address space
With the introduction of the VA_BITS definition for arm64, make use of
it in the driver, allowing up to 42-bits of VA space when configured
with 64k pages.
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'drivers/iommu/arm-smmu.c')
| -rw-r--r-- | drivers/iommu/arm-smmu.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 879da20617fb..fa3371adea4f 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -24,7 +24,7 @@ * - v7/v8 long-descriptor format * - Non-secure access to the SMMU * - 4k and 64k pages, with contiguous pte hints. - * - Up to 39-bit addressing + * - Up to 42-bit addressing (dependent on VA_BITS) * - Context fault reporting */ @@ -1747,7 +1747,6 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu) * allocation (PTRS_PER_PGD). */ #ifdef CONFIG_64BIT - /* Current maximum output size of 39 bits */ smmu->s1_output_size = min(39UL, size); #else smmu->s1_output_size = min(32UL, size); @@ -1762,7 +1761,7 @@ static int arm_smmu_device_cfg_probe(struct arm_smmu_device *smmu) } else { #ifdef CONFIG_64BIT size = (id >> ID2_UBS_SHIFT) & ID2_UBS_MASK; - size = min(39, arm_smmu_id_size_to_bits(size)); + size = min(VA_BITS, arm_smmu_id_size_to_bits(size)); #else size = 32; #endif |