diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2018-03-28 16:39:30 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-04-04 02:24:31 -0400 |
commit | a108d3f0368c72f2d553cac1470531677b5a7b88 (patch) | |
tree | 24e252a07dfc4951c60e321e8e44e74a4df7e84f /drivers/gpu/nvgpu/common | |
parent | af65ec26976719547212ae29abc10548cf40b7ac (diff) |
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>
Diffstat (limited to 'drivers/gpu/nvgpu/common')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/debug.c | 4 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/log.c | 6 |
2 files changed, 5 insertions, 5 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) | |||
308 | l->debugfs, &g->disable_syncpoints); | 308 | l->debugfs, &g->disable_syncpoints); |
309 | 309 | ||
310 | /* Legacy debugging API. */ | 310 | /* Legacy debugging API. */ |
311 | debugfs_create_u32("dbg_mask", S_IRUGO|S_IWUSR, | 311 | debugfs_create_u64("dbg_mask", S_IRUGO|S_IWUSR, |
312 | l->debugfs, &nvgpu_dbg_mask); | 312 | l->debugfs, &nvgpu_dbg_mask); |
313 | 313 | ||
314 | /* New debug logging API. */ | 314 | /* New debug logging API. */ |
315 | debugfs_create_u32("log_mask", S_IRUGO|S_IWUSR, | 315 | debugfs_create_u64("log_mask", S_IRUGO|S_IWUSR, |
316 | l->debugfs, &g->log_mask); | 316 | l->debugfs, &g->log_mask); |
317 | debugfs_create_u32("log_trace", S_IRUGO|S_IWUSR, | 317 | debugfs_create_u32("log_trace", S_IRUGO|S_IWUSR, |
318 | l->debugfs, &g->log_trace); | 318 | 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 @@ | |||
38 | */ | 38 | */ |
39 | #define LOG_FMT "nvgpu: %s %33s:%-4d [%s] %s\n" | 39 | #define LOG_FMT "nvgpu: %s %33s:%-4d [%s] %s\n" |
40 | 40 | ||
41 | u32 nvgpu_dbg_mask = NVGPU_DEFAULT_DBG_MASK; | 41 | u64 nvgpu_dbg_mask = NVGPU_DEFAULT_DBG_MASK; |
42 | 42 | ||
43 | static const char *log_types[] = { | 43 | static const char *log_types[] = { |
44 | "ERR", | 44 | "ERR", |
@@ -47,7 +47,7 @@ static const char *log_types[] = { | |||
47 | "INFO", | 47 | "INFO", |
48 | }; | 48 | }; |
49 | 49 | ||
50 | int nvgpu_log_mask_enabled(struct gk20a *g, u32 log_mask) | 50 | int nvgpu_log_mask_enabled(struct gk20a *g, u64 log_mask) |
51 | { | 51 | { |
52 | return !!(g->log_mask & log_mask); | 52 | return !!(g->log_mask & log_mask); |
53 | } | 53 | } |
@@ -115,7 +115,7 @@ void __nvgpu_log_msg(struct gk20a *g, const char *func_name, int line, | |||
115 | } | 115 | } |
116 | 116 | ||
117 | __attribute__((format (printf, 5, 6))) | 117 | __attribute__((format (printf, 5, 6))) |
118 | void __nvgpu_log_dbg(struct gk20a *g, u32 log_mask, | 118 | void __nvgpu_log_dbg(struct gk20a *g, u64 log_mask, |
119 | const char *func_name, int line, | 119 | const char *func_name, int line, |
120 | const char *fmt, ...) | 120 | const char *fmt, ...) |
121 | { | 121 | { |