gpu: nvgpu: Fix alignment calculation overflow

Bug 200150865

Change-Id: If4f0e01bdeb95c303675b63444bd497b65d934f3
Signed-off-by: Ari Hirvonen <ahirvonen@nvidia.com>
Reviewed-on: http://git-master/r/835151
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Arto Merilainen <amerilainen@nvidia.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
index a9bca317..86b9f045 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
@@ -1473,7 +1473,7 @@ u64 gk20a_vm_map(struct vm_gk20a *vm,
 
                         buf_addr = (u64)sg_phys(sgl);
 
-                        align = 1 << __ffs(buf_addr | (u64)sgl->length);
+                        align = 1ULL << __ffs(buf_addr | (u64)sgl->length);
                         if (bfr.align)
                                 bfr.align = min_t(u64, align, bfr.align);
                         else
@@ -1481,7 +1481,7 @@ u64 gk20a_vm_map(struct vm_gk20a *vm,
                         sgl = sg_next(sgl);
                 }
         } else
-                bfr.align = 1 << __ffs(buf_addr);
+                bfr.align = 1ULL << __ffs(buf_addr);
 
         bfr.pgsz_idx = -1;
         mapping_size = mapping_size ? mapping_size : bfr.size;