diff --git a/drivers/gpu/nvgpu/common/gsp_scheduler/gsp_runlist.c b/drivers/gpu/nvgpu/common/gsp_scheduler/gsp_runlist.c index 501997d4b..98239d79f 100644 --- a/drivers/gpu/nvgpu/common/gsp_scheduler/gsp_runlist.c +++ b/drivers/gpu/nvgpu/common/gsp_scheduler/gsp_runlist.c @@ -39,7 +39,7 @@ static void gsp_handle_cmd_ack(struct gk20a *g, struct nv_flcn_msg_gsp *msg, { bool *command_ack = param; - nvgpu_log_fn(g, " "); + nvgpu_gsp_dbg(g, " "); switch (msg->hdr.unit_id) { case NV_GSP_UNIT_NULL: @@ -89,7 +89,7 @@ int nvgpu_gsp_runlist_submit(struct gk20a *g, struct nvgpu_runlist *runlist) int err = 0; size_t tmp_size; - nvgpu_log_fn(g, " "); + nvgpu_gsp_dbg(g, " "); (void) memset(&cmd, 0, sizeof(struct nv_flcn_cmd_gsp)); cmd.hdr.unit_id = NV_GSP_UNIT_SUBMIT_RUNLIST; @@ -146,7 +146,7 @@ int nvgpu_gsp_send_devices_info(struct gk20a *g) int err = 0; size_t tmp_size; - nvgpu_log_fn(g, " "); + nvgpu_gsp_dbg(g, " "); (void) memset(&cmd, 0, sizeof(struct nv_flcn_cmd_gsp)); cmd.hdr.unit_id = NV_GSP_UNIT_DEVICES_INFO; diff --git a/drivers/gpu/nvgpu/common/gsp_scheduler/gsp_scheduler.c b/drivers/gpu/nvgpu/common/gsp_scheduler/gsp_scheduler.c index 7945874f1..676876ebc 100644 --- a/drivers/gpu/nvgpu/common/gsp_scheduler/gsp_scheduler.c +++ b/drivers/gpu/nvgpu/common/gsp_scheduler/gsp_scheduler.c @@ -35,7 +35,7 @@ static void gsp_sched_get_file_names(struct gk20a *g, struct gsp_fw *gsp_ucode) { - nvgpu_log_fn(g, " "); + nvgpu_gsp_dbg(g, " "); gsp_ucode->code_name = GSP_DBG_RISCV_FW_CODE; gsp_ucode->data_name = GSP_DBG_RISCV_FW_DATA; @@ -46,7 +46,7 @@ void nvgpu_gsp_sched_suspend(struct gk20a *g, struct nvgpu_gsp_sched *gsp_sched) { struct nvgpu_gsp *gsp = gsp_sched->gsp; - nvgpu_log_fn(g, " "); + nvgpu_gsp_dbg(g, " "); if (gsp == NULL) { nvgpu_info(g, "GSP not initialized"); @@ -69,7 +69,7 @@ void nvgpu_gsp_sched_sw_deinit(struct gk20a *g) { struct nvgpu_gsp_sched *gsp_sched = g->gsp_sched; - nvgpu_log_fn(g, " "); + nvgpu_gsp_dbg(g, " "); if (gsp_sched == NULL) { return; @@ -93,7 +93,7 @@ void nvgpu_gsp_sched_sw_deinit(struct gk20a *g) static int gsp_sched_wait_for_init(struct gk20a *g, struct nvgpu_gsp_sched *gsp_sched, signed int timeoutms) { - nvgpu_log_fn(g, " "); + nvgpu_gsp_dbg(g, " "); do { if (gsp_sched->gsp_ready) { @@ -118,7 +118,7 @@ int nvgpu_gsp_sched_sw_init(struct gk20a *g) struct nvgpu_gsp_sched *gsp_sched; struct nvgpu_gsp *gsp; - nvgpu_log_fn(g, " "); + nvgpu_gsp_dbg(g, " "); if (g->gsp_sched != NULL) { /* @@ -161,7 +161,7 @@ int nvgpu_gsp_sched_sw_init(struct gk20a *g) goto de_init; } - nvgpu_log_fn(g, " Done "); + nvgpu_gsp_dbg(g, " Done "); return err; de_init: nvgpu_gsp_sched_sw_deinit(g); diff --git a/drivers/gpu/nvgpu/common/gsp_scheduler/ipc/gsp_cmd.c b/drivers/gpu/nvgpu/common/gsp_scheduler/ipc/gsp_cmd.c index 806e4b29d..bbbdcbb16 100644 --- a/drivers/gpu/nvgpu/common/gsp_scheduler/ipc/gsp_cmd.c +++ b/drivers/gpu/nvgpu/common/gsp_scheduler/ipc/gsp_cmd.c @@ -78,7 +78,7 @@ static int gsp_write_cmd(struct nvgpu_gsp_sched *gsp_sched, struct nvgpu_gsp *gsp = gsp_sched->gsp; int err; - nvgpu_log_fn(g, " "); + nvgpu_gsp_dbg(g, " "); nvgpu_timeout_init_cpu_timer(g, &timeout, timeout_ms); diff --git a/drivers/gpu/nvgpu/common/gsp_scheduler/ipc/gsp_msg.c b/drivers/gpu/nvgpu/common/gsp_scheduler/ipc/gsp_msg.c index bd7a0f192..081081d54 100644 --- a/drivers/gpu/nvgpu/common/gsp_scheduler/ipc/gsp_msg.c +++ b/drivers/gpu/nvgpu/common/gsp_scheduler/ipc/gsp_msg.c @@ -174,7 +174,7 @@ int nvgpu_gsp_process_message(struct gk20a *g) bool read_msg; int status = 0; - nvgpu_log_fn(g, " "); + nvgpu_gsp_dbg(g, " "); if (unlikely(!gsp_sched->gsp_ready)) { status = gsp_process_init_msg(gsp_sched, &msg); diff --git a/drivers/gpu/nvgpu/common/gsp_scheduler/ipc/gsp_seq.c b/drivers/gpu/nvgpu/common/gsp_scheduler/ipc/gsp_seq.c index 952bbd316..67664bfc7 100644 --- a/drivers/gpu/nvgpu/common/gsp_scheduler/ipc/gsp_seq.c +++ b/drivers/gpu/nvgpu/common/gsp_scheduler/ipc/gsp_seq.c @@ -34,7 +34,7 @@ static void gsp_sequences_init(struct gk20a *g, { u16 i = 0; - nvgpu_log_fn(g, " "); + nvgpu_gsp_dbg(g, " "); (void) memset(sequences->seq, 0, sizeof(*sequences->seq) * GSP_MAX_NUM_SEQUENCES); @@ -52,7 +52,7 @@ int nvgpu_gsp_sequences_init(struct gk20a *g, struct nvgpu_gsp_sched *gsp_sched) int err = 0; struct gsp_sequences *seqs; - nvgpu_log_fn(g, " "); + nvgpu_gsp_dbg(g, " "); seqs = (struct gsp_sequences *) nvgpu_kzalloc(g, sizeof(*seqs->seq)); if (seqs == NULL) { @@ -95,7 +95,7 @@ int nvgpu_gsp_seq_acquire(struct gk20a *g, u32 index = 0; int err = 0; - nvgpu_log_fn(g, " "); + nvgpu_gsp_dbg(g, " "); nvgpu_mutex_acquire(&sequences->gsp_seq_lock); @@ -146,7 +146,7 @@ int nvgpu_gsp_seq_response_handle(struct gk20a *g, { struct gsp_sequence *seq; - nvgpu_log_fn(g, " "); + nvgpu_gsp_dbg(g, " "); /* get the sequence info data associated with this message */ seq = &sequences->seq[seq_id]; diff --git a/drivers/gpu/nvgpu/include/nvgpu/gsp.h b/drivers/gpu/nvgpu/include/nvgpu/gsp.h index 19d1c5fe4..e8ccb2e67 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/gsp.h +++ b/drivers/gpu/nvgpu/include/nvgpu/gsp.h @@ -24,6 +24,10 @@ #define NVGPU_GSP #include #include + +/* macro is used to log debug messages when the gpu_dbg_gsp is enabled */ +#define nvgpu_gsp_dbg(g, fmt, arg...) nvgpu_log(g, gpu_dbg_gsp, fmt, ##arg) + struct gk20a; struct nvgpu_gsp; struct nvgpu_runlist; diff --git a/drivers/gpu/nvgpu/include/nvgpu/log_common.h b/drivers/gpu/nvgpu/include/nvgpu/log_common.h index 98c78b3b6..dad92bc35 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/log_common.h +++ b/drivers/gpu/nvgpu/include/nvgpu/log_common.h @@ -88,5 +88,5 @@ enum nvgpu_log_type { #define gpu_dbg_nvs BIT(45) /* NvGPU's NVS logging. */ #define gpu_dbg_nvs_internal BIT(46) /* Internal NVS logging. */ #endif - +#define gpu_dbg_gsp BIT(47) /* GSP Scheduler debugging */ #endif