summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gp106/sec2_gp106.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/gp106/sec2_gp106.c')
-rw-r--r--drivers/gpu/nvgpu/gp106/sec2_gp106.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/gp106/sec2_gp106.c b/drivers/gpu/nvgpu/gp106/sec2_gp106.c
index 08c7f84a..1c959022 100644
--- a/drivers/gpu/nvgpu/gp106/sec2_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/sec2_gp106.c
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. 2 * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved.
3 * 3 *
4 * Permission is hereby granted, free of charge, to any person obtaining a 4 * Permission is hereby granted, free of charge, to any person obtaining a
5 * copy of this software and associated documentation files (the "Software"), 5 * copy of this software and associated documentation files (the "Software"),
@@ -31,8 +31,8 @@
31#include <nvgpu/hw/gp106/hw_psec_gp106.h> 31#include <nvgpu/hw/gp106/hw_psec_gp106.h>
32 32
33/*Defines*/ 33/*Defines*/
34#define gm20b_dbg_pmu(fmt, arg...) \ 34#define gm20b_dbg_pmu(g, fmt, arg...) \
35 gk20a_dbg(gpu_dbg_pmu, fmt, ##arg) 35 nvgpu_log(g, gpu_dbg_pmu, fmt, ##arg)
36 36
37int sec2_clear_halt_interrupt_status(struct gk20a *g, unsigned int timeout) 37int sec2_clear_halt_interrupt_status(struct gk20a *g, unsigned int timeout)
38{ 38{
@@ -56,7 +56,7 @@ int sec2_wait_for_halt(struct gk20a *g, unsigned int timeout)
56 } 56 }
57 57
58 g->acr.capabilities = gk20a_readl(g, psec_falcon_mailbox1_r()); 58 g->acr.capabilities = gk20a_readl(g, psec_falcon_mailbox1_r());
59 gm20b_dbg_pmu("ACR capabilities %x\n", g->acr.capabilities); 59 gm20b_dbg_pmu(g, "ACR capabilities %x\n", g->acr.capabilities);
60 data = gk20a_readl(g, psec_falcon_mailbox0_r()); 60 data = gk20a_readl(g, psec_falcon_mailbox0_r());
61 if (data) { 61 if (data) {
62 nvgpu_err(g, "ACR boot failed, err %x", data); 62 nvgpu_err(g, "ACR boot failed, err %x", data);
@@ -87,7 +87,7 @@ int bl_bootstrap_sec2(struct nvgpu_pmu *pmu,
87 u32 data = 0; 87 u32 data = 0;
88 u32 dst; 88 u32 dst;
89 89
90 gk20a_dbg_fn(""); 90 nvgpu_log_fn(g, " ");
91 91
92 /* SEC2 Config */ 92 /* SEC2 Config */
93 gk20a_writel(g, psec_falcon_itfen_r(), 93 gk20a_writel(g, psec_falcon_itfen_r(),
@@ -123,7 +123,7 @@ int bl_bootstrap_sec2(struct nvgpu_pmu *pmu,
123 (u8 *)(acr->hsbl_ucode.cpu_va), bl_sz, 0, 0, 123 (u8 *)(acr->hsbl_ucode.cpu_va), bl_sz, 0, 0,
124 pmu_bl_gm10x_desc->bl_start_tag); 124 pmu_bl_gm10x_desc->bl_start_tag);
125 125
126 gm20b_dbg_pmu("Before starting falcon with BL\n"); 126 gm20b_dbg_pmu(g, "Before starting falcon with BL\n");
127 127
128 gk20a_writel(g, psec_falcon_mailbox0_r(), 0xDEADA5A5); 128 gk20a_writel(g, psec_falcon_mailbox0_r(), 0xDEADA5A5);
129 129