diff options
| author | Geert Uytterhoeven <geert+renesas@glider.be> | 2015-12-22 20:01:06 +0100 |
|---|---|---|
| committer | Joerg Roedel <jroedel@suse.de> | 2015-12-28 17:10:52 +0100 |
| commit | f64232eee61906f22942224af2a9fd40e26e592e (patch) | |
| tree | 0f5da57be15a71661d49e855af41ce2deb5f3b9c /drivers/iommu | |
| parent | iommu/dma: Avoid unlikely high-order allocations (diff) | |
| download | linux-f64232eee61906f22942224af2a9fd40e26e592e.tar.xz linux-f64232eee61906f22942224af2a9fd40e26e592e.zip | |
iommu/ipmmu-vmsa: Don't truncate ttbr if LPAE is not enabled
If CONFIG_PHYS_ADDR_T_64BIT=n:
drivers/iommu/ipmmu-vmsa.c: In function 'ipmmu_domain_init_context':
drivers/iommu/ipmmu-vmsa.c:434:2: warning: right shift count >= width of type
ipmmu_ctx_write(domain, IMTTUBR0, ttbr >> 32);
^
As io_pgtable_cfg.arm_lpae_s1_cfg.ttbr[] is an array of u64s, assigning
it to a phys_addr_t may truncates it. Make ttbr u64 to fix this.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/ipmmu-vmsa.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c index 8cf605fa9946..dfb868e2d129 100644 --- a/drivers/iommu/ipmmu-vmsa.c +++ b/drivers/iommu/ipmmu-vmsa.c @@ -295,7 +295,7 @@ static struct iommu_gather_ops ipmmu_gather_ops = { static int ipmmu_domain_init_context(struct ipmmu_vmsa_domain *domain) { - phys_addr_t ttbr; + u64 ttbr; /* * Allocate the page table operations. |