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

PMUFW: PM: Remove error-only acknowledge option

Browse source 
Signed-off-by: Davorin Mista <davorin.mista@aggios.com>
Acked-by: Jyotheeswar Reddy Mutthareddyvari <jyothee@xilinx.com>
This commit is contained in:
Davorin Mista 2015-07-02 17:10:35 -07:00 • committed by Nava kishore Manne
parent 1f36fb5736
commit 860c409ea5
6 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/sw_apps/zynqmp_pmufw/src/pm_common.c
View file

@ -177,8 +177,6 @@ const char* PmStrAck(const u32 ack)
return "REQUEST_ACK_BLOCKING";
case REQUEST_ACK_CB_STANDARD:
return "REQUEST_ACK_CB_STANDARD";
case REQUEST_ACK_CB_ERROR:
return "REQUEST_ACK_CB_ERROR";
default:
return "ERROR_ACK";
}

4
lib/sw_apps/zynqmp_pmufw/src/pm_common.h
View file

@ -77,9 +77,7 @@ typedef u32 (*const PmTranHandler)(void);
#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
#define BIT0(x) (x & 1U)
#define TO_ACK_CB(ack, status) \
((REQUEST_ACK_CB_STANDARD == (ack)) || \
((REQUEST_ACK_CB_ERROR == (ack)) && (XST_SUCCESS != (status))))
#define TO_ACK_CB(ack, status) (REQUEST_ACK_CB_STANDARD == (ack))
/* All WFI bitfields in GPI2 */
#define PMU_LOCAL_GPI2_ENABLE_ALL_PWRDN_REQ_MASK \

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

@ -63,8 +63,7 @@ static void PmProcessAckRequest(const u32 ack,
if (REQUEST_ACK_BLOCKING == ack) {
/* Return status immediately */
XPfw_Write32(master->buffer + IPI_BUFFER_RESP_OFFSET, status);
} else if ((REQUEST_ACK_CB_STANDARD == ack) ||
((REQUEST_ACK_CB_ERROR == ack) && (XST_SUCCESS != status))) {
} else if (REQUEST_ACK_CB_STANDARD == ack) {
/* Return acknowledge through callback */
PmAcknowledgeCb(master, nodeId, status, oppoint);
} else {

3
lib/sw_apps/zynqmp_pmufw/src/pm_defs.h
View file

@ -161,9 +161,8 @@
#define REQUEST_ACK_NO 1U
#define REQUEST_ACK_BLOCKING 2U
#define REQUEST_ACK_CB_STANDARD 3U
#define REQUEST_ACK_CB_ERROR 4U
#define REQUEST_ACK_MIN REQUEST_ACK_NO
#define REQUEST_ACK_MAX REQUEST_ACK_CB_ERROR
#define REQUEST_ACK_MAX REQUEST_ACK_CB_STANDARD
/* Abort reason argument */
#define ABORT_REASON_WKUP_EVENT 100U

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

@ -1106,8 +1106,7 @@ int PmRememberSuspendRequest(const PmMaster* const reqMaster,
status = XST_PM_NO_ACCESS;
if (reqMaster == respMaster->pmSuspRequests.reqMst) {
if ((REQUEST_ACK_CB_STANDARD == ack) ||
(REQUEST_ACK_CB_ERROR == ack)) {
if (REQUEST_ACK_CB_STANDARD == ack) {
respMaster->pmSuspRequests.ackReq = ack;
respMaster->pmSuspRequests.flags |= PM_REQUESTED_SUSPEND;
status = XST_SUCCESS;

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-47-g664cb2bea224"
#define ZYNQMP_XPFW_VERSION "2015.1-swbeta2-49-g7256b97be64c"
#endif