Merge pull request #533 from FrameworkComputer/fwk.support_touchpad_hybrid_mode

Support hybrid mode report data packet and add the set power function

Author: kiram9

baseboard/fwk/ps2mouse.c

@@ -294,9 +294,18 @@ void set_ps2_mouse_emulation(bool disable)
 }
 void set_power(bool standby)
 {
-	int data = BIT(11) + standby ? 1 : 0;
+	uint16_t data = BIT(11) | (standby ? 0x01 : 0x0);
 
-	i2c_write_offset16(I2C_PORT_TOUCHPAD, TOUCHPAD_I2C_HID_EP | I2C_FLAG_ADDR16_LITTLE_ENDIAN, PCT3854_COMMAND, data, 1);
+	i2c_write_offset16(I2C_PORT_TOUCHPAD,
+		TOUCHPAD_I2C_HID_EP | I2C_FLAG_ADDR16_LITTLE_ENDIAN, PCT3854_COMMAND, data, 2);
+}
+
+void set_reset(void)
+{
+	uint16_t data = BIT(8);
+
+	i2c_write_offset16(I2C_PORT_TOUCHPAD,
+		TOUCHPAD_I2C_HID_EP | I2C_FLAG_ADDR16_LITTLE_ENDIAN, PCT3854_COMMAND, data, 2);
 }
 
 void setup_touchpad(void)
@@ -329,6 +338,7 @@ void read_touchpad_in_report(void)
 	int need_reset = 0;
 	uint8_t data[128];
 	int xfer_len = 0;
+	int report_mode = PS2MOUSE_REPORT_UNKNOWN;
 	int16_t x, y;
 	uint8_t response_byte = 0x08;
 
@@ -359,7 +369,11 @@ void read_touchpad_in_report(void)
 		CPRINTS("PS2M Touchpad need to reset");
 		xfer_len = 6;
 		need_reset = 1;
-	}
+	} else if (xfer_len == 7)
+		report_mode = PS2MOUSE_REPORT_HYBRID;
+	else if (xfer_len == 8)
+		report_mode = PS2MOUSE_REPORT_PARALLEL;
+
 	xfer_len = MIN(126, xfer_len-2);
 	rv = i2c_xfer_unlocked(I2C_PORT_TOUCHPAD,
 							TOUCHPAD_I2C_HID_EP | I2C_FLAG_ADDR16_LITTLE_ENDIAN,
@@ -403,8 +417,20 @@ void read_touchpad_in_report(void)
 	if (rv == EC_SUCCESS && data[2] == 0x02) {
 		/*0x0800 02 04 feff 0000
 		 *0x0800 02 04 fdff ffff */
-		x = (int16_t)(data[4] + (data[5] << 8));
-		y = -(int16_t)(data[6] + (data[7] << 8));
+		if (report_mode == PS2MOUSE_REPORT_HYBRID) {
+
+			if (data[4] & 0x80)
+				x = (int16_t)(data[4] + (0xff << 8));
+			else
+				x = (int16_t)data[4];
+			if (data[5] & 0x80)
+				y = -(int16_t)(data[5] + (0xff << 8));
+			else
+				y = -(int16_t)data[5];
+		} else {
+			x = (int16_t)(data[4] + (data[5] << 8));
+			y = -(int16_t)(data[6] + (data[7] << 8));
+		}
 		x = MIN(255, MAX(x, -255));
 		y = MIN(255, MAX(y, -255));
 		/*button data*/
@@ -491,6 +517,8 @@ void mouse_interrupt_handler_task(void *p)
 					CPRINTS("PS2M Configuring for ps2 emulation mode");
 					/*tp takes about 80 ms to come up, wait a bit*/
 					usleep(200*MSEC);
+					set_power(false);
+					set_reset();
 					setup_touchpad();
 
 					gpio_enable_interrupt(GPIO_SOC_TP_INT_L);
@@ -501,12 +529,15 @@ void mouse_interrupt_handler_task(void *p)
 				}
 				if (power_state == POWER_S0S3 || power_state == POWER_S5) {
 					/* Power Down */
+					set_power(true);
 					gpio_disable_interrupt(GPIO_SOC_TP_INT_L);
 					gpio_disable_interrupt(GPIO_EC_I2C_3_SDA);
 				}
 			}
 			if (evt & PS2MOUSE_EVT_REENABLE) {
 				CPRINTS("PS2M renabling");
+				set_power(false);
+				set_reset();
 				setup_touchpad();
 				gpio_enable_interrupt(GPIO_SOC_TP_INT_L);
 				gpio_enable_interrupt(GPIO_EC_I2C_3_SDA);

baseboard/fwk/ps2mouse.h

@@ -54,6 +54,12 @@ enum ps2_mouse_task_evt {
 
 };
 
+enum ps2_mouse_report_mode {
+	PS2MOUSE_REPORT_UNKNOWN,
+	PS2MOUSE_REPORT_PARALLEL,
+	PS2MOUSE_REPORT_HYBRID,
+};
+
 #define LEFT_BTN BIT(0)
 #define RIGHT_BTN BIT(1)
 #define MIDDLE_BTN BIT(2)