Merge pull request #471 from FrameworkComputer/hx30.fix_ps2_mouse_hang

hx30 fix ps2 mouse emulation not work in winpe

Author: kiram9

board/hx30/ps2mouse.c

@@ -46,7 +46,7 @@ void send_data_byte(uint8_t data) {
 	int timeout = 0;
 
 		/* sometimes the host will get behind */
-	while (aux_buffer_available() < 1 && timeout++ < 25)
+	while (aux_buffer_available() < 1 && timeout++ < AUX_BUFFER_FULL_RETRIES)
 		usleep(10*MSEC);
 	send_aux_data_to_host_interrupt(data);
 }
@@ -56,14 +56,16 @@ void send_movement_packet(void)
 	int max = 3;
 	int timeout = 0;
 
-
 	if (five_button_mode)
 		max = 4;
 	/* sometimes the host will get behind */
-	while (aux_buffer_available() < max && timeout++ < 25)
+	while (aux_buffer_available() < max && timeout++ < AUX_BUFFER_FULL_RETRIES &&
+			(*task_get_event_bitmap(emumouse_task_id) & PS2MOUSE_EVT_AUX_DATA) == 0) {
 		usleep(10*MSEC);
+	}
 
-	if (timeout == 25) {
+	if (timeout == AUX_BUFFER_FULL_RETRIES ||
+		(*task_get_event_bitmap(emumouse_task_id) & PS2MOUSE_EVT_AUX_DATA)) {
 		CPRINTS("PS2M Dropping");
 		/*drop mouse packet - host is too far behind */
 		return;
@@ -328,15 +330,28 @@ void read_touchpad_in_report(void)
 	int xfer_len = 0;
 	int16_t x, y;
 	uint8_t response_byte = 0x08;
+
+	/* Make sure report id is set to an invalid value */
+	data[2] = 0;
+
+	if (power_get_state() == POWER_S5)
+		return;
+
 	/*dont trigger disable state during our own transactions*/
 	gpio_disable_interrupt(GPIO_EC_I2C_3_SDA);
+	i2c_set_timeout(I2C_PORT_TOUCHPAD, 25*MSEC);
 	i2c_lock(I2C_PORT_TOUCHPAD, 1);
 	rv = i2c_xfer_unlocked(I2C_PORT_TOUCHPAD,
 							TOUCHPAD_I2C_HID_EP | I2C_FLAG_ADDR16_LITTLE_ENDIAN,
 							NULL, 0, data, 2, I2C_XFER_START);
 	if (rv != EC_SUCCESS)
 		goto read_failed;
 	xfer_len = (data[1]<<8) + data[0];
+	if (xfer_len == 0) {
+		/* touchpad has reset per i2c-hid-protocol 7.3 */
+		CPRINTS("PS2M Touchpad Reset");
+		goto read_failed;
+	}
 	xfer_len = MIN(126, xfer_len-2);
 	rv = i2c_xfer_unlocked(I2C_PORT_TOUCHPAD,
 							TOUCHPAD_I2C_HID_EP | I2C_FLAG_ADDR16_LITTLE_ENDIAN,
@@ -353,7 +368,13 @@ void read_touchpad_in_report(void)
 			/* try again some other time later if the TP keeps interrupting us */
 			detected_host_packet = true;
 			inreport_retries = 0;
-			CPRINTS("PS2M Too many retries");
+			usleep(10*MSEC);
+			/*The EC SMB controller sometimes gets in a bad state, so try to recover */
+			MCHP_I2C_CTRL(MCHP_I2C_CTRL4) = BIT(7) |
+				BIT(6) |
+				BIT(3) |
+				BIT(0);
+			CPRINTS("PS2M  %d Too many retries", rv);
 		} else {
 			hook_call_deferred(&retry_tp_read_evt_deferred_data, 25*MSEC);
 		}
@@ -400,6 +421,7 @@ void read_touchpad_in_report(void)
 			setup_touchpad();
 		}
 	}
+
 }
 /*
  * Looking at timing it takes the SOC about 2ms to grab a tp packet from start of
@@ -410,6 +432,7 @@ void mouse_interrupt_handler_task(void *p)
 {
 	int power_state = 0;
 	int evt;
+	int i;
 
 	emumouse_task_id = task_get_current();
 	while (1) {
@@ -431,19 +454,20 @@ void mouse_interrupt_handler_task(void *p)
 		if (ec_mode_disabled == false) {
 			if (evt & PS2MOUSE_EVT_AUX_DATA) {
 				process_request(aux_data);
-			}
-
-			if  (evt & PS2MOUSE_EVT_INTERRUPT) {
-				usleep(4*MSEC);
+			} else if  (evt & PS2MOUSE_EVT_INTERRUPT) {
 				/* at the expensive of a slight additional latency
 				 * check to see if the soc has grabbed this out from under us
 				 */
-				if (gpio_get_level(GPIO_SOC_TP_INT_L) == 1) {
-					CPRINTS("PS2M Detected host packet during interrupt handling");
-					detected_host_packet = true;
-				} else {
-					read_touchpad_in_report();
+				for (i = 0; i < 4; i++) {
+					usleep(MSEC);
+					if (gpio_get_level(GPIO_SOC_TP_INT_L) == 1) {
+						CPRINTS("PS2M Detected host pkt during int");
+						detected_host_packet = true;
+						break;
+					}
 				}
+				if (detected_host_packet != true)
+					read_touchpad_in_report();
 			}
 
 			if  (evt & PS2MOUSE_EVT_I2C_INTERRUPT) {
@@ -468,7 +492,7 @@ void mouse_interrupt_handler_task(void *p)
 				if ((power_state == POWER_S3S0) && gpio_get_level(GPIO_SOC_TP_INT_L) == 0) {
 					read_touchpad_in_report();
 				}
-				if (power_state == POWER_S0S3) {
+				if (power_state == POWER_S0S3 || power_state == POWER_S5) {
 					/* Power Down */
 					gpio_disable_interrupt(GPIO_SOC_TP_INT_L);
 					gpio_disable_interrupt(GPIO_EC_I2C_3_SDA);

board/hx30/ps2mouse.h

@@ -70,6 +70,8 @@ enum ps2_mouse_task_evt {
 
 #define TOUCHPAD_I2C_RETRY_COUNT_TO_RENABLE 6
 
+#define AUX_BUFFER_FULL_RETRIES 25
+
 enum pixart_pct3854_regs {
 	PCT3854_DESCRIPTOR	= 0x0020,
 	PCT3854_REPORT_DESC	= 0x0021,