summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2017-05-22 14:27:40 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-05-26 06:34:30 -0400
commit2e338c77eac4edffb94c8c9480dbd72712c7696f (patch)
tree9d5da6355bc653ef2ba9014ea696ad0391c523a1 /drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
parent726900b8433294fd89a6d730d2fec9de8e33afda (diff)
gpu: nvgpu: remove duplicate \n from log messages
nvgpu_log/info/warn/err() internally add a \n to the end of the message. Hence, callers should not include a \n at the end of the message. Doing so results in duplicate \n being printed, which ends up creating empty log messages. Remove the duplicate \n from all err/warn messages. Bug 1928311 Change-Id: I99362c5327f36146f28ba63d4e68181589735c39 Signed-off-by: Stephen Warren <swarren@nvidia.com> Reviewed-on: http://git-master/r/1487232 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/pmu_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/pmu_gk20a.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
index 8b28a71a..a9e03943 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
@@ -2193,7 +2193,7 @@ int gk20a_init_pmu(struct pmu_gk20a *pmu)
2193 get_pmu_sequence_out_alloc_ptr_v0; 2193 get_pmu_sequence_out_alloc_ptr_v0;
2194 break; 2194 break;
2195 default: 2195 default:
2196 nvgpu_err(g, "PMU code version not supported version: %d\n", 2196 nvgpu_err(g, "PMU code version not supported version: %d",
2197 pmu->desc->app_version); 2197 pmu->desc->app_version);
2198 err = -EINVAL; 2198 err = -EINVAL;
2199 goto fail_pmu_seq; 2199 goto fail_pmu_seq;
@@ -3227,7 +3227,7 @@ static int gk20a_init_pmu_setup_sw(struct gk20a *g)
3227 err = nvgpu_dma_alloc_map_sys(vm, GK20A_PMU_SEQ_BUF_SIZE, 3227 err = nvgpu_dma_alloc_map_sys(vm, GK20A_PMU_SEQ_BUF_SIZE,
3228 &pmu->seq_buf); 3228 &pmu->seq_buf);
3229 if (err) { 3229 if (err) {
3230 nvgpu_err(g, "failed to allocate memory\n"); 3230 nvgpu_err(g, "failed to allocate memory");
3231 goto err_free_seq; 3231 goto err_free_seq;
3232 } 3232 }
3233 3233
@@ -3244,7 +3244,7 @@ static int gk20a_init_pmu_setup_sw(struct gk20a *g)
3244 err = nvgpu_dma_alloc_map(vm, GK20A_PMU_TRACE_BUFSIZE, 3244 err = nvgpu_dma_alloc_map(vm, GK20A_PMU_TRACE_BUFSIZE,
3245 &pmu->trace_buf); 3245 &pmu->trace_buf);
3246 if (err) { 3246 if (err) {
3247 nvgpu_err(g, "failed to allocate pmu trace buffer\n"); 3247 nvgpu_err(g, "failed to allocate pmu trace buffer");
3248 goto err_free_seq_buf; 3248 goto err_free_seq_buf;
3249 } 3249 }
3250 3250
@@ -4542,7 +4542,7 @@ void pmu_dump_falcon_stats(struct pmu_gk20a *pmu)
4542 nvgpu_err(g, "PMU_FALCON_REG_SP : 0x%x", 4542 nvgpu_err(g, "PMU_FALCON_REG_SP : 0x%x",
4543 gk20a_readl(g, pwr_pmu_falcon_icd_rdata_r())); 4543 gk20a_readl(g, pwr_pmu_falcon_icd_rdata_r()));
4544 } 4544 }
4545 nvgpu_err(g, "elpg stat: %d\n", 4545 nvgpu_err(g, "elpg stat: %d",
4546 pmu->elpg_stat); 4546 pmu->elpg_stat);
4547 4547
4548 /* PMU may crash due to FECS crash. Dump FECS status */ 4548 /* PMU may crash due to FECS crash. Dump FECS status */
@@ -4671,7 +4671,7 @@ static bool pmu_validate_cmd(struct pmu_gk20a *pmu, struct pmu_cmd *cmd,
4671 return true; 4671 return true;
4672 4672
4673invalid_cmd: 4673invalid_cmd:
4674 nvgpu_err(g, "invalid pmu cmd :\n" 4674 nvgpu_err(g, "invalid pmu cmd :"
4675 "queue_id=%d,\n" 4675 "queue_id=%d,\n"
4676 "cmd_size=%d, cmd_unit_id=%d, msg=%p, msg_size=%d,\n" 4676 "cmd_size=%d, cmd_unit_id=%d, msg=%p, msg_size=%d,\n"
4677 "payload in=%p, in_size=%d, in_offset=%d,\n" 4677 "payload in=%p, in_size=%d, in_offset=%d,\n"
@@ -4756,7 +4756,7 @@ int gk20a_pmu_sysmem_surface_alloc(struct gk20a *g, struct nvgpu_mem *mem,
4756 4756
4757 err = nvgpu_dma_alloc_map_sys(vm, size, mem); 4757 err = nvgpu_dma_alloc_map_sys(vm, size, mem);
4758 if (err) { 4758 if (err) {
4759 nvgpu_err(g, "failed to allocate memory\n"); 4759 nvgpu_err(g, "failed to allocate memory");
4760 return -ENOMEM; 4760 return -ENOMEM;
4761 } 4761 }
4762 4762