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

xilpm: Expand 'req' to 'request'

Browse source 
To avoid confustion between request vs requirement, spell them out.

Scripted change:
  find -type f -name "*.[chS]" -exec sed -i -e 's/PM_REQ_WAKEUP/PM_REQUEST_WAKEUP/g' -e 's/PM_REQ_SUSPEND/PM_REQUEST_SUSPEND/g' -e 's/PM_REQ_NODE/PM_REQUEST_NODE/g' -e 's/REQ_ACK_NO/REQUEST_ACK_NO/g' -e 's/REQ_ACK_BLOCKING/REQUEST_ACK_BLOCKING/g' -e 's/REQ_ACK_CB_STANDARD/REQUEST_ACK_CB_STANDARD/g' -e 's/REQ_ACK_CB_ERROR/REQUEST_ACK_CB_CERROR/g' -e 's/IPI_BUFFER_REQ_OFFSET/IPI_BUFFER_REQUEST_OFFSET/g' -e 's/XPm_ReqSuspend/XPm_RequestSuspend/g' -e 's/XPm_ReqWakeUp/XPm_RequestWakeUp/g' -e 's/XPm_ReqNode/XPm_RequestNode/g' '{}' ';'

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
This commit is contained in:
Soren Brinkmann 2015-04-27 17:17:22 -07:00 • committed by Nava kishore Manne
parent e4671ddd37
commit 69bae79a14
5 changed files with 34 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
lib/sw_services/xilpm/examples/xilpm_selfsuspend_example.c
View file

@ -148,13 +148,13 @@ static void PrepareSuspend(void)
/* APU */
XPm_SelfSuspend(NODE_APU_0, MAX_LATENCY, 0);
usleep(100000);
XPm_SetRequirement(NODE_OCM_BANK_0, PM_CAP_CONTEXT, 0, REQ_ACK_NO);
XPm_SetRequirement(NODE_OCM_BANK_0, PM_CAP_CONTEXT, 0, REQUEST_ACK_NO);
usleep(100000);
XPm_SetRequirement(NODE_OCM_BANK_1, PM_CAP_CONTEXT, 0, REQ_ACK_NO);
XPm_SetRequirement(NODE_OCM_BANK_1, PM_CAP_CONTEXT, 0, REQUEST_ACK_NO);
usleep(100000);
XPm_SetRequirement(NODE_OCM_BANK_2, PM_CAP_CONTEXT, 0, REQ_ACK_NO);
XPm_SetRequirement(NODE_OCM_BANK_2, PM_CAP_CONTEXT, 0, REQUEST_ACK_NO);
usleep(100000);
XPm_SetRequirement(NODE_OCM_BANK_3, PM_CAP_CONTEXT, 0, REQ_ACK_NO);
XPm_SetRequirement(NODE_OCM_BANK_3, PM_CAP_CONTEXT, 0, REQUEST_ACK_NO);
usleep(100000);
/*
@ -173,13 +173,13 @@ static void PrepareSuspend(void)
/* RPU */
XPm_SelfSuspend(NODE_RPU_0, MAX_LATENCY, 0);
usleep(100000);
XPm_SetRequirement(NODE_TCM_0_A, PM_CAP_CONTEXT, 0, REQ_ACK_NO);
XPm_SetRequirement(NODE_TCM_0_A, PM_CAP_CONTEXT, 0, REQUEST_ACK_NO);
usleep(100000);
XPm_SetRequirement(NODE_TCM_0_B, PM_CAP_CONTEXT, 0, REQ_ACK_NO);
XPm_SetRequirement(NODE_TCM_0_B, PM_CAP_CONTEXT, 0, REQUEST_ACK_NO);
usleep(100000);
XPm_SetRequirement(NODE_TCM_1_A, PM_CAP_CONTEXT, 0, REQ_ACK_NO);
XPm_SetRequirement(NODE_TCM_1_A, PM_CAP_CONTEXT, 0, REQUEST_ACK_NO);
usleep(100000);
XPm_SetRequirement(NODE_TCM_1_B, PM_CAP_CONTEXT, 0, REQ_ACK_NO);
XPm_SetRequirement(NODE_TCM_1_B, PM_CAP_CONTEXT, 0, REQUEST_ACK_NO);
usleep(100000);
/*

30
lib/sw_services/xilpm/src/common/pm_api_sys.c
View file

@ -100,7 +100,7 @@ static enum XPmStatus pm_ipi_send(const struct XPm_Master *const master,
u32 offset = 0;
u32 buffer_base = master->ipi->buffer_base
+ IPI_BUFFER_TARGET_PMU_OFFSET
+ IPI_BUFFER_REQ_OFFSET;
+ IPI_BUFFER_REQUEST_OFFSET;
/* Wait until previous interrupt is handled by PMU */
pm_ipi_wait(master);
@ -194,7 +194,7 @@ enum XPmStatus XPm_SelfSuspend(const enum XPmNodeId nid,
}
/**
* XPm_ReqSuspend() - PM call to request for another PU or subsystem to
* XPm_RequestSuspend() - PM call to request for another PU or subsystem to
* be suspended gracefully.
* @target Node id of the targeted PU or subsystem
* @ack Flag to specify whether acknowledge is requested
@ -203,7 +203,7 @@ enum XPmStatus XPm_SelfSuspend(const enum XPmNodeId nid,
*
* @return Returns status, either success or error+reason
*/
enum XPmStatus XPm_ReqSuspend(const enum XPmNodeId target,
enum XPmStatus XPm_RequestSuspend(const enum XPmNodeId target,
const enum XPmRequestAck ack,
const u32 latency, const u8 state)
{
@ -211,23 +211,23 @@ enum XPmStatus XPm_ReqSuspend(const enum XPmNodeId target,
u32 payload[PAYLOAD_ARG_CNT];
/* Send request to the PMU */
PACK_PAYLOAD(payload, PM_REQ_SUSPEND, target, ack, latency, state);
PACK_PAYLOAD(payload, PM_REQUEST_SUSPEND, target, ack, latency, state);
ret = pm_ipi_send(primary_master, payload);
if ((PM_RET_SUCCESS == ret) && (REQ_ACK_BLOCKING == ack))
if ((PM_RET_SUCCESS == ret) && (REQUEST_ACK_BLOCKING == ack))
return pm_ipi_buff_read32(primary_master, NULL);
else
return ret;
}
/**
* XPm_ReqWakeUp() - PM call for master to wake up selected master or subsystem
* XPm_RequestWakeUp() - PM call for master to wake up selected master or subsystem
* @node Node id of the master or subsystem
* @ack Flag to specify whether acknowledge requested
*
* @return Returns status, either success or error+reason
*/
enum XPmStatus XPm_ReqWakeUp(const enum XPmNodeId target,
enum XPmStatus XPm_RequestWakeUp(const enum XPmNodeId target,
const enum XPmRequestAck ack)
{
enum XPmStatus ret;
@ -236,10 +236,10 @@ enum XPmStatus XPm_ReqWakeUp(const enum XPmNodeId target,
XPm_ClientWakeup(master);
/* Send request to the PMU */
PACK_PAYLOAD(payload, PM_REQ_WAKEUP, target, ack, 0, 0);
PACK_PAYLOAD(payload, PM_REQUEST_WAKEUP, target, ack, 0, 0);
ret = pm_ipi_send(primary_master, payload);
if ((PM_RET_SUCCESS == ret) && (REQ_ACK_BLOCKING == ack))
if ((PM_RET_SUCCESS == ret) && (REQUEST_ACK_BLOCKING == ack))
return pm_ipi_buff_read32(primary_master, NULL);
else
return ret;
@ -263,7 +263,7 @@ enum XPmStatus XPm_ForcePowerDown(const enum XPmNodeId target,
PACK_PAYLOAD(payload, PM_FORCE_POWERDOWN, target, ack, 0, 0);
ret = pm_ipi_send(primary_master, payload);
if ((PM_RET_SUCCESS == ret) && (REQ_ACK_BLOCKING == ack))
if ((PM_RET_SUCCESS == ret) && (REQUEST_ACK_BLOCKING == ack))
return pm_ipi_buff_read32(primary_master, NULL);
else
return ret;
@ -331,7 +331,7 @@ enum XPmStatus XPm_SystemShutdown(const u8 restart)
/* APIs for managing PM slaves: */
/**
* XPm_ReqNode() - PM call to request a node with specifc capabilities
* XPm_RequestNode() - PM call to request a node with specifc capabilities
* @node Node id of the slave
* @capabilities Requested capabilities of the slave
* @qos Quality of service (not supported)
@ -339,7 +339,7 @@ enum XPmStatus XPm_SystemShutdown(const u8 restart)
*
* @return Returns status, either success or error+reason
*/
enum XPmStatus XPm_ReqNode(const enum XPmNodeId node,
enum XPmStatus XPm_RequestNode(const enum XPmNodeId node,
const u32 capabilities,
const u32 qos,
const enum XPmRequestAck ack)
@ -347,10 +347,10 @@ enum XPmStatus XPm_ReqNode(const enum XPmNodeId node,
enum XPmStatus ret;
u32 payload[PAYLOAD_ARG_CNT];
PACK_PAYLOAD(payload, PM_REQ_NODE, node, capabilities, qos, ack);
PACK_PAYLOAD(payload, PM_REQUEST_NODE, node, capabilities, qos, ack);
ret = pm_ipi_send(primary_master, payload);
if ((PM_RET_SUCCESS == ret) && (REQ_ACK_BLOCKING == ack))
if ((PM_RET_SUCCESS == ret) && (REQUEST_ACK_BLOCKING == ack))
return pm_ipi_buff_read32(primary_master, NULL);
else
return ret;
@ -377,7 +377,7 @@ enum XPmStatus XPm_SetRequirement(const enum XPmNodeId nid,
PACK_PAYLOAD(payload, PM_SET_REQUIREMENT, nid, capabilities, qos, ack);
ret = pm_ipi_send(primary_master, payload);
if ((PM_RET_SUCCESS == ret) && (REQ_ACK_BLOCKING == ack))
if ((PM_RET_SUCCESS == ret) && (REQUEST_ACK_BLOCKING == ack))
return pm_ipi_buff_read32(primary_master, NULL);
else
return ret;

6
lib/sw_services/xilpm/src/common/pm_api_sys.h
View file

@ -38,7 +38,7 @@
enum XPmBootStatus XPm_GetBootStatus();
/* System-level API function declarations */
enum XPmStatus XPm_ReqSuspend(const enum XPmNodeId node,
enum XPmStatus XPm_RequestSuspend(const enum XPmNodeId node,
const enum XPmRequestAck ack,
const u32 latency,
const u8 state);
@ -52,7 +52,7 @@ enum XPmStatus XPm_ForcePowerDown(const enum XPmNodeId node,
enum XPmStatus XPm_AbortSuspend(const enum XPmAbortReason reason);
enum XPmStatus XPm_ReqWakeUp(const enum XPmNodeId node,
enum XPmStatus XPm_RequestWakeUp(const enum XPmNodeId node,
const enum XPmRequestAck ack);
enum XPmStatus XPm_SetWakeUpSource(const enum XPmNodeId target,
@ -62,7 +62,7 @@ enum XPmStatus XPm_SetWakeUpSource(const enum XPmNodeId target,
enum XPmStatus XPm_SystemShutdown(const u8 restart);
/* API functions for managing PM Slaves */
enum XPmStatus XPm_ReqNode(const enum XPmNodeId node,
enum XPmStatus XPm_RequestNode(const enum XPmNodeId node,
const u32 capabilities,
const u32 qos,
const enum XPmRequestAck ack);

14
lib/sw_services/xilpm/src/common/pm_defs.h
View file

@ -53,15 +53,15 @@ enum XPmApiId {
PM_GET_OP_CHARACTERISTIC = 4,
PM_REGISTER_NOTIFIER = 5,
/* API for suspending of PUs: */
PM_REQ_SUSPEND = 6,
PM_REQUEST_SUSPEND = 6,
PM_SELF_SUSPEND = 7,
PM_FORCE_POWERDOWN = 8,
PM_ABORT_SUSPEND = 9,
PM_REQ_WAKEUP = 10,
PM_REQUEST_WAKEUP = 10,
PM_SET_WAKEUP_SOURCE = 11,
PM_SYSTEM_SHUTDOWN = 12,
/* API for managing PM slaves: */
PM_REQ_NODE = 13,
PM_REQUEST_NODE = 13,
PM_RELEASE_NODE = 14,
PM_SET_REQUIREMENT = 15,
PM_SET_MAX_LATENCY = 16,
@ -115,10 +115,10 @@ enum XPmNodeId {
};
enum XPmRequestAck {
REQ_ACK_NO = 1,
REQ_ACK_BLOCKING = 2,
REQ_ACK_CB_STANDARD = 3,
REQ_ACK_CB_ERROR = 4,
REQUEST_ACK_NO = 1,
REQUEST_ACK_BLOCKING = 2,
REQUEST_ACK_CB_STANDARD = 3,
REQUEST_ACK_CB_CERROR = 4,
};
enum XPmAbortReason {

2
lib/sw_services/xilpm/src/common/pm_ipi_buffer.h
View file

@ -52,7 +52,7 @@
#define IPI_BUFFER_TARGET_PL_3_OFFSET 0x180U
#define IPI_BUFFER_TARGET_PMU_OFFSET 0x1C0U
#define IPI_BUFFER_REQ_OFFSET 0x0U
#define IPI_BUFFER_REQUEST_OFFSET 0x0U
#define IPI_BUFFER_RESP_OFFSET 0x20U
#endif