summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/therm
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/therm')
-rw-r--r--drivers/gpu/nvgpu/therm/thrm.c4
-rw-r--r--drivers/gpu/nvgpu/therm/thrmchannel.c10
-rw-r--r--drivers/gpu/nvgpu/therm/thrmdev.c8
-rw-r--r--drivers/gpu/nvgpu/therm/thrmpmu.c20
4 files changed, 20 insertions, 22 deletions
diff --git a/drivers/gpu/nvgpu/therm/thrm.c b/drivers/gpu/nvgpu/therm/thrm.c
index 731cf89e..863574b6 100644
--- a/drivers/gpu/nvgpu/therm/thrm.c
+++ b/drivers/gpu/nvgpu/therm/thrm.c
@@ -21,7 +21,7 @@ u32 therm_domain_sw_setup(struct gk20a *g)
21 21
22 status = therm_device_sw_setup(g); 22 status = therm_device_sw_setup(g);
23 if (status) { 23 if (status) {
24 gk20a_err(dev_from_gk20a(g), 24 nvgpu_err(g,
25 "error creating boardobjgrp for therm devices, status - 0x%x", 25 "error creating boardobjgrp for therm devices, status - 0x%x",
26 status); 26 status);
27 goto exit; 27 goto exit;
@@ -29,7 +29,7 @@ u32 therm_domain_sw_setup(struct gk20a *g)
29 29
30 status = therm_channel_sw_setup(g); 30 status = therm_channel_sw_setup(g);
31 if (status) { 31 if (status) {
32 gk20a_err(dev_from_gk20a(g), 32 nvgpu_err(g,
33 "error creating boardobjgrp for therm channel, status - 0x%x", 33 "error creating boardobjgrp for therm channel, status - 0x%x",
34 status); 34 status);
35 goto exit; 35 goto exit;
diff --git a/drivers/gpu/nvgpu/therm/thrmchannel.c b/drivers/gpu/nvgpu/therm/thrmchannel.c
index a09a4599..556bad86 100644
--- a/drivers/gpu/nvgpu/therm/thrmchannel.c
+++ b/drivers/gpu/nvgpu/therm/thrmchannel.c
@@ -32,7 +32,7 @@ static u32 _therm_channel_pmudatainit_device(struct gk20a *g,
32 32
33 status = boardobj_pmudatainit_super(g, board_obj_ptr, ppmudata); 33 status = boardobj_pmudatainit_super(g, board_obj_ptr, ppmudata);
34 if (status) { 34 if (status) {
35 gk20a_err(dev_from_gk20a(g), 35 nvgpu_err(g,
36 "error updating pmu boardobjgrp for therm channel 0x%x", 36 "error updating pmu boardobjgrp for therm channel 0x%x",
37 status); 37 status);
38 status = -ENOMEM; 38 status = -ENOMEM;
@@ -177,7 +177,7 @@ static u32 devinit_get_therm_channel_table(struct gk20a *g,
177 therm_channel_size, therm_channel_data.boardobj.type); 177 therm_channel_size, therm_channel_data.boardobj.type);
178 178
179 if (!boardobj) { 179 if (!boardobj) {
180 gk20a_err(dev_from_gk20a(g), 180 nvgpu_err(g,
181 "unable to create thermal device for %d type %d", 181 "unable to create thermal device for %d type %d",
182 index, therm_channel_data.boardobj.type); 182 index, therm_channel_data.boardobj.type);
183 status = -EINVAL; 183 status = -EINVAL;
@@ -188,7 +188,7 @@ static u32 devinit_get_therm_channel_table(struct gk20a *g,
188 boardobj, obj_index); 188 boardobj, obj_index);
189 189
190 if (status) { 190 if (status) {
191 gk20a_err(dev_from_gk20a(g), 191 nvgpu_err(g,
192 "unable to insert thermal device boardobj for %d", index); 192 "unable to insert thermal device boardobj for %d", index);
193 status = -EINVAL; 193 status = -EINVAL;
194 goto done; 194 goto done;
@@ -211,7 +211,7 @@ u32 therm_channel_sw_setup(struct gk20a *g)
211 /* Construct the Super Class and override the Interfaces */ 211 /* Construct the Super Class and override the Interfaces */
212 status = boardobjgrpconstruct_e32(&g->therm_pmu.therm_channelobjs.super); 212 status = boardobjgrpconstruct_e32(&g->therm_pmu.therm_channelobjs.super);
213 if (status) { 213 if (status) {
214 gk20a_err(dev_from_gk20a(g), 214 nvgpu_err(g,
215 "error creating boardobjgrp for therm devices, status - 0x%x", 215 "error creating boardobjgrp for therm devices, status - 0x%x",
216 status); 216 status);
217 goto done; 217 goto done;
@@ -232,7 +232,7 @@ u32 therm_channel_sw_setup(struct gk20a *g)
232 status = BOARDOBJGRP_PMU_CMD_GRP_SET_CONSTRUCT(g, pboardobjgrp, 232 status = BOARDOBJGRP_PMU_CMD_GRP_SET_CONSTRUCT(g, pboardobjgrp,
233 therm, THERM, therm_channel, THERM_CHANNEL); 233 therm, THERM, therm_channel, THERM_CHANNEL);
234 if (status) { 234 if (status) {
235 gk20a_err(dev_from_gk20a(g), 235 nvgpu_err(g,
236 "error constructing PMU_BOARDOBJ_CMD_GRP_SET interface - 0x%x", 236 "error constructing PMU_BOARDOBJ_CMD_GRP_SET interface - 0x%x",
237 status); 237 status);
238 goto done; 238 goto done;
diff --git a/drivers/gpu/nvgpu/therm/thrmdev.c b/drivers/gpu/nvgpu/therm/thrmdev.c
index 199343e0..4772b628 100644
--- a/drivers/gpu/nvgpu/therm/thrmdev.c
+++ b/drivers/gpu/nvgpu/therm/thrmdev.c
@@ -124,7 +124,7 @@ static u32 devinit_get_therm_device_table(struct gk20a *g,
124 therm_device_size, therm_device_data.boardobj.type); 124 therm_device_size, therm_device_data.boardobj.type);
125 125
126 if (!boardobj) { 126 if (!boardobj) {
127 gk20a_err(dev_from_gk20a(g), 127 nvgpu_err(g,
128 "unable to create thermal device for %d type %d", 128 "unable to create thermal device for %d type %d",
129 index, therm_device_data.boardobj.type); 129 index, therm_device_data.boardobj.type);
130 status = -EINVAL; 130 status = -EINVAL;
@@ -135,7 +135,7 @@ static u32 devinit_get_therm_device_table(struct gk20a *g,
135 boardobj, obj_index); 135 boardobj, obj_index);
136 136
137 if (status) { 137 if (status) {
138 gk20a_err(dev_from_gk20a(g), 138 nvgpu_err(g,
139 "unable to insert thermal device boardobj for %d", index); 139 "unable to insert thermal device boardobj for %d", index);
140 status = -EINVAL; 140 status = -EINVAL;
141 goto done; 141 goto done;
@@ -158,7 +158,7 @@ u32 therm_device_sw_setup(struct gk20a *g)
158 /* Construct the Super Class and override the Interfaces */ 158 /* Construct the Super Class and override the Interfaces */
159 status = boardobjgrpconstruct_e32(&g->therm_pmu.therm_deviceobjs.super); 159 status = boardobjgrpconstruct_e32(&g->therm_pmu.therm_deviceobjs.super);
160 if (status) { 160 if (status) {
161 gk20a_err(dev_from_gk20a(g), 161 nvgpu_err(g,
162 "error creating boardobjgrp for therm devices, status - 0x%x", 162 "error creating boardobjgrp for therm devices, status - 0x%x",
163 status); 163 status);
164 goto done; 164 goto done;
@@ -179,7 +179,7 @@ u32 therm_device_sw_setup(struct gk20a *g)
179 status = BOARDOBJGRP_PMU_CMD_GRP_SET_CONSTRUCT(g, pboardobjgrp, 179 status = BOARDOBJGRP_PMU_CMD_GRP_SET_CONSTRUCT(g, pboardobjgrp,
180 therm, THERM, therm_device, THERM_DEVICE); 180 therm, THERM, therm_device, THERM_DEVICE);
181 if (status) { 181 if (status) {
182 gk20a_err(dev_from_gk20a(g), 182 nvgpu_err(g,
183 "error constructing PMU_BOARDOBJ_CMD_GRP_SET interface - 0x%x", 183 "error constructing PMU_BOARDOBJ_CMD_GRP_SET interface - 0x%x",
184 status); 184 status);
185 goto done; 185 goto done;
diff --git a/drivers/gpu/nvgpu/therm/thrmpmu.c b/drivers/gpu/nvgpu/therm/thrmpmu.c
index 50df55c0..3d80eff3 100644
--- a/drivers/gpu/nvgpu/therm/thrmpmu.c
+++ b/drivers/gpu/nvgpu/therm/thrmpmu.c
@@ -29,15 +29,13 @@ static void therm_pmucmdhandler(struct gk20a *g, struct pmu_msg *msg,
29 (struct therm_pmucmdhandler_params *)param; 29 (struct therm_pmucmdhandler_params *)param;
30 30
31 if (msg->msg.therm.msg_type != NV_PMU_THERM_MSG_ID_RPC) { 31 if (msg->msg.therm.msg_type != NV_PMU_THERM_MSG_ID_RPC) {
32 gk20a_err(dev_from_gk20a(g), 32 nvgpu_err(g, "unknow msg %x",
33 "unknow msg %x",
34 msg->msg.pmgr.msg_type); 33 msg->msg.pmgr.msg_type);
35 return; 34 return;
36 } 35 }
37 36
38 if (!phandlerparams->prpccall->b_supported) 37 if (!phandlerparams->prpccall->b_supported)
39 gk20a_err(dev_from_gk20a(g), 38 nvgpu_err(g, "RPC msg %x failed",
40 "RPC msg %x failed",
41 msg->msg.pmgr.msg_type); 39 msg->msg.pmgr.msg_type);
42 else 40 else
43 phandlerparams->success = 1; 41 phandlerparams->success = 1;
@@ -52,7 +50,7 @@ u32 therm_send_pmgr_tables_to_pmu(struct gk20a *g)
52 pboardobjgrp = &g->therm_pmu.therm_deviceobjs.super.super; 50 pboardobjgrp = &g->therm_pmu.therm_deviceobjs.super.super;
53 status = pboardobjgrp->pmuinithandle(g, pboardobjgrp); 51 status = pboardobjgrp->pmuinithandle(g, pboardobjgrp);
54 if (status) { 52 if (status) {
55 gk20a_err(dev_from_gk20a(g), 53 nvgpu_err(g,
56 "therm_send_pmgr_tables_to_pmu - therm_device failed %x", 54 "therm_send_pmgr_tables_to_pmu - therm_device failed %x",
57 status); 55 status);
58 goto exit; 56 goto exit;
@@ -64,7 +62,7 @@ u32 therm_send_pmgr_tables_to_pmu(struct gk20a *g)
64 pboardobjgrp = &g->therm_pmu.therm_channelobjs.super.super; 62 pboardobjgrp = &g->therm_pmu.therm_channelobjs.super.super;
65 status = pboardobjgrp->pmuinithandle(g, pboardobjgrp); 63 status = pboardobjgrp->pmuinithandle(g, pboardobjgrp);
66 if (status) { 64 if (status) {
67 gk20a_err(dev_from_gk20a(g), 65 nvgpu_err(g,
68 "therm_send_pmgr_tables_to_pmu - therm_channel failed %x", 66 "therm_send_pmgr_tables_to_pmu - therm_channel failed %x",
69 status); 67 status);
70 goto exit; 68 goto exit;
@@ -90,7 +88,7 @@ static u32 therm_pmu_cmd_post(struct gk20a *g, struct pmu_cmd *cmd,
90 seq_desc, 88 seq_desc,
91 timeout); 89 timeout);
92 if (status) { 90 if (status) {
93 gk20a_err(dev_from_gk20a(g), 91 nvgpu_err(g,
94 "unable to post therm cmd for unit %x cmd id %x size %x", 92 "unable to post therm cmd for unit %x cmd id %x size %x",
95 cmd->hdr.unit_id, cmd->cmd.therm.cmd_type, cmd->hdr.size); 93 cmd->hdr.unit_id, cmd->cmd.therm.cmd_type, cmd->hdr.size);
96 goto exit; 94 goto exit;
@@ -104,7 +102,7 @@ static u32 therm_pmu_cmd_post(struct gk20a *g, struct pmu_cmd *cmd,
104 &handlerparams->success, 1); 102 &handlerparams->success, 1);
105 103
106 if (handlerparams->success == 0) { 104 if (handlerparams->success == 0) {
107 gk20a_err(dev_from_gk20a(g), "could not process cmd\n"); 105 nvgpu_err(g, "could not process cmd\n");
108 status = -ETIMEDOUT; 106 status = -ETIMEDOUT;
109 goto exit; 107 goto exit;
110 } 108 }
@@ -225,7 +223,7 @@ u32 therm_configure_therm_alert(struct gk20a *g)
225 223
226 status = therm_enable_slct_notification_request(g); 224 status = therm_enable_slct_notification_request(g);
227 if (status) { 225 if (status) {
228 gk20a_err(dev_from_gk20a(g), 226 nvgpu_err(g,
229 "therm_enable_slct_notification_request-failed %d", 227 "therm_enable_slct_notification_request-failed %d",
230 status); 228 status);
231 goto exit; 229 goto exit;
@@ -233,7 +231,7 @@ u32 therm_configure_therm_alert(struct gk20a *g)
233 231
234 status = therm_send_slct_configuration_to_pmu(g); 232 status = therm_send_slct_configuration_to_pmu(g);
235 if (status) { 233 if (status) {
236 gk20a_err(dev_from_gk20a(g), 234 nvgpu_err(g,
237 "therm_send_slct_configuration_to_pmu-failed %d", 235 "therm_send_slct_configuration_to_pmu-failed %d",
238 status); 236 status);
239 goto exit; 237 goto exit;
@@ -241,7 +239,7 @@ u32 therm_configure_therm_alert(struct gk20a *g)
241 239
242 status = therm_set_warn_temp_limit(g); 240 status = therm_set_warn_temp_limit(g);
243 if (status) { 241 if (status) {
244 gk20a_err(dev_from_gk20a(g), 242 nvgpu_err(g,
245 "therm_set_warn_temp_limit-failed %d", 243 "therm_set_warn_temp_limit-failed %d",
246 status); 244 status);
247 goto exit; 245 goto exit;
generated by cgit v1.2.2 (git 2.25.0) at 2024-07-07 20:52:24 -0400