gpu: nvgpu: Use u64 for log mask

BIT() is defined as returning a 64-bit value. We use it to create the
log mask values, but the functions that accept log mask take only
u32 as parameter.

Use u64 as log mask parameter for the logging functions to match the
sizes.

Change-Id: I6f0803a7d04ee6a2ee725b5defc4cc14b5b7acf5
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1683818
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

4 files changed, 9 insertions, 9 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/debug.c b/drivers/gpu/nvgpu/common/linux/debug.c
index 80a1f7db..a458a3d4 100644
--- a/drivers/gpu/nvgpu/common/linux/debug.c
+++ b/drivers/gpu/nvgpu/common/linux/debug.c
@@ -308,11 +308,11 @@ void gk20a_debug_init(struct gk20a *g, const char *debugfs_symlink)
                 l->debugfs, &g->disable_syncpoints);
 
         /* Legacy debugging API. */
-        debugfs_create_u32("dbg_mask", S_IRUGO|S_IWUSR,
+        debugfs_create_u64("dbg_mask", S_IRUGO|S_IWUSR,
                 l->debugfs, &nvgpu_dbg_mask);
 
         /* New debug logging API. */
-        debugfs_create_u32("log_mask", S_IRUGO|S_IWUSR,
+        debugfs_create_u64("log_mask", S_IRUGO|S_IWUSR,
                 l->debugfs, &g->log_mask);
         debugfs_create_u32("log_trace", S_IRUGO|S_IWUSR,
                 l->debugfs, &g->log_trace);
diff --git a/drivers/gpu/nvgpu/common/linux/log.c b/drivers/gpu/nvgpu/common/linux/log.c
index 01d3add1..4dc8f667 100644
--- a/drivers/gpu/nvgpu/common/linux/log.c
+++ b/drivers/gpu/nvgpu/common/linux/log.c
@@ -38,7 +38,7 @@
  */
 #define LOG_FMT                 "nvgpu: %s %33s:%-4d [%s]  %s\n"
 
-u32 nvgpu_dbg_mask = NVGPU_DEFAULT_DBG_MASK;
+u64 nvgpu_dbg_mask = NVGPU_DEFAULT_DBG_MASK;
 
 static const char *log_types[] = {
         "ERR",
@@ -47,7 +47,7 @@ static const char *log_types[] = {
         "INFO",
 };
 
-int nvgpu_log_mask_enabled(struct gk20a *g, u32 log_mask)
+int nvgpu_log_mask_enabled(struct gk20a *g, u64 log_mask)
 {
         return !!(g->log_mask & log_mask);
 }
@@ -115,7 +115,7 @@ void __nvgpu_log_msg(struct gk20a *g, const char *func_name, int line,
 }
 
 __attribute__((format (printf, 5, 6)))
-void __nvgpu_log_dbg(struct gk20a *g, u32 log_mask,
+void __nvgpu_log_dbg(struct gk20a *g, u64 log_mask,
                      const char *func_name, int line,
                      const char *fmt, ...)
 {
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index b5ebb9ba..d61423d1 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -1233,7 +1233,7 @@ struct gk20a {
         bool suspended;
         bool sw_ready;
 
-        u32 log_mask;
+        u64 log_mask;
         u32 log_trace;
 
         struct nvgpu_gpu_params params;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/log.h b/drivers/gpu/nvgpu/include/nvgpu/log.h
index 183948cd..897dcfc6 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/log.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/log.h
@@ -44,7 +44,7 @@ void __nvgpu_log_msg(struct gk20a *g, const char *func_name, int line,
                      enum nvgpu_log_type type, const char *fmt, ...);
 
 __attribute__((format (printf, 5, 6)))
-void __nvgpu_log_dbg(struct gk20a *g, u32 log_mask,
+void __nvgpu_log_dbg(struct gk20a *g, u64 log_mask,
                      const char *func_name, int line,
                      const char *fmt, ...);
 
@@ -92,7 +92,7 @@ void __nvgpu_log_dbg(struct gk20a *g, u32 log_mask,
  * said prints would not happen. For example for-loops of log statements in
  * critical paths.
  */
-int nvgpu_log_mask_enabled(struct gk20a *g, u32 log_mask);
+int nvgpu_log_mask_enabled(struct gk20a *g, u64 log_mask);
 
 /**
  * nvgpu_log - Print a debug message
@@ -164,7 +164,7 @@ int nvgpu_log_mask_enabled(struct gk20a *g, u32 log_mask);
  * This exist for backwards compatibility with the old debug/logging API. If you
  * want ftrace support use the new API!
  */
-extern u32 nvgpu_dbg_mask;
+extern u64 nvgpu_dbg_mask;
 
 #define gk20a_dbg(log_mask, fmt, arg...)                                \
         do {                                                            \