gpu: nvgpu: fix MISRA 17.7 in nvgpu.common.pmu.clk*

MISRA Rule-17.7 requires the return value of all functions to be
used. Fix is either to use the return value or change the function
to return void. This patch contains fixes for all 17.7 violations
in the nvgpu.common.pmu.clk.* units.

JIRA NVGPU-3035

Change-Id: I13863f43c6bea76917978a12df091a672a3e5098
Signed-off-by: Nicolas Benech <nbenech@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2108887
GVS: Gerrit_Virtual_Submit
Reviewed-by: Adeel Raza <araza@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Nicolas Benech
2019-04-26 13:30:58 -04:00
committed by mobile promotions
parent f160202dbb
commit 3a3d78adf2
7 changed files with 65 additions and 22 deletions

View File

@@ -77,7 +77,7 @@ int nvgpu_clk_domain_freq_to_volt(struct gk20a *g, u8 clkdomain_idx,
return status;
}
static u32 nvgpu_clk_vf_change_inject_data_fill(struct gk20a *g,
static void nvgpu_clk_vf_change_inject_data_fill(struct gk20a *g,
struct nv_pmu_clk_rpc *rpccall,
struct nvgpu_set_fll_clk *setfllclk)
{
@@ -106,8 +106,6 @@ static u32 nvgpu_clk_vf_change_inject_data_fill(struct gk20a *g,
vfchange->volt_list.rails[0].voltage_uv = setfllclk->voltuv;
vfchange->volt_list.rails[0].voltage_min_noise_unaware_uv =
setfllclk->voltuv;
return 0;
}
static int clk_pmu_vf_inject(struct gk20a *g,

View File

@@ -258,8 +258,20 @@ int nvgpu_clk_domain_sw_setup(struct gk20a *g)
pboardobjgrp->pmudatainstget = _clk_domains_pmudata_instget;
/* Initialize mask to zero.*/
boardobjgrpmask_e32_init(&pclkdomainobjs->prog_domains_mask, NULL);
boardobjgrpmask_e32_init(&pclkdomainobjs->master_domains_mask, NULL);
status = boardobjgrpmask_e32_init(&pclkdomainobjs->prog_domains_mask,
NULL);
if (status != 0) {
nvgpu_err(g, "boardobjgrpmask_e32_init(prog) failed err=%d",
status);
goto done;
}
status = boardobjgrpmask_e32_init(&pclkdomainobjs->master_domains_mask,
NULL);
if (status != 0) {
nvgpu_err(g, "boardobjgrpmask_e32_init(master) failed err=%d",
status);
goto done;
}
pclkdomainobjs->b_enforce_vf_monotonicity = true;
pclkdomainobjs->b_enforce_vf_smoothening = true;
@@ -589,7 +601,8 @@ static int devinit_get_clocks_table(struct gk20a *g,
nvgpu_memcpy((u8 *)&clocks_table_header, clocks_table_ptr,
VBIOS_CLOCKS_TABLE_35_HEADER_SIZE_09);
devinit_get_clocks_table_35(g, pclkdomainobjs, clocks_table_ptr);
status = devinit_get_clocks_table_35(g, pclkdomainobjs,
clocks_table_ptr);
done:
return status;
@@ -1155,7 +1168,8 @@ static int clk_domain_construct_35_master(struct gk20a *g,
pdomain->master.slave_idxs_mask = 0;
pdomain->super.clk_pos = 0;
boardobjgrpmask_e32_init(&pdomain->master_slave_domains_grp_mask, NULL);
status = boardobjgrpmask_e32_init(
&pdomain->master_slave_domains_grp_mask, NULL);
return status;
}

View File

@@ -178,7 +178,12 @@ int nvgpu_clk_fll_sw_setup(struct gk20a *g)
pfllobjs->lut_min_voltage_uv = CTRL_CLK_LUT_MIN_VOLTAGE_UV;
/* Initialize lut prog master mask to zero.*/
boardobjgrpmask_e32_init(&pfllobjs->lut_prog_master_mask, NULL);
status = boardobjgrpmask_e32_init(&pfllobjs->lut_prog_master_mask,
NULL);
if (status != 0) {
nvgpu_err(g, "boardobjgrpmask_e32_init failed err=%d", status);
goto done;
}
status = devinit_get_fll_device_table(g, pfllobjs);
if (status != 0) {
@@ -472,8 +477,17 @@ static struct fll_device *construct_fll_device(struct gk20a *g,
(u8 *)&pfll_dev->regime_desc,
sizeof(struct nv_pmu_clk_regime_desc));
board_obj_fll_ptr->b_dvco_1x=pfll_dev->b_dvco_1x;
boardobjgrpmask_e32_init(
status = boardobjgrpmask_e32_init(
&board_obj_fll_ptr->lut_prog_broadcast_slave_mask, NULL);
if (status != 0) {
nvgpu_err(g, "boardobjgrpmask_e32_init failed err=%d", status);
status = board_obj_ptr->destruct(board_obj_ptr);
if (status != 0) {
nvgpu_err(g, "destruct failed err=%d", status);
}
return NULL;
}
nvgpu_log_info(g, " Done");

View File

@@ -453,8 +453,12 @@ int nvgpu_clk_freq_controller_sw_setup(struct gk20a *g)
pboardobjgrp->pmustatusinstget = NULL;
/* Initialize mask to zero.*/
boardobjgrpmask_e32_init(&pclk_freq_controllers->freq_ctrl_load_mask,
NULL);
status = boardobjgrpmask_e32_init(
&pclk_freq_controllers->freq_ctrl_load_mask, NULL);
if (status != 0) {
nvgpu_err(g, "boardobjgrpmask_e32_init failed err=%d", status);
goto done;
}
BOARDOBJGRP_PMU_CONSTRUCT(pboardobjgrp, CLK, CLK_FREQ_CONTROLLER);
@@ -485,8 +489,13 @@ int nvgpu_clk_freq_controller_sw_setup(struct gk20a *g)
break;
}
}
nvgpu_boardobjgrpmask_bit_set(&pclk_freq_controllers->
status = nvgpu_boardobjgrpmask_bit_set(&pclk_freq_controllers->
freq_ctrl_load_mask.super, i);
if (status != 0) {
nvgpu_err(g, "boardobjgrpmask_bitset failed err=%d",
status);
goto done;
}
}
done:
nvgpu_log_info(g, " done status %x", status);

View File

@@ -186,7 +186,7 @@ int nvgpu_clk_freq_domain_sw_setup(struct gk20a *g)
}
for (idx = 0; idx < num_of_domains; idx++) {
memset(&freq_domain_data, 0, sizeof(freq_domain_data));
(void) memset(&freq_domain_data, 0, sizeof(freq_domain_data));
freq_domain_data.super.type = clk_freq_domain_type[idx].type;
freq_domain_data.freq_domain.clk_domain =

View File

@@ -266,7 +266,7 @@ static int devinit_get_clk_prog_table_35(struct gk20a *g,
pclkprogobjs->vf_sec_entry_count = header.vf_sec_entry_count;
for (i = 0; i < header.entry_count; i++) {
memset(&prog_data, 0x0, (u32)sizeof(prog_data));
(void) memset(&prog_data, 0x0, (u32)sizeof(prog_data));
/* Read table entries*/
entry = clkprogs_tbl_ptr + hszfmt +
@@ -275,16 +275,16 @@ static int devinit_get_clk_prog_table_35(struct gk20a *g,
(header.vf_sec_entry_count * vfsecszfmt)));
nvgpu_memcpy((u8 *)&prog, entry, szfmt);
memset(vfentries, 0xFF,
(void) memset(vfentries, 0xFF,
sizeof(struct ctrl_clk_clk_prog_1x_master_vf_entry) *
CTRL_CLK_CLK_PROG_1X_MASTER_VF_ENTRY_MAX_ENTRIES);
memset(voltrailsecvfentries, 0xFF,
(void) memset(voltrailsecvfentries, 0xFF,
sizeof(struct ctrl_clk_clk_prog_35_master_sec_vf_entry_voltrail) *
CTRL_CLK_CLK_PROG_1X_MASTER_VF_ENTRY_MAX_ENTRIES);
memset(ratioslaveentries, 0xFF,
(void) memset(ratioslaveentries, 0xFF,
sizeof(struct ctrl_clk_clk_prog_1x_master_ratio_slave_entry) *
CTRL_CLK_PROG_1X_MASTER_MAX_SLAVE_ENTRIES);
memset(tableslaveentries, 0xFF,
(void) memset(tableslaveentries, 0xFF,
sizeof(struct ctrl_clk_clk_prog_1x_master_table_slave_entry) *
CTRL_CLK_PROG_1X_MASTER_MAX_SLAVE_ENTRIES);
@@ -824,7 +824,7 @@ static int clk_prog_construct_35_master(struct gk20a *g,
(struct ctrl_clk_clk_prog_35_master_sec_vf_entry_voltrail *)
nvgpu_kzalloc(g, voltrail_sec_vfsize);
memset(pclkprog->p_voltrail_sec_vf_entries,
(void) memset(pclkprog->p_voltrail_sec_vf_entries,
CTRL_CLK_CLK_DOMAIN_INDEX_INVALID, voltrail_sec_vfsize);
nvgpu_memcpy((u8 *)pclkprog->p_voltrail_sec_vf_entries,
@@ -914,7 +914,7 @@ static int clk_prog_construct_35_master_table(struct gk20a *g,
goto exit;
}
memset(pclkprog->table.p_slave_entries,
(void) memset(pclkprog->table.p_slave_entries,
CTRL_CLK_CLK_DOMAIN_INDEX_INVALID, slavesize);
nvgpu_memcpy((u8 *)pclkprog->table.p_slave_entries,
@@ -955,7 +955,10 @@ static struct clk_prog *construct_clk_prog(struct gk20a *g, void *pargs)
if (status != 0) {
if (board_obj_ptr != NULL) {
board_obj_ptr->destruct(board_obj_ptr);
status = board_obj_ptr->destruct(board_obj_ptr);
if (status != 0) {
nvgpu_err(g, "destruct failed err=%d", status);
}
}
return NULL;
}

View File

@@ -218,7 +218,12 @@ int nvgpu_clk_vin_sw_setup(struct gk20a *g)
}
/*update vin calibration to fuse */
nvgpu_clk_avfs_get_vin_cal_fuse_v20(g, pvinobjs, pvindev);
status = nvgpu_clk_avfs_get_vin_cal_fuse_v20(g, pvinobjs, pvindev);
if (status != 0) {
nvgpu_err(g, "clk_avfs_get_vin_cal_fuse_v20 failed err=%d",
status);
goto done;
}
status = BOARDOBJGRP_PMU_CMD_GRP_GET_STATUS_CONSTRUCT(g,
&g->pmu.clk_pmu->avfs_vinobjs->super.super,