diff --git a/lib/sw_apps/zynqmp_pmufw/src/pm_binding.c b/lib/sw_apps/zynqmp_pmufw/src/pm_binding.c index bbcba1b5..5e49ba03 100644 --- a/lib/sw_apps/zynqmp_pmufw/src/pm_binding.c +++ b/lib/sw_apps/zynqmp_pmufw/src/pm_binding.c @@ -90,7 +90,7 @@ void XPfw_PmIpiHandler(const u32 isrMask, if (NULL == master) { /* Never happens if IPI interrupt routine is implemented correctly */ - PmDbg("%s ERROR: IPI source not supported %d\n", __func__, isrMask); + PmDbg("ERROR: IPI source not supported %d\n", isrMask); goto done; } @@ -120,7 +120,7 @@ void XPfw_PmWfiHandler(const u32 srcMask) PmProc *proc = PmGetProcByWfiStatus(srcMask); if (NULL == proc) { - PmDbg("%s ERROR: Unknown processor %d\n", __func__, srcMask); + PmDbg("ERROR: Unknown processor %d\n", srcMask); goto done; } diff --git a/lib/sw_apps/zynqmp_pmufw/src/pm_callbacks.c b/lib/sw_apps/zynqmp_pmufw/src/pm_callbacks.c index 7c80f9d0..00ba1f4d 100644 --- a/lib/sw_apps/zynqmp_pmufw/src/pm_callbacks.c +++ b/lib/sw_apps/zynqmp_pmufw/src/pm_callbacks.c @@ -93,8 +93,8 @@ void PmInitSuspendCb(const PmMaster* const master, const PmNodeId nodeId, const u32 reason, const u32 latency, const u32 state, const u32 timeout) { - PmDbg("%s(%s, %d, %d, %d, %d)\n", __func__, PmStrNode(nodeId), reason, - latency, state, timeout); + PmDbg("of %s (%d, %d, %d, %d)\n", PmStrNode(nodeId), reason, latency, + state, timeout); XPfw_Write32(master->buffer + IPI_BUFFER_RESP_OFFSET, PM_INIT_SUSPEND_CB); XPfw_Write32(master->buffer + IPI_BUFFER_RESP_OFFSET + PAYLOAD_ELEM_SIZE, diff --git a/lib/sw_apps/zynqmp_pmufw/src/pm_common.h b/lib/sw_apps/zynqmp_pmufw/src/pm_common.h index b719db54..8f39d350 100644 --- a/lib/sw_apps/zynqmp_pmufw/src/pm_common.h +++ b/lib/sw_apps/zynqmp_pmufw/src/pm_common.h @@ -70,7 +70,7 @@ typedef u32 (*const PmTranHandler)(void); * has enabled debug prints, power management prints should be configurable. */ #ifdef DEBUG_PM - #define PmDbg(MSG, ...) fw_printf("PMU-PM: " MSG, ##__VA_ARGS__) + #define PmDbg(MSG, ...) fw_printf("PMUFW: %s: " MSG, __func__, ##__VA_ARGS__) #else #define PmDbg(MSG, ...) {} #endif diff --git a/lib/sw_apps/zynqmp_pmufw/src/pm_core.c b/lib/sw_apps/zynqmp_pmufw/src/pm_core.c index 1d0b71a3..e6ea31d2 100644 --- a/lib/sw_apps/zynqmp_pmufw/src/pm_core.c +++ b/lib/sw_apps/zynqmp_pmufw/src/pm_core.c @@ -90,11 +90,11 @@ static void PmSelfSuspend(const PmMaster *const master, /* the node ID must refer to a processor belonging to this master */ PmProc* proc = PmGetProcOfThisMaster(master, node); - PmDbg("%s(%s, %d, %d)\n", __func__, PmStrNode(node), latency, state); + PmDbg("(%s, %d, %d)\n", PmStrNode(node), latency, state); if (NULL == proc) { - PmDbg("%s ERROR node ID %s(=%d) does not refer to a processor of this master channel\n", - __func__, PmStrNode(node), node); + PmDbg("ERROR node ID %s(=%d) does not refer to a processor of " + "this master channel\n", PmStrNode(node), node); goto done; } @@ -120,11 +120,11 @@ static void PmRequestSuspend(const PmMaster *const master, { PmProc* proc = PmGetProcOfOtherMaster(master, node); - PmDbg("%s(%s, %s, %d, %d)\n", __func__, PmStrNode(node), PmStrAck(ack), - latency, state); + PmDbg("(%s, %s, %d, %d)\n", + PmStrNode(node), PmStrAck(ack), latency, state); if (NULL == proc) { - PmDbg("%s ERROR processor not found by node %d\n", __func__, node); + PmDbg("ERROR processor not found by node %d\n", node); PmProcessAckRequest(ack, master, node, PM_RET_ERROR_ARGS, 0); goto done; } @@ -155,7 +155,7 @@ static void PmForcePowerdown(const PmMaster *const master, u32 oppoint = 0; PmNode* nodePtr = PmGetNodeById(node); - PmDbg("%s(%s, %s)\n", __func__, PmStrNode(node), PmStrAck(ack)); + PmDbg("(%s, %s)\n", PmStrNode(node), PmStrAck(ack)); if (NULL == nodePtr) { status = PM_RET_ERROR_ARGS; @@ -204,11 +204,11 @@ static void PmAbortSuspend(const PmMaster *const master, { PmProc* proc = PmGetProcOfThisMaster(master, node); - PmDbg("%s(%s, %s)\n", __func__, PmStrNode(node), PmStrReason(reason)); + PmDbg("(%s, %s)\n", PmStrNode(node), PmStrReason(reason)); if (NULL == proc) { - PmDbg("%s ERROR processor access for node #%d not allowed\n", - __func__, node); + PmDbg("ERROR processor access for node %s not allowed\n", + PmStrNode(node)); goto done; } @@ -231,7 +231,7 @@ static void PmRequestWakeup(const PmMaster *const master, const u32 node, u32 oppoint = 0; PmProc* proc = PmGetProcByNodeId(node); - PmDbg("%s(%s, %s)\n", __func__, PmStrNode(node), PmStrAck(ack)); + PmDbg("(%s, %s)\n", PmStrNode(node), PmStrAck(ack)); if (NULL == proc) { status = PM_RET_ERROR_PROC; @@ -268,9 +268,10 @@ static void PmReleaseNode(const PmMaster *master, /* Release requirements */ status = PmRequirementUpdate(masterReq, 0); masterReq->info &= ~PM_MASTER_USING_SLAVE_MASK; + if (PM_RET_SUCCESS != status) { - PmDbg("%s: ERROR PmRequirementUpdate status = %d (should be 0!!)\n", - __func__, status); + PmDbg("ERROR PmRequirementUpdate status = %d (should be 0!!)\n", + status); goto done; } @@ -281,7 +282,7 @@ static void PmReleaseNode(const PmMaster *master, } done: - PmDbg("%s (%s, %d)\n", __func__, PmStrNode(node), latency); + PmDbg("(%s, %d)\n", PmStrNode(node), latency); } /** @@ -302,7 +303,7 @@ static void PmRequestNode(const PmMaster *master, u32 oppoint = 0; PmRequirement* masterReq = PmGetRequirementForSlave(master, node); - PmDbg("%s(%s, %d, %d, %s)\n", __func__, PmStrNode(node), capabilities, + PmDbg("(%s, %d, %d, %s)\n", PmStrNode(node), capabilities, qos, PmStrAck(ack)); if (NULL == masterReq) { @@ -354,7 +355,7 @@ static void PmSetRequirement(const PmMaster *master, u32 oppoint = 0; PmRequirement* masterReq = PmGetRequirementForSlave(master, node); - PmDbg("%s(%s, %d, %d, %s)\n", __func__, PmStrNode(node), capabilities, + PmDbg("(%s, %d, %d, %s)\n", PmStrNode(node), capabilities, qos, PmStrAck(ack)); /* Is there a provision for the master to use the given slave node */ @@ -397,7 +398,7 @@ static void PmGetApiVersion(const PmMaster *const master) { u32 version = (PM_VERSION_MAJOR << 16) | PM_VERSION_MINOR; - PmDbg("%s version %d.%d\n", __func__, PM_VERSION_MAJOR, PM_VERSION_MINOR); + PmDbg("version %d.%d\n", PM_VERSION_MAJOR, PM_VERSION_MINOR); XPfw_Write32(master->buffer + IPI_BUFFER_RESP_OFFSET, PM_RET_SUCCESS); XPfw_Write32(master->buffer + IPI_BUFFER_RESP_OFFSET + PAYLOAD_ELEM_SIZE, @@ -417,7 +418,7 @@ static void PmGetApiVersion(const PmMaster *const master) static void PmMmioWrite(const PmMaster *const master, const u32 address, const u32 mask, const u32 value) { - PmDbg("%s (0x%x, 0x%x, 0x%x)\n", __func__, address, mask, value); + PmDbg("(0x%x, 0x%x, 0x%x)\n", address, mask, value); XPfw_Write32(address, mask & value); XPfw_Write32(master->buffer + IPI_BUFFER_RESP_OFFSET, PM_RET_SUCCESS); @@ -437,7 +438,7 @@ static void PmMmioRead(const PmMaster *const master, const u32 address, { u32 value; - PmDbg("%s addr=0x%x, mask=0x%x\n", __func__, address, mask); + PmDbg("addr=0x%x, mask=0x%x\n", address, mask); value = XPfw_Read32(address) & mask; XPfw_Write32(master->buffer + IPI_BUFFER_RESP_OFFSET, PM_RET_SUCCESS); @@ -473,8 +474,8 @@ static void PmSetWakeupSource(const PmMaster *const master, } done: - PmDbg("%s(%s, %s, %d)\n", __func__, PmStrNode(master->procs->node.nodeId), - PmStrNode(sourceNode), enable); + PmDbg("(%s, %s, %d)\n", PmStrNode(master->procs->node.nodeId), + PmStrNode(sourceNode), enable); } /** @@ -484,7 +485,7 @@ done: */ static void PmSystemShutdown(const PmMaster *const master, const u32 restart) { - PmDbg("%s(%d) not implemented\n", __func__, restart); + PmDbg("(%d) not implemented\n", restart); } /** @@ -497,7 +498,7 @@ static void PmSystemShutdown(const PmMaster *const master, const u32 restart) static void PmSetMaxLatency(const PmMaster *const master, const u32 node, const u32 latency) { - PmDbg("%s(%s, %d) not implemented\n", __func__, PmStrNode(node), latency); + PmDbg("(%s, %d) not implemented\n", PmStrNode(node), latency); } /** @@ -507,7 +508,7 @@ static void PmSetMaxLatency(const PmMaster *const master, const u32 node, */ static void PmSetConfiguration(const PmMaster *const master, const u32 address) { - PmDbg("%s(0x%x) not implemented\n", __func__, address); + PmDbg("(0x%x) not implemented\n", address); } /** @@ -517,7 +518,7 @@ static void PmSetConfiguration(const PmMaster *const master, const u32 address) */ static void PmGetNodeStatus(const PmMaster *const master, const u32 node) { - PmDbg("%s(%s) not implemented\n", __func__, PmStrNode(node)); + PmDbg("(%s) not implemented\n", PmStrNode(node)); } /** @@ -529,7 +530,7 @@ static void PmGetNodeStatus(const PmMaster *const master, const u32 node) static void PmGetOpCharacteristics(const PmMaster *const master, const u32 node, const u32 type) { - PmDbg("%s(%s, %d) not implemented\n", __func__, PmStrNode(node), type); + PmDbg("(%s, %d) not implemented\n", PmStrNode(node), type); } /** @@ -544,7 +545,7 @@ static void PmRegisterNotifier(const PmMaster *const master, const u32 node, const u32 event, const u32 wake, const u32 enable) { - PmDbg("%s(%s, %d, %d, %d) not implemented\n", __func__, PmStrNode(node), + PmDbg("(%s, %d, %d, %d) not implemented\n", PmStrNode(node), event, wake, enable); } @@ -567,7 +568,7 @@ static void PmResetAssert(const PmMaster *const master, const u32 reset, */ static void PmResetGetStatus(const PmMaster *const master, const u32 reset) { - PmDbg("%s(%d) not implemented\n", __func__, reset); + PmDbg("(%d) not implemented\n", reset); } /** @@ -643,7 +644,7 @@ void PmProcessApiCall(const PmMaster *const master, PmMmioRead(master, pload[1], pload[2]); break; default: - PmDbg("%s ERROR unsupported PM API #%d\n", __func__, pload[0]); + PmDbg("ERROR unsupported PM API #%d\n", pload[0]); PmProcessAckRequest(PmRequestAcknowledge(pload), master, NODE_UNKNOWN, PM_RET_ERROR_NOTSUPPORTED, 0); break; @@ -667,7 +668,7 @@ void PmProcessRequest(const PmMaster *const master, if (PM_PAYLOAD_OK == status) { PmProcessApiCall(master, pload); } else { - PmDbg("%s ERROR invalid payload, status #%d\n", __func__, status); + PmDbg("ERROR invalid payload, status #%d\n", status); /* Acknowledge if possible */ if (PM_PAYLOAD_ERR_API_ID != status) { u32 ack = PmRequestAcknowledge(pload); diff --git a/lib/sw_apps/zynqmp_pmufw/src/pm_master.c b/lib/sw_apps/zynqmp_pmufw/src/pm_master.c index ed8ece98..f3c236c3 100644 --- a/lib/sw_apps/zynqmp_pmufw/src/pm_master.c +++ b/lib/sw_apps/zynqmp_pmufw/src/pm_master.c @@ -279,7 +279,7 @@ u32 PmRequirementUpdate(PmRequirement* const masterReq, const u32 caps) u32 status; u32 tmpCaps; - PmDbg("%s\n", __func__); + PmDbg("\n"); /* Check if slave has a state with requested capabilities */ status = PmCheckCapabilities(masterReq->slave, caps); @@ -328,7 +328,7 @@ void PmRequirementUpdateScheduled(const PmMaster* const master, const bool swap) u32 status; PmRequirementId i; - PmDbg("%s master %s\n", __func__, PmStrNode(master->procs[0].node.nodeId)); + PmDbg("master %s\n", PmStrNode(master->procs[0].node.nodeId)); for (i = 0; i < master->reqsCnt; i++) { if (master->reqs[i].currReq != master->reqs[i].nextReq) { @@ -345,8 +345,7 @@ void PmRequirementUpdateScheduled(const PmMaster* const master, const bool swap) status = PmUpdateSlave(master->reqs[i].slave); /* if rom works correctly, status should be always ok */ if (PM_RET_SUCCESS != status) { - PmDbg("%s ERROR setting slave node %s\n", - __func__, + PmDbg("ERROR setting slave node %s\n", PmStrNode(master->reqs[i].slave->node.nodeId)); } } @@ -365,7 +364,7 @@ void PmRequirementCancelScheduled(const PmMaster* const master) for (i = 0; i < master->reqsCnt; i++) { if (master->reqs[i].currReq != master->reqs[i].nextReq) { /* Drop the scheduled request by making it constant */ - PmDbg("%s %s\n", __func__, + PmDbg("%s\n", PmStrNode(master->reqs[i].slave->node.nodeId)); master->reqs[i].nextReq = master->reqs[i].currReq; } @@ -390,7 +389,7 @@ void PmRequirementReleaseAll(const PmMaster* const master) status = PmUpdateSlave(master->reqs[i].slave); /* if pmu rom works correctly, status should be always ok */ if (PM_RET_SUCCESS != status) { - PmDbg("%s ERROR setting slave node %s\n", __func__, + PmDbg("ERROR setting slave node %s\n", PmStrNode(master->reqs[i].slave->node.nodeId)); } } @@ -628,7 +627,7 @@ void PmEnableProxyWake(PmMaster* const master) { u32 i; - PmDbg("%s %s\n", __func__, PmStrNode(master->procs->node.nodeId)); + PmDbg("%s\n", PmStrNode(master->procs->node.nodeId)); for (i = 0; i < master->reqsCnt; i++) { if (master->reqs[i].info & PM_MASTER_WAKEUP_REQ_MASK) { @@ -646,7 +645,7 @@ static void PmWakeUpCancelScheduled(PmMaster* const master) { u32 i; - PmDbg("%s %s\n", __func__, PmStrNode(master->procs->node.nodeId)); + PmDbg("%s\n", PmStrNode(master->procs->node.nodeId)); for (i = 0; i < master->reqsCnt; i++) { master->reqs[i].info &= ~PM_MASTER_WAKEUP_REQ_MASK; @@ -661,7 +660,7 @@ static void PmWakeUpDisableAll(PmMaster* const master) { u32 i; - PmDbg("%s for %s\n", __func__, PmStrNode(master->procs->node.nodeId)); + PmDbg("for %s\n", PmStrNode(master->procs->node.nodeId)); for (i = 0; i < master->reqsCnt; i++) { PmMasterId r; @@ -715,7 +714,7 @@ void PmMasterNotify(PmMaster* const master, const PmProcEvent event) PmWakeUpCancelScheduled(master); break; default: - PmDbg("%s undefined event #%d\n", __func__, event); + PmDbg("undefined event #%d\n", event); break; } } diff --git a/lib/sw_apps/zynqmp_pmufw/src/pm_power.c b/lib/sw_apps/zynqmp_pmufw/src/pm_power.c index a4fa5994..e826b933 100644 --- a/lib/sw_apps/zynqmp_pmufw/src/pm_power.c +++ b/lib/sw_apps/zynqmp_pmufw/src/pm_power.c @@ -79,7 +79,7 @@ static u32 PmPwrDnHandler(PmNode* const nodePtr) ret = XpbrPwrDnRpuHandler(); break; default: - PmDbg("%s - unsupported node %s(%d)\n", __func__, + PmDbg("unsupported node %s(%d)\n", PmStrNode(nodePtr->nodeId), nodePtr->nodeId); break; } @@ -93,7 +93,7 @@ static u32 PmPwrDnHandler(PmNode* const nodePtr) ret = PM_RET_SUCCESS; done: - PmDbg("%s %s\n", __func__, PmStrNode(nodePtr->nodeId)); + PmDbg("%s\n", PmStrNode(nodePtr->nodeId)); return ret; } @@ -109,7 +109,7 @@ static u32 PmPwrUpHandler(PmNode* const nodePtr) { u32 ret = PM_RET_ERROR_FAILURE; - PmDbg("%s %s\n", __func__, PmStrNode(nodePtr->nodeId)); + PmDbg("%s\n", PmStrNode(nodePtr->nodeId)); if (NULL == nodePtr) { goto done; @@ -119,9 +119,9 @@ static u32 PmPwrUpHandler(PmNode* const nodePtr) switch (nodePtr->nodeId) { case NODE_FPD: ret = XpbrPwrUpFpdHandler(); - PmDbg("%s XpbrPwrUpFpdHandler return code #%d\n", __func__, ret); + PmDbg("XpbrPwrUpFpdHandler return code #%d\n", ret); /* FIXME workaround for old version of pmu-rom */ - PmDbg("%s ignoring error\n", __func__); + PmDbg("ignoring error\n"); ret = XST_SUCCESS; break; case NODE_APU: @@ -140,13 +140,13 @@ static u32 PmPwrUpHandler(PmNode* const nodePtr) break; } default: - PmDbg("%s ERROR - unsupported node %s(%d)\n", __func__, + PmDbg("ERROR - unsupported node %s(%d)\n", PmStrNode(nodePtr->nodeId), nodePtr->nodeId); break; } if (XST_SUCCESS != ret) { - PmDbg("%s failed to power up %s PBR ERROR #%d\n", __func__, + PmDbg("failed to power up %s PBR ERROR #%d\n", PmStrNode(nodePtr->nodeId), ret); ret = PM_RET_ERROR_FAILURE; goto done; @@ -290,8 +290,7 @@ static bool PmHasAwakeChild(const PmPower* const power) for (i = 0U; i < power->childCnt; i++) { if (false == PmChildIsInLowestPowerState(power->children[i])) { hasAwakeChild = true; - PmDbg("%s %s\n", __func__, - PmStrNode(power->children[i]->nodeId)); + PmDbg("%s\n", PmStrNode(power->children[i]->nodeId)); break; } } @@ -397,7 +396,7 @@ u32 PmTriggerPowerUp(PmPower* const power) done: if (PM_RET_SUCCESS != status) { - PmDbg("%s failed to power up: ERROR #%d\n", __func__, status); + PmDbg("failed to power up: ERROR #%d\n", status); } return status; diff --git a/lib/sw_apps/zynqmp_pmufw/src/pm_proc.c b/lib/sw_apps/zynqmp_pmufw/src/pm_proc.c index 5459f9fa..1777a834 100644 --- a/lib/sw_apps/zynqmp_pmufw/src/pm_proc.c +++ b/lib/sw_apps/zynqmp_pmufw/src/pm_proc.c @@ -356,8 +356,7 @@ u32 PmProcFsm(PmProc* const proc, const PmProcEvent event) if (PM_PROC_STATE_ACTIVE == currState) { status = PmProcTrActiveToSuspend(proc); } else { - PmDbg("%s illegal state %d for SUSPND event\n", - __func__, currState); + PmDbg("illegal state %d for SUSPND event\n", currState); status = PM_RET_ERROR_INTERNAL; } break; @@ -371,8 +370,7 @@ u32 PmProcFsm(PmProc* const proc, const PmProcEvent event) if (PM_PROC_STATE_SUSPENDING == currState) { status = PmProcTrSuspendToActive(proc); } else { - PmDbg("%s illegal state %d for ABORT event\n", - __func__, currState); + PmDbg("illegal state %d for ABORT event\n", currState); status = PM_RET_ERROR_INTERNAL; } break; @@ -380,8 +378,7 @@ u32 PmProcFsm(PmProc* const proc, const PmProcEvent event) if (PM_PROC_STATE_SUSPENDING == currState) { status = PmProcTrSuspendToSleep(proc); } else { - PmDbg("%s illegal state %d for SLEEP event\n", - __func__, currState); + PmDbg("illegal state %d for SLEEP event\n", currState); status = PM_RET_ERROR_INTERNAL; } break; @@ -391,13 +388,12 @@ u32 PmProcFsm(PmProc* const proc, const PmProcEvent event) } else if (PM_PROC_STATE_FORCEDOFF == currState) { status = PmProcTrForcePwrdnToActive(proc); } else { - PmDbg("%s illegal state %d for WAKE event\n", - __func__, currState); + PmDbg("illegal state %d for WAKE event\n", currState); status = PM_RET_ERROR_INTERNAL; } break; default: - PmDbg("%s unrecognized event\n", __func__, event); + PmDbg("unrecognized event\n", event); status = PM_RET_ERROR_INTERNAL; break; } diff --git a/lib/sw_apps/zynqmp_pmufw/src/pm_slave.c b/lib/sw_apps/zynqmp_pmufw/src/pm_slave.c index 0df76d4e..38a0a217 100644 --- a/lib/sw_apps/zynqmp_pmufw/src/pm_slave.c +++ b/lib/sw_apps/zynqmp_pmufw/src/pm_slave.c @@ -255,7 +255,7 @@ static void PmSlaveWakeMasters(PmSlave* const slave) for (i = 0U; i < slave->reqsCnt; i++) { if (slave->reqs[i]->info & PM_MASTER_WAKEUP_REQ_MASK) { slave->reqs[i]->info &= ~PM_MASTER_WAKEUP_REQ_MASK; - PmDbg("%s %s->%s\n", __func__, PmStrNode(slave->node.nodeId), + PmDbg("%s->%s\n", PmStrNode(slave->node.nodeId), PmStrNode(slave->reqs[i]->requestor->procs->node.nodeId)); PmProcFsm(slave->reqs[i]->requestor->procs, PM_PROC_EVENT_WAKE); } @@ -331,7 +331,7 @@ static bool PmWaitingForGicProxyWake(void) */ void PmSlaveWakeEnable(PmSlave* const slave) { - PmDbg("%s %s\n", __func__, PmStrNode(slave->node.nodeId)); + PmDbg("%s\n", PmStrNode(slave->node.nodeId)); if (NULL == slave->wake) { goto done; @@ -356,7 +356,7 @@ done: */ void PmSlaveWakeDisable(PmSlave* const slave) { - PmDbg("%s %s\n", __func__, PmStrNode(slave->node.nodeId)); + PmDbg("%s\n", PmStrNode(slave->node.nodeId)); if (NULL == slave->wake) { goto done; diff --git a/lib/sw_apps/zynqmp_pmufw/src/pm_sram.c b/lib/sw_apps/zynqmp_pmufw/src/pm_sram.c index 6fe7bd47..822b1a12 100644 --- a/lib/sw_apps/zynqmp_pmufw/src/pm_sram.c +++ b/lib/sw_apps/zynqmp_pmufw/src/pm_sram.c @@ -46,7 +46,7 @@ static u32 PmOcm0RetEntry(void) PMU_LOCAL_OCM_RET_CNTRL_BANK0_MASK, PMU_LOCAL_OCM_RET_CNTRL_BANK0_MASK); - PmDbg("%s\n", __func__); + PmDbg("\n"); return XST_SUCCESS; } @@ -57,7 +57,7 @@ static u32 PmOcm0RetExit(void) PMU_LOCAL_OCM_RET_CNTRL_BANK0_MASK, ~PMU_LOCAL_OCM_RET_CNTRL_BANK0_MASK); - PmDbg("%s\n", __func__); + PmDbg("\n"); return XST_SUCCESS; } @@ -69,7 +69,7 @@ static u32 PmOcm1RetEntry(void) PMU_LOCAL_OCM_RET_CNTRL_BANK1_MASK, PMU_LOCAL_OCM_RET_CNTRL_BANK1_MASK); - PmDbg("%s\n", __func__); + PmDbg("\n"); return XST_SUCCESS; } @@ -80,7 +80,7 @@ static u32 PmOcm1RetExit(void) PMU_LOCAL_OCM_RET_CNTRL_BANK1_MASK, ~PMU_LOCAL_OCM_RET_CNTRL_BANK1_MASK); - PmDbg("%s\n", __func__); + PmDbg("\n"); return XST_SUCCESS; } @@ -92,7 +92,7 @@ static u32 PmOcm2RetEntry(void) PMU_LOCAL_OCM_RET_CNTRL_BANK2_MASK, PMU_LOCAL_OCM_RET_CNTRL_BANK2_MASK); - PmDbg("%s\n", __func__); + PmDbg("\n"); return XST_SUCCESS; } @@ -103,7 +103,7 @@ static u32 PmOcm2RetExit(void) PMU_LOCAL_OCM_RET_CNTRL_BANK2_MASK, ~PMU_LOCAL_OCM_RET_CNTRL_BANK2_MASK); - PmDbg("%s\n", __func__); + PmDbg("\n"); return XST_SUCCESS; } @@ -115,7 +115,7 @@ static u32 PmOcm3RetEntry(void) PMU_LOCAL_OCM_RET_CNTRL_BANK3_MASK, PMU_LOCAL_OCM_RET_CNTRL_BANK3_MASK); - PmDbg("%s\n", __func__); + PmDbg("\n"); return XST_SUCCESS; } @@ -126,7 +126,7 @@ static u32 PmOcm3RetExit(void) PMU_LOCAL_OCM_RET_CNTRL_BANK3_MASK, ~PMU_LOCAL_OCM_RET_CNTRL_BANK3_MASK); - PmDbg("%s\n", __func__); + PmDbg("\n"); return XST_SUCCESS; } @@ -137,7 +137,7 @@ static u32 PmTcm0ARetEntry(void) PMU_LOCAL_TCM_RET_CNTRL_TCMA0_MASK, PMU_LOCAL_TCM_RET_CNTRL_TCMA0_MASK); - PmDbg("%s\n", __func__); + PmDbg("\n"); return XST_SUCCESS; } @@ -148,7 +148,7 @@ static u32 PmTcm0ARetExit(void) PMU_LOCAL_TCM_RET_CNTRL_TCMA0_MASK, ~PMU_LOCAL_TCM_RET_CNTRL_TCMA0_MASK); - PmDbg("%s\n", __func__); + PmDbg("\n"); return XST_SUCCESS; } @@ -159,7 +159,7 @@ static u32 PmTcm0BRetEntry(void) PMU_LOCAL_TCM_RET_CNTRL_TCMB0_MASK, PMU_LOCAL_TCM_RET_CNTRL_TCMB0_MASK); - PmDbg("%s\n", __func__); + PmDbg("\n"); return XST_SUCCESS; } @@ -170,7 +170,7 @@ static u32 PmTcm0BRetExit(void) PMU_LOCAL_TCM_RET_CNTRL_TCMB0_MASK, ~PMU_LOCAL_TCM_RET_CNTRL_TCMB0_MASK); - PmDbg("%s\n", __func__); + PmDbg("\n"); return XST_SUCCESS; } @@ -181,7 +181,7 @@ static u32 PmTcm1ARetEntry(void) PMU_LOCAL_TCM_RET_CNTRL_TCMA1_MASK, PMU_LOCAL_TCM_RET_CNTRL_TCMA1_MASK); - PmDbg("%s\n", __func__); + PmDbg("\n"); return XST_SUCCESS; } @@ -192,7 +192,7 @@ static u32 PmTcm1ARetExit(void) PMU_LOCAL_TCM_RET_CNTRL_TCMA1_MASK, ~PMU_LOCAL_TCM_RET_CNTRL_TCMA1_MASK); - PmDbg("%s\n", __func__); + PmDbg("\n"); return XST_SUCCESS; } @@ -203,7 +203,7 @@ static u32 PmTcm1BRetEntry(void) PMU_LOCAL_TCM_RET_CNTRL_TCMB1_MASK, PMU_LOCAL_TCM_RET_CNTRL_TCMB1_MASK); - PmDbg("%s\n", __func__); + PmDbg("\n"); return XST_SUCCESS; } @@ -214,7 +214,7 @@ static u32 PmTcm1BRetExit(void) PMU_LOCAL_TCM_RET_CNTRL_TCMB1_MASK, ~PMU_LOCAL_TCM_RET_CNTRL_TCMB1_MASK); - PmDbg("%s\n", __func__); + PmDbg("\n"); return XST_SUCCESS; } @@ -225,7 +225,7 @@ static u32 PmL2RetEntry(void) PMU_LOCAL_L2_RET_CNTRL_BANK0_MASK, PMU_LOCAL_L2_RET_CNTRL_BANK0_MASK); - PmDbg("%s\n", __func__); + PmDbg("\n"); return XST_SUCCESS; } @@ -236,7 +236,7 @@ static u32 PmL2RetExit(void) PMU_LOCAL_L2_RET_CNTRL_BANK0_MASK, ~PMU_LOCAL_L2_RET_CNTRL_BANK0_MASK); - PmDbg("%s\n", __func__); + PmDbg("\n"); return XST_SUCCESS; } diff --git a/lib/sw_apps/zynqmp_pmufw/src/xpfw_version.h b/lib/sw_apps/zynqmp_pmufw/src/xpfw_version.h index 9b0c37bc..f0859cf4 100644 --- a/lib/sw_apps/zynqmp_pmufw/src/xpfw_version.h +++ b/lib/sw_apps/zynqmp_pmufw/src/xpfw_version.h @@ -1,4 +1,4 @@ #ifndef ZYNQMP_XPFW_VERSION__H_ #define ZYNQMP_XPFW_VERSION__H_ - #define ZYNQMP_XPFW_VERSION "2015.1-swbeta2-14-g2a2f9ea1077b" + #define ZYNQMP_XPFW_VERSION "2015.1-swbeta2-15-g9a15e28febbd" #endif