From 860c409ea5be3c83a28eafe4d2e5e13d9f45d3d3 Mon Sep 17 00:00:00 2001 From: Davorin Mista Date: Thu, 2 Jul 2015 17:10:35 -0700 Subject: [PATCH] PMUFW: PM: Remove error-only acknowledge option Signed-off-by: Davorin Mista Acked-by: Jyotheeswar Reddy Mutthareddyvari --- lib/sw_apps/zynqmp_pmufw/src/pm_common.c | 2 -- lib/sw_apps/zynqmp_pmufw/src/pm_common.h | 4 +--- lib/sw_apps/zynqmp_pmufw/src/pm_core.c | 3 +-- lib/sw_apps/zynqmp_pmufw/src/pm_defs.h | 3 +-- lib/sw_apps/zynqmp_pmufw/src/pm_master.c | 3 +-- lib/sw_apps/zynqmp_pmufw/src/xpfw_version.h | 2 +- 6 files changed, 5 insertions(+), 12 deletions(-) diff --git a/lib/sw_apps/zynqmp_pmufw/src/pm_common.c b/lib/sw_apps/zynqmp_pmufw/src/pm_common.c index fed0fa7f..aa71715e 100644 --- a/lib/sw_apps/zynqmp_pmufw/src/pm_common.c +++ b/lib/sw_apps/zynqmp_pmufw/src/pm_common.c @@ -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"; } diff --git a/lib/sw_apps/zynqmp_pmufw/src/pm_common.h b/lib/sw_apps/zynqmp_pmufw/src/pm_common.h index 30d05e0b..41541b3c 100644 --- a/lib/sw_apps/zynqmp_pmufw/src/pm_common.h +++ b/lib/sw_apps/zynqmp_pmufw/src/pm_common.h @@ -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 \ diff --git a/lib/sw_apps/zynqmp_pmufw/src/pm_core.c b/lib/sw_apps/zynqmp_pmufw/src/pm_core.c index e66242f0..51176250 100644 --- a/lib/sw_apps/zynqmp_pmufw/src/pm_core.c +++ b/lib/sw_apps/zynqmp_pmufw/src/pm_core.c @@ -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 { diff --git a/lib/sw_apps/zynqmp_pmufw/src/pm_defs.h b/lib/sw_apps/zynqmp_pmufw/src/pm_defs.h index abe18d64..15e65d41 100644 --- a/lib/sw_apps/zynqmp_pmufw/src/pm_defs.h +++ b/lib/sw_apps/zynqmp_pmufw/src/pm_defs.h @@ -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 diff --git a/lib/sw_apps/zynqmp_pmufw/src/pm_master.c b/lib/sw_apps/zynqmp_pmufw/src/pm_master.c index b28c4830..b03a26d3 100644 --- a/lib/sw_apps/zynqmp_pmufw/src/pm_master.c +++ b/lib/sw_apps/zynqmp_pmufw/src/pm_master.c @@ -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; diff --git a/lib/sw_apps/zynqmp_pmufw/src/xpfw_version.h b/lib/sw_apps/zynqmp_pmufw/src/xpfw_version.h index 89e88559..70cc8f88 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-47-g664cb2bea224" + #define ZYNQMP_XPFW_VERSION "2015.1-swbeta2-49-g7256b97be64c" #endif