summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeepak Nibade <dnibade@nvidia.com>2017-04-12 02:26:20 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-04-12 18:34:53 -0400
commite846d396686f828e2302a1acc286bf06b1499408 (patch)
tree0915bcba8d1802736252327ae144957bac87b70f
parent8b5e78dab27fdcc41dec91ec5305b89270682a75 (diff)
gpu: nvgpu: add INFO log type
nvgpu_info() currently prints "DEBUG" in its message whereas we need "INFO" to be printed Add new type INFO to enum nvgpu_log_type and log_types[] strings Add a case for INFO in __nvgpu_really_print_log() which uses pr_info() for INFO messages Change-Id: I1a0205b3f8665decab686d290a559b5c05e34d4a Signed-off-by: Deepak Nibade <dnibade@nvidia.com> Reviewed-on: http://git-master/r/1461134 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
-rw-r--r--drivers/gpu/nvgpu/common/linux/log.c6
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/log.h5
2 files changed, 8 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/log.c b/drivers/gpu/nvgpu/common/linux/log.c
index e89840ef..959acfcb 100644
--- a/drivers/gpu/nvgpu/common/linux/log.c
+++ b/drivers/gpu/nvgpu/common/linux/log.c
@@ -41,7 +41,8 @@ u32 nvgpu_dbg_mask = NVGPU_DEFAULT_DBG_MASK;
41static const char *log_types[] = { 41static const char *log_types[] = {
42 "ERR", 42 "ERR",
43 "WRN", 43 "WRN",
44 "DBG" 44 "DBG",
45 "INFO",
45}; 46};
46 47
47int nvgpu_log_mask_enabled(struct gk20a *g, u32 log_mask) 48int nvgpu_log_mask_enabled(struct gk20a *g, u32 log_mask)
@@ -85,6 +86,9 @@ static void __nvgpu_really_print_log(u32 trace, const char *gpu_name,
85 */ 86 */
86 pr_info(LOG_FMT, name, func_name, line, log_type, log); 87 pr_info(LOG_FMT, name, func_name, line, log_type, log);
87 break; 88 break;
89 case INFO:
90 pr_info(LOG_FMT, name, func_name, line, log_type, log);
91 break;
88 case WARNING: 92 case WARNING:
89 pr_warn(LOG_FMT, name, func_name, line, log_type, log); 93 pr_warn(LOG_FMT, name, func_name, line, log_type, log);
90 break; 94 break;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/log.h b/drivers/gpu/nvgpu/include/nvgpu/log.h
index e16aaa92..45a6ec11 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/log.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/log.h
@@ -25,7 +25,8 @@ struct gk20a;
25enum nvgpu_log_type { 25enum nvgpu_log_type {
26 ERROR, 26 ERROR,
27 WARNING, 27 WARNING,
28 DEBUG 28 DEBUG,
29 INFO,
29}; 30};
30 31
31/* 32/*
@@ -131,7 +132,7 @@ int nvgpu_log_mask_enabled(struct gk20a *g, u32 log_mask);
131 * Unconditionally print an information message. 132 * Unconditionally print an information message.
132 */ 133 */
133#define nvgpu_info(g, fmt, arg...) \ 134#define nvgpu_info(g, fmt, arg...) \
134 __nvgpu_log_msg(g, __func__, __LINE__, DEBUG, fmt, ##arg) 135 __nvgpu_log_msg(g, __func__, __LINE__, INFO, fmt, ##arg)
135 136
136/* 137/*
137 * Some convenience macros. 138 * Some convenience macros.