zephyr test: Check PD power info

In test_attach_pd_charger, check the charging current and voltage using
EC_CMD_USB_PD_POWER_INFO.

BUG=b:209907297
TEST=zmake configure --test zephyr/test/drivers
BRANCH=none

Change-Id: I4d66946aa3b4c61df487a3cc859ee29b91190b7d
Signed-off-by: Abe Levkoy <alevkoy@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3379470
Reviewed-by: Keith Short <keithshort@chromium.org>
Commit-Queue: Keith Short <keithshort@chromium.org>

1 files changed, 52 insertions, 28 deletions

diff --git a/zephyr/test/drivers/src/integration_usb.c b/zephyr/test/drivers/src/integration_usb.c
index 4205d3fd3e..6274ebef8b 100644
--- a/zephyr/test/drivers/src/integration_usb.c
+++ b/zephyr/test/drivers/src/integration_usb.c
@@ -68,6 +68,49 @@ static void integration_usb_after(void *state)
 	k_sleep(K_SECONDS(1));
 }
 
+/* Check the results of EC_CMD_USB_PD_POWER_INFO against expected charger
+ * properties.
+ */
+static void check_usb_pd_power_info(int port, enum usb_power_roles role,
+		enum usb_chg_type charger_type, int charge_voltage_mv,
+		int charge_current_ma)
+{
+	struct ec_params_usb_pd_power_info power_info_params = {.port = port};
+	struct ec_response_usb_pd_power_info power_info_response;
+	struct host_cmd_handler_args power_info_args =  BUILD_HOST_COMMAND(
+			EC_CMD_USB_PD_POWER_INFO, 0, power_info_response,
+			power_info_params);
+	struct usb_chg_measures *meas = &power_info_response.meas;
+
+	zassert_ok(host_command_process(&power_info_args),
+			"Failed to get PD power info");
+	zassert_equal(power_info_response.role, role,
+			"Power role %d, but PD reports role %d",
+			role, power_info_response.role);
+	zassert_equal(power_info_response.type, charger_type,
+			"Charger type %d, but PD reports type %d",
+			charger_type, power_info_response.type);
+	/* The measurements in this response are denoted in mV, mA, and mW. */
+	zassert_equal(meas->voltage_max, charge_voltage_mv,
+			"Charging at VBUS %dmV, but PD reports %dmV",
+			charge_voltage_mv, meas->voltage_max);
+	zassert_within(meas->voltage_now, charge_voltage_mv,
+			charge_voltage_mv / 10,
+			"Actually charging at VBUS %dmV, but PD reports %dmV",
+			charge_voltage_mv, meas->voltage_now);
+	zassert_equal(meas->current_max, charge_current_ma,
+			"Charging at VBUS max %dmA, but PD reports %dmA",
+			charge_current_ma, meas->current_max);
+	zassert_true(meas->current_lim >= charge_current_ma,
+			"Charging at VBUS max %dmA, but PD current limit %dmA",
+			charge_current_ma, meas->current_lim);
+	zassert_equal(power_info_response.max_power,
+			charge_voltage_mv * charge_current_ma,
+			"Charging up to %duW, PD max power %duW",
+			charge_voltage_mv * charge_current_ma,
+			power_info_response.max_power);
+}
+
 ZTEST(integration_usb, test_attach_compliant_charger)
 {
 	const struct emul *tcpci_emul =
@@ -130,11 +173,6 @@ ZTEST(integration_usb, test_attach_pd_charger)
 	struct host_cmd_handler_args typec_args =  BUILD_HOST_COMMAND(
 			EC_CMD_TYPEC_STATUS, 0, typec_response, typec_params);
 
-	/*
-	 * TODO(b/209907297): Implement the steps of the test beyond USB default
-	 * charging.
-	 */
-
 	/* Attach emulated charger. Send Source Capabilities that offer 20V. Set
 	 * the charger input voltage to ~18V (the highest voltage it supports).
 	 */
@@ -146,7 +184,12 @@ ZTEST(integration_usb, test_attach_pd_charger)
 						   &my_charger.common_data,
 						   &my_charger.ops, tcpci_emul),
 		   NULL);
-	isl923x_emul_set_adc_vbus(charger_emul, 0x3f);
+	/* This corresponds to 20.352V according to the scheme used by
+	 * isl923x_get_vbus_voltage, which is slightly different than that
+	 * described in the ISL9238 datasheet.
+	 * TODO(b/216497851): Specify this in natural units.
+	 */
+	isl923x_emul_set_adc_vbus(charger_emul, 0x3500);
 
 	/* Wait for PD negotiation and current ramp.
 	 * TODO(b/213906889): Check message timing and contents.
@@ -167,10 +210,7 @@ ZTEST(integration_usb, test_attach_pd_charger)
 	 * the PD charging and current, but they should be positive if the
 	 * battery is charging.
 	 */
-	/*
-	 * TODO(b/213908743): Also check the corresponding PD state and
-	 * encapsulate this for use in other tests.
-	 */
+	/* TODO(b/213908743): Encapsulate this for use in other tests. */
 	charge_params.chgnum = 0;
 	charge_params.cmd = CHARGE_STATE_CMD_GET_STATE;
 	zassert_ok(host_command_process(&args), "Failed to get charge state");
@@ -198,24 +238,8 @@ ZTEST(integration_usb, test_attach_pd_charger)
 			"Charger attached, but TCPM power role is %d",
 			typec_response.power_role);
 
-	/*
-	 * 3. Wait for SenderResponseTimeout. Expect TCPM to send Request.
-	 * We could verify that the Request references the expected PDO, but
-	 * the voltage/current/PDO checks at the end of the test should all be
-	 * wrong if the requested PDO was wrong here.
-	 */
-
-	/*
-	 * 4. Send Accept and PS_RDY from partner with appropriate delay between
-	 * them. Emulate supplying VBUS at the requested voltage/current before
-	 * PS_RDY.
-	 */
-
-	/*
-	 * 5. Check the charging voltage and current. Cross-check the PD state,
-	 * the battery/charger state, and the active PDO as reported by the PD
-	 * state.
-	 */
+	check_usb_pd_power_info(0, USB_PD_PORT_POWER_SINK, USB_CHG_TYPE_PD,
+			20000, 3000);
 }
 
 ZTEST(integration_usb, test_attach_sink)