stv0g/embeddedsw
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

PMUFW: PM: Minor MISRA compliance fixes

Browse source 
Signed-off-by: Davorin Mista <davorin.mista@aggios.com>
Reviewed-by: Sören Brinkmann <soren.brinkmann@xilinx.com>
Acked-by: Jyotheeswar Reddy Mutthareddyvari <jyothee@xilinx.com>
This commit is contained in:
Davorin Mista 2015-05-27 15:00:38 -07:00 • committed by Nava kishore Manne
parent b380c07463
commit b8db439393
4 changed files with 19 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/sw_apps/zynqmp_pmufw/src/pm_api.c
View file

@ -154,12 +154,12 @@ static PmPayloadStatus PmCheckArgument(const u8 argType,
}
break;
case ARG_WAKE:
if (arg != 1 && arg != 0) {
if (arg != 1U && arg != 0U) {
status = PM_PAYLOAD_ERR_WAKE;
}
break;
case ARG_ENABLE:
if (arg != 1 && arg != 0) {
if (arg != 1U && arg != 0U) {
status = PM_PAYLOAD_ERR_ENABLE;
}
break;

15
lib/sw_apps/zynqmp_pmufw/src/pm_core.c
View file

@ -152,7 +152,7 @@ static void PmForcePowerdown(const PmMaster *const master,
const u32 ack)
{
u32 status;
u32 oppoint = 0;
u32 oppoint = 0U;
PmNode* nodePtr = PmGetNodeById(node);
PmDbg("(%s, %s)\n", PmStrNode(node), PmStrAck(ack));
@ -228,7 +228,7 @@ static void PmRequestWakeup(const PmMaster *const master, const u32 node,
const u32 ack)
{
u32 status;
u32 oppoint = 0;
u32 oppoint = 0U;
PmProc* proc = PmGetProcByNodeId(node);
PmDbg("(%s, %s)\n", PmStrNode(node), PmStrAck(ack));
@ -266,7 +266,7 @@ static void PmReleaseNode(const PmMaster *master,
}
/* Release requirements */
status = PmRequirementUpdate(masterReq, 0);
status = PmRequirementUpdate(masterReq, 0U);
masterReq->info &= ~PM_MASTER_USING_SLAVE_MASK;
if (PM_RET_SUCCESS != status) {
@ -300,7 +300,7 @@ static void PmRequestNode(const PmMaster *master,
const u32 ack)
{
u32 status;
u32 oppoint = 0;
u32 oppoint = 0U;
PmRequirement* masterReq = PmGetRequirementForSlave(master, node);
PmDbg("(%s, %d, %d, %s)\n", PmStrNode(node), capabilities,
@ -352,7 +352,7 @@ static void PmSetRequirement(const PmMaster *master,
const u32 ack)
{
u32 status;
u32 oppoint = 0;
u32 oppoint = 0U;
PmRequirement* masterReq = PmGetRequirementForSlave(master, node);
PmDbg("(%s, %d, %d, %s)\n", PmStrNode(node), capabilities,
@ -365,14 +365,14 @@ static void PmSetRequirement(const PmMaster *master,
}
/* Does master have the privilege to request settings for the node? */
if (!(PM_MASTER_USING_SLAVE_MASK & masterReq->info)) {
if (0U == (PM_MASTER_USING_SLAVE_MASK & masterReq->info)) {
status = PM_RET_ERROR_ACCESS;
goto done;
}
/* Master is using slave (previously has requested node) */
switch (master->procs->node.currState) {
case (PM_PROC_STATE_SUSPENDING):
case PM_PROC_STATE_SUSPENDING:
/* Schedule setting the requirement */
status = PmRequirementSchedule(masterReq, capabilities);
break;
@ -385,6 +385,7 @@ static void PmSetRequirement(const PmMaster *master,
status = PM_RET_ERROR_COMMUNIC;
break;
}
oppoint = masterReq->slave->node.currState;
done:
PmProcessAckRequest(ack, master, node, status, oppoint);

38
lib/sw_apps/zynqmp_pmufw/src/pm_master.c
View file

@ -211,7 +211,7 @@ PmMaster pmMasterApu_g = {
PmMaster pmMasterRpu0_g = {
.procs = &pmRpuProcs_g[PM_PROC_RPU_0],
.procsCnt = 1,
.procsCnt = 1U,
.ipiMask = IPI_PMU_0_IER_RPU_0_MASK,
.ipiTrigMask = IPI_PMU_0_TRIG_RPU_0_MASK,
.pmuBuffer = IPI_BUFFER_PMU_BASE + IPI_BUFFER_TARGET_RPU_0_OFFSET,
@ -222,19 +222,19 @@ PmMaster pmMasterRpu0_g = {
PmMaster pmMasterRpu1_g = {
.procs = &pmRpuProcs_g[PM_PROC_RPU_1],
.procsCnt = 1,
.procsCnt = 1U,
.ipiMask = IPI_PMU_0_IER_RPU_1_MASK,
.ipiTrigMask = IPI_PMU_0_TRIG_RPU_1_MASK,
.pmuBuffer = IPI_BUFFER_PMU_BASE + IPI_BUFFER_TARGET_RPU_1_OFFSET,
.buffer = IPI_BUFFER_RPU_1_BASE + IPI_BUFFER_TARGET_PMU_OFFSET,
.reqs = NULL, /* lockstep mode is assumed for now */
.reqsCnt = 0,
.reqsCnt = 0U,
};
static const PmMaster *const pmAllMasters[PM_MASTER_MAX] = {
[PM_MASTER_APU] = &pmMasterApu_g,
[PM_MASTER_RPU_0] = &pmMasterRpu0_g,
[PM_MASTER_RPU_1] = &pmMasterRpu1_g,
static const PmMaster *const pmAllMasters[] = {
&pmMasterApu_g,
&pmMasterRpu0_g,
&pmMasterRpu1_g,
};
/**
@ -377,7 +377,7 @@ void PmRequirementCancelScheduled(const PmMaster* const master)
* are automatically released.
* @master Master whose primary processor was forced to power down
*/
void PmRequirementReleaseAll(const PmMaster* const master)
static void PmRequirementReleaseAll(const PmMaster* const master)
{
u32 status;
PmRequirementId i;
@ -595,28 +595,6 @@ done:
return proc;
}
/**
* PmMasterGetAwakeProcCnt() - count how many processors within master are not
* in sleep state
* processor
* @master Pointer to the master whose awake processors are to be counted
*
* @return Number of awake processors within a master
*/
u32 PmMasterGetAwakeProcCnt(const PmMaster* const master)
{
u32 i;
u32 activeCnt = 0U;
for (i = 0U; i < master->procsCnt; i++) {
if (PM_PROC_STATE_ACTIVE == master->procs[i].node.currState) {
activeCnt++;
}
}
return activeCnt;
}
/**
* PmEnableProxyWake() - Enable scheduled wake-up sources in GIC Proxy
* @master Pointer to master whose scheduled wake-up sources should be enabled

2
lib/sw_apps/zynqmp_pmufw/src/xpfw_version.h
View file

@ -1,4 +1,4 @@
#ifndef ZYNQMP_XPFW_VERSION__H_
#define ZYNQMP_XPFW_VERSION__H_
#define ZYNQMP_XPFW_VERSION "2015.1-swbeta2-15-g9a15e28febbd"
#define ZYNQMP_XPFW_VERSION "2015.1-swbeta2-16-g1a5a1abd8be3"
#endif