summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/volt
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/volt')
-rw-r--r--drivers/gpu/nvgpu/volt/volt_dev.c8
-rw-r--r--drivers/gpu/nvgpu/volt/volt_dev.h4
-rw-r--r--drivers/gpu/nvgpu/volt/volt_pmu.c2
-rw-r--r--drivers/gpu/nvgpu/volt/volt_policy.c4
-rw-r--r--drivers/gpu/nvgpu/volt/volt_rail.c10
-rw-r--r--drivers/gpu/nvgpu/volt/volt_rail.h4
6 files changed, 16 insertions, 16 deletions
diff --git a/drivers/gpu/nvgpu/volt/volt_dev.c b/drivers/gpu/nvgpu/volt/volt_dev.c
index fccd3b03..bb5d1821 100644
--- a/drivers/gpu/nvgpu/volt/volt_dev.c
+++ b/drivers/gpu/nvgpu/volt/volt_dev.c
@@ -35,8 +35,8 @@
35 35
36#include "volt.h" 36#include "volt.h"
37 37
38#define VOLT_DEV_PWM_VOLTAGE_STEPS_INVALID 0 38#define VOLT_DEV_PWM_VOLTAGE_STEPS_INVALID 0U
39#define VOLT_DEV_PWM_VOLTAGE_STEPS_DEFAULT 1 39#define VOLT_DEV_PWM_VOLTAGE_STEPS_DEFAULT 1U
40 40
41static int volt_device_pmu_data_init_super(struct gk20a *g, 41static int volt_device_pmu_data_init_super(struct gk20a *g,
42 struct boardobj *pboard_obj, struct nv_pmu_boardobj *ppmudata) 42 struct boardobj *pboard_obj, struct nv_pmu_boardobj *ppmudata)
@@ -425,7 +425,7 @@ static int _volt_device_devgrp_pmudata_instget(struct gk20a *g,
425 425
426 /*check whether pmuboardobjgrp has a valid boardobj in index*/ 426 /*check whether pmuboardobjgrp has a valid boardobj in index*/
427 if (((u32)BIT(idx) & 427 if (((u32)BIT(idx) &
428 pgrp_set->hdr.data.super.obj_mask.super.data[0]) == 0) { 428 pgrp_set->hdr.data.super.obj_mask.super.data[0]) == 0U) {
429 return -EINVAL; 429 return -EINVAL;
430 } 430 }
431 431
@@ -445,7 +445,7 @@ static int _volt_device_devgrp_pmustatus_instget(struct gk20a *g,
445 445
446 /*check whether pmuboardobjgrp has a valid boardobj in index*/ 446 /*check whether pmuboardobjgrp has a valid boardobj in index*/
447 if (((u32)BIT(idx) & 447 if (((u32)BIT(idx) &
448 pgrp_get_status->hdr.data.super.obj_mask.super.data[0]) == 0) { 448 pgrp_get_status->hdr.data.super.obj_mask.super.data[0]) == 0U) {
449 return -EINVAL; 449 return -EINVAL;
450 } 450 }
451 451
diff --git a/drivers/gpu/nvgpu/volt/volt_dev.h b/drivers/gpu/nvgpu/volt/volt_dev.h
index eb1868cb..48d93aea 100644
--- a/drivers/gpu/nvgpu/volt/volt_dev.h
+++ b/drivers/gpu/nvgpu/volt/volt_dev.h
@@ -27,8 +27,8 @@
27#include "boardobj/boardobjgrp.h" 27#include "boardobj/boardobjgrp.h"
28#include "ctrl/ctrlvolt.h" 28#include "ctrl/ctrlvolt.h"
29 29
30#define VOLTAGE_TABLE_MAX_ENTRIES_ONE 1 30#define VOLTAGE_TABLE_MAX_ENTRIES_ONE 1U
31#define VOLTAGE_TABLE_MAX_ENTRIES 256 31#define VOLTAGE_TABLE_MAX_ENTRIES 256U
32 32
33struct voltage_device { 33struct voltage_device {
34 struct boardobj super; 34 struct boardobj super;
diff --git a/drivers/gpu/nvgpu/volt/volt_pmu.c b/drivers/gpu/nvgpu/volt/volt_pmu.c
index 184aa5d0..2249ae24 100644
--- a/drivers/gpu/nvgpu/volt/volt_pmu.c
+++ b/drivers/gpu/nvgpu/volt/volt_pmu.c
@@ -108,7 +108,7 @@ static u32 volt_pmu_rpc_execute(struct gk20a *g,
108 gk20a_get_gr_idle_timeout(g), 108 gk20a_get_gr_idle_timeout(g),
109 &handler.success, 1); 109 &handler.success, 1);
110 110
111 if (handler.success == 0) { 111 if (handler.success == 0U) {
112 status = -EINVAL; 112 status = -EINVAL;
113 nvgpu_err(g, "rpc call to volt failed"); 113 nvgpu_err(g, "rpc call to volt failed");
114 } 114 }
diff --git a/drivers/gpu/nvgpu/volt/volt_policy.c b/drivers/gpu/nvgpu/volt/volt_policy.c
index 4f9d7ad8..cc60730d 100644
--- a/drivers/gpu/nvgpu/volt/volt_policy.c
+++ b/drivers/gpu/nvgpu/volt/volt_policy.c
@@ -382,7 +382,7 @@ static int _volt_policy_devgrp_pmudata_instget(struct gk20a *g,
382 382
383 /*check whether pmuboardobjgrp has a valid boardobj in index*/ 383 /*check whether pmuboardobjgrp has a valid boardobj in index*/
384 if (((u32)BIT(idx) & 384 if (((u32)BIT(idx) &
385 pgrp_set->hdr.data.super.obj_mask.super.data[0]) == 0) { 385 pgrp_set->hdr.data.super.obj_mask.super.data[0]) == 0U) {
386 return -EINVAL; 386 return -EINVAL;
387 } 387 }
388 388
@@ -402,7 +402,7 @@ static int _volt_policy_devgrp_pmustatus_instget(struct gk20a *g,
402 402
403 /*check whether pmuboardobjgrp has a valid boardobj in index*/ 403 /*check whether pmuboardobjgrp has a valid boardobj in index*/
404 if (((u32)BIT(idx) & 404 if (((u32)BIT(idx) &
405 p_get_status->hdr.data.super.obj_mask.super.data[0]) == 0) { 405 p_get_status->hdr.data.super.obj_mask.super.data[0]) == 0U) {
406 return -EINVAL; 406 return -EINVAL;
407 } 407 }
408 408
diff --git a/drivers/gpu/nvgpu/volt/volt_rail.c b/drivers/gpu/nvgpu/volt/volt_rail.c
index 37e85761..caf297f0 100644
--- a/drivers/gpu/nvgpu/volt/volt_rail.c
+++ b/drivers/gpu/nvgpu/volt/volt_rail.c
@@ -105,7 +105,7 @@ static u32 volt_rail_state_init(struct gk20a *g,
105 pvolt_rail->volt_dev_idx_default = CTRL_BOARDOBJ_IDX_INVALID; 105 pvolt_rail->volt_dev_idx_default = CTRL_BOARDOBJ_IDX_INVALID;
106 106
107 for (i = 0; i < CTRL_VOLT_RAIL_VOLT_DELTA_MAX_ENTRIES; i++) { 107 for (i = 0; i < CTRL_VOLT_RAIL_VOLT_DELTA_MAX_ENTRIES; i++) {
108 pvolt_rail->volt_delta_uv[i] = NV_PMU_VOLT_VALUE_0V_IN_UV; 108 pvolt_rail->volt_delta_uv[i] = (int)NV_PMU_VOLT_VALUE_0V_IN_UV;
109 g->perf_pmu.volt.volt_rail_metadata.ext_rel_delta_uv[i] = 109 g->perf_pmu.volt.volt_rail_metadata.ext_rel_delta_uv[i] =
110 NV_PMU_VOLT_VALUE_0V_IN_UV; 110 NV_PMU_VOLT_VALUE_0V_IN_UV;
111 } 111 }
@@ -162,7 +162,7 @@ static int volt_rail_init_pmudata_super(struct gk20a *g,
162 162
163 for (i = 0; i < CTRL_VOLT_RAIL_VOLT_DELTA_MAX_ENTRIES; i++) { 163 for (i = 0; i < CTRL_VOLT_RAIL_VOLT_DELTA_MAX_ENTRIES; i++) {
164 rail_pmu_data->volt_delta_uv[i] = prail->volt_delta_uv[i] + 164 rail_pmu_data->volt_delta_uv[i] = prail->volt_delta_uv[i] +
165 g->perf_pmu.volt.volt_rail_metadata.ext_rel_delta_uv[i]; 165 (int)g->perf_pmu.volt.volt_rail_metadata.ext_rel_delta_uv[i];
166 } 166 }
167 167
168 status = boardobjgrpmask_export(&prail->volt_dev_mask.super, 168 status = boardobjgrpmask_export(&prail->volt_dev_mask.super,
@@ -225,7 +225,7 @@ u8 volt_rail_vbios_volt_domain_convert_to_internal(struct gk20a *g,
225{ 225{
226 switch (g->perf_pmu.volt.volt_rail_metadata.volt_domain_hal) { 226 switch (g->perf_pmu.volt.volt_rail_metadata.volt_domain_hal) {
227 case CTRL_VOLT_DOMAIN_HAL_GP10X_SINGLE_RAIL: 227 case CTRL_VOLT_DOMAIN_HAL_GP10X_SINGLE_RAIL:
228 if (vbios_volt_domain == 0) { 228 if (vbios_volt_domain == 0U) {
229 return CTRL_VOLT_DOMAIN_LOGIC; 229 return CTRL_VOLT_DOMAIN_LOGIC;
230 } 230 }
231 break; 231 break;
@@ -382,7 +382,7 @@ static int _volt_rail_devgrp_pmudata_instget(struct gk20a *g,
382 382
383 /*check whether pmuboardobjgrp has a valid boardobj in index*/ 383 /*check whether pmuboardobjgrp has a valid boardobj in index*/
384 if (((u32)BIT(idx) & 384 if (((u32)BIT(idx) &
385 pgrp_set->hdr.data.super.obj_mask.super.data[0]) == 0) { 385 pgrp_set->hdr.data.super.obj_mask.super.data[0]) == 0U) {
386 return -EINVAL; 386 return -EINVAL;
387 } 387 }
388 388
@@ -402,7 +402,7 @@ static int _volt_rail_devgrp_pmustatus_instget(struct gk20a *g,
402 402
403 /*check whether pmuboardobjgrp has a valid boardobj in index*/ 403 /*check whether pmuboardobjgrp has a valid boardobj in index*/
404 if (((u32)BIT(idx) & 404 if (((u32)BIT(idx) &
405 pgrp_get_status->hdr.data.super.obj_mask.super.data[0]) == 0) { 405 pgrp_get_status->hdr.data.super.obj_mask.super.data[0]) == 0U) {
406 return -EINVAL; 406 return -EINVAL;
407 } 407 }
408 408
diff --git a/drivers/gpu/nvgpu/volt/volt_rail.h b/drivers/gpu/nvgpu/volt/volt_rail.h
index 522d635a..72bb2546 100644
--- a/drivers/gpu/nvgpu/volt/volt_rail.h
+++ b/drivers/gpu/nvgpu/volt/volt_rail.h
@@ -27,8 +27,8 @@
27#include "boardobj/boardobj.h" 27#include "boardobj/boardobj.h"
28#include "boardobj/boardobjgrp.h" 28#include "boardobj/boardobjgrp.h"
29 29
30#define CTRL_VOLT_RAIL_VOLT_DELTA_MAX_ENTRIES 0x04 30#define CTRL_VOLT_RAIL_VOLT_DELTA_MAX_ENTRIES 0x04U
31#define CTRL_PMGR_PWR_EQUATION_INDEX_INVALID 0xFF 31#define CTRL_PMGR_PWR_EQUATION_INDEX_INVALID 0xFFU
32 32
33#define VOLT_GET_VOLT_RAIL(pvolt, rail_idx) \ 33#define VOLT_GET_VOLT_RAIL(pvolt, rail_idx) \
34 ((struct voltage_rail *)BOARDOBJGRP_OBJ_GET_BY_IDX( \ 34 ((struct voltage_rail *)BOARDOBJGRP_OBJ_GET_BY_IDX( \