nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-22 17:36:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: Remove pmgr.h dependency from gk20a.h

Browse Source 
gk20a.h depends on definition of struct pmgr_pmupstate. Change that
to a pointer and use forward declaration, and allocation and
free functions. Also set pointer to NULL when freed.

Fix a few build breaks by adding explicit includes where previously
a header file had gotten included implicitly.

JIRA NVGPU-596

Change-Id: I21ff1ae93ac7b92a71502f97785252c04964e72f
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1954003
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Terje Bergstrom
2018-11-09 08:46:44 -08:00
committed by mobile promotions
parent ae6e4d0572
commit 1cf6e4fc5e
11 changed files with 111 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/nvgpu/include/nvgpu/gk20a.h
View File

@@ -55,6 +55,9 @@ struct perf_pmupstate;
struct vin_device_v20; struct vin_device_v20;
struct avfsvinobjs; struct avfsvinobjs;
struct set_fll_clk; struct set_fll_clk;
struct boardobjgrp;
struct boardobjgrp_pmu_cmd;
struct boardobjgrpmask;
#include <nvgpu/lock.h> #include <nvgpu/lock.h>
#include <nvgpu/thread.h> #include <nvgpu/thread.h>
@@ -79,7 +82,6 @@ struct set_fll_clk;
#include "gk20a/clk_gk20a.h" #include "gk20a/clk_gk20a.h"
#include "gk20a/fifo_gk20a.h" #include "gk20a/fifo_gk20a.h"
#include "gk20a/gr_gk20a.h" #include "gk20a/gr_gk20a.h"
#include "pmgr/pmgr.h"
#ifdef CONFIG_DEBUG_FS #ifdef CONFIG_DEBUG_FS
struct railgate_stats { struct railgate_stats {
@@ -1498,7 +1500,7 @@ struct gk20a {
struct nvgpu_ecc ecc; struct nvgpu_ecc ecc;
struct clk_pmupstate *clk_pmu; struct clk_pmupstate *clk_pmu;
struct perf_pmupstate *perf_pmu; struct perf_pmupstate *perf_pmu;
struct pmgr_pmupstate pmgr_pmu; struct pmgr_pmupstate *pmgr_pmu;
struct therm_pmupstate *therm_pmu; struct therm_pmupstate *therm_pmu;
struct nvgpu_sec2 sec2; struct nvgpu_sec2 sec2;

1
drivers/gpu/nvgpu/os/linux/ioctl_ctrl.c
View File

@@ -46,6 +46,7 @@
#include "dmabuf.h" #include "dmabuf.h"
#include "channel.h" #include "channel.h"
#include "dmabuf_vidmem.h" #include "dmabuf_vidmem.h"
#include "pmgr/pmgr.h"
#define HZ_TO_MHZ(a) ((a > 0xF414F9CD7ULL) ? 0xffff : (a >> 32) ? \ #define HZ_TO_MHZ(a) ((a > 0xF414F9CD7ULL) ? 0xffff : (a >> 32) ? \
(u32) ((a * 0x10C8ULL) >> 32) : (u16) ((u32) a/MHZ)) (u32) ((a * 0x10C8ULL) >> 32) : (u16) ((u32) a/MHZ))

22
drivers/gpu/nvgpu/pmgr/pmgr.c
View File

@@ -22,6 +22,7 @@
#include <nvgpu/gk20a.h> #include <nvgpu/gk20a.h>
#include "pmgr.h"
#include "pwrdev.h" #include "pwrdev.h"
#include "pmgrpmu.h" #include "pmgrpmu.h"
@@ -109,3 +110,24 @@ int pmgr_domain_pmu_setup(struct gk20a *g)
{ {
return pmgr_send_pmgr_tables_to_pmu(g); return pmgr_send_pmgr_tables_to_pmu(g);
} }
int pmgr_pmu_init_pmupstate(struct gk20a *g)
{
/* If already allocated, do not re-allocate */
if (g->pmgr_pmu != NULL) {
return 0;
}
g->pmgr_pmu = nvgpu_kzalloc(g, sizeof(*g->pmgr_pmu));
if (g->pmgr_pmu == NULL) {
return -ENOMEM;
}
return 0;
}
void pmgr_pmu_free_pmupstate(struct gk20a *g)
{
nvgpu_kfree(g, g->pmgr_pmu);
g->pmgr_pmu = NULL;
}

2
drivers/gpu/nvgpu/pmgr/pmgr.h
View File

@@ -39,5 +39,7 @@ int pmgr_domain_pmu_setup(struct gk20a *g);
int pmgr_pwr_devices_get_current(struct gk20a *g, u32 *val); int pmgr_pwr_devices_get_current(struct gk20a *g, u32 *val);
int pmgr_pwr_devices_get_voltage(struct gk20a *g, u32 *val); int pmgr_pwr_devices_get_voltage(struct gk20a *g, u32 *val);
int pmgr_pwr_devices_get_power(struct gk20a *g, u32 *val); int pmgr_pwr_devices_get_power(struct gk20a *g, u32 *val);
int pmgr_pmu_init_pmupstate(struct gk20a *g);
void pmgr_pmu_free_pmupstate(struct gk20a *g);
#endif /* NVGPU_PMGR_H */ #endif /* NVGPU_PMGR_H */

52
drivers/gpu/nvgpu/pmgr/pmgrpmu.c
View File

@@ -31,6 +31,7 @@
#include "gp106/bios_gp106.h" #include "gp106/bios_gp106.h"
#include "pwrdev.h" #include "pwrdev.h"
#include "pmgr.h"
#include "pmgrpmu.h" #include "pmgrpmu.h"
struct pmgr_pmucmdhandler_params { struct pmgr_pmucmdhandler_params {
@@ -194,10 +195,10 @@ static int pmgr_send_pwr_device_topology_to_pmu(struct gk20a *g)
/* populate the table */ /* populate the table */
boardobjgrpe32hdrset((struct nv_pmu_boardobjgrp *)&ppwr_desc_header->super, boardobjgrpe32hdrset((struct nv_pmu_boardobjgrp *)&ppwr_desc_header->super,
g->pmgr_pmu.pmgr_deviceobjs.super.super.objmask); g->pmgr_pmu->pmgr_deviceobjs.super.super.objmask);
status = boardobjgrp_pmudatainit_legacy(g, status = boardobjgrp_pmudatainit_legacy(g,
&g->pmgr_pmu.pmgr_deviceobjs.super.super, &g->pmgr_pmu->pmgr_deviceobjs.super.super,
(struct nv_pmu_boardobjgrp_super *)pwr_desc_table); (struct nv_pmu_boardobjgrp_super *)pwr_desc_table);
if (status != 0) { if (status != 0) {
@@ -240,14 +241,14 @@ static int pmgr_send_pwr_mointer_to_pmu(struct gk20a *g)
/* Copy all the global settings from the RM copy */ /* Copy all the global settings from the RM copy */
pwr_channel_hdr = &(pwr_monitor_pack->channels.hdr.data); pwr_channel_hdr = &(pwr_monitor_pack->channels.hdr.data);
*pwr_monitor_pack = g->pmgr_pmu.pmgr_monitorobjs.pmu_data; *pwr_monitor_pack = g->pmgr_pmu->pmgr_monitorobjs.pmu_data;
boardobjgrpe32hdrset((struct nv_pmu_boardobjgrp *)&pwr_channel_hdr->super, boardobjgrpe32hdrset((struct nv_pmu_boardobjgrp *)&pwr_channel_hdr->super,
g->pmgr_pmu.pmgr_monitorobjs.pwr_channels.super.objmask); g->pmgr_pmu->pmgr_monitorobjs.pwr_channels.super.objmask);
/* Copy in each channel */ /* Copy in each channel */
status = boardobjgrp_pmudatainit_legacy(g, status = boardobjgrp_pmudatainit_legacy(g,
&g->pmgr_pmu.pmgr_monitorobjs.pwr_channels.super, &g->pmgr_pmu->pmgr_monitorobjs.pwr_channels.super,
(struct nv_pmu_boardobjgrp_super *)&(pwr_monitor_pack->channels)); (struct nv_pmu_boardobjgrp_super *)&(pwr_monitor_pack->channels));
if (status != 0) { if (status != 0) {
@@ -260,13 +261,14 @@ static int pmgr_send_pwr_mointer_to_pmu(struct gk20a *g)
pwr_chrelationship_header = &(pwr_monitor_pack->ch_rels.hdr.data); pwr_chrelationship_header = &(pwr_monitor_pack->ch_rels.hdr.data);
boardobjgrpe32hdrset((struct nv_pmu_boardobjgrp *)&pwr_chrelationship_header->super, boardobjgrpe32hdrset((struct nv_pmu_boardobjgrp *)&pwr_chrelationship_header->super,
g->pmgr_pmu.pmgr_monitorobjs.pwr_ch_rels.super.objmask); g->pmgr_pmu->pmgr_monitorobjs.pwr_ch_rels.super.objmask);
pwr_channel_hdr->physical_channel_mask = g->pmgr_pmu.pmgr_monitorobjs.physical_channel_mask; pwr_channel_hdr->physical_channel_mask =
g->pmgr_pmu->pmgr_monitorobjs.physical_channel_mask;
pwr_channel_hdr->type = NV_PMU_PMGR_PWR_MONITOR_TYPE_NO_POLLING; pwr_channel_hdr->type = NV_PMU_PMGR_PWR_MONITOR_TYPE_NO_POLLING;
status = boardobjgrp_pmudatainit_legacy(g, status = boardobjgrp_pmudatainit_legacy(g,
&g->pmgr_pmu.pmgr_monitorobjs.pwr_ch_rels.super, &g->pmgr_pmu->pmgr_monitorobjs.pwr_ch_rels.super,
(struct nv_pmu_boardobjgrp_super *)&(pwr_monitor_pack->ch_rels)); (struct nv_pmu_boardobjgrp_super *)&(pwr_monitor_pack->ch_rels));
if (status != 0) { if (status != 0) {
@@ -312,31 +314,31 @@ static int pmgr_send_pwr_policy_to_pmu(struct gk20a *g)
goto exit; goto exit;
} }
ppwrpack->policies.hdr.data.version = g->pmgr_pmu.pmgr_policyobjs.version; ppwrpack->policies.hdr.data.version = g->pmgr_pmu->pmgr_policyobjs.version;
ppwrpack->policies.hdr.data.b_enabled = g->pmgr_pmu.pmgr_policyobjs.b_enabled; ppwrpack->policies.hdr.data.b_enabled = g->pmgr_pmu->pmgr_policyobjs.b_enabled;
boardobjgrpe32hdrset((struct nv_pmu_boardobjgrp *) boardobjgrpe32hdrset((struct nv_pmu_boardobjgrp *)
&ppwrpack->policies.hdr.data.super, &ppwrpack->policies.hdr.data.super,
g->pmgr_pmu.pmgr_policyobjs.pwr_policies.super.objmask); g->pmgr_pmu->pmgr_policyobjs.pwr_policies.super.objmask);
(void) memset(&ppwrpack->policies.hdr.data.reserved_pmu_policy_mask, (void) memset(&ppwrpack->policies.hdr.data.reserved_pmu_policy_mask,
0, 0,
sizeof(ppwrpack->policies.hdr.data.reserved_pmu_policy_mask)); sizeof(ppwrpack->policies.hdr.data.reserved_pmu_policy_mask));
ppwrpack->policies.hdr.data.base_sample_period = ppwrpack->policies.hdr.data.base_sample_period =
g->pmgr_pmu.pmgr_policyobjs.base_sample_period; g->pmgr_pmu->pmgr_policyobjs.base_sample_period;
ppwrpack->policies.hdr.data.min_client_sample_period = ppwrpack->policies.hdr.data.min_client_sample_period =
g->pmgr_pmu.pmgr_policyobjs.min_client_sample_period; g->pmgr_pmu->pmgr_policyobjs.min_client_sample_period;
ppwrpack->policies.hdr.data.low_sampling_mult = ppwrpack->policies.hdr.data.low_sampling_mult =
g->pmgr_pmu.pmgr_policyobjs.low_sampling_mult; g->pmgr_pmu->pmgr_policyobjs.low_sampling_mult;
nvgpu_memcpy((u8 *)&ppwrpack->policies.hdr.data.global_ceiling, nvgpu_memcpy((u8 *)&ppwrpack->policies.hdr.data.global_ceiling,
(u8 *)&g->pmgr_pmu.pmgr_policyobjs.global_ceiling, (u8 *)&g->pmgr_pmu->pmgr_policyobjs.global_ceiling,
sizeof(struct nv_pmu_perf_domain_group_limits)); sizeof(struct nv_pmu_perf_domain_group_limits));
nvgpu_memcpy((u8 *)&ppwrpack->policies.hdr.data.semantic_policy_tbl, nvgpu_memcpy((u8 *)&ppwrpack->policies.hdr.data.semantic_policy_tbl,
(u8 *)&g->pmgr_pmu.pmgr_policyobjs.policy_idxs, (u8 *)&g->pmgr_pmu->pmgr_policyobjs.policy_idxs,
sizeof(g->pmgr_pmu.pmgr_policyobjs.policy_idxs)); sizeof(g->pmgr_pmu->pmgr_policyobjs.policy_idxs));
BOARDOBJGRP_FOR_EACH_INDEX_IN_MASK(32, indx, BOARDOBJGRP_FOR_EACH_INDEX_IN_MASK(32, indx,
ppwrpack->policies.hdr.data.super.obj_mask.super.data[0]) { ppwrpack->policies.hdr.data.super.obj_mask.super.data[0]) {
@@ -355,11 +357,11 @@ static int pmgr_send_pwr_policy_to_pmu(struct gk20a *g)
boardobjgrpe32hdrset((struct nv_pmu_boardobjgrp *) boardobjgrpe32hdrset((struct nv_pmu_boardobjgrp *)
&ppwrpack->policy_rels.hdr.data.super, &ppwrpack->policy_rels.hdr.data.super,
g->pmgr_pmu.pmgr_policyobjs.pwr_policy_rels.super.objmask); g->pmgr_pmu->pmgr_policyobjs.pwr_policy_rels.super.objmask);
boardobjgrpe32hdrset((struct nv_pmu_boardobjgrp *) boardobjgrpe32hdrset((struct nv_pmu_boardobjgrp *)
&ppwrpack->violations.hdr.data.super, &ppwrpack->violations.hdr.data.super,
g->pmgr_pmu.pmgr_policyobjs.pwr_violations.super.objmask); g->pmgr_pmu->pmgr_policyobjs.pwr_violations.super.objmask);
max_dmem_size = sizeof(union nv_pmu_pmgr_pwr_policy_dmem_size); max_dmem_size = sizeof(union nv_pmu_pmgr_pwr_policy_dmem_size);
@@ -500,7 +502,7 @@ int pmgr_send_pmgr_tables_to_pmu(struct gk20a *g)
goto exit; goto exit;
} }
if (!BOARDOBJGRP_IS_EMPTY(&g->pmgr_pmu.pmgr_deviceobjs.super.super)) { if (!BOARDOBJGRP_IS_EMPTY(&g->pmgr_pmu->pmgr_deviceobjs.super.super)) {
status = pmgr_send_pwr_device_topology_to_pmu(g); status = pmgr_send_pwr_device_topology_to_pmu(g);
if (status != 0) { if (status != 0) {
nvgpu_err(g, nvgpu_err(g,
@@ -511,9 +513,9 @@ int pmgr_send_pmgr_tables_to_pmu(struct gk20a *g)
} }
if (!(BOARDOBJGRP_IS_EMPTY( if (!(BOARDOBJGRP_IS_EMPTY(
&g->pmgr_pmu.pmgr_monitorobjs.pwr_channels.super)) || &g->pmgr_pmu->pmgr_monitorobjs.pwr_channels.super)) ||
!(BOARDOBJGRP_IS_EMPTY( !(BOARDOBJGRP_IS_EMPTY(
&g->pmgr_pmu.pmgr_monitorobjs.pwr_ch_rels.super))) { &g->pmgr_pmu->pmgr_monitorobjs.pwr_ch_rels.super))) {
status = pmgr_send_pwr_mointer_to_pmu(g); status = pmgr_send_pwr_mointer_to_pmu(g);
if (status != 0) { if (status != 0) {
nvgpu_err(g, nvgpu_err(g,
@@ -523,11 +525,11 @@ int pmgr_send_pmgr_tables_to_pmu(struct gk20a *g)
} }
if (!(BOARDOBJGRP_IS_EMPTY( if (!(BOARDOBJGRP_IS_EMPTY(
&g->pmgr_pmu.pmgr_policyobjs.pwr_policies.super)) || &g->pmgr_pmu->pmgr_policyobjs.pwr_policies.super)) ||
!(BOARDOBJGRP_IS_EMPTY( !(BOARDOBJGRP_IS_EMPTY(
&g->pmgr_pmu.pmgr_policyobjs.pwr_policy_rels.super)) || &g->pmgr_pmu->pmgr_policyobjs.pwr_policy_rels.super)) ||
!(BOARDOBJGRP_IS_EMPTY( !(BOARDOBJGRP_IS_EMPTY(
&g->pmgr_pmu.pmgr_policyobjs.pwr_violations.super))) { &g->pmgr_pmu->pmgr_policyobjs.pwr_violations.super))) {
status = pmgr_send_pwr_policy_to_pmu(g); status = pmgr_send_pwr_policy_to_pmu(g);
if (status != 0) { if (status != 0) {
nvgpu_err(g, nvgpu_err(g,

7
drivers/gpu/nvgpu/pmgr/pwrdev.c
View File

@@ -27,6 +27,7 @@
#include <nvgpu/string.h> #include <nvgpu/string.h>
#include "pwrdev.h" #include "pwrdev.h"
#include "pmgr.h"
#include "gp106/bios_gp106.h" #include "gp106/bios_gp106.h"
static int _pwr_device_pmudata_instget(struct gk20a *g, static int _pwr_device_pmudata_instget(struct gk20a *g,
@@ -295,7 +296,7 @@ int pmgr_device_sw_setup(struct gk20a *g)
struct pwr_devices *ppwrdeviceobjs; struct pwr_devices *ppwrdeviceobjs;
/* Construct the Super Class and override the Interfaces */ /* Construct the Super Class and override the Interfaces */
status = boardobjgrpconstruct_e32(g, &g->pmgr_pmu.pmgr_deviceobjs.super); status = boardobjgrpconstruct_e32(g, &g->pmgr_pmu->pmgr_deviceobjs.super);
if (status != 0) { if (status != 0) {
nvgpu_err(g, nvgpu_err(g,
"error creating boardobjgrp for pmgr devices, status - 0x%x", "error creating boardobjgrp for pmgr devices, status - 0x%x",
@@ -303,8 +304,8 @@ int pmgr_device_sw_setup(struct gk20a *g)
goto done; goto done;
} }
pboardobjgrp = &g->pmgr_pmu.pmgr_deviceobjs.super.super; pboardobjgrp = &g->pmgr_pmu->pmgr_deviceobjs.super.super;
ppwrdeviceobjs = &(g->pmgr_pmu.pmgr_deviceobjs); ppwrdeviceobjs = &(g->pmgr_pmu->pmgr_deviceobjs);
/* Override the Interfaces */ /* Override the Interfaces */
pboardobjgrp->pmudatainstget = _pwr_device_pmudata_instget; pboardobjgrp->pmudatainstget = _pwr_device_pmudata_instget;

27
drivers/gpu/nvgpu/pmgr/pwrmonitor.c
View File

@@ -27,6 +27,7 @@
#include <nvgpu/string.h> #include <nvgpu/string.h>
#include "pwrdev.h" #include "pwrdev.h"
#include "pmgr.h"
#include "gp106/bios_gp106.h" #include "gp106/bios_gp106.h"
static int _pwr_channel_pmudata_instget(struct gk20a *g, static int _pwr_channel_pmudata_instget(struct gk20a *g,
@@ -85,7 +86,7 @@ static u32 _pwr_channel_state_init(struct gk20a *g)
u8 indx = 0; u8 indx = 0;
struct pwr_channel *pchannel; struct pwr_channel *pchannel;
u32 objmask = u32 objmask =
g->pmgr_pmu.pmgr_monitorobjs.pwr_channels.super.objmask; g->pmgr_pmu->pmgr_monitorobjs.pwr_channels.super.objmask;
/* Initialize each PWR_CHANNEL's dependent channel mask */ /* Initialize each PWR_CHANNEL's dependent channel mask */
BOARDOBJGRP_FOR_EACH_INDEX_IN_MASK(32, indx, objmask) { BOARDOBJGRP_FOR_EACH_INDEX_IN_MASK(32, indx, objmask) {
@@ -214,7 +215,7 @@ static int devinit_get_pwr_topology_table(struct gk20a *g,
goto done; goto done;
} }
g->pmgr_pmu.pmgr_monitorobjs.b_is_topology_tbl_ver_1x = false; g->pmgr_pmu->pmgr_monitorobjs.b_is_topology_tbl_ver_1x = false;
if (pwr_topology_table_header.header_size < if (pwr_topology_table_header.header_size <
VBIOS_POWER_TOPOLOGY_2X_HEADER_SIZE_06) { VBIOS_POWER_TOPOLOGY_2X_HEADER_SIZE_06) {
@@ -312,7 +313,7 @@ int pmgr_monitor_sw_setup(struct gk20a *g)
/* Construct the Super Class and override the Interfaces */ /* Construct the Super Class and override the Interfaces */
status = boardobjgrpconstruct_e32(g, status = boardobjgrpconstruct_e32(g,
&g->pmgr_pmu.pmgr_monitorobjs.pwr_channels); &g->pmgr_pmu->pmgr_monitorobjs.pwr_channels);
if (status != 0) { if (status != 0) {
nvgpu_err(g, nvgpu_err(g,
"error creating boardobjgrp for pmgr channel, status - 0x%x", "error creating boardobjgrp for pmgr channel, status - 0x%x",
@@ -320,14 +321,14 @@ int pmgr_monitor_sw_setup(struct gk20a *g)
goto done; goto done;
} }
pboardobjgrp = &(g->pmgr_pmu.pmgr_monitorobjs.pwr_channels.super); pboardobjgrp = &(g->pmgr_pmu->pmgr_monitorobjs.pwr_channels.super);
/* Override the Interfaces */ /* Override the Interfaces */
pboardobjgrp->pmudatainstget = _pwr_channel_pmudata_instget; pboardobjgrp->pmudatainstget = _pwr_channel_pmudata_instget;
/* Construct the Super Class and override the Interfaces */ /* Construct the Super Class and override the Interfaces */
status = boardobjgrpconstruct_e32(g, status = boardobjgrpconstruct_e32(g,
&g->pmgr_pmu.pmgr_monitorobjs.pwr_ch_rels); &g->pmgr_pmu->pmgr_monitorobjs.pwr_ch_rels);
if (status != 0) { if (status != 0) {
nvgpu_err(g, nvgpu_err(g,
"error creating boardobjgrp for pmgr channel relationship, status - 0x%x", "error creating boardobjgrp for pmgr channel relationship, status - 0x%x",
@@ -335,20 +336,20 @@ int pmgr_monitor_sw_setup(struct gk20a *g)
goto done; goto done;
} }
pboardobjgrp = &(g->pmgr_pmu.pmgr_monitorobjs.pwr_ch_rels.super); pboardobjgrp = &(g->pmgr_pmu->pmgr_monitorobjs.pwr_ch_rels.super);
/* Override the Interfaces */ /* Override the Interfaces */
pboardobjgrp->pmudatainstget = _pwr_channel_rels_pmudata_instget; pboardobjgrp->pmudatainstget = _pwr_channel_rels_pmudata_instget;
/* Initialize the Total GPU Power Channel Mask to 0 */ /* Initialize the Total GPU Power Channel Mask to 0 */
g->pmgr_pmu.pmgr_monitorobjs.pmu_data.channels.hdr.data.total_gpu_power_channel_mask = 0; g->pmgr_pmu->pmgr_monitorobjs.pmu_data.channels.hdr.data.total_gpu_power_channel_mask = 0;
g->pmgr_pmu.pmgr_monitorobjs.total_gpu_channel_idx = g->pmgr_pmu->pmgr_monitorobjs.total_gpu_channel_idx =
CTRL_PMGR_PWR_CHANNEL_INDEX_INVALID; CTRL_PMGR_PWR_CHANNEL_INDEX_INVALID;
/* Supported topology table version 1.0 */ /* Supported topology table version 1.0 */
g->pmgr_pmu.pmgr_monitorobjs.b_is_topology_tbl_ver_1x = true; g->pmgr_pmu->pmgr_monitorobjs.b_is_topology_tbl_ver_1x = true;
ppwrmonitorobjs = &(g->pmgr_pmu.pmgr_monitorobjs); ppwrmonitorobjs = &(g->pmgr_pmu->pmgr_monitorobjs);
status = devinit_get_pwr_topology_table(g, ppwrmonitorobjs); status = devinit_get_pwr_topology_table(g, ppwrmonitorobjs);
if (status != 0) { if (status != 0) {
@@ -361,14 +362,14 @@ int pmgr_monitor_sw_setup(struct gk20a *g)
} }
/* Initialise physicalChannelMask */ /* Initialise physicalChannelMask */
g->pmgr_pmu.pmgr_monitorobjs.physical_channel_mask = 0; g->pmgr_pmu->pmgr_monitorobjs.physical_channel_mask = 0;
pboardobjgrp = &g->pmgr_pmu.pmgr_monitorobjs.pwr_channels.super; pboardobjgrp = &g->pmgr_pmu->pmgr_monitorobjs.pwr_channels.super;
BOARDOBJGRP_FOR_EACH(pboardobjgrp, struct pwr_channel *, pchannel, indx) { BOARDOBJGRP_FOR_EACH(pboardobjgrp, struct pwr_channel *, pchannel, indx) {
if (_pwr_channel_implements(pchannel, if (_pwr_channel_implements(pchannel,
CTRL_PMGR_PWR_CHANNEL_TYPE_SENSOR)) { CTRL_PMGR_PWR_CHANNEL_TYPE_SENSOR)) {
g->pmgr_pmu.pmgr_monitorobjs.physical_channel_mask |= BIT(indx); g->pmgr_pmu->pmgr_monitorobjs.physical_channel_mask |= BIT(indx);
} }
} }

2
drivers/gpu/nvgpu/pmgr/pwrmonitor.h
View File

@@ -62,7 +62,7 @@ struct pmgr_pwr_monitor {
#define PMGR_PWR_MONITOR_GET_PWR_CHANNEL(g, channel_idx) \ #define PMGR_PWR_MONITOR_GET_PWR_CHANNEL(g, channel_idx) \
((struct pwr_channel *)BOARDOBJGRP_OBJ_GET_BY_IDX( \ ((struct pwr_channel *)BOARDOBJGRP_OBJ_GET_BY_IDX( \
&(g->pmgr_pmu.pmgr_monitorobjs.pwr_channels.super), (channel_idx))) &(g->pmgr_pmu->pmgr_monitorobjs.pwr_channels.super), (channel_idx)))
int pmgr_monitor_sw_setup(struct gk20a *g); int pmgr_monitor_sw_setup(struct gk20a *g);

23
drivers/gpu/nvgpu/pmgr/pwrpolicy.c
View File

@@ -28,6 +28,7 @@
#include <nvgpu/string.h> #include <nvgpu/string.h>
#include "pwrpolicy.h" #include "pwrpolicy.h"
#include "pmgr.h"
#include "gp106/bios_gp106.h" #include "gp106/bios_gp106.h"
#define _pwr_policy_limitarboutputget_helper(p_limit_arb) (p_limit_arb)->output #define _pwr_policy_limitarboutputget_helper(p_limit_arb) (p_limit_arb)->output
@@ -722,7 +723,7 @@ int pmgr_policy_sw_setup(struct gk20a *g)
/* Construct the Super Class and override the Interfaces */ /* Construct the Super Class and override the Interfaces */
status = boardobjgrpconstruct_e32(g, status = boardobjgrpconstruct_e32(g,
&g->pmgr_pmu.pmgr_policyobjs.pwr_policies); &g->pmgr_pmu->pmgr_policyobjs.pwr_policies);
if (status != 0) { if (status != 0) {
nvgpu_err(g, nvgpu_err(g,
"error creating boardobjgrp for pmgr policy, status - 0x%x", "error creating boardobjgrp for pmgr policy, status - 0x%x",
@@ -731,7 +732,7 @@ int pmgr_policy_sw_setup(struct gk20a *g)
} }
status = boardobjgrpconstruct_e32(g, status = boardobjgrpconstruct_e32(g,
&g->pmgr_pmu.pmgr_policyobjs.pwr_policy_rels); &g->pmgr_pmu->pmgr_policyobjs.pwr_policy_rels);
if (status != 0) { if (status != 0) {
nvgpu_err(g, nvgpu_err(g,
"error creating boardobjgrp for pmgr policy rels, status - 0x%x", "error creating boardobjgrp for pmgr policy rels, status - 0x%x",
@@ -740,7 +741,7 @@ int pmgr_policy_sw_setup(struct gk20a *g)
} }
status = boardobjgrpconstruct_e32(g, status = boardobjgrpconstruct_e32(g,
&g->pmgr_pmu.pmgr_policyobjs.pwr_violations); &g->pmgr_pmu->pmgr_policyobjs.pwr_violations);
if (status != 0) { if (status != 0) {
nvgpu_err(g, nvgpu_err(g,
"error creating boardobjgrp for pmgr violations, status - 0x%x", "error creating boardobjgrp for pmgr violations, status - 0x%x",
@@ -748,37 +749,37 @@ int pmgr_policy_sw_setup(struct gk20a *g)
goto done; goto done;
} }
(void) memset(g->pmgr_pmu.pmgr_policyobjs.policy_idxs, (void) memset(g->pmgr_pmu->pmgr_policyobjs.policy_idxs,
CTRL_PMGR_PWR_POLICY_INDEX_INVALID, CTRL_PMGR_PWR_POLICY_INDEX_INVALID,
sizeof(u8) * CTRL_PMGR_PWR_POLICY_IDX_NUM_INDEXES); sizeof(u8) * CTRL_PMGR_PWR_POLICY_IDX_NUM_INDEXES);
/* Initialize external power limit policy indexes to _INVALID/0xFF */ /* Initialize external power limit policy indexes to _INVALID/0xFF */
for (indx = 0; indx < PWR_POLICY_EXT_POWER_STATE_ID_COUNT; indx++) { for (indx = 0; indx < PWR_POLICY_EXT_POWER_STATE_ID_COUNT; indx++) {
g->pmgr_pmu.pmgr_policyobjs.ext_limits[indx].policy_table_idx = g->pmgr_pmu->pmgr_policyobjs.ext_limits[indx].policy_table_idx =
CTRL_PMGR_PWR_POLICY_INDEX_INVALID; CTRL_PMGR_PWR_POLICY_INDEX_INVALID;
} }
/* Initialize external power state to _D1 */ /* Initialize external power state to _D1 */
g->pmgr_pmu.pmgr_policyobjs.ext_power_state = 0xFFFFFFFF; g->pmgr_pmu->pmgr_policyobjs.ext_power_state = 0xFFFFFFFF;
ppwrpolicyobjs = &(g->pmgr_pmu.pmgr_policyobjs); ppwrpolicyobjs = &(g->pmgr_pmu->pmgr_policyobjs);
pboardobjgrp = &(g->pmgr_pmu.pmgr_policyobjs.pwr_policies.super); pboardobjgrp = &(g->pmgr_pmu->pmgr_policyobjs.pwr_policies.super);
status = devinit_get_pwr_policy_table(g, ppwrpolicyobjs); status = devinit_get_pwr_policy_table(g, ppwrpolicyobjs);
if (status != 0) { if (status != 0) {
goto done; goto done;
} }
g->pmgr_pmu.pmgr_policyobjs.b_enabled = true; g->pmgr_pmu->pmgr_policyobjs.b_enabled = true;
BOARDOBJGRP_FOR_EACH(pboardobjgrp, struct pwr_policy *, ppolicy, indx) { BOARDOBJGRP_FOR_EACH(pboardobjgrp, struct pwr_policy *, ppolicy, indx) {
PMGR_PWR_POLICY_INCREMENT_LIMIT_INPUT_COUNT(ppolicy); PMGR_PWR_POLICY_INCREMENT_LIMIT_INPUT_COUNT(ppolicy);
} }
g->pmgr_pmu.pmgr_policyobjs.global_ceiling.values[0] = g->pmgr_pmu->pmgr_policyobjs.global_ceiling.values[0] =
0xFF; 0xFF;
g->pmgr_pmu.pmgr_policyobjs.client_work_item.b_pending = false; g->pmgr_pmu->pmgr_policyobjs.client_work_item.b_pending = false;
done: done:
nvgpu_log_info(g, " done status %x", status); nvgpu_log_info(g, " done status %x", status);

2
drivers/gpu/nvgpu/pmgr/pwrpolicy.h
View File

@@ -126,7 +126,7 @@ union pwr_policy_data_union {
#define PMGR_GET_PWR_POLICY(g, policy_idx) \ #define PMGR_GET_PWR_POLICY(g, policy_idx) \
((struct pwr_policy *)BOARDOBJGRP_OBJ_GET_BY_IDX( \ ((struct pwr_policy *)BOARDOBJGRP_OBJ_GET_BY_IDX( \
&(g->pmgr_pmu.pmgr_policyobjs.pwr_policies.super), (policy_idx))) &(g->pmgr_pmu->pmgr_policyobjs.pwr_policies.super), (policy_idx)))
#define PMGR_PWR_POLICY_INCREMENT_LIMIT_INPUT_COUNT(ppolicy) \ #define PMGR_PWR_POLICY_INCREMENT_LIMIT_INPUT_COUNT(ppolicy) \
((ppolicy)->num_limit_inputs++) ((ppolicy)->num_limit_inputs++)

38
drivers/gpu/nvgpu/pstate/pstate.c
View File

@@ -37,6 +37,7 @@ static int pstate_sw_setup(struct gk20a *g);
void gk20a_deinit_pstate_support(struct gk20a *g) void gk20a_deinit_pstate_support(struct gk20a *g)
{ {
pmgr_pmu_free_pmupstate(g);
therm_pmu_free_pmupstate(g); therm_pmu_free_pmupstate(g);
perf_pmu_free_pmupstate(g); perf_pmu_free_pmupstate(g);
clk_free_pmupstate(g); clk_free_pmupstate(g);
@@ -70,84 +71,89 @@ int gk20a_init_pstate_support(struct gk20a *g)
goto err_perf_pmu_init_pmupstate; goto err_perf_pmu_init_pmupstate;
} }
err = volt_rail_sw_setup(g); err = pmgr_pmu_init_pmupstate(g);
if (err != 0) { if (err != 0) {
goto err_therm_pmu_init_pmupstate; goto err_therm_pmu_init_pmupstate;
} }
err = volt_rail_sw_setup(g);
if (err != 0) {
goto err_pmgr_pmu_init_pmupstate;
}
err = volt_dev_sw_setup(g); err = volt_dev_sw_setup(g);
if (err != 0) { if (err != 0) {
goto err_therm_pmu_init_pmupstate; goto err_pmgr_pmu_init_pmupstate;
} }
err = volt_policy_sw_setup(g); err = volt_policy_sw_setup(g);
if (err != 0) { if (err != 0) {
goto err_therm_pmu_init_pmupstate; goto err_pmgr_pmu_init_pmupstate;
} }
err = clk_vin_sw_setup(g); err = clk_vin_sw_setup(g);
if (err != 0) { if (err != 0) {
goto err_therm_pmu_init_pmupstate; goto err_pmgr_pmu_init_pmupstate;
} }
err = clk_fll_sw_setup(g); err = clk_fll_sw_setup(g);
if (err != 0) { if (err != 0) {
goto err_therm_pmu_init_pmupstate; goto err_pmgr_pmu_init_pmupstate;
} }
err = therm_domain_sw_setup(g); err = therm_domain_sw_setup(g);
if (err != 0) { if (err != 0) {
goto err_therm_pmu_init_pmupstate; goto err_pmgr_pmu_init_pmupstate;
} }
err = vfe_var_sw_setup(g); err = vfe_var_sw_setup(g);
if (err != 0) { if (err != 0) {
goto err_therm_pmu_init_pmupstate; goto err_pmgr_pmu_init_pmupstate;
} }
err = vfe_equ_sw_setup(g); err = vfe_equ_sw_setup(g);
if (err != 0) { if (err != 0) {
goto err_therm_pmu_init_pmupstate; goto err_pmgr_pmu_init_pmupstate;
} }
err = clk_domain_sw_setup(g); err = clk_domain_sw_setup(g);
if (err != 0) { if (err != 0) {
goto err_therm_pmu_init_pmupstate; goto err_pmgr_pmu_init_pmupstate;
} }
err = clk_vf_point_sw_setup(g); err = clk_vf_point_sw_setup(g);
if (err != 0) { if (err != 0) {
goto err_therm_pmu_init_pmupstate; goto err_pmgr_pmu_init_pmupstate;
} }
err = clk_prog_sw_setup(g); err = clk_prog_sw_setup(g);
if (err != 0) { if (err != 0) {
goto err_therm_pmu_init_pmupstate; goto err_pmgr_pmu_init_pmupstate;
} }
err = pstate_sw_setup(g); err = pstate_sw_setup(g);
if (err != 0) { if (err != 0) {
goto err_therm_pmu_init_pmupstate; goto err_pmgr_pmu_init_pmupstate;
} }
if(g->ops.clk.support_pmgr_domain) { if(g->ops.clk.support_pmgr_domain) {
err = pmgr_domain_sw_setup(g); err = pmgr_domain_sw_setup(g);
if (err != 0) { if (err != 0) {
goto err_therm_pmu_init_pmupstate; goto err_pmgr_pmu_init_pmupstate;
} }
} }
if (g->ops.clk.support_clk_freq_controller) { if (g->ops.clk.support_clk_freq_controller) {
err = clk_freq_controller_sw_setup(g); err = clk_freq_controller_sw_setup(g);
if (err != 0) { if (err != 0) {
goto err_therm_pmu_init_pmupstate; goto err_pmgr_pmu_init_pmupstate;
} }
} }
if(g->ops.clk.support_lpwr_pg) { if(g->ops.clk.support_lpwr_pg) {
err = nvgpu_lpwr_pg_setup(g); err = nvgpu_lpwr_pg_setup(g);
if (err != 0) { if (err != 0) {
goto err_therm_pmu_init_pmupstate; goto err_pmgr_pmu_init_pmupstate;
} }
} }
@@ -160,6 +166,8 @@ int gk20a_init_pstate_support(struct gk20a *g)
return 0; return 0;
err_pmgr_pmu_init_pmupstate:
pmgr_pmu_free_pmupstate(g);
err_therm_pmu_init_pmupstate: err_therm_pmu_init_pmupstate:
therm_pmu_free_pmupstate(g); therm_pmu_free_pmupstate(g);
err_perf_pmu_init_pmupstate: err_perf_pmu_init_pmupstate: