nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 10:34:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: common/pmu: fix compile error of new compile flags

Browse Source 
It's preparing to add bellow CFLAGS:
    -Werror -Wall -Wextra \
    -Wmissing-braces -Wpointer-arith -Wundef \
    -Wconversion -Wsign-conversion \
    -Wformat-security \
    -Wmissing-declarations -Wredundant-decls -Wimplicit-fallthrough

Jira GVSCI-11640

Signed-off-by: Richard Zhao <rizhao@nvidia.com>
Change-Id: Ide3ab484924bd5be976a9f335b55b136575ce428
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2555055
Reviewed-by: Shashank Singh <shashsingh@nvidia.com>
Reviewed-by: Aparna Das <aparnad@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
This commit is contained in:
Richard Zhao
2021-07-06 21:26:47 -07:00
committed by mobile promotions
parent a3ed73a57c
commit 851666b632
45 changed files with 313 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/gpu/nvgpu/common/pmu/clk/clk_prog.c
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2016-2020, NVIDIA CORPORATION. All rights reserved.
* Copyright (c) 2016-2022, NVIDIA CORPORATION. All rights reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -437,7 +437,7 @@ static int devinit_get_clk_prog_table_35(struct gk20a *g,
}
status = boardobjgrp_objinsert(&pclkprogobjs->super.super,
(struct pmu_board_obj *)(void *)pprog, i);
(struct pmu_board_obj *)(void *)pprog, (u8)i);
if (status != 0) {
nvgpu_err(g, "error adding clk_prog boardobj %d", i);
status = -EINVAL;
@@ -646,6 +646,8 @@ static int _clk_prog_1x_master_rail_construct_vf_point(struct gk20a *g,
struct clk_vf_point *p_vf_point;
int status;
(void)p1xmaster;
nvgpu_log_info(g, " ");
p_vf_point = nvgpu_construct_clk_vf_point(g, (void *)p_vf_point_tmp);
@@ -1010,6 +1012,8 @@ static int vfflatten_prog_1x_master(struct gk20a *g,
u8 vf_point_idx;
u8 vf_rail_idx;
(void)clk_domain_idx;
nvgpu_log_info(g, " ");
(void) memset(&vf_point_data, 0x0, sizeof(vf_point_data));
@@ -1041,7 +1045,7 @@ static int vfflatten_prog_1x_master(struct gk20a *g,
freq_step_size_mhz = source_pll->freq_step_size_mhz;
step_count = (freq_step_size_mhz == 0U) ? 0U :
(u8)(p1xmaster->super.freq_max_mhz -
*pfreqmaxlastmhz - 1U) /
*pfreqmaxlastmhz - 1) /
freq_step_size_mhz;
/* Intentional fall-through.*/
@@ -1050,9 +1054,9 @@ static int vfflatten_prog_1x_master(struct gk20a *g,
CTRL_CLK_CLK_VF_POINT_TYPE_35_FREQ;
do {
vf_point_data.vf_point.pair.freq_mhz =
p1xmaster->super.freq_max_mhz -
(u16)(p1xmaster->super.freq_max_mhz -
U16(step_count) *
U16(freq_step_size_mhz);
U16(freq_step_size_mhz));
status = _clk_prog_1x_master_rail_construct_vf_point(g, pclk,
p1xmaster, p_vf_rail,
@@ -1162,7 +1166,7 @@ static int vflookup_prog_1x_master(struct gk20a *g,
if (i == slaveentrycount) {
return -EINVAL;
}
clkmhz = (clkmhz * 100U)/pslaveents->ratio;
clkmhz = (u16)((clkmhz * 100U)/pslaveents->ratio);
} else {
/* only support ratio for now */
return -EINVAL;
@@ -1239,7 +1243,7 @@ static int vflookup_prog_1x_master(struct gk20a *g,
if (i == slaveentrycount) {
return -EINVAL;
}
clkmhz = (clkmhz * pslaveents->ratio)/100U;
clkmhz = (u16)((clkmhz * pslaveents->ratio)/100);
} else {
/* only support ratio for now */
return -EINVAL;
@@ -1266,6 +1270,8 @@ static int getfpoints_prog_1x_master(struct gk20a *g,
u8 j;
u32 fpointscount = 0;
(void)g;
if (pfpointscount == NULL) {
return -EINVAL;
}
@@ -1352,7 +1358,7 @@ static int getslaveclk_prog_1x_master(struct gk20a *g,
if (i == slaveentrycount) {
return -EINVAL;
}
*pclkmhz = (masterclkmhz * pslaveents->ratio)/100U;
*pclkmhz = (u16)((masterclkmhz * pslaveents->ratio)/100);
} else {
/* only support ratio for now */
return -EINVAL;
@@ -1374,9 +1380,9 @@ static int getslaveclk_prog_1x_master(struct gk20a *g,
if (i == slaveentrycount) {
return -EINVAL;
}
*pclkmhz = (masterclkmhz * pslaveents->ratio)/100U;
*pclkmhz = (u16)((masterclkmhz * pslaveents->ratio)/100);
/* Floor/Quantize all the slave clocks to the multiple of step size*/
*pclkmhz = (*pclkmhz / FREQ_STEP_SIZE_MHZ) * FREQ_STEP_SIZE_MHZ;
*pclkmhz = (u16)((*pclkmhz / FREQ_STEP_SIZE_MHZ) * FREQ_STEP_SIZE_MHZ);
*ratio = pslaveents->ratio;
} else {
/* only support ratio for now */