diff options
author | Sai Nikhil <snikhil@nvidia.com> | 2018-08-17 01:20:17 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-08-29 11:59:31 -0400 |
commit | 2f97e683feed3c3ba3c8722c4f6ab7466bcef0c0 (patch) | |
tree | c0f90c3dc6909122cfde071efff8ff24d2b61471 /drivers/gpu/nvgpu/common/mm/nvgpu_mem.c | |
parent | 19cd7ffb5def933db323fe682ec4a263eb1923f9 (diff) |
gpu: nvgpu: common: fix MISRA Rule 10.4
MISRA Rule 10.4 only allows the usage of arithmetic operations on
operands of the same essential type category.
Adding "U" at the end of the integer literals to have same type of
operands when an arithmetic operation is performed.
This fix violations where an arithmetic operation is performed on
signed and unsigned int types.
In balloc_get_order_list() the argument "int order" has been changed to
a u64 because all callers of this function pass a u64 argument.
JIRA NVGPU-992
Change-Id: Ie2964f9f1dfb2865a9bd6e6cdd65e7cda6c1f638
Signed-off-by: Sai Nikhil <snikhil@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1784419
Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com>
Reviewed-by: Adeel Raza <araza@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common/mm/nvgpu_mem.c')
-rw-r--r-- | drivers/gpu/nvgpu/common/mm/nvgpu_mem.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c b/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c index 345b947d..ab75b136 100644 --- a/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c +++ b/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c | |||
@@ -205,15 +205,15 @@ u32 nvgpu_mem_rd32(struct gk20a *g, struct nvgpu_mem *mem, u32 w) | |||
205 | 205 | ||
206 | u32 nvgpu_mem_rd(struct gk20a *g, struct nvgpu_mem *mem, u32 offset) | 206 | u32 nvgpu_mem_rd(struct gk20a *g, struct nvgpu_mem *mem, u32 offset) |
207 | { | 207 | { |
208 | WARN_ON(offset & 3); | 208 | WARN_ON(offset & 3U); |
209 | return nvgpu_mem_rd32(g, mem, offset / sizeof(u32)); | 209 | return nvgpu_mem_rd32(g, mem, offset / sizeof(u32)); |
210 | } | 210 | } |
211 | 211 | ||
212 | void nvgpu_mem_rd_n(struct gk20a *g, struct nvgpu_mem *mem, | 212 | void nvgpu_mem_rd_n(struct gk20a *g, struct nvgpu_mem *mem, |
213 | u32 offset, void *dest, u32 size) | 213 | u32 offset, void *dest, u32 size) |
214 | { | 214 | { |
215 | WARN_ON(offset & 3); | 215 | WARN_ON(offset & 3U); |
216 | WARN_ON(size & 3); | 216 | WARN_ON(size & 3U); |
217 | 217 | ||
218 | if (mem->aperture == APERTURE_SYSMEM) { | 218 | if (mem->aperture == APERTURE_SYSMEM) { |
219 | u8 *src = (u8 *)mem->cpu_va + offset; | 219 | u8 *src = (u8 *)mem->cpu_va + offset; |
@@ -246,15 +246,15 @@ void nvgpu_mem_wr32(struct gk20a *g, struct nvgpu_mem *mem, u32 w, u32 data) | |||
246 | 246 | ||
247 | void nvgpu_mem_wr(struct gk20a *g, struct nvgpu_mem *mem, u32 offset, u32 data) | 247 | void nvgpu_mem_wr(struct gk20a *g, struct nvgpu_mem *mem, u32 offset, u32 data) |
248 | { | 248 | { |
249 | WARN_ON(offset & 3); | 249 | WARN_ON(offset & 3U); |
250 | nvgpu_mem_wr32(g, mem, offset / sizeof(u32), data); | 250 | nvgpu_mem_wr32(g, mem, offset / sizeof(u32), data); |
251 | } | 251 | } |
252 | 252 | ||
253 | void nvgpu_mem_wr_n(struct gk20a *g, struct nvgpu_mem *mem, u32 offset, | 253 | void nvgpu_mem_wr_n(struct gk20a *g, struct nvgpu_mem *mem, u32 offset, |
254 | void *src, u32 size) | 254 | void *src, u32 size) |
255 | { | 255 | { |
256 | WARN_ON(offset & 3); | 256 | WARN_ON(offset & 3U); |
257 | WARN_ON(size & 3); | 257 | WARN_ON(size & 3U); |
258 | 258 | ||
259 | if (mem->aperture == APERTURE_SYSMEM) { | 259 | if (mem->aperture == APERTURE_SYSMEM) { |
260 | u8 *dest = (u8 *)mem->cpu_va + offset; | 260 | u8 *dest = (u8 *)mem->cpu_va + offset; |
@@ -274,11 +274,11 @@ void nvgpu_mem_wr_n(struct gk20a *g, struct nvgpu_mem *mem, u32 offset, | |||
274 | void nvgpu_memset(struct gk20a *g, struct nvgpu_mem *mem, u32 offset, | 274 | void nvgpu_memset(struct gk20a *g, struct nvgpu_mem *mem, u32 offset, |
275 | u32 c, u32 size) | 275 | u32 c, u32 size) |
276 | { | 276 | { |
277 | WARN_ON(offset & 3); | 277 | WARN_ON(offset & 3U); |
278 | WARN_ON(size & 3); | 278 | WARN_ON(size & 3U); |
279 | WARN_ON(c & ~0xff); | 279 | WARN_ON(c & ~0xffU); |
280 | 280 | ||
281 | c &= 0xff; | 281 | c &= 0xffU; |
282 | 282 | ||
283 | if (mem->aperture == APERTURE_SYSMEM) { | 283 | if (mem->aperture == APERTURE_SYSMEM) { |
284 | u8 *dest = (u8 *)mem->cpu_va + offset; | 284 | u8 *dest = (u8 *)mem->cpu_va + offset; |