Merge branch 'update-2.1.1.1'

1 files changed, 33 insertions, 12 deletions

diff --git a/hw/occ.c b/hw/occ.c
index 74c9deb..5b3c3a6 100644
--- a/hw/occ.c
+++ b/hw/occ.c
@@ -127,8 +127,7 @@ static bool add_cpu_pstate_properties(s8 *pstate_nom)
 	struct dt_node *power_mgt;
 	u8 nr_pstates;
 	/* Arrays for device tree */
-	u32 dt_id[MAX_PSTATES];
-	u32 dt_freq[MAX_PSTATES];
+	u32 *dt_id, *dt_freq;
 	int i;
 
 	prlog(PR_DEBUG, "OCC: CPU pstate state device tree init\n");
@@ -163,18 +162,32 @@ static bool add_cpu_pstate_properties(s8 *pstate_nom)
 		return false;
 	}
 
-	/* Setup arrays for device-tree */
-	for( i=0; i < nr_pstates; i++) {
-		dt_id[i] = occ_data->pstates[i].id;
-		dt_freq[i] = occ_data->pstates[i].freq_khz/1000;
-	}
-
 	power_mgt = dt_find_by_path(dt_root, "/ibm,opal/power-mgt");
 	if (!power_mgt) {
 		prerror("OCC: dt node /ibm,opal/power-mgt not found\n");
 		return false;
 	}
 
+	/* Setup arrays for device-tree */
+	/* Allocate memory */
+	dt_id = (u32 *) malloc(MAX_PSTATES * sizeof(u32));
+	if (!dt_id) {
+		printf("OCC: dt_id array alloc failure\n");
+		return false;
+	}
+
+	dt_freq = (u32 *) malloc(MAX_PSTATES * sizeof(u32));
+	if (!dt_freq) {
+		printf("OCC: dt_freq array alloc failure\n");
+		free(dt_id);
+		return false;
+	}
+
+	for( i=0; i < nr_pstates; i++) {
+		dt_id[i] = occ_data->pstates[i].id;
+		dt_freq[i] = occ_data->pstates[i].freq_khz/1000;
+	}
+
 	/* Add the device-tree entries */
 	dt_add_property(power_mgt, "ibm,pstate-ids", dt_id, nr_pstates * 4);
 	dt_add_property(power_mgt, "ibm,pstate-frequencies-mhz", dt_freq, nr_pstates * 4);
@@ -184,6 +197,9 @@ static bool add_cpu_pstate_properties(s8 *pstate_nom)
 
 	/* Return pstate to set for each core */
 	*pstate_nom = occ_data->pstate_nom;
+	/* Free memory */
+	free(dt_id);
+	free(dt_freq);
 	return true;
 }
 
@@ -321,7 +337,7 @@ static void occ_do_load(u8 scope, u32 dbob_id __unused, u32 seq_id)
 	}
 
 	/* First queue up an OK response to the load message itself */
-	rsp = fsp_mkmsg(FSP_RSP_LOAD_OCC, 0 | err);
+	rsp = fsp_mkmsg(FSP_RSP_LOAD_OCC | err, 0);
 	if (rsp)
 		rc = fsp_queue_msg(rsp, fsp_freemsg);
 	if (rc) {
@@ -383,7 +399,7 @@ static void occ_do_reset(u8 scope, u32 dbob_id, u32 seq_id)
 	}
 
 	/* First queue up an OK response to the reset message itself */
-	rsp = fsp_mkmsg(FSP_RSP_RESET_OCC, 0 | err);
+	rsp = fsp_mkmsg(FSP_RSP_RESET_OCC | err, 0);
 	if (rsp)
 		rc = fsp_queue_msg(rsp, fsp_freemsg);
 	if (rc) {
@@ -396,8 +412,13 @@ static void occ_do_reset(u8 scope, u32 dbob_id, u32 seq_id)
 	if (err)
 		return;
 
-	/* Call HBRT... */
-	rc = host_services_occ_start();
+	/*
+	 * Call HBRT to stop OCC and leave it stopped.  FSP will send load/start
+	 * request subsequently.  Also after few runtime restarts (currently 3),
+	 * FSP will request OCC to left in stopped state.
+	 */
+
+	rc = host_services_occ_stop();
 
 	/* Handle fallback to preload */
 	if (rc == -ENOENT && chip->homer_base) {