[WIP] ec/system76/ec: Implement USB-C DP HPD

Change-Id: I0487b761a5a83b0a1897c92416d0d81219303341
Signed-off-by: Tim Crawford <[email protected]>

Author: crawfxrd

src/ec/system76/ec/usbc_mux.c

@@ -4,6 +4,8 @@
 #include <console/console.h>
 #include <delay.h>
 #include <device/usbc_mux.h>
+#include <intelblocks/tcss.h>
+#include <timer.h>
 #include <types.h>
 
 #define CMD_USBC_MUX_INFO 23
@@ -46,7 +48,30 @@ static int system76_ec_get_mux_info(int port, struct usbc_mux_info *info)
 	info->hpd_irq = !!(flags & USBC_MUX_HPD_IRQ);
 	info->ufp = !!(flags & USBC_MUX_UFP);
 	info->dbg_acc = !!(flags & USBC_MUX_DBG_ACC);
-	info->dp_pin_mode = pin_mode;
+
+	switch (pin_mode) {
+	case 1:
+		info->dp_pin_mode = MODE_DP_PIN_A;
+		break;
+	case 2:
+		info->dp_pin_mode = MODE_DP_PIN_B;
+		break;
+	case 3:
+		info->dp_pin_mode = MODE_DP_PIN_C;
+		break;
+	case 4:
+		info->dp_pin_mode = MODE_DP_PIN_D;
+		break;
+	case 5:
+		info->dp_pin_mode = MODE_DP_PIN_E;
+		break;
+	case 6:
+		info->dp_pin_mode = MODE_DP_PIN_F;
+		break;
+	default:
+		info->dp_pin_mode = 0;
+		break;
+	}
 
 	printk(BIOS_SPEW, "%s: dp=%u, usb=%u\n", __func__, info->dp, info->usb);
 	printk(BIOS_SPEW, "%s: cable=%u, polarity=%u\n", __func__, info->cable, info->polarity);
@@ -60,25 +85,57 @@ static int system76_ec_get_mux_info(int port, struct usbc_mux_info *info)
 static int system76_ec_wait_for_connection(long timeout_ms)
 {
 	// TODO
-	return 0;
+	return 1;
 }
 
 static int system76_ec_enter_dp_mode(int port)
 {
 	// TODO
-	return -1;
+	return 0;
 }
 
 static int system76_ec_wait_for_dp_mode_entry(int port, long timeout_ms)
 {
-	// TODO
-	return -1;
+	struct usbc_mux_info info;
+
+	if (system76_ec_get_mux_info(port, &info) < 0) {
+		printk(BIOS_WARNING, "%s: could not get usbc mux info\n", __func__);
+		return -1;
+	}
+
+	if (!info.dp) {
+		printk(BIOS_WARNING, "DP mode not ready\n");
+		return -1;
+	}
+
+	return 0;
 }
 
 static int system76_ec_wait_for_hpd(int port, long timeout_ms)
 {
-	// TODO
-	return -1;
+	struct usbc_mux_info info;
+	struct stopwatch sw;
+
+	stopwatch_init_msecs_expire(&sw, timeout_ms);
+	while (1) {
+		if (system76_ec_get_mux_info(port, &info) < 0) {
+			printk(BIOS_WARNING, "%s: could not get usbc mux info\n", __func__);
+			return -1;
+		}
+
+		if (info.hpd_lvl)
+			break;
+
+		if (stopwatch_expired(&sw)) {
+			printk(BIOS_WARNING, "HPD not ready after %ldms\n", timeout_ms);
+			return -1;
+		}
+
+		mdelay(100);
+	}
+
+	printk(BIOS_INFO, "HPD ready after %lldms\n", stopwatch_duration_msecs(&sw));
+	return 0;
 }
 
 static const struct usbc_ops system76_ec_usbc_ops = {