5 files changed, 31 insertions, 32 deletions

diff --git a/drivers/gpu/nvgpu/include/nvgpu/kmem.h b/drivers/gpu/nvgpu/include/nvgpu/kmem.h
index 91574ce0..852f6f8a 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/kmem.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/kmem.h
@@ -24,13 +24,7 @@
 #define __NVGPU_KMEM_H__
 
 #include <nvgpu/types.h>
-
-/*
- * Incase this isn't defined already.
- */
-#ifndef _THIS_IP_
-#define _THIS_IP_  ({ __label__ __here; __here: (unsigned long)&&__here; })
-#endif
+#include <nvgpu/utils.h>
 
 struct gk20a;
 
@@ -125,7 +119,7 @@ void nvgpu_kmem_cache_free(struct nvgpu_kmem_cache *cache, void *ptr);
  *
  * This function may sleep so cannot be used in IRQs.
  */
-#define nvgpu_kmalloc(g, size)          __nvgpu_kmalloc(g, size, _THIS_IP_)
+#define nvgpu_kmalloc(g, size)          __nvgpu_kmalloc(g, size, _NVGPU_GET_IP_)
 
 /**
  * nvgpu_kzalloc - Allocate from the kernel's allocator.
@@ -136,7 +130,7 @@ void nvgpu_kmem_cache_free(struct nvgpu_kmem_cache *cache, void *ptr);
  * Identical to nvgpu_kalloc() except the memory will be zeroed before being
  * returned.
  */
-#define nvgpu_kzalloc(g, size)          __nvgpu_kzalloc(g, size, _THIS_IP_)
+#define nvgpu_kzalloc(g, size)          __nvgpu_kzalloc(g, size, _NVGPU_GET_IP_)
 
 /**
  * nvgpu_kcalloc - Allocate from the kernel's allocator.
@@ -148,7 +142,8 @@ void nvgpu_kmem_cache_free(struct nvgpu_kmem_cache *cache, void *ptr);
  * Identical to nvgpu_kalloc() except the size of the memory chunk returned is
  * @n * @size.
  */
-#define nvgpu_kcalloc(g, n, size)       __nvgpu_kcalloc(g, n, size, _THIS_IP_)
+#define nvgpu_kcalloc(g, n, size)       \
+        __nvgpu_kcalloc(g, n, size, _NVGPU_GET_IP_)
 
 /**
  * nvgpu_vmalloc - Allocate memory and return a map to it.
@@ -164,7 +159,7 @@ void nvgpu_kmem_cache_free(struct nvgpu_kmem_cache *cache, void *ptr);
  *
  * This function may sleep.
  */
-#define nvgpu_vmalloc(g, size)          __nvgpu_vmalloc(g, size, _THIS_IP_)
+#define nvgpu_vmalloc(g, size)          __nvgpu_vmalloc(g, size, _NVGPU_GET_IP_)
 
 /**
  * nvgpu_vzalloc - Allocate memory and return a map to it.
@@ -174,7 +169,7 @@ void nvgpu_kmem_cache_free(struct nvgpu_kmem_cache *cache, void *ptr);
  *
  * Identical to nvgpu_vmalloc() except this will return zero'ed memory.
  */
-#define nvgpu_vzalloc(g, size)          __nvgpu_vzalloc(g, size, _THIS_IP_)
+#define nvgpu_vzalloc(g, size)          __nvgpu_vzalloc(g, size, _NVGPU_GET_IP_)
 
 /**
  * nvgpu_kfree - Frees an alloc from nvgpu_kmalloc, nvgpu_kzalloc,
diff --git a/drivers/gpu/nvgpu/include/nvgpu/linux/kmem.h b/drivers/gpu/nvgpu/include/nvgpu/linux/kmem.h
index 611854f2..660aac9f 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/linux/kmem.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/linux/kmem.h
@@ -21,14 +21,11 @@ struct gk20a;
 struct device;
 
 #ifdef CONFIG_NVGPU_TRACK_MEM_USAGE
-void *__nvgpu_track_vmalloc(struct gk20a *g, unsigned long size,
-                            unsigned long ip);
-void *__nvgpu_track_vzalloc(struct gk20a *g, unsigned long size,
-                            unsigned long ip);
-void *__nvgpu_track_kmalloc(struct gk20a *g, size_t size, unsigned long ip);
-void *__nvgpu_track_kzalloc(struct gk20a *g, size_t size, unsigned long ip);
-void *__nvgpu_track_kcalloc(struct gk20a *g, size_t n, size_t size,
-                            unsigned long ip);
+void *__nvgpu_track_vmalloc(struct gk20a *g, unsigned long size, void *ip);
+void *__nvgpu_track_vzalloc(struct gk20a *g, unsigned long size, void *ip);
+void *__nvgpu_track_kmalloc(struct gk20a *g, size_t size, void *ip);
+void *__nvgpu_track_kzalloc(struct gk20a *g, size_t size, void *ip);
+void *__nvgpu_track_kcalloc(struct gk20a *g, size_t n, size_t size, void *ip);
 void  __nvgpu_track_vfree(struct gk20a *g, void *addr);
 void  __nvgpu_track_kfree(struct gk20a *g, void *addr);
 #endif
@@ -39,11 +36,11 @@ void  __nvgpu_track_kfree(struct gk20a *g, void *addr);
  * These are the Linux implementations of the various kmem functions defined by
  * nvgpu. This should not be included directly - instead include <nvgpu/kmem.h>.
  */
-void *__nvgpu_kmalloc(struct gk20a *g, size_t size, unsigned long ip);
-void *__nvgpu_kzalloc(struct gk20a *g, size_t size, unsigned long ip);
-void *__nvgpu_kcalloc(struct gk20a *g, size_t n, size_t size, unsigned long ip);
-void *__nvgpu_vmalloc(struct gk20a *g, unsigned long size, unsigned long ip);
-void *__nvgpu_vzalloc(struct gk20a *g, unsigned long size, unsigned long ip);
+void *__nvgpu_kmalloc(struct gk20a *g, size_t size, void *ip);
+void *__nvgpu_kzalloc(struct gk20a *g, size_t size, void *ip);
+void *__nvgpu_kcalloc(struct gk20a *g, size_t n, size_t size, void *ip);
+void *__nvgpu_vmalloc(struct gk20a *g, unsigned long size, void *ip);
+void *__nvgpu_vzalloc(struct gk20a *g, unsigned long size, void *ip);
 void __nvgpu_kfree(struct gk20a *g, void *addr);
 void __nvgpu_vfree(struct gk20a *g, void *addr);
 
diff --git a/drivers/gpu/nvgpu/include/nvgpu/posix/kmem.h b/drivers/gpu/nvgpu/include/nvgpu/posix/kmem.h
index 483ac3b3..efcdd3d5 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/posix/kmem.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/posix/kmem.h
@@ -25,11 +25,11 @@
 
 #include <nvgpu/types.h>
 
-void *__nvgpu_kmalloc(struct gk20a *g, size_t size, unsigned long ip);
-void *__nvgpu_kzalloc(struct gk20a *g, size_t size, unsigned long ip);
-void *__nvgpu_kcalloc(struct gk20a *g, size_t n, size_t size, unsigned long ip);
-void *__nvgpu_vmalloc(struct gk20a *g, unsigned long size, unsigned long ip);
-void *__nvgpu_vzalloc(struct gk20a *g, unsigned long size, unsigned long ip);
+void *__nvgpu_kmalloc(struct gk20a *g, size_t size, void *ip);
+void *__nvgpu_kzalloc(struct gk20a *g, size_t size, void *ip);
+void *__nvgpu_kcalloc(struct gk20a *g, size_t n, size_t size, void *ip);
+void *__nvgpu_vmalloc(struct gk20a *g, unsigned long size, void *ip);
+void *__nvgpu_vzalloc(struct gk20a *g, unsigned long size, void *ip);
 void __nvgpu_kfree(struct gk20a *g, void *addr);
 void __nvgpu_vfree(struct gk20a *g, void *addr);
 
diff --git a/drivers/gpu/nvgpu/include/nvgpu/timers.h b/drivers/gpu/nvgpu/include/nvgpu/timers.h
index 83dd8d78..20becfdd 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/timers.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/timers.h
@@ -24,6 +24,7 @@
 #define __NVGPU_TIMERS_H__
 
 #include <nvgpu/types.h>
+#include <nvgpu/utils.h>
 
 struct gk20a;
 
@@ -85,10 +86,10 @@ int nvgpu_timeout_init(struct gk20a *g, struct nvgpu_timeout *timeout,
 int nvgpu_timeout_peek_expired(struct nvgpu_timeout *timeout);
 
 #define nvgpu_timeout_expired(__timeout)                                \
-        __nvgpu_timeout_expired_msg(__timeout, (void *)_THIS_IP_, "")
+        __nvgpu_timeout_expired_msg(__timeout, _NVGPU_GET_IP_, "")
 
 #define nvgpu_timeout_expired_msg(__timeout, fmt, args...)              \
-        __nvgpu_timeout_expired_msg(__timeout, (void *)_THIS_IP_,       \
+        __nvgpu_timeout_expired_msg(__timeout, _NVGPU_GET_IP_,          \
                                     fmt, ##args)
 
 /*
diff --git a/drivers/gpu/nvgpu/include/nvgpu/utils.h b/drivers/gpu/nvgpu/include/nvgpu/utils.h
index 22102fa3..6184608a 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/utils.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/utils.h
@@ -49,4 +49,10 @@ static inline u32 get_field(u32 reg, u32 mask)
 {
         return (reg & mask);
 }
+
+/*
+ * MISRA Rule 11.6 compliant IP address generator.
+ */
+#define _NVGPU_GET_IP_          ({ __label__ __here; __here: &&__here; })
+
 #endif /* NVGPU_UTILS_H */