From 7f8226887c28267d3c2351692d4429ead1e17695 Mon Sep 17 00:00:00 2001 From: Philip Elcan Date: Wed, 29 Aug 2018 15:46:12 -0400 Subject: gpu: nvgpu: cleanup return types for MISRA 10.3 This is a big cleanup of return types across a number of modules in the nvgpu driver. Many functions were returning u32 but using negative return codes. This is a MISRA 10.3 violation by assigning signed values to a u32. JIRA NVGPU-647 Change-Id: I59ee66706321f5b5b1a07ed8c24b81583e9ba28c Signed-off-by: Philip Elcan Reviewed-on: https://git-master.nvidia.com/r/1810743 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/clk/clk_domain.c | 86 ++++++++++++++--------------- drivers/gpu/nvgpu/clk/clk_domain.h | 8 +-- drivers/gpu/nvgpu/clk/clk_fll.c | 30 +++++----- drivers/gpu/nvgpu/clk/clk_fll.h | 5 +- drivers/gpu/nvgpu/clk/clk_freq_controller.c | 36 ++++++------ drivers/gpu/nvgpu/clk/clk_freq_controller.h | 6 +- drivers/gpu/nvgpu/clk/clk_prog.c | 60 ++++++++++---------- drivers/gpu/nvgpu/clk/clk_prog.h | 6 +- drivers/gpu/nvgpu/clk/clk_vf_point.c | 48 ++++++++-------- drivers/gpu/nvgpu/clk/clk_vf_point.h | 6 +- drivers/gpu/nvgpu/clk/clk_vin.c | 60 ++++++++++---------- drivers/gpu/nvgpu/clk/clk_vin.h | 4 +- 12 files changed, 177 insertions(+), 178 deletions(-) (limited to 'drivers/gpu/nvgpu/clk') diff --git a/drivers/gpu/nvgpu/clk/clk_domain.c b/drivers/gpu/nvgpu/clk/clk_domain.c index 9f17d199..c0445e5c 100644 --- a/drivers/gpu/nvgpu/clk/clk_domain.c +++ b/drivers/gpu/nvgpu/clk/clk_domain.c @@ -33,10 +33,10 @@ static struct clk_domain *construct_clk_domain(struct gk20a *g, void *pargs); -static u32 devinit_get_clocks_table(struct gk20a *g, +static int devinit_get_clocks_table(struct gk20a *g, struct clk_domains *pdomainobjs); -static u32 clk_domain_pmudatainit_super(struct gk20a *g, struct boardobj +static int clk_domain_pmudatainit_super(struct gk20a *g, struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata); static struct vbios_clocks_table_1x_hal_clock_entry @@ -120,7 +120,7 @@ static u32 clktranslatehalmumsettoapinumset(u32 clkhaldomains) return clkapidomains; } -static u32 _clk_domains_pmudatainit_3x(struct gk20a *g, +static int _clk_domains_pmudatainit_3x(struct gk20a *g, struct boardobjgrp *pboardobjgrp, struct nv_pmu_boardobjgrp_super *pboardobjgrppmu) { @@ -128,7 +128,7 @@ static u32 _clk_domains_pmudatainit_3x(struct gk20a *g, (struct nv_pmu_clk_clk_domain_boardobjgrp_set_header *) pboardobjgrppmu; struct clk_domains *pdomains = (struct clk_domains *)pboardobjgrp; - u32 status = 0; + int status = 0; status = boardobjgrp_pmudatainit_e32(g, pboardobjgrp, pboardobjgrppmu); if (status) { @@ -162,7 +162,7 @@ done: return status; } -static u32 _clk_domains_pmudata_instget(struct gk20a *g, +static int _clk_domains_pmudata_instget(struct gk20a *g, struct nv_pmu_boardobjgrp *pmuboardobjgrp, struct nv_pmu_boardobj **ppboardobjpmudata, u8 idx) @@ -185,9 +185,9 @@ static u32 _clk_domains_pmudata_instget(struct gk20a *g, return 0; } -u32 clk_domain_sw_setup(struct gk20a *g) +int clk_domain_sw_setup(struct gk20a *g) { - u32 status; + int status; struct boardobjgrp *pboardobjgrp = NULL; struct clk_domains *pclkdomainobjs; struct clk_domain *pdomain; @@ -281,9 +281,9 @@ done: return status; } -u32 clk_domain_pmu_setup(struct gk20a *g) +int clk_domain_pmu_setup(struct gk20a *g) { - u32 status; + int status; struct boardobjgrp *pboardobjgrp = NULL; nvgpu_log_info(g, " "); @@ -300,10 +300,10 @@ u32 clk_domain_pmu_setup(struct gk20a *g) return status; } -static u32 devinit_get_clocks_table(struct gk20a *g, +static int devinit_get_clocks_table(struct gk20a *g, struct clk_domains *pclkdomainobjs) { - u32 status = 0; + int status = 0; u8 *clocks_table_ptr = NULL; struct vbios_clocks_table_1x_header clocks_table_header = { 0 }; struct vbios_clocks_table_1x_entry clocks_table_entry = { 0 }; @@ -486,7 +486,7 @@ done: return status; } -static u32 clkdomainclkproglink_not_supported(struct gk20a *g, +static int clkdomainclkproglink_not_supported(struct gk20a *g, struct clk_pmupstate *pclk, struct clk_domain *pdomain) { @@ -520,13 +520,13 @@ static u32 clkdomaingetfpoints_stub( } -static u32 clk_domain_construct_super(struct gk20a *g, +static int clk_domain_construct_super(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pargs) { struct clk_domain *pdomain; struct clk_domain *ptmpdomain = (struct clk_domain *)pargs; - u32 status = 0; + int status = 0; status = boardobj_construct_super(g, ppboardobj, size, pargs); @@ -557,11 +557,11 @@ static u32 clk_domain_construct_super(struct gk20a *g, return status; } -static u32 _clk_domain_pmudatainit_3x(struct gk20a *g, +static int _clk_domain_pmudatainit_3x(struct gk20a *g, struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata) { - u32 status = 0; + int status = 0; struct clk_domain_3x *pclk_domain_3x; struct nv_pmu_clk_clk_domain_3x_boardobj_set *pset; @@ -581,7 +581,7 @@ static u32 _clk_domain_pmudatainit_3x(struct gk20a *g, return status; } -static u32 clk_domain_construct_3x(struct gk20a *g, +static int clk_domain_construct_3x(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pargs) { @@ -589,7 +589,7 @@ static u32 clk_domain_construct_3x(struct gk20a *g, struct clk_domain_3x *pdomain; struct clk_domain_3x *ptmpdomain = (struct clk_domain_3x *)pargs; - u32 status = 0; + int status = 0; ptmpobj->type_mask = BIT(CTRL_CLK_CLK_DOMAIN_TYPE_3X); status = clk_domain_construct_super(g, ppboardobj, @@ -608,11 +608,11 @@ static u32 clk_domain_construct_3x(struct gk20a *g, return status; } -static u32 clkdomainclkproglink_3x_prog(struct gk20a *g, +static int clkdomainclkproglink_3x_prog(struct gk20a *g, struct clk_pmupstate *pclk, struct clk_domain *pdomain) { - u32 status = 0; + int status = 0; struct clk_domain_3x_prog *p3xprog = (struct clk_domain_3x_prog *)pdomain; struct clk_prog *pprog = NULL; @@ -822,11 +822,11 @@ done: return status; } -static u32 _clk_domain_pmudatainit_3x_prog(struct gk20a *g, +static int _clk_domain_pmudatainit_3x_prog(struct gk20a *g, struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata) { - u32 status = 0; + int status = 0; struct clk_domain_3x_prog *pclk_domain_3x_prog; struct nv_pmu_clk_clk_domain_3x_prog_boardobj_set *pset; struct clk_domains *pdomains = &(g->clk_pmu.clk_domainobjs); @@ -860,7 +860,7 @@ static u32 _clk_domain_pmudatainit_3x_prog(struct gk20a *g, return status; } -static u32 clk_domain_construct_3x_prog(struct gk20a *g, +static int clk_domain_construct_3x_prog(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pargs) { @@ -868,7 +868,7 @@ static u32 clk_domain_construct_3x_prog(struct gk20a *g, struct clk_domain_3x_prog *pdomain; struct clk_domain_3x_prog *ptmpdomain = (struct clk_domain_3x_prog *)pargs; - u32 status = 0; + int status = 0; ptmpobj->type_mask |= BIT(CTRL_CLK_CLK_DOMAIN_TYPE_3X_PROG); status = clk_domain_construct_3x(g, ppboardobj, size, pargs); @@ -905,11 +905,11 @@ static u32 clk_domain_construct_3x_prog(struct gk20a *g, return status; } -static u32 _clk_domain_pmudatainit_3x_slave(struct gk20a *g, +static int _clk_domain_pmudatainit_3x_slave(struct gk20a *g, struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata) { - u32 status = 0; + int status = 0; struct clk_domain_3x_slave *pclk_domain_3x_slave; struct nv_pmu_clk_clk_domain_3x_slave_boardobj_set *pset; @@ -930,7 +930,7 @@ static u32 _clk_domain_pmudatainit_3x_slave(struct gk20a *g, return status; } -static u32 clk_domain_construct_3x_slave(struct gk20a *g, +static int clk_domain_construct_3x_slave(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pargs) { @@ -938,7 +938,7 @@ static u32 clk_domain_construct_3x_slave(struct gk20a *g, struct clk_domain_3x_slave *pdomain; struct clk_domain_3x_slave *ptmpdomain = (struct clk_domain_3x_slave *)pargs; - u32 status = 0; + int status = 0; if (BOARDOBJ_GET_TYPE(pargs) != CTRL_CLK_CLK_DOMAIN_TYPE_3X_SLAVE) { return -EINVAL; @@ -963,11 +963,11 @@ static u32 clk_domain_construct_3x_slave(struct gk20a *g, return status; } -static u32 clkdomainclkproglink_3x_master(struct gk20a *g, +static int clkdomainclkproglink_3x_master(struct gk20a *g, struct clk_pmupstate *pclk, struct clk_domain *pdomain) { - u32 status = 0; + int status = 0; struct clk_domain_3x_master *p3xmaster = (struct clk_domain_3x_master *)pdomain; struct clk_prog *pprog = NULL; @@ -1007,11 +1007,11 @@ done: return status; } -static u32 _clk_domain_pmudatainit_3x_master(struct gk20a *g, +static int _clk_domain_pmudatainit_3x_master(struct gk20a *g, struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata) { - u32 status = 0; + int status = 0; struct clk_domain_3x_master *pclk_domain_3x_master; struct nv_pmu_clk_clk_domain_3x_master_boardobj_set *pset; @@ -1032,13 +1032,13 @@ static u32 _clk_domain_pmudatainit_3x_master(struct gk20a *g, return status; } -static u32 clk_domain_construct_3x_master(struct gk20a *g, +static int clk_domain_construct_3x_master(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pargs) { struct boardobj *ptmpobj = (struct boardobj *)pargs; struct clk_domain_3x_master *pdomain; - u32 status = 0; + int status = 0; if (BOARDOBJ_GET_TYPE(pargs) != CTRL_CLK_CLK_DOMAIN_TYPE_3X_MASTER) { return -EINVAL; @@ -1062,7 +1062,7 @@ static u32 clk_domain_construct_3x_master(struct gk20a *g, return status; } -static u32 clkdomainclkproglink_fixed(struct gk20a *g, +static int clkdomainclkproglink_fixed(struct gk20a *g, struct clk_pmupstate *pclk, struct clk_domain *pdomain) { @@ -1070,11 +1070,11 @@ static u32 clkdomainclkproglink_fixed(struct gk20a *g, return 0; } -static u32 _clk_domain_pmudatainit_3x_fixed(struct gk20a *g, +static int _clk_domain_pmudatainit_3x_fixed(struct gk20a *g, struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata) { - u32 status = 0; + int status = 0; struct clk_domain_3x_fixed *pclk_domain_3x_fixed; struct nv_pmu_clk_clk_domain_3x_fixed_boardobj_set *pset; @@ -1095,7 +1095,7 @@ static u32 _clk_domain_pmudatainit_3x_fixed(struct gk20a *g, return status; } -static u32 clk_domain_construct_3x_fixed(struct gk20a *g, +static int clk_domain_construct_3x_fixed(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pargs) { @@ -1103,7 +1103,7 @@ static u32 clk_domain_construct_3x_fixed(struct gk20a *g, struct clk_domain_3x_fixed *pdomain; struct clk_domain_3x_fixed *ptmpdomain = (struct clk_domain_3x_fixed *)pargs; - u32 status = 0; + int status = 0; if (BOARDOBJ_GET_TYPE(pargs) != CTRL_CLK_CLK_DOMAIN_TYPE_3X_FIXED) { return -EINVAL; @@ -1163,11 +1163,11 @@ static struct clk_domain *construct_clk_domain(struct gk20a *g, void *pargs) return (struct clk_domain *)board_obj_ptr; } -static u32 clk_domain_pmudatainit_super(struct gk20a *g, +static int clk_domain_pmudatainit_super(struct gk20a *g, struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata) { - u32 status = 0; + int status = 0; struct clk_domain *pclk_domain; struct nv_pmu_clk_clk_domain_boardobj_set *pset; @@ -1189,9 +1189,9 @@ static u32 clk_domain_pmudatainit_super(struct gk20a *g, return status; } -u32 clk_domain_clk_prog_link(struct gk20a *g, struct clk_pmupstate *pclk) +int clk_domain_clk_prog_link(struct gk20a *g, struct clk_pmupstate *pclk) { - u32 status = 0; + int status = 0; struct clk_domain *pdomain; u8 i; diff --git a/drivers/gpu/nvgpu/clk/clk_domain.h b/drivers/gpu/nvgpu/clk/clk_domain.h index 4441e7a1..d0170339 100644 --- a/drivers/gpu/nvgpu/clk/clk_domain.h +++ b/drivers/gpu/nvgpu/clk/clk_domain.h @@ -38,10 +38,10 @@ struct clk_domain; enum nv_pmu_clk_clkwhich; /*data and function definition to talk to driver*/ -u32 clk_domain_sw_setup(struct gk20a *g); -u32 clk_domain_pmu_setup(struct gk20a *g); +int clk_domain_sw_setup(struct gk20a *g); +int clk_domain_pmu_setup(struct gk20a *g); -typedef u32 clkproglink(struct gk20a *g, struct clk_pmupstate *pclk, +typedef int clkproglink(struct gk20a *g, struct clk_pmupstate *pclk, struct clk_domain *pdomain); typedef int clkvfsearch(struct gk20a *g, struct clk_pmupstate *pclk, @@ -123,7 +123,7 @@ struct clk_domain_3x_slave { clkgetslaveclk *clkdomainclkgetslaveclk; }; -u32 clk_domain_clk_prog_link(struct gk20a *g, struct clk_pmupstate *pclk); +int clk_domain_clk_prog_link(struct gk20a *g, struct clk_pmupstate *pclk); #define CLK_CLK_DOMAIN_GET(pclk, idx) \ ((struct clk_domain *)BOARDOBJGRP_OBJ_GET_BY_IDX( \ diff --git a/drivers/gpu/nvgpu/clk/clk_fll.c b/drivers/gpu/nvgpu/clk/clk_fll.c index 0fd9c33f..700aeb2d 100644 --- a/drivers/gpu/nvgpu/clk/clk_fll.c +++ b/drivers/gpu/nvgpu/clk/clk_fll.c @@ -31,15 +31,15 @@ #include "ctrl/ctrlclk.h" #include "ctrl/ctrlvolt.h" -static u32 devinit_get_fll_device_table(struct gk20a *g, +static int devinit_get_fll_device_table(struct gk20a *g, struct avfsfllobjs *pfllobjs); static struct fll_device *construct_fll_device(struct gk20a *g, void *pargs); -static u32 fll_device_init_pmudata_super(struct gk20a *g, +static int fll_device_init_pmudata_super(struct gk20a *g, struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata); -static u32 _clk_fll_devgrp_pmudatainit_super(struct gk20a *g, +static int _clk_fll_devgrp_pmudatainit_super(struct gk20a *g, struct boardobjgrp *pboardobjgrp, struct nv_pmu_boardobjgrp_super *pboardobjgrppmu) { @@ -48,7 +48,7 @@ static u32 _clk_fll_devgrp_pmudatainit_super(struct gk20a *g, pboardobjgrppmu; struct avfsfllobjs *pfll_objs = (struct avfsfllobjs *) pboardobjgrp; - u32 status = 0; + int status = 0; nvgpu_log_info(g, " "); @@ -71,7 +71,7 @@ static u32 _clk_fll_devgrp_pmudatainit_super(struct gk20a *g, return status; } -static u32 _clk_fll_devgrp_pmudata_instget(struct gk20a *g, +static int _clk_fll_devgrp_pmudata_instget(struct gk20a *g, struct nv_pmu_boardobjgrp *pmuboardobjgrp, struct nv_pmu_boardobj **ppboardobjpmudata, u8 idx) @@ -94,7 +94,7 @@ static u32 _clk_fll_devgrp_pmudata_instget(struct gk20a *g, return 0; } -static u32 _clk_fll_devgrp_pmustatus_instget(struct gk20a *g, +static int _clk_fll_devgrp_pmustatus_instget(struct gk20a *g, void *pboardobjgrppmu, struct nv_pmu_boardobj_query **ppboardobjpmustatus, u8 idx) @@ -114,9 +114,9 @@ static u32 _clk_fll_devgrp_pmustatus_instget(struct gk20a *g, return 0; } -u32 clk_fll_sw_setup(struct gk20a *g) +int clk_fll_sw_setup(struct gk20a *g) { - u32 status; + int status; struct boardobjgrp *pboardobjgrp = NULL; struct avfsfllobjs *pfllobjs; struct fll_device *pfll; @@ -209,9 +209,9 @@ done: return status; } -u32 clk_fll_pmu_setup(struct gk20a *g) +int clk_fll_pmu_setup(struct gk20a *g) { - u32 status; + int status; struct boardobjgrp *pboardobjgrp = NULL; nvgpu_log_info(g, " "); @@ -228,10 +228,10 @@ u32 clk_fll_pmu_setup(struct gk20a *g) return status; } -static u32 devinit_get_fll_device_table(struct gk20a *g, +static int devinit_get_fll_device_table(struct gk20a *g, struct avfsfllobjs *pfllobjs) { - u32 status = 0; + int status = 0; u8 *fll_table_ptr = NULL; struct fll_descriptor_header fll_desc_table_header_sz = { 0 }; struct fll_descriptor_header_10 fll_desc_table_header = { 0 }; @@ -411,7 +411,7 @@ static struct fll_device *construct_fll_device(struct gk20a *g, struct boardobj *board_obj_ptr = NULL; struct fll_device *pfll_dev; struct fll_device *board_obj_fll_ptr = NULL; - u32 status; + int status; nvgpu_log_info(g, " "); status = boardobj_construct_super(g, &board_obj_ptr, @@ -449,11 +449,11 @@ static struct fll_device *construct_fll_device(struct gk20a *g, return (struct fll_device *)board_obj_ptr; } -static u32 fll_device_init_pmudata_super(struct gk20a *g, +static int fll_device_init_pmudata_super(struct gk20a *g, struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata) { - u32 status = 0; + int status = 0; struct fll_device *pfll_dev; struct nv_pmu_clk_clk_fll_device_boardobj_set *perf_pmu_data; diff --git a/drivers/gpu/nvgpu/clk/clk_fll.h b/drivers/gpu/nvgpu/clk/clk_fll.h index 79ecf5e1..7f7cad97 100644 --- a/drivers/gpu/nvgpu/clk/clk_fll.h +++ b/drivers/gpu/nvgpu/clk/clk_fll.h @@ -28,8 +28,8 @@ #include "boardobj/boardobjgrpmask.h" /*data and function definition to talk to driver*/ -u32 clk_fll_sw_setup(struct gk20a *g); -u32 clk_fll_pmu_setup(struct gk20a *g); +int clk_fll_sw_setup(struct gk20a *g); +int clk_fll_pmu_setup(struct gk20a *g); struct avfsfllobjs { struct boardobjgrp_e32 super; @@ -79,4 +79,3 @@ u32 nvgpu_clk_get_vbios_clk_domain_gp10x( u32 vbios_domain); (pclk->avfs_fllobjs.lut_step_size_uv) #endif - diff --git a/drivers/gpu/nvgpu/clk/clk_freq_controller.c b/drivers/gpu/nvgpu/clk/clk_freq_controller.c index aa2a3a54..f114f5d5 100644 --- a/drivers/gpu/nvgpu/clk/clk_freq_controller.c +++ b/drivers/gpu/nvgpu/clk/clk_freq_controller.c @@ -32,13 +32,13 @@ #include "ctrl/ctrlclk.h" #include "ctrl/ctrlvolt.h" -static u32 clk_freq_controller_pmudatainit_super(struct gk20a *g, +static int clk_freq_controller_pmudatainit_super(struct gk20a *g, struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata) { struct nv_pmu_clk_clk_freq_controller_boardobj_set *pfreq_cntlr_set; struct clk_freq_controller *pfreq_cntlr; - u32 status = 0; + int status = 0; status = boardobj_pmudatainit_super(g, board_obj_ptr, ppmudata); if (status) { @@ -63,14 +63,14 @@ static u32 clk_freq_controller_pmudatainit_super(struct gk20a *g, return status; } -static u32 clk_freq_controller_pmudatainit_pi(struct gk20a *g, +static int clk_freq_controller_pmudatainit_pi(struct gk20a *g, struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata) { struct nv_pmu_clk_clk_freq_controller_pi_boardobj_set *pfreq_cntlr_pi_set; struct clk_freq_controller_pi *pfreq_cntlr_pi; - u32 status = 0; + int status = 0; status = clk_freq_controller_pmudatainit_super(g, board_obj_ptr, ppmudata); @@ -94,13 +94,13 @@ static u32 clk_freq_controller_pmudatainit_pi(struct gk20a *g, return status; } -static u32 clk_freq_controller_construct_super(struct gk20a *g, +static int clk_freq_controller_construct_super(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pargs) { struct clk_freq_controller *pfreq_cntlr = NULL; struct clk_freq_controller *pfreq_cntlr_tmp = NULL; - u32 status = 0; + int status = 0; status = boardobj_construct_super(g, ppboardobj, size, pargs); if (status) { @@ -125,13 +125,13 @@ static u32 clk_freq_controller_construct_super(struct gk20a *g, return status; } -static u32 clk_freq_controller_construct_pi(struct gk20a *g, +static int clk_freq_controller_construct_pi(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pargs) { struct clk_freq_controller_pi *pfreq_cntlr_pi = NULL; struct clk_freq_controller_pi *pfreq_cntlr_pi_tmp = NULL; - u32 status = 0; + int status = 0; status = clk_freq_controller_construct_super(g, ppboardobj, size, pargs); @@ -161,7 +161,7 @@ static struct clk_freq_controller *clk_clk_freq_controller_construct( void *pargs) { struct boardobj *board_obj_ptr = NULL; - u32 status = 0; + int status = 0; if (BOARDOBJ_GET_TYPE(pargs) != CTRL_CLK_CLK_FREQ_CONTROLLER_TYPE_PI) { return NULL; @@ -177,10 +177,10 @@ static struct clk_freq_controller *clk_clk_freq_controller_construct( } -static u32 clk_get_freq_controller_table(struct gk20a *g, +static int clk_get_freq_controller_table(struct gk20a *g, struct clk_freq_controllers *pclk_freq_controllers) { - u32 status = 0; + int status = 0; u8 *pfreq_controller_table_ptr = NULL; struct vbios_fct_1x_header header = { 0 }; struct vbios_fct_1x_entry entry = { 0 }; @@ -324,9 +324,9 @@ done: return status; } -u32 clk_freq_controller_pmu_setup(struct gk20a *g) +int clk_freq_controller_pmu_setup(struct gk20a *g) { - u32 status; + int status; struct boardobjgrp *pboardobjgrp = NULL; nvgpu_log_info(g, " "); @@ -343,7 +343,7 @@ u32 clk_freq_controller_pmu_setup(struct gk20a *g) return status; } -static u32 _clk_freq_controller_devgrp_pmudata_instget(struct gk20a *g, +static int _clk_freq_controller_devgrp_pmudata_instget(struct gk20a *g, struct nv_pmu_boardobjgrp *pmuboardobjgrp, struct nv_pmu_boardobj **ppboardobjpmudata, u8 idx) @@ -366,7 +366,7 @@ static u32 _clk_freq_controller_devgrp_pmudata_instget(struct gk20a *g, return 0; } -static u32 _clk_freq_controllers_pmudatainit(struct gk20a *g, +static int _clk_freq_controllers_pmudatainit(struct gk20a *g, struct boardobjgrp *pboardobjgrp, struct nv_pmu_boardobjgrp_super *pboardobjgrppmu) { @@ -375,7 +375,7 @@ static u32 _clk_freq_controllers_pmudatainit(struct gk20a *g, pboardobjgrppmu; struct clk_freq_controllers *pcntrs = (struct clk_freq_controllers *)pboardobjgrp; - u32 status = 0; + int status = 0; status = boardobjgrp_pmudatainit_e32(g, pboardobjgrp, pboardobjgrppmu); if (status) { @@ -391,9 +391,9 @@ done: return status; } -u32 clk_freq_controller_sw_setup(struct gk20a *g) +int clk_freq_controller_sw_setup(struct gk20a *g) { - u32 status = 0; + int status = 0; struct boardobjgrp *pboardobjgrp = NULL; struct clk_freq_controllers *pclk_freq_controllers; struct avfsfllobjs *pfllobjs = &(g->clk_pmu.avfs_fllobjs); diff --git a/drivers/gpu/nvgpu/clk/clk_freq_controller.h b/drivers/gpu/nvgpu/clk/clk_freq_controller.h index 1b8a24c9..659b75d5 100644 --- a/drivers/gpu/nvgpu/clk/clk_freq_controller.h +++ b/drivers/gpu/nvgpu/clk/clk_freq_controller.h @@ -1,5 +1,5 @@ /* -* Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. +* Copyright (c) 2016-2018, 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"), @@ -78,7 +78,7 @@ struct clk_freq_controllers { void *pprereq_load; }; -u32 clk_freq_controller_sw_setup(struct gk20a *g); -u32 clk_freq_controller_pmu_setup(struct gk20a *g); +int clk_freq_controller_sw_setup(struct gk20a *g); +int clk_freq_controller_pmu_setup(struct gk20a *g); #endif diff --git a/drivers/gpu/nvgpu/clk/clk_prog.c b/drivers/gpu/nvgpu/clk/clk_prog.c index 5966d64a..ae8f8e01 100644 --- a/drivers/gpu/nvgpu/clk/clk_prog.c +++ b/drivers/gpu/nvgpu/clk/clk_prog.c @@ -34,14 +34,14 @@ #include "ctrl/ctrlvolt.h" static struct clk_prog *construct_clk_prog(struct gk20a *g, void *pargs); -static u32 devinit_get_clk_prog_table(struct gk20a *g, +static int devinit_get_clk_prog_table(struct gk20a *g, struct clk_progs *pprogobjs); static vf_flatten vfflatten_prog_1x_master; static vf_lookup vflookup_prog_1x_master; static get_fpoints getfpoints_prog_1x_master; static get_slaveclk getslaveclk_prog_1x_master; -static u32 _clk_progs_pmudatainit(struct gk20a *g, +static int _clk_progs_pmudatainit(struct gk20a *g, struct boardobjgrp *pboardobjgrp, struct nv_pmu_boardobjgrp_super *pboardobjgrppmu) { @@ -64,7 +64,7 @@ done: return status; } -static u32 _clk_progs_pmudata_instget(struct gk20a *g, +static int _clk_progs_pmudata_instget(struct gk20a *g, struct nv_pmu_boardobjgrp *pmuboardobjgrp, struct nv_pmu_boardobj **ppboardobjpmudata, u8 idx) @@ -86,9 +86,9 @@ static u32 _clk_progs_pmudata_instget(struct gk20a *g, return 0; } -u32 clk_prog_sw_setup(struct gk20a *g) +int clk_prog_sw_setup(struct gk20a *g) { - u32 status; + int status; struct boardobjgrp *pboardobjgrp = NULL; struct clk_progs *pclkprogobjs; @@ -136,9 +136,9 @@ done: return status; } -u32 clk_prog_pmu_setup(struct gk20a *g) +int clk_prog_pmu_setup(struct gk20a *g) { - u32 status; + int status; struct boardobjgrp *pboardobjgrp = NULL; nvgpu_log_info(g, " "); @@ -155,10 +155,10 @@ u32 clk_prog_pmu_setup(struct gk20a *g) return status; } -static u32 devinit_get_clk_prog_table(struct gk20a *g, +static int devinit_get_clk_prog_table(struct gk20a *g, struct clk_progs *pclkprogobjs) { - u32 status = 0; + int status = 0; u8 *clkprogs_tbl_ptr = NULL; struct vbios_clock_programming_table_1x_header header = { 0 }; struct vbios_clock_programming_table_1x_entry prog = { 0 }; @@ -379,11 +379,11 @@ done: return status; } -static u32 _clk_prog_pmudatainit_super(struct gk20a *g, +static int _clk_prog_pmudatainit_super(struct gk20a *g, struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata) { - u32 status = 0; + int status = 0; nvgpu_log_info(g, " "); @@ -391,11 +391,11 @@ static u32 _clk_prog_pmudatainit_super(struct gk20a *g, return status; } -static u32 _clk_prog_pmudatainit_1x(struct gk20a *g, +static int _clk_prog_pmudatainit_1x(struct gk20a *g, struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata) { - u32 status = 0; + int status = 0; struct clk_prog_1x *pclk_prog_1x; struct nv_pmu_clk_clk_prog_1x_boardobj_set *pset; @@ -418,11 +418,11 @@ static u32 _clk_prog_pmudatainit_1x(struct gk20a *g, return status; } -static u32 _clk_prog_pmudatainit_1x_master(struct gk20a *g, +static int _clk_prog_pmudatainit_1x_master(struct gk20a *g, struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata) { - u32 status = 0; + int status = 0; struct clk_prog_1x_master *pclk_prog_1x_master; struct nv_pmu_clk_clk_prog_1x_master_boardobj_set *pset; u32 vfsize = sizeof(struct ctrl_clk_clk_prog_1x_master_vf_entry) * @@ -449,11 +449,11 @@ static u32 _clk_prog_pmudatainit_1x_master(struct gk20a *g, return status; } -static u32 _clk_prog_pmudatainit_1x_master_ratio(struct gk20a *g, +static int _clk_prog_pmudatainit_1x_master_ratio(struct gk20a *g, struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata) { - u32 status = 0; + int status = 0; struct clk_prog_1x_master_ratio *pclk_prog_1x_master_ratio; struct nv_pmu_clk_clk_prog_1x_master_ratio_boardobj_set *pset; u32 slavesize = sizeof(struct ctrl_clk_clk_prog_1x_master_ratio_slave_entry) * @@ -478,11 +478,11 @@ static u32 _clk_prog_pmudatainit_1x_master_ratio(struct gk20a *g, return status; } -static u32 _clk_prog_pmudatainit_1x_master_table(struct gk20a *g, +static int _clk_prog_pmudatainit_1x_master_table(struct gk20a *g, struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata) { - u32 status = 0; + int status = 0; struct clk_prog_1x_master_table *pclk_prog_1x_master_table; struct nv_pmu_clk_clk_prog_1x_master_table_boardobj_set *pset; u32 slavesize = sizeof(struct ctrl_clk_clk_prog_1x_master_ratio_slave_entry) * @@ -538,12 +538,12 @@ done: return status; } -static u32 clk_prog_construct_super(struct gk20a *g, +static int clk_prog_construct_super(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pargs) { struct clk_prog *pclkprog; - u32 status = 0; + int status = 0; status = boardobj_construct_super(g, ppboardobj, size, pargs); @@ -559,7 +559,7 @@ static u32 clk_prog_construct_super(struct gk20a *g, } -static u32 clk_prog_construct_1x(struct gk20a *g, +static int clk_prog_construct_1x(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pargs) { @@ -567,7 +567,7 @@ static u32 clk_prog_construct_1x(struct gk20a *g, struct clk_prog_1x *pclkprog; struct clk_prog_1x *ptmpprog = (struct clk_prog_1x *)pargs; - u32 status = 0; + int status = 0; nvgpu_log_info(g, " "); ptmpobj->type_mask |= BIT(CTRL_CLK_CLK_PROG_TYPE_1X); @@ -588,7 +588,7 @@ static u32 clk_prog_construct_1x(struct gk20a *g, return status; } -static u32 clk_prog_construct_1x_master(struct gk20a *g, +static int clk_prog_construct_1x_master(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pargs) { @@ -596,7 +596,7 @@ static u32 clk_prog_construct_1x_master(struct gk20a *g, struct clk_prog_1x_master *pclkprog; struct clk_prog_1x_master *ptmpprog = (struct clk_prog_1x_master *)pargs; - u32 status = 0; + int status = 0; u32 vfsize = sizeof(struct ctrl_clk_clk_prog_1x_master_vf_entry) * g->clk_pmu.clk_progobjs.vf_entry_count; u8 railidx; @@ -645,7 +645,7 @@ static u32 clk_prog_construct_1x_master(struct gk20a *g, return status; } -static u32 clk_prog_construct_1x_master_ratio(struct gk20a *g, +static int clk_prog_construct_1x_master_ratio(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pargs) { @@ -653,7 +653,7 @@ static u32 clk_prog_construct_1x_master_ratio(struct gk20a *g, struct clk_prog_1x_master_ratio *pclkprog; struct clk_prog_1x_master_ratio *ptmpprog = (struct clk_prog_1x_master_ratio *)pargs; - u32 status = 0; + int status = 0; u32 slavesize = sizeof(struct ctrl_clk_clk_prog_1x_master_ratio_slave_entry) * g->clk_pmu.clk_progobjs.slave_entry_count; @@ -687,7 +687,7 @@ static u32 clk_prog_construct_1x_master_ratio(struct gk20a *g, return status; } -static u32 clk_prog_construct_1x_master_table(struct gk20a *g, +static int clk_prog_construct_1x_master_table(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pargs) { @@ -695,7 +695,7 @@ static u32 clk_prog_construct_1x_master_table(struct gk20a *g, struct clk_prog_1x_master_table *pclkprog; struct clk_prog_1x_master_table *ptmpprog = (struct clk_prog_1x_master_table *)pargs; - u32 status = 0; + int status = 0; u32 slavesize = sizeof(struct ctrl_clk_clk_prog_1x_master_ratio_slave_entry) * g->clk_pmu.clk_progobjs.slave_entry_count; @@ -741,7 +741,7 @@ exit: static struct clk_prog *construct_clk_prog(struct gk20a *g, void *pargs) { struct boardobj *board_obj_ptr = NULL; - u32 status; + int status; nvgpu_log_info(g, " type - %x", BOARDOBJ_GET_TYPE(pargs)); switch (BOARDOBJ_GET_TYPE(pargs)) { diff --git a/drivers/gpu/nvgpu/clk/clk_prog.h b/drivers/gpu/nvgpu/clk/clk_prog.h index 64cb1b51..cabe0bf0 100644 --- a/drivers/gpu/nvgpu/clk/clk_prog.h +++ b/drivers/gpu/nvgpu/clk/clk_prog.h @@ -1,5 +1,5 @@ /* -* Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. +* Copyright (c) 2016-2018, 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"), @@ -29,8 +29,8 @@ #include "boardobj/boardobjgrp_e255.h" #include "boardobj/boardobjgrpmask.h" -u32 clk_prog_sw_setup(struct gk20a *g); -u32 clk_prog_pmu_setup(struct gk20a *g); +int clk_prog_sw_setup(struct gk20a *g); +int clk_prog_pmu_setup(struct gk20a *g); struct clk_prog_1x_master; typedef u32 vf_flatten(struct gk20a *g, struct clk_pmupstate *pclk, diff --git a/drivers/gpu/nvgpu/clk/clk_vf_point.c b/drivers/gpu/nvgpu/clk/clk_vf_point.c index 5fc1d8e5..80eefe96 100644 --- a/drivers/gpu/nvgpu/clk/clk_vf_point.c +++ b/drivers/gpu/nvgpu/clk/clk_vf_point.c @@ -29,10 +29,10 @@ #include "ctrl/ctrlclk.h" #include "ctrl/ctrlvolt.h" -static u32 _clk_vf_point_pmudatainit_super(struct gk20a *g, struct boardobj +static int _clk_vf_point_pmudatainit_super(struct gk20a *g, struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata); -static u32 _clk_vf_points_pmudatainit(struct gk20a *g, +static int _clk_vf_points_pmudatainit(struct gk20a *g, struct boardobjgrp *pboardobjgrp, struct nv_pmu_boardobjgrp_super *pboardobjgrppmu) { @@ -50,7 +50,7 @@ done: return status; } -static u32 _clk_vf_points_pmudata_instget(struct gk20a *g, +static int _clk_vf_points_pmudata_instget(struct gk20a *g, struct nv_pmu_boardobjgrp *pmuboardobjgrp, struct nv_pmu_boardobj **ppboardobjpmudata, u8 idx) @@ -72,7 +72,7 @@ static u32 _clk_vf_points_pmudata_instget(struct gk20a *g, return 0; } -static u32 _clk_vf_points_pmustatus_instget(struct gk20a *g, +static int _clk_vf_points_pmustatus_instget(struct gk20a *g, void *pboardobjgrppmu, struct nv_pmu_boardobj_query **ppboardobjpmustatus, u8 idx) @@ -91,9 +91,9 @@ static u32 _clk_vf_points_pmustatus_instget(struct gk20a *g, return 0; } -u32 clk_vf_point_sw_setup(struct gk20a *g) +int clk_vf_point_sw_setup(struct gk20a *g) { - u32 status; + int status; struct boardobjgrp *pboardobjgrp = NULL; nvgpu_log_info(g, " "); @@ -138,9 +138,9 @@ done: return status; } -u32 clk_vf_point_pmu_setup(struct gk20a *g) +int clk_vf_point_pmu_setup(struct gk20a *g) { - u32 status; + int status; struct boardobjgrp *pboardobjgrp = NULL; nvgpu_log_info(g, " "); @@ -157,14 +157,14 @@ u32 clk_vf_point_pmu_setup(struct gk20a *g) return status; } -static u32 clk_vf_point_construct_super(struct gk20a *g, +static int clk_vf_point_construct_super(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pargs) { struct clk_vf_point *pclkvfpoint; struct clk_vf_point *ptmpvfpoint = (struct clk_vf_point *)pargs; - u32 status = 0; + int status = 0; status = boardobj_construct_super(g, ppboardobj, size, pargs); @@ -183,11 +183,11 @@ static u32 clk_vf_point_construct_super(struct gk20a *g, return status; } -static u32 _clk_vf_point_pmudatainit_volt(struct gk20a *g, +static int _clk_vf_point_pmudatainit_volt(struct gk20a *g, struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata) { - u32 status = 0; + int status = 0; struct clk_vf_point_volt *pclk_vf_point_volt; struct nv_pmu_clk_clk_vf_point_volt_boardobj_set *pset; @@ -211,11 +211,11 @@ static u32 _clk_vf_point_pmudatainit_volt(struct gk20a *g, return status; } -static u32 _clk_vf_point_pmudatainit_freq(struct gk20a *g, +static int _clk_vf_point_pmudatainit_freq(struct gk20a *g, struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata) { - u32 status = 0; + int status = 0; struct clk_vf_point_freq *pclk_vf_point_freq; struct nv_pmu_clk_clk_vf_point_freq_boardobj_set *pset; @@ -240,7 +240,7 @@ static u32 _clk_vf_point_pmudatainit_freq(struct gk20a *g, return status; } -static u32 clk_vf_point_construct_volt(struct gk20a *g, +static int clk_vf_point_construct_volt(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pargs) { @@ -248,7 +248,7 @@ static u32 clk_vf_point_construct_volt(struct gk20a *g, struct clk_vf_point_volt *pclkvfpoint; struct clk_vf_point_volt *ptmpvfpoint = (struct clk_vf_point_volt *)pargs; - u32 status = 0; + int status = 0; if (BOARDOBJ_GET_TYPE(pargs) != CTRL_CLK_CLK_VF_POINT_TYPE_VOLT) { return -EINVAL; @@ -271,7 +271,7 @@ static u32 clk_vf_point_construct_volt(struct gk20a *g, return status; } -static u32 clk_vf_point_construct_freq(struct gk20a *g, +static int clk_vf_point_construct_freq(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pargs) { @@ -279,7 +279,7 @@ static u32 clk_vf_point_construct_freq(struct gk20a *g, struct clk_vf_point_freq *pclkvfpoint; struct clk_vf_point_freq *ptmpvfpoint = (struct clk_vf_point_freq *)pargs; - u32 status = 0; + int status = 0; if (BOARDOBJ_GET_TYPE(pargs) != CTRL_CLK_CLK_VF_POINT_TYPE_FREQ) { return -EINVAL; @@ -305,7 +305,7 @@ static u32 clk_vf_point_construct_freq(struct gk20a *g, struct clk_vf_point *construct_clk_vf_point(struct gk20a *g, void *pargs) { struct boardobj *board_obj_ptr = NULL; - u32 status; + int status; nvgpu_log_info(g, " "); switch (BOARDOBJ_GET_TYPE(pargs)) { @@ -332,11 +332,11 @@ struct clk_vf_point *construct_clk_vf_point(struct gk20a *g, void *pargs) return (struct clk_vf_point *)board_obj_ptr; } -static u32 _clk_vf_point_pmudatainit_super(struct gk20a *g, +static int _clk_vf_point_pmudatainit_super(struct gk20a *g, struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata) { - u32 status = 0; + int status = 0; struct clk_vf_point *pclk_vf_point; struct nv_pmu_clk_clk_vf_point_boardobj_set *pset; @@ -360,7 +360,7 @@ static u32 _clk_vf_point_pmudatainit_super(struct gk20a *g, } -static u32 clk_vf_point_update(struct gk20a *g, +static int clk_vf_point_update(struct gk20a *g, struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata) { @@ -388,7 +388,7 @@ static u32 clk_vf_point_update(struct gk20a *g, } /*get latest vf point data from PMU */ -u32 clk_vf_point_cache(struct gk20a *g) +int clk_vf_point_cache(struct gk20a *g) { struct clk_vf_points *pclk_vf_points; @@ -397,7 +397,7 @@ u32 clk_vf_point_cache(struct gk20a *g) struct nv_pmu_boardobjgrp_super *pboardobjgrppmu; struct boardobj *pboardobj = NULL; struct nv_pmu_boardobj_query *pboardobjpmustatus = NULL; - u32 status; + int status; u8 index; nvgpu_log_info(g, " "); diff --git a/drivers/gpu/nvgpu/clk/clk_vf_point.h b/drivers/gpu/nvgpu/clk/clk_vf_point.h index b67434b7..a4e2f48f 100644 --- a/drivers/gpu/nvgpu/clk/clk_vf_point.h +++ b/drivers/gpu/nvgpu/clk/clk_vf_point.h @@ -28,9 +28,9 @@ #include "boardobj/boardobjgrp_e32.h" #include "boardobj/boardobjgrpmask.h" -u32 clk_vf_point_sw_setup(struct gk20a *g); -u32 clk_vf_point_pmu_setup(struct gk20a *g); -u32 clk_vf_point_cache(struct gk20a *g); +int clk_vf_point_sw_setup(struct gk20a *g); +int clk_vf_point_pmu_setup(struct gk20a *g); +int clk_vf_point_cache(struct gk20a *g); struct clk_vf_points { struct boardobjgrp_e255 super; diff --git a/drivers/gpu/nvgpu/clk/clk_vin.c b/drivers/gpu/nvgpu/clk/clk_vin.c index 1c18b662..9a163594 100644 --- a/drivers/gpu/nvgpu/clk/clk_vin.c +++ b/drivers/gpu/nvgpu/clk/clk_vin.c @@ -36,27 +36,27 @@ #include "clk.h" #include "clk_vin.h" -static u32 devinit_get_vin_device_table(struct gk20a *g, +static int devinit_get_vin_device_table(struct gk20a *g, struct avfsvinobjs *pvinobjs); -static u32 vin_device_construct_v10(struct gk20a *g, +static int vin_device_construct_v10(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pargs); -static u32 vin_device_construct_v20(struct gk20a *g, +static int vin_device_construct_v20(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pargs); -static u32 vin_device_construct_super(struct gk20a *g, +static int vin_device_construct_super(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pargs); static struct vin_device *construct_vin_device(struct gk20a *g, void *pargs); -static u32 vin_device_init_pmudata_v10(struct gk20a *g, +static int vin_device_init_pmudata_v10(struct gk20a *g, struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata); -static u32 vin_device_init_pmudata_v20(struct gk20a *g, +static int vin_device_init_pmudata_v20(struct gk20a *g, struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata); -static u32 vin_device_init_pmudata_super(struct gk20a *g, +static int vin_device_init_pmudata_super(struct gk20a *g, struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata); @@ -122,7 +122,7 @@ u32 clk_avfs_get_vin_cal_fuse_v20(struct gk20a *g, } -static u32 _clk_vin_devgrp_pmudatainit_super(struct gk20a *g, +static int _clk_vin_devgrp_pmudatainit_super(struct gk20a *g, struct boardobjgrp *pboardobjgrp, struct nv_pmu_boardobjgrp_super *pboardobjgrppmu) { @@ -130,7 +130,7 @@ static u32 _clk_vin_devgrp_pmudatainit_super(struct gk20a *g, (struct nv_pmu_clk_clk_vin_device_boardobjgrp_set_header *) pboardobjgrppmu; struct avfsvinobjs *pvin_obbj = (struct avfsvinobjs *)pboardobjgrp; - u32 status = 0; + int status = 0; nvgpu_log_info(g, " "); @@ -142,7 +142,7 @@ static u32 _clk_vin_devgrp_pmudatainit_super(struct gk20a *g, return status; } -static u32 _clk_vin_devgrp_pmudata_instget(struct gk20a *g, +static int _clk_vin_devgrp_pmudata_instget(struct gk20a *g, struct nv_pmu_boardobjgrp *pmuboardobjgrp, struct nv_pmu_boardobj **ppboardobjpmudata, u8 idx) @@ -165,7 +165,7 @@ static u32 _clk_vin_devgrp_pmudata_instget(struct gk20a *g, return 0; } -static u32 _clk_vin_devgrp_pmustatus_instget(struct gk20a *g, +static int _clk_vin_devgrp_pmustatus_instget(struct gk20a *g, void *pboardobjgrppmu, struct nv_pmu_boardobj_query **ppboardobjpmustatus, u8 idx) @@ -185,9 +185,9 @@ static u32 _clk_vin_devgrp_pmustatus_instget(struct gk20a *g, return 0; } -u32 clk_vin_sw_setup(struct gk20a *g) +int clk_vin_sw_setup(struct gk20a *g) { - u32 status; + int status; struct boardobjgrp *pboardobjgrp = NULL; struct vin_device_v20 *pvindev = NULL; struct avfsvinobjs *pvinobjs; @@ -243,9 +243,9 @@ done: return status; } -u32 clk_vin_pmu_setup(struct gk20a *g) +int clk_vin_pmu_setup(struct gk20a *g) { - u32 status; + int status; struct boardobjgrp *pboardobjgrp = NULL; nvgpu_log_info(g, " "); @@ -262,10 +262,10 @@ u32 clk_vin_pmu_setup(struct gk20a *g) return status; } -static u32 devinit_get_vin_device_table(struct gk20a *g, +static int devinit_get_vin_device_table(struct gk20a *g, struct avfsvinobjs *pvinobjs) { - u32 status = 0; + int status = 0; u8 *vin_table_ptr = NULL; struct vin_descriptor_header_10 vin_desc_table_header = { 0 }; struct vin_descriptor_entry_10 vin_desc_table_entry = { 0 }; @@ -376,14 +376,14 @@ done: return status; } -static u32 vin_device_construct_v10(struct gk20a *g, +static int vin_device_construct_v10(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pargs) { struct boardobj *ptmpobj = (struct boardobj *)pargs; struct vin_device_v10 *pvin_device_v10; struct vin_device_v10 *ptmpvin_device_v10 = (struct vin_device_v10 *)pargs; - u32 status = 0; + int status = 0; if (BOARDOBJ_GET_TYPE(pargs) != CTRL_CLK_VIN_TYPE_V10) { return -EINVAL; @@ -406,14 +406,14 @@ static u32 vin_device_construct_v10(struct gk20a *g, return status; } -static u32 vin_device_construct_v20(struct gk20a *g, +static int vin_device_construct_v20(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pargs) { struct boardobj *ptmpobj = (struct boardobj *)pargs; struct vin_device_v20 *pvin_device_v20; struct vin_device_v20 *ptmpvin_device_v20 = (struct vin_device_v20 *)pargs; - u32 status = 0; + int status = 0; if (BOARDOBJ_GET_TYPE(pargs) != CTRL_CLK_VIN_TYPE_V20) { return -EINVAL; @@ -435,13 +435,13 @@ static u32 vin_device_construct_v20(struct gk20a *g, return status; } -static u32 vin_device_construct_super(struct gk20a *g, +static int vin_device_construct_super(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *pargs) { struct vin_device *pvin_device; struct vin_device *ptmpvin_device = (struct vin_device *)pargs; - u32 status = 0; + int status = 0; status = boardobj_construct_super(g, ppboardobj, size, pargs); if (status) { @@ -463,7 +463,7 @@ static u32 vin_device_construct_super(struct gk20a *g, static struct vin_device *construct_vin_device(struct gk20a *g, void *pargs) { struct boardobj *board_obj_ptr = NULL; - u32 status; + int status; nvgpu_log_info(g, " %d", BOARDOBJ_GET_TYPE(pargs)); switch (BOARDOBJ_GET_TYPE(pargs)) { @@ -492,11 +492,11 @@ static struct vin_device *construct_vin_device(struct gk20a *g, void *pargs) -static u32 vin_device_init_pmudata_v10(struct gk20a *g, +static int vin_device_init_pmudata_v10(struct gk20a *g, struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata) { - u32 status = 0; + int status = 0; struct vin_device_v20 *pvin_dev_v20; struct nv_pmu_clk_clk_vin_device_v10_boardobj_set *perf_pmu_data; @@ -519,11 +519,11 @@ static u32 vin_device_init_pmudata_v10(struct gk20a *g, return status; } -static u32 vin_device_init_pmudata_v20(struct gk20a *g, +static int vin_device_init_pmudata_v20(struct gk20a *g, struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata) { - u32 status = 0; + int status = 0; struct vin_device_v20 *pvin_dev_v20; struct nv_pmu_clk_clk_vin_device_v20_boardobj_set *perf_pmu_data; @@ -546,11 +546,11 @@ static u32 vin_device_init_pmudata_v20(struct gk20a *g, return status; } -static u32 vin_device_init_pmudata_super(struct gk20a *g, +static int vin_device_init_pmudata_super(struct gk20a *g, struct boardobj *board_obj_ptr, struct nv_pmu_boardobj *ppmudata) { - u32 status = 0; + int status = 0; struct vin_device *pvin_dev; struct nv_pmu_clk_clk_vin_device_boardobj_set *perf_pmu_data; diff --git a/drivers/gpu/nvgpu/clk/clk_vin.h b/drivers/gpu/nvgpu/clk/clk_vin.h index 209e7055..9396c848 100644 --- a/drivers/gpu/nvgpu/clk/clk_vin.h +++ b/drivers/gpu/nvgpu/clk/clk_vin.h @@ -67,8 +67,8 @@ struct vin_device_v20 { boardobj_construct construct_vindevice; boardobj_pmudatainit vindeviceinit_pmudata_super; -u32 clk_vin_sw_setup(struct gk20a *g); -u32 clk_vin_pmu_setup(struct gk20a *g); +int clk_vin_sw_setup(struct gk20a *g); +int clk_vin_pmu_setup(struct gk20a *g); u32 clk_avfs_get_vin_cal_fuse_v10(struct gk20a *g, struct avfsvinobjs *pvinobjs, struct vin_device_v20 *pvindev); -- cgit v1.2.2