summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/common/pmu/pmu_pg.c
diff options
context:
space:
mode:
authorAmulya <Amurthyreddy@nvidia.com>2018-08-28 03:04:55 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-09-19 06:24:12 -0400
commit941ac9a9d07bedb4062fd0c4d32eb2ef80a42359 (patch)
treec53622d96a4c2e7c18693ecf4059d7e403cd7808 /drivers/gpu/nvgpu/common/pmu/pmu_pg.c
parent2805f03aa0496502b64ff760f667bfe9d8a27928 (diff)
nvgpu: common: MISRA 10.1 boolean fixes
Fix violations where a variable of type non-boolean is used as a boolean in gpu/nvgpu/common. JIRA NVGPU-646 Change-Id: I9773d863b715f83ae1772b75d5373f77244bc8ca Signed-off-by: Amulya <Amurthyreddy@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1807132 GVS: Gerrit_Virtual_Submit Tested-by: Amulya Murthyreddy <amurthyreddy@nvidia.com> Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com> Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common/pmu/pmu_pg.c')
-rw-r--r--drivers/gpu/nvgpu/common/pmu/pmu_pg.c23
1 files changed, 12 insertions, 11 deletions
diff --git a/drivers/gpu/nvgpu/common/pmu/pmu_pg.c b/drivers/gpu/nvgpu/common/pmu/pmu_pg.c
index 0758279d..d2615b1a 100644
--- a/drivers/gpu/nvgpu/common/pmu/pmu_pg.c
+++ b/drivers/gpu/nvgpu/common/pmu/pmu_pg.c
@@ -89,9 +89,9 @@ static void pmu_handle_pg_elpg_msg(struct gk20a *g, struct pmu_msg *msg,
89 } 89 }
90 90
91 if (pmu->pmu_state == PMU_STATE_ELPG_BOOTING) { 91 if (pmu->pmu_state == PMU_STATE_ELPG_BOOTING) {
92 if (g->ops.pmu.pmu_pg_engines_feature_list && 92 if (g->ops.pmu.pmu_pg_engines_feature_list != NULL &&
93 g->ops.pmu.pmu_pg_engines_feature_list(g, 93 g->ops.pmu.pmu_pg_engines_feature_list(g,
94 PMU_PG_ELPG_ENGINE_ID_GRAPHICS) != 94 PMU_PG_ELPG_ENGINE_ID_GRAPHICS) !=
95 NVGPU_PMU_GR_FEATURE_MASK_POWER_GATING) { 95 NVGPU_PMU_GR_FEATURE_MASK_POWER_GATING) {
96 pmu->initialized = true; 96 pmu->initialized = true;
97 nvgpu_pmu_state_change(g, PMU_STATE_STARTED, 97 nvgpu_pmu_state_change(g, PMU_STATE_STARTED,
@@ -117,9 +117,9 @@ int nvgpu_pmu_pg_global_enable(struct gk20a *g, u32 enable_pg)
117 u32 status = 0; 117 u32 status = 0;
118 118
119 if (enable_pg == true) { 119 if (enable_pg == true) {
120 if (g->ops.pmu.pmu_pg_engines_feature_list && 120 if (g->ops.pmu.pmu_pg_engines_feature_list != NULL &&
121 g->ops.pmu.pmu_pg_engines_feature_list(g, 121 g->ops.pmu.pmu_pg_engines_feature_list(g,
122 PMU_PG_ELPG_ENGINE_ID_GRAPHICS) != 122 PMU_PG_ELPG_ENGINE_ID_GRAPHICS) !=
123 NVGPU_PMU_GR_FEATURE_MASK_POWER_GATING) { 123 NVGPU_PMU_GR_FEATURE_MASK_POWER_GATING) {
124 if (g->ops.pmu.pmu_lpwr_enable_pg) { 124 if (g->ops.pmu.pmu_lpwr_enable_pg) {
125 status = g->ops.pmu.pmu_lpwr_enable_pg(g, 125 status = g->ops.pmu.pmu_lpwr_enable_pg(g,
@@ -129,9 +129,9 @@ int nvgpu_pmu_pg_global_enable(struct gk20a *g, u32 enable_pg)
129 status = nvgpu_pmu_enable_elpg(g); 129 status = nvgpu_pmu_enable_elpg(g);
130 } 130 }
131 } else if (enable_pg == false) { 131 } else if (enable_pg == false) {
132 if (g->ops.pmu.pmu_pg_engines_feature_list && 132 if (g->ops.pmu.pmu_pg_engines_feature_list != NULL &&
133 g->ops.pmu.pmu_pg_engines_feature_list(g, 133 g->ops.pmu.pmu_pg_engines_feature_list(g,
134 PMU_PG_ELPG_ENGINE_ID_GRAPHICS) != 134 PMU_PG_ELPG_ENGINE_ID_GRAPHICS) !=
135 NVGPU_PMU_GR_FEATURE_MASK_POWER_GATING) { 135 NVGPU_PMU_GR_FEATURE_MASK_POWER_GATING) {
136 if (g->ops.pmu.pmu_lpwr_disable_pg) { 136 if (g->ops.pmu.pmu_lpwr_disable_pg) {
137 status = g->ops.pmu.pmu_lpwr_disable_pg(g, 137 status = g->ops.pmu.pmu_lpwr_disable_pg(g,
@@ -207,7 +207,7 @@ int nvgpu_pmu_enable_elpg(struct gk20a *g)
207 nvgpu_warn(g, 207 nvgpu_warn(g,
208 "%s(): possible elpg refcnt mismatch. elpg refcnt=%d", 208 "%s(): possible elpg refcnt mismatch. elpg refcnt=%d",
209 __func__, pmu->elpg_refcnt); 209 __func__, pmu->elpg_refcnt);
210 WARN_ON(1); 210 WARN_ON(true);
211 } 211 }
212 212
213 /* do NOT enable elpg until golden ctx is created, 213 /* do NOT enable elpg until golden ctx is created,
@@ -273,7 +273,7 @@ int nvgpu_pmu_disable_elpg(struct gk20a *g)
273 nvgpu_warn(g, 273 nvgpu_warn(g,
274 "%s(): possible elpg refcnt mismatch. elpg refcnt=%d", 274 "%s(): possible elpg refcnt mismatch. elpg refcnt=%d",
275 __func__, pmu->elpg_refcnt); 275 __func__, pmu->elpg_refcnt);
276 WARN_ON(1); 276 WARN_ON(true);
277 ret = 0; 277 ret = 0;
278 goto exit_unlock; 278 goto exit_unlock;
279 } 279 }
@@ -481,7 +481,8 @@ int nvgpu_pmu_init_powergating(struct gk20a *g)
481 pg_engine_id++) { 481 pg_engine_id++) {
482 482
483 if (BIT(pg_engine_id) & pg_engine_id_list) { 483 if (BIT(pg_engine_id) & pg_engine_id_list) {
484 if (pmu && pmu->pmu_state == PMU_STATE_INIT_RECEIVED) { 484 if (pmu != NULL &&
485 pmu->pmu_state == PMU_STATE_INIT_RECEIVED) {
485 nvgpu_pmu_state_change(g, 486 nvgpu_pmu_state_change(g,
486 PMU_STATE_ELPG_BOOTING, false); 487 PMU_STATE_ELPG_BOOTING, false);
487 } 488 }
@@ -636,9 +637,9 @@ static void ap_callback_init_and_enable_ctrl(
636 void *param, u32 seq_desc, u32 status) 637 void *param, u32 seq_desc, u32 status)
637{ 638{
638 /* Define p_ap (i.e pointer to pmu_ap structure) */ 639 /* Define p_ap (i.e pointer to pmu_ap structure) */
639 WARN_ON(!msg); 640 WARN_ON(msg == NULL);
640 641
641 if (!status) { 642 if (status == 0U) {
642 switch (msg->msg.pg.ap_msg.cmn.msg_id) { 643 switch (msg->msg.pg.ap_msg.cmn.msg_id) {
643 case PMU_AP_MSG_ID_INIT_ACK: 644 case PMU_AP_MSG_ID_INIT_ACK:
644 nvgpu_pmu_dbg(g, "reply PMU_AP_CMD_ID_INIT"); 645 nvgpu_pmu_dbg(g, "reply PMU_AP_CMD_ID_INIT");