[modify] switch Legacy or ESPI PECI

when Legacy PECI is read 3 times pass will force at
Legacy PECI, but when to read 10 times fail will
switch to ESPI PECI.

Signed-off-by: Leo_Tsai <LeoCX_Tsai@compal.com>

Author: LeoCX-Tsai

board/hx30/board.c

@@ -998,7 +998,7 @@ const struct temp_sensor_t temp_sensors[] = {
 	[TEMP_SENSOR_PECI] = {
 		.name = "PECI",
 		.type = TEMP_SENSOR_TYPE_CPU,
-		.read = peci_temp_sensor_get_val,
+		.read = peci_over_espi_temp_sensor_get_val,
 		.idx = 0,
 	},
 #endif /* CONFIG_PECI */

board/hx30/peci_customization.c

@@ -18,6 +18,8 @@
 #define CPRINTS(format, args...) cprints(CC_THERMAL, format, ## args)
 
 static int peci_temp;
+static int peci_select_count;
+static int peci_select_flags;
 
 /*****************************************************************************/
 /* Internal functions */
@@ -74,18 +76,27 @@ int peci_Wr_Pkg_Config(uint8_t index, uint16_t parameter, uint32_t data, int wle
 	for (clen = 4; clen < wlen - 1; clen++)
 		out[clen] = ((data >> ((clen - 4) * 8)) & 0xFF);
 
-/*	if (board_get_version() >= BOARD_VERSION_7)
-		espi_oob_peci_transaction(&peci);
-	else {
-		 DVT1 is HW PECI pin
-*/
-	rv = peci_transaction(&peci);
+
+	if (peci_select_count < 10 || peci_select_flags) {
+		rv = peci_transaction(&peci);
+
+		if (rv != 0)
+			peci_select_count++;
+		else if (!peci_select_flags) {
+			CPRINTS("FORCE GPIO PECI!");
+			peci_select_count = 0;
+			peci_select_flags = 1;
+		}
+	} else {
+		rv = espi_oob_peci_transaction(&peci);
+	}
+
 	if (rv)
 		return rv;
-	/*}*/
+
 	return EC_SUCCESS;
 }
-/*
+
 static int peci_over_espi_get_cpu_temp(int *cpu_temp)
 {
 	int rv;
@@ -101,32 +112,43 @@ static int peci_over_espi_get_cpu_temp(int *cpu_temp)
 		.timeout_us = PECI_GET_TEMP_TIMEOUT_US,
 	};
 
-	rv = espi_oob_peci_transaction(&peci);
+	if (peci_select_count < 10 || peci_select_flags) {
+		rv = peci_transaction(&peci);
+
+		if (rv != 0)
+			peci_select_count++;
+		else if (!peci_select_flags && peci_select_count > 3) {
+			CPRINTS("FORCE GPIO PECI!");
+			peci_select_count = 0;
+			peci_select_flags = 1;
+		}
+	} else {
+		rv = espi_oob_peci_transaction(&peci);
 
-	if (rv == EC_ERROR_TIMEOUT) {
-		CPRINTS("ESPI GET VALUE TIMEOUT!");
-		espi_oob_retry_receive_date(r_buf);
+		if (rv == EC_ERROR_TIMEOUT) {
+			CPRINTS("ESPI GET VALUE TIMEOUT!");
+			espi_oob_retry_receive_date(r_buf);
+		}
 	}
 
 	if (rv)
 		return rv;
 
-
-	 Get relative raw data of temperature.
+	/* Get relative raw data of temperature. */
 	*cpu_temp = (r_buf[1] << 8) | r_buf[0];
 
-	 Convert relative raw data to degrees C.
+	/* Convert relative raw data to degrees C. */
 	*cpu_temp = ((*cpu_temp ^ 0xFFFF) + 1) >> 6;
 
 	if (*cpu_temp >= CONFIG_PECI_TJMAX)
 		return EC_ERROR_INVAL;
 
-	 temperature in K
+	/* temperature in K */
 	*cpu_temp = CONFIG_PECI_TJMAX - *cpu_temp + 273;
 
 	return EC_SUCCESS;
 }
-*/
+
 int check_system_power(void)
 {
 	uint8_t host_power_state = *host_get_customer_memmap(EC_EMEMAP_ER1_POWER_STATE);
@@ -265,7 +287,7 @@ int peci_over_espi_temp_sensor_get_val(int idx, int *temp_ptr)
 	return EC_SUCCESS;
 }
 
-/*
+
 void read_peci_over_espi_gettemp(void)
 {
 	int rv;
@@ -288,4 +310,3 @@ void read_peci_over_espi_gettemp(void)
 	}
 }
 DECLARE_HOOK(HOOK_SECOND, read_peci_over_espi_gettemp, HOOK_PRIO_DEFAULT);
-*/

chip/mchp/peci.c

@@ -346,6 +346,7 @@ DECLARE_HOOK(HOOK_INIT, peci_init, HOOK_PRIO_DEFAULT);
 int peci_transaction(struct peci_data *peci)
 {
 	struct peci_params_t peci_params;
+	uint8_t rv;
 	int index;
 	int dlen;
 	uint8_t aw_FCS_calc;
@@ -381,11 +382,11 @@ int peci_transaction(struct peci_data *peci)
 		peci_params.cmd_fifo[peci_params.cmd_length - 1] = aw_FCS_calc;
 	}
 
-	peci_trans(&peci_params);
+	rv = peci_trans(&peci_params);
 
 	/* TODO: check error message, if no error, pass the data fifo to *in*/
 	for (dlen = 0; dlen < peci_params.read_length; dlen++)
 		peci->r_buf[dlen] = peci_params.data_fifo[dlen];
 
-	return PECI_STATUS_NO_ERR;
+	return rv;
 }