PMUFW: PM: slave: Changed code related to updating state to fix USB bug

-Changed code in PmUpdateSlave to first determine the state to be
 entered
-Added function for finding the state with required capabilities
-Removed function which was finding and changing state of a slave
 (not used anymore)
-Major reason for changing this code is the bug: in USB case,
 when USB is already in right state and upon the set requirement
 request which should be resolved to the same state (nothing to
 configure, state is already configured as requested) PM
 acknowledged an error, although there was no error

Signed-off-by: Mirela Simonovic <mirela.simonovic@aggios.com>
Acked-by: Sören Brinkmann <soren.brinkmann@xilinx.com>

lib/sw_apps/zynqmp_pmufw/src/pm_slave.c

@@ -215,41 +215,74 @@ static int PmSlaveChangeState(PmSlave* const slave, const PmStateId state)
 	return status;
 }
 
+/**
+ * PmGetStateWithCaps() - Get id of the state with provided capabilities
+ * @slave       Slave whose states are searched
+ * @caps        Capabilities the state must have
+ * @state       Pointer to a PmStateId variable where the result is put if
+ *              state is found
+ *
+ * @return      Status of the operation
+ *              - XST_SUCCESS if state is found
+ *              - XST_NO_FEATURE if state with required capabilities does not
+ *                exist
+ *
+ * This function is to be called when state of a slave should be updated,
+ * to find the slave's state with required capabilities.
+ * Argument caps has included capabilities requested by all masters which
+ * currently use the slave. Although these separate capabilities are validated
+ * at the moment request is made, it could happen that there is no state that
+ * has capabilities requested by all masters. This conflict has to be resolved
+ * between the masters, so PM returns an error.
+ */
+static int PmGetStateWithCaps(const PmSlave* const slave, const u32 caps,
+				  PmStateId* const state)
+{
+	PmStateId i;
+	int status = XST_PM_CONFLICT;
+
+	for (i = 0; i < slave->slvFsm->statesCnt; i++) {
+		/* Find the first state that contains all capabilities */
+		if ((caps & slave->slvFsm->states[i]) == caps) {
+			status = XST_SUCCESS;
+			if (NULL != state) {
+				*state = i;
+			}
+			break;
+		}
+	}
+
+	return status;
+}
+
 /**
  * PmUpdateSlave() - Update the slave's state according to the current
  *                   requirements from all masters
  * @slave       Slave whose state is about to be updated
  *
- * @return      Status of operation
+ * @return      Status of operation of updating slave's state.
  */
 int PmUpdateSlave(PmSlave* const slave)
 {
-	PmStateId s;
-	const PmSlaveFsm* fsm = slave->slvFsm;
-	int status = XST_FAILURE;
+	PmStateId state;
+	int status = XST_SUCCESS;
 	u32 capsToSet = PmGetMaxCapabilities(slave);
 
-	if (0U != capsToSet) {
-		for (s = 0U; s < fsm->statesCnt; s++) {
-			/* Find first state with all required capabilities */
-			if ((capsToSet & fsm->states[s]) == capsToSet) {
-				if (s == slave->node.currState) {
-					/* Slave is already in right state */
-					status = XST_SUCCESS;
-				} else {
-					status = PmSlaveChangeState(slave, s);
-				}
-				break;
-			}
-		}
-	} else {
+	if (0U == capsToSet) {
 		/*
-		 * Set the lowest power state, no capabilities are required. This
-		 * check has to exist because some slaves have no state with 0
-		 * capabilities. Therefore, they are always placed in first,
-		 * lowest power state when their capabilities are not required.
+		 * Set the lowest power state as no capabilities are required.
+		 * This check has to exist because some slaves have no state
+		 * with 0 capabilities. Therefore, they are always placed in
+		 * first, lowest power state when their caps are not required.
 		 */
-		status = PmSlaveChangeState(slave, 0U);
+		state = 0U;
+	} else {
+		/* Get state that has all required capabilities */
+		status = PmGetStateWithCaps(slave, capsToSet, &state);
+	}
+
+	if ((XST_SUCCESS == status) && (state != slave->node.currState)) {
+		status = PmSlaveChangeState(slave, state);
 	}
 
 	return status;

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-30-g61a804cc37eb"
+ #define ZYNQMP_XPFW_VERSION	"2015.1-swbeta2-31-g8df039867de7"
  #endif