nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 01:50:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: Fix MISRA violations in clk_domain unit

Browse Source 
Fixed following MISRA violations:
-MISRA C-2012 Rule 11.3
-MISRA C-2012 Rule 16.1

NVGPU-3222

Change-Id: I9dcb6c5c3fab6be0135919dfbcf273f7ee44949b
Signed-off-by: rmylavarapu <rmylavarapu@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2107418
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
rmylavarapu
2019-04-29 16:33:59 +05:30
committed by mobile promotions
parent 17486ec1f6
commit 5ed6909d07
2 changed files with 37 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
drivers/gpu/nvgpu/common/pmu/clk/clk_domain.c
View File

@@ -155,9 +155,9 @@ static int _clk_domains_pmudatainit_3x(struct gk20a *g,
{ {
struct nv_pmu_clk_clk_domain_boardobjgrp_set_header *pset = struct nv_pmu_clk_clk_domain_boardobjgrp_set_header *pset =
(struct nv_pmu_clk_clk_domain_boardobjgrp_set_header *) (struct nv_pmu_clk_clk_domain_boardobjgrp_set_header *)
pboardobjgrppmu; (void *)pboardobjgrppmu;
struct nvgpu_clk_domains *pdomains = struct nvgpu_clk_domains *pdomains =
(struct nvgpu_clk_domains *)pboardobjgrp; (struct nvgpu_clk_domains *)(void *)pboardobjgrp;
int status = 0; int status = 0;
status = boardobjgrp_pmudatainit_e32(g, pboardobjgrp, pboardobjgrppmu); status = boardobjgrp_pmudatainit_e32(g, pboardobjgrp, pboardobjgrppmu);
@@ -201,7 +201,7 @@ static int _clk_domains_pmudata_instget(struct gk20a *g,
struct nv_pmu_boardobj **ppboardobjpmudata, u8 idx) struct nv_pmu_boardobj **ppboardobjpmudata, u8 idx)
{ {
struct nv_pmu_clk_clk_domain_boardobj_grp_set *pgrp_set = struct nv_pmu_clk_clk_domain_boardobj_grp_set *pgrp_set =
(struct nv_pmu_clk_clk_domain_boardobj_grp_set *) (struct nv_pmu_clk_clk_domain_boardobj_grp_set *)(void *)
pmuboardobjgrp; pmuboardobjgrp;
nvgpu_log_info(g, " "); nvgpu_log_info(g, " ");
@@ -310,7 +310,7 @@ int nvgpu_clk_domain_sw_setup(struct gk20a *g)
goto done; goto done;
} }
pdomain_master_35 = pdomain_master_35 =
(struct clk_domain_35_master *)pdomain; (struct clk_domain_35_master *)(void *)pdomain;
status = nvgpu_boardobjgrpmask_bit_set( status = nvgpu_boardobjgrpmask_bit_set(
&pdomain_master_35-> &pdomain_master_35->
master_slave_domains_grp_mask.super, i); master_slave_domains_grp_mask.super, i);
@@ -322,7 +322,7 @@ int nvgpu_clk_domain_sw_setup(struct gk20a *g)
if (pdomain->super.implements(g, &pdomain->super, if (pdomain->super.implements(g, &pdomain->super,
CTRL_CLK_CLK_DOMAIN_TYPE_35_SLAVE)) { CTRL_CLK_CLK_DOMAIN_TYPE_35_SLAVE)) {
pdomain_slave_35 = pdomain_slave_35 =
(struct clk_domain_35_slave *)pdomain; (struct clk_domain_35_slave *)(void *)pdomain;
pdomain_master_35 = (struct clk_domain_35_master *) pdomain_master_35 = (struct clk_domain_35_master *)
(void *) (void *)
(g->pmu.clk_pmu->clk_get_clk_domain( (g->pmu.clk_pmu->clk_get_clk_domain(
@@ -379,7 +379,7 @@ static int devinit_get_clocks_table_35(struct gk20a *g,
bool done = false; bool done = false;
struct nvgpu_clk_domain *pclkdomain_dev; struct nvgpu_clk_domain *pclkdomain_dev;
union { union {
struct boardobj boardobj; struct boardobj board_obj;
struct nvgpu_clk_domain clk_domain; struct nvgpu_clk_domain clk_domain;
struct clk_domain_3x v3x; struct clk_domain_3x v3x;
struct clk_domain_3x_fixed v3x_fixed; struct clk_domain_3x_fixed v3x_fixed;
@@ -439,7 +439,7 @@ static int devinit_get_clocks_table_35(struct gk20a *g,
NV_VBIOS_CLOCKS_TABLE_1X_ENTRY_FLAGS0_USAGE)) { NV_VBIOS_CLOCKS_TABLE_1X_ENTRY_FLAGS0_USAGE)) {
case NV_VBIOS_CLOCKS_TABLE_1X_ENTRY_FLAGS0_USAGE_FIXED: case NV_VBIOS_CLOCKS_TABLE_1X_ENTRY_FLAGS0_USAGE_FIXED:
{ {
clk_domain_data.boardobj.type = clk_domain_data.board_obj.type =
CTRL_CLK_CLK_DOMAIN_TYPE_3X_FIXED; CTRL_CLK_CLK_DOMAIN_TYPE_3X_FIXED;
clk_domain_data.v3x_fixed.freq_mhz = BIOS_GET_FIELD(u16, clk_domain_data.v3x_fixed.freq_mhz = BIOS_GET_FIELD(u16,
clocks_table_entry.param1, clocks_table_entry.param1,
@@ -449,7 +449,7 @@ static int devinit_get_clocks_table_35(struct gk20a *g,
case NV_VBIOS_CLOCKS_TABLE_1X_ENTRY_FLAGS0_USAGE_MASTER: case NV_VBIOS_CLOCKS_TABLE_1X_ENTRY_FLAGS0_USAGE_MASTER:
{ {
clk_domain_data.boardobj.type = clk_domain_data.board_obj.type =
CTRL_CLK_CLK_DOMAIN_TYPE_35_MASTER; CTRL_CLK_CLK_DOMAIN_TYPE_35_MASTER;
clk_domain_data.v35_prog.super.clk_prog_idx_first = clk_domain_data.v35_prog.super.clk_prog_idx_first =
BIOS_GET_FIELD(u8, clocks_table_entry.param0, BIOS_GET_FIELD(u8, clocks_table_entry.param0,
@@ -496,7 +496,7 @@ static int devinit_get_clocks_table_35(struct gk20a *g,
case NV_VBIOS_CLOCKS_TABLE_1X_ENTRY_FLAGS0_USAGE_SLAVE: case NV_VBIOS_CLOCKS_TABLE_1X_ENTRY_FLAGS0_USAGE_SLAVE:
{ {
clk_domain_data.boardobj.type = clk_domain_data.board_obj.type =
CTRL_CLK_CLK_DOMAIN_TYPE_35_SLAVE; CTRL_CLK_CLK_DOMAIN_TYPE_35_SLAVE;
clk_domain_data.v35_prog.super.clk_prog_idx_first = clk_domain_data.v35_prog.super.clk_prog_idx_first =
BIOS_GET_FIELD(u8, clocks_table_entry.param0, BIOS_GET_FIELD(u8, clocks_table_entry.param0,
@@ -624,7 +624,7 @@ static int clk_domain_construct_super(struct gk20a *g,
return -EINVAL; return -EINVAL;
} }
pdomain = (struct nvgpu_clk_domain *)*ppboardobj; pdomain = (struct nvgpu_clk_domain *)(void *)*ppboardobj;
pdomain->super.pmudatainit = pdomain->super.pmudatainit =
clk_domain_pmudatainit_super; clk_domain_pmudatainit_super;
@@ -652,9 +652,9 @@ static int _clk_domain_pmudatainit_3x(struct gk20a *g,
return status; return status;
} }
pclk_domain_3x = (struct clk_domain_3x *)board_obj_ptr; pclk_domain_3x = (struct clk_domain_3x *)(void *)board_obj_ptr;
pset = (struct nv_pmu_clk_clk_domain_3x_boardobj_set *)ppmudata; pset = (struct nv_pmu_clk_clk_domain_3x_boardobj_set *)(void *)ppmudata;
pset->b_noise_aware_capable = pclk_domain_3x->b_noise_aware_capable; pset->b_noise_aware_capable = pclk_domain_3x->b_noise_aware_capable;
@@ -678,7 +678,7 @@ static int clk_domain_construct_3x(struct gk20a *g,
return -EINVAL; return -EINVAL;
} }
pdomain = (struct clk_domain_3x *)*ppboardobj; pdomain = (struct clk_domain_3x *)(void *)*ppboardobj;
pdomain->super.super.pmudatainit = pdomain->super.super.pmudatainit =
_clk_domain_pmudatainit_3x; _clk_domain_pmudatainit_3x;
@@ -694,7 +694,7 @@ static int clkdomainclkproglink_3x_prog(struct gk20a *g,
{ {
int status = 0; int status = 0;
struct clk_domain_3x_prog *p3xprog = struct clk_domain_3x_prog *p3xprog =
(struct clk_domain_3x_prog *)pdomain; (struct clk_domain_3x_prog *)(void *)pdomain;
struct clk_prog *pprog = NULL; struct clk_prog *pprog = NULL;
u8 i; u8 i;
@@ -727,17 +727,17 @@ static int clkdomaingetslaveclk(struct gk20a *g,
if (pclkmhz == NULL) { if (pclkmhz == NULL) {
return -EINVAL; return -EINVAL;
} }
if (masterclkmhz == 0U) { if (masterclkmhz == 0U) {
return -EINVAL; return -EINVAL;
} }
slaveidx = BOARDOBJ_GET_IDX(pdomain); slaveidx = BOARDOBJ_GET_IDX(pdomain);
p35master = (struct clk_domain_35_master *)(void *) p35master = (struct clk_domain_35_master *)(void *)
g->pmu.clk_pmu->clk_get_clk_domain(pclk, g->pmu.clk_pmu->clk_get_clk_domain(pclk,
((struct clk_domain_35_slave *)pdomain)->slave.master_idx); ((struct clk_domain_35_slave *)
(void *)pdomain)->slave.master_idx);
pprog = CLK_CLK_PROG_GET(pclk, p35master-> pprog = CLK_CLK_PROG_GET(pclk, p35master->
master.super.clk_prog_idx_first); master.super.clk_prog_idx_first);
pprog1xmaster = (struct clk_prog_1x_master *)pprog; pprog1xmaster = (struct clk_prog_1x_master *)(void *)pprog;
status = pprog1xmaster->getslaveclk(g, pclk, pprog1xmaster, status = pprog1xmaster->getslaveclk(g, pclk, pprog1xmaster,
slaveidx, pclkmhz, masterclkmhz); slaveidx, pclkmhz, masterclkmhz);
@@ -753,7 +753,7 @@ static int clkdomainvfsearch(struct gk20a *g,
{ {
int status = 0; int status = 0;
struct clk_domain_3x_master *p3xmaster = struct clk_domain_3x_master *p3xmaster =
(struct clk_domain_3x_master *)pdomain; (struct clk_domain_3x_master *)(void *)pdomain;
struct clk_prog *pprog = NULL; struct clk_prog *pprog = NULL;
struct clk_prog_1x_master *pprog1xmaster = NULL; struct clk_prog_1x_master *pprog1xmaster = NULL;
u8 i; u8 i;
@@ -783,7 +783,7 @@ static int clkdomainvfsearch(struct gk20a *g,
pslaveidx = &slaveidx; pslaveidx = &slaveidx;
p3xmaster = (struct clk_domain_3x_master *)(void *) p3xmaster = (struct clk_domain_3x_master *)(void *)
g->pmu.clk_pmu->clk_get_clk_domain(pclk, g->pmu.clk_pmu->clk_get_clk_domain(pclk,
((struct clk_domain_3x_slave *) ((struct clk_domain_3x_slave *)(void *)
pdomain)->master_idx); pdomain)->master_idx);
} }
/* Iterate over the set of CLK_PROGs pointed at by this domain.*/ /* Iterate over the set of CLK_PROGs pointed at by this domain.*/
@@ -801,7 +801,7 @@ static int clkdomainvfsearch(struct gk20a *g,
goto done; goto done;
} }
pprog1xmaster = (struct clk_prog_1x_master *)pprog; pprog1xmaster = (struct clk_prog_1x_master *)(void *)pprog;
status = pprog1xmaster->vflookup(g, pclk, pprog1xmaster, status = pprog1xmaster->vflookup(g, pclk, pprog1xmaster,
pslaveidx, &clkmhz, &voltuv, rail); pslaveidx, &clkmhz, &voltuv, rail);
/* if look up has found the V or F value matching to other /* if look up has found the V or F value matching to other
@@ -844,7 +844,7 @@ static int clkdomaingetfpoints
{ {
int status = 0; int status = 0;
struct clk_domain_3x_master *p3xmaster = struct clk_domain_3x_master *p3xmaster =
(struct clk_domain_3x_master *)pdomain; (struct clk_domain_3x_master *)(void *)pdomain;
struct clk_prog *pprog = NULL; struct clk_prog *pprog = NULL;
struct clk_prog_1x_master *pprog1xmaster = NULL; struct clk_prog_1x_master *pprog1xmaster = NULL;
u32 fpointscount = 0; u32 fpointscount = 0;
@@ -877,7 +877,7 @@ static int clkdomaingetfpoints
i <= p3xmaster->super.clk_prog_idx_last; i <= p3xmaster->super.clk_prog_idx_last;
i++) { i++) {
pprog = CLK_CLK_PROG_GET(pclk, i); pprog = CLK_CLK_PROG_GET(pclk, i);
pprog1xmaster = (struct clk_prog_1x_master *)pprog; pprog1xmaster = (struct clk_prog_1x_master *)(void *)pprog;
status = pprog1xmaster->getfpoints(g, pclk, pprog1xmaster, status = pprog1xmaster->getfpoints(g, pclk, pprog1xmaster,
&fpointscount, &freqpointsdata, rail); &fpointscount, &freqpointsdata, rail);
if (status != 0) { if (status != 0) {
@@ -1068,7 +1068,7 @@ static int clkdomainclkproglink_3x_master(struct gk20a *g,
{ {
int status = 0; int status = 0;
struct clk_domain_3x_master *p3xmaster = struct clk_domain_3x_master *p3xmaster =
(struct clk_domain_3x_master *)pdomain; (struct clk_domain_3x_master *)(void *)pdomain;
struct clk_prog *pprog = NULL; struct clk_prog *pprog = NULL;
struct clk_prog_1x_master *pprog1xmaster = NULL; struct clk_prog_1x_master *pprog1xmaster = NULL;
u16 freq_max_last_mhz = 0; u16 freq_max_last_mhz = 0;
@@ -1094,7 +1094,7 @@ static int clkdomainclkproglink_3x_master(struct gk20a *g,
goto done; goto done;
} }
pprog1xmaster = (struct clk_prog_1x_master *)pprog; pprog1xmaster = (struct clk_prog_1x_master *)(void *)pprog;
status = pprog1xmaster->vfflatten(g, pclk, pprog1xmaster, status = pprog1xmaster->vfflatten(g, pclk, pprog1xmaster,
BOARDOBJ_GET_IDX(p3xmaster), &freq_max_last_mhz); BOARDOBJ_GET_IDX(p3xmaster), &freq_max_last_mhz);
if (status != 0) { if (status != 0) {
@@ -1197,10 +1197,11 @@ static int _clk_domain_pmudatainit_3x_fixed(struct gk20a *g,
return status; return status;
} }
pclk_domain_3x_fixed = (struct clk_domain_3x_fixed *)board_obj_ptr; pclk_domain_3x_fixed = (struct clk_domain_3x_fixed *)
(void *)board_obj_ptr;
pset = (struct nv_pmu_clk_clk_domain_3x_fixed_boardobj_set *) pset = (struct nv_pmu_clk_clk_domain_3x_fixed_boardobj_set *)
ppmudata; (void *)ppmudata;
pset->freq_mhz = pclk_domain_3x_fixed->freq_mhz; pset->freq_mhz = pclk_domain_3x_fixed->freq_mhz;
@@ -1227,7 +1228,7 @@ static int clk_domain_construct_3x_fixed(struct gk20a *g,
return -EINVAL; return -EINVAL;
} }
pdomain = (struct clk_domain_3x_fixed *)*ppboardobj; pdomain = (struct clk_domain_3x_fixed *)(void *)*ppboardobj;
pdomain->super.super.super.pmudatainit = pdomain->super.super.super.pmudatainit =
_clk_domain_pmudatainit_3x_fixed; _clk_domain_pmudatainit_3x_fixed;
@@ -1246,7 +1247,7 @@ static struct nvgpu_clk_domain *construct_clk_domain(struct gk20a *g,
struct boardobj *board_obj_ptr = NULL; struct boardobj *board_obj_ptr = NULL;
int status; int status;
nvgpu_log_info(g, " %d", BOARDOBJ_GET_TYPE(pargs)); nvgpu_log_info(g, " %d", (BOARDOBJ_GET_TYPE(pargs)));
switch (BOARDOBJ_GET_TYPE(pargs)) { switch (BOARDOBJ_GET_TYPE(pargs)) {
case CTRL_CLK_CLK_DOMAIN_TYPE_3X_FIXED: case CTRL_CLK_CLK_DOMAIN_TYPE_3X_FIXED:
status = clk_domain_construct_3x_fixed(g, &board_obj_ptr, status = clk_domain_construct_3x_fixed(g, &board_obj_ptr,
@@ -1264,7 +1265,9 @@ static struct nvgpu_clk_domain *construct_clk_domain(struct gk20a *g,
break; break;
default: default:
return NULL; nvgpu_err(g, "Unsupported Clk domain type");
status = -EINVAL;
break;
} }
if (status != 0) { if (status != 0) {
@@ -1273,7 +1276,7 @@ static struct nvgpu_clk_domain *construct_clk_domain(struct gk20a *g,
nvgpu_log_info(g, " Done"); nvgpu_log_info(g, " Done");
return (struct nvgpu_clk_domain *)board_obj_ptr; return (struct nvgpu_clk_domain *)(void *)board_obj_ptr;
} }
static int clk_domain_pmudatainit_super(struct gk20a *g, static int clk_domain_pmudatainit_super(struct gk20a *g,
@@ -1291,9 +1294,9 @@ static int clk_domain_pmudatainit_super(struct gk20a *g,
return status; return status;
} }
pclk_domain = (struct nvgpu_clk_domain *)board_obj_ptr; pclk_domain = (struct nvgpu_clk_domain *)(void *)board_obj_ptr;
pset = (struct nv_pmu_clk_clk_domain_boardobj_set *)ppmudata; pset = (struct nv_pmu_clk_clk_domain_boardobj_set *)(void *)ppmudata;
pset->domain = pclk_domain->domain; pset->domain = pclk_domain->domain;
pset->api_domain = pclk_domain->api_domain; pset->api_domain = pclk_domain->api_domain;

4
drivers/gpu/nvgpu/include/nvgpu/boardobj.h
View File

@@ -81,8 +81,8 @@ struct boardobjgrp_pmucmdhandler_params {
u32 success; u32 success;
}; };
#define BOARDOBJ_GET_TYPE(pobj) (((struct boardobj *)(pobj))->type) #define BOARDOBJ_GET_TYPE(pobj) (((struct boardobj *)(void *)(pobj))->type)
#define BOARDOBJ_GET_IDX(pobj) (((struct boardobj *)(pobj))->idx) #define BOARDOBJ_GET_IDX(pobj) (((struct boardobj *)(void *)(pobj))->idx)
#define HIGHESTBITIDX_32(n32) \ #define HIGHESTBITIDX_32(n32) \
{ \ { \