diff options
author | Tom Hughes <tomhughes@chromium.org> | 2022-09-21 14:10:01 -0700 |
---|---|---|
committer | Tom Hughes <tomhughes@chromium.org> | 2022-09-22 12:49:33 -0700 |
commit | 2bcf863b492fe7ed8105c853814dba6ed32ba719 (patch) | |
tree | fcf6ce5810f9ff9e3c8cce434812dd75492269ed /zephyr/test/drivers/default/src/integration/usbc/usb_20v_3a_pd_charger.c | |
parent | e5fb0b9ba488614b5684e640530f00821ab7b943 (diff) | |
parent | 28712dae9d7ed1e694f7622cc083afa71090d4d5 (diff) | |
download | chrome-ec-2bcf863b492fe7ed8105c853814dba6ed32ba719.tar.gz |
Merge remote-tracking branch cros/main into firmware-fpmcu-bloonchipper-releasefirmware-fpmcu-bloonchipper-release
Generated by: ./util/update_release_branch.py --board bloonchipper
--relevant_paths_file ./util/fingerprint-relevant-paths.txt firmware-
fpmcu-bloonchipper-release
Relevant changes:
git log --oneline e5fb0b9ba4..28712dae9d -- board/hatch_fp
board/bloonchipper common/fpsensor docs/fingerprint driver/fingerprint
util/getversion.sh
ded9307b79 util/getversion.sh: Fix version when not in a git repo
956055e692 board: change Google USB vendor info
71b2ef709d Update license boilerplate text in source code files
33e11afda0 Revert "fpsensor: Build fpsensor source file with C++"
c8d0360723 fpsensor: Build fpsensor source file with C++
bc113abd53 fpsensor: Fix g++ compiler error
150a58a0dc fpsensor: Fix fp_set_sensor_mode return type
b33b5ce85b fpsensor: Remove nested designators for C++ compatibility
2e864b2539 tree-wide: const-ify argv for console commands
56d8b360f9 test: Add test for get ikm failure when seed not set
3a3d6c3690 test: Add test for fpsensor trivial key failure
233e6bbd08 fpsensor_crypto: Abstract calls to hmac_SHA256
0a041b285b docs/fingerprint: Typo correction
c03fab67e2 docs/fingerprint: Fix the path of fputils.py
0b5d4baf5a util/getversion.sh: Fix empty file list handling
6e128fe760 FPMCU dev board environment with Satlab
3eb29b6aa5 builtin: Move ssize_t to sys/types.h
345d62ebd1 docs/fingerprint: Update power numbers for latest dartmonkey release
c25ffdb316 common: Conditionally support printf %l and %i modifiers
9a3c514b45 test: Add a test to check if the debugger is connected
54e603413f Move standard library tests to their own file
43fa6b4bf8 docs/fingerprint: Update power numbers for latest bloonchipper release
25536f9a84 driver/fingerprint/fpc/bep/fpc_sensor_spi.c: Format with clang-format
4face99efd driver/fingerprint/fpc/libfp/fpc_sensor_pal.h: Format with clang-format
738de2b575 trng: Rename rand to trng_rand
14b8270edd docs/fingerprint: Update dragonclaw power numbers
0b268f93d1 driver/fingerprint/fpc/libfp/fpc_private.c: Format with clang-format
f80da163f2 driver/fingerprint/fpc/libfp/fpc_private.h: Format with clang-format
5e9c85c9b1 driver/fingerprint/fpc/libfp/fpc_sensor_pal.c: Format with clang-format
c1f9dd3cf8 driver/fingerprint/fpc/libfp/fpc_bio_algorithm.h: Format with clang-format
eb1e1bed8d driver/fingerprint/fpc/libfp/fpc1145_private.h: Format with clang-format
6e7b611821 driver/fingerprint/fpc/bep/fpc_bio_algorithm.h: Format with clang-format
e0589cd5e2 driver/fingerprint/fpc/bep/fpc1035_private.h: Format with clang-format
7905e556a0 common/fpsensor/fpsensor_crypto.c: Format with clang-format
21289d170c driver/fingerprint/fpc/bep/fpc1025_private.h: Format with clang-format
98a20f937e common/fpsensor/fpsensor_state.c: Format with clang-format
a2d255d8af common/fpsensor/fpsensor.c: Format with clang-format
73055eeb3f driver/fingerprint/fpc/bep/fpc_private.c: Format with clang-format
0f7b5cb509 common/fpsensor/fpsensor_private.h: Format with clang-format
1ceade6e65 driver/fingerprint/fpc/bep/fpc_private.h: Format with clang-format
dc3e9008b8 board/hatch_fp/board.h: Format with clang-format
dca9d74321 Revert "trng: Rename rand to trng_rand"
a6b0b3554f trng: Rename rand to trng_rand
28d0b75b70 third_party/boringssl: Remove unused header
BRANCH=None
BUG=b:246424843 b:234181908 b:244781166 b:234181908 b:244387210
BUG=b:242720240 chromium:1098010 b:180945056 b:236025198 b:234181908
BUG=b:234181908 b:237344361 b:131913998 b:236386294 b:234143158
BUG=b:234781655 b:215613183 b:242720910
TEST=`make -j buildall`
TEST=./test/run_device_tests.py --board bloonchipper
Test "aes": PASSED
Test "cec": PASSED
Test "cortexm_fpu": PASSED
Test "crc": PASSED
Test "flash_physical": PASSED
Test "flash_write_protect": PASSED
Test "fpsensor_hw": PASSED
Test "fpsensor_spi_ro": PASSED
Test "fpsensor_spi_rw": PASSED
Test "fpsensor_uart_ro": PASSED
Test "fpsensor_uart_rw": PASSED
Test "mpu_ro": PASSED
Test "mpu_rw": PASSED
Test "mutex": PASSED
Test "pingpong": PASSED
Test "printf": PASSED
Test "queue": PASSED
Test "rollback_region0": PASSED
Test "rollback_region1": PASSED
Test "rollback_entropy": PASSED
Test "rtc": PASSED
Test "sha256": PASSED
Test "sha256_unrolled": PASSED
Test "static_if": PASSED
Test "stdlib": PASSED
Test "system_is_locked_wp_on": PASSED
Test "system_is_locked_wp_off": PASSED
Test "timer_dos": PASSED
Test "utils": PASSED
Test "utils_str": PASSED
Test "stm32f_rtc": PASSED
Test "panic_data_bloonchipper_v2.0.4277": PASSED
Test "panic_data_bloonchipper_v2.0.5938": PASSED
Force-Relevant-Builds: all
Signed-off-by: Tom Hughes <tomhughes@chromium.org>
Change-Id: I264ad0ffe7afcd507a1e483c6e934a9c4fea47c3
Diffstat (limited to 'zephyr/test/drivers/default/src/integration/usbc/usb_20v_3a_pd_charger.c')
-rw-r--r-- | zephyr/test/drivers/default/src/integration/usbc/usb_20v_3a_pd_charger.c | 231 |
1 files changed, 231 insertions, 0 deletions
diff --git a/zephyr/test/drivers/default/src/integration/usbc/usb_20v_3a_pd_charger.c b/zephyr/test/drivers/default/src/integration/usbc/usb_20v_3a_pd_charger.c new file mode 100644 index 0000000000..3fc73337b9 --- /dev/null +++ b/zephyr/test/drivers/default/src/integration/usbc/usb_20v_3a_pd_charger.c @@ -0,0 +1,231 @@ +/* Copyright 2022 The ChromiumOS Authors + * Use of this source code is governed by a BSD-style license that can be + * found in the LICENSE file. + */ + +#include <zephyr/ztest.h> + +#include "battery_smart.h" +#include "emul/emul_isl923x.h" +#include "emul/emul_smart_battery.h" +#include "emul/tcpc/emul_tcpci_partner_src.h" +#include "test/drivers/test_state.h" +#include "test/drivers/utils.h" +#include "usb_pd.h" + +#define BATTERY_NODE DT_NODELABEL(battery) + +struct usb_attach_20v_3a_pd_charger_fixture { + struct tcpci_partner_data charger_20v; + struct tcpci_src_emul_data src_ext; + const struct emul *tcpci_emul; + const struct emul *charger_emul; +}; + +static inline void +connect_charger_to_port(struct usb_attach_20v_3a_pd_charger_fixture *fixture) +{ + set_ac_enabled(true); + zassume_ok(tcpci_partner_connect_to_tcpci(&fixture->charger_20v, + fixture->tcpci_emul), + NULL); + + isl923x_emul_set_adc_vbus(fixture->charger_emul, + PDO_FIXED_GET_VOLT(fixture->src_ext.pdo[1])); + + /* Wait for PD negotiation and current ramp. + * TODO(b/213906889): Check message timing and contents. + */ + k_sleep(K_SECONDS(10)); +} + +static inline void disconnect_charger_from_port( + struct usb_attach_20v_3a_pd_charger_fixture *fixture) +{ + set_ac_enabled(false); + zassume_ok(tcpci_emul_disconnect_partner(fixture->tcpci_emul), NULL); + isl923x_emul_set_adc_vbus(fixture->charger_emul, 0); + k_sleep(K_SECONDS(1)); +} + +static void *usb_attach_20v_3a_pd_charger_setup(void) +{ + static struct usb_attach_20v_3a_pd_charger_fixture test_fixture; + + /* Get references for the emulators */ + test_fixture.tcpci_emul = EMUL_GET_USBC_BINDING(0, tcpc); + test_fixture.charger_emul = EMUL_GET_USBC_BINDING(0, chg); + + /* Initialized the charger to supply 20V and 3A */ + tcpci_partner_init(&test_fixture.charger_20v, PD_REV20); + test_fixture.charger_20v.extensions = tcpci_src_emul_init( + &test_fixture.src_ext, &test_fixture.charger_20v, NULL); + test_fixture.src_ext.pdo[1] = + PDO_FIXED(20000, 3000, PDO_FIXED_UNCONSTRAINED); + + return &test_fixture; +} + +static void usb_attach_20v_3a_pd_charger_before(void *data) +{ + connect_charger_to_port( + (struct usb_attach_20v_3a_pd_charger_fixture *)data); +} + +static void usb_attach_20v_3a_pd_charger_after(void *data) +{ + disconnect_charger_from_port( + (struct usb_attach_20v_3a_pd_charger_fixture *)data); +} + +ZTEST_SUITE(usb_attach_20v_3a_pd_charger, drivers_predicate_post_main, + usb_attach_20v_3a_pd_charger_setup, + usb_attach_20v_3a_pd_charger_before, + usb_attach_20v_3a_pd_charger_after, NULL); + +ZTEST(usb_attach_20v_3a_pd_charger, test_battery_is_charging) +{ + const struct emul *emul = EMUL_DT_GET(BATTERY_NODE); + uint16_t battery_status; + + zassume_ok(sbat_emul_get_word_val(emul, SB_BATTERY_STATUS, + &battery_status), + NULL); + zassert_equal(battery_status & STATUS_DISCHARGING, 0, + "Battery is discharging: %d", battery_status); +} + +ZTEST(usb_attach_20v_3a_pd_charger, test_charge_state) +{ + struct ec_response_charge_state state = host_cmd_charge_state(0); + + zassert_true(state.get_state.ac, "AC_OK not triggered"); + zassert_true(state.get_state.chg_voltage > 0, + "Expected a charge voltage, but got %dmV", + state.get_state.chg_voltage); + zassert_true(state.get_state.chg_current > 0, + "Expected a charge current, but got %dmA", + state.get_state.chg_current); +} + +ZTEST(usb_attach_20v_3a_pd_charger, test_typec_status) +{ + struct ec_response_typec_status status = host_cmd_typec_status(0); + + zassert_true(status.pd_enabled, "PD is disabled"); + zassert_true(status.dev_connected, "Device disconnected"); + zassert_true(status.sop_connected, "Charger is not SOP capable"); + zassert_equal(status.source_cap_count, 2, + "Expected 2 source PDOs, but got %d", + status.source_cap_count); + zassert_equal(status.power_role, PD_ROLE_SINK, + "Expected power role to be %d, but got %d", PD_ROLE_SINK, + status.power_role); +} + +ZTEST(usb_attach_20v_3a_pd_charger, test_power_info) +{ + struct ec_response_usb_pd_power_info info = host_cmd_power_info(0); + + zassert_equal(info.role, USB_PD_PORT_POWER_SINK, + "Expected role to be %d, but got %d", + USB_PD_PORT_POWER_SINK, info.role); + zassert_equal(info.type, USB_CHG_TYPE_PD, + "Expected type to be %d, but got %d", USB_CHG_TYPE_PD, + info.type); + zassert_equal(info.meas.voltage_max, 20000, + "Expected charge voltage max of 20000mV, but got %dmV", + info.meas.voltage_max); + zassert_within( + info.meas.voltage_now, 20000, 2000, + "Charging voltage expected to be near 20000mV, but was %dmV", + info.meas.voltage_now); + zassert_equal(info.meas.current_max, 3000, + "Current max expected to be 3000mV, but was %dmV", + info.meas.current_max); + zassert_true(info.meas.current_lim >= 3000, + "VBUS max is set to 3000mA, but PD is reporting %dmA", + info.meas.current_lim); + zassert_equal(info.max_power, 20000 * 3000, + "Charging expected to be at %duW, but PD max is %duW", + 20000 * 3000, info.max_power); +} + +ZTEST_F(usb_attach_20v_3a_pd_charger, test_disconnect_battery_not_charging) +{ + const struct emul *emul = EMUL_DT_GET(BATTERY_NODE); + uint16_t battery_status; + + disconnect_charger_from_port(fixture); + zassert_ok(sbat_emul_get_word_val(emul, SB_BATTERY_STATUS, + &battery_status), + NULL); + zassert_equal(battery_status & STATUS_DISCHARGING, STATUS_DISCHARGING, + "Battery is not discharging: %d", battery_status); +} + +ZTEST_F(usb_attach_20v_3a_pd_charger, test_disconnect_charge_state) +{ + struct ec_response_charge_state charge_state; + + disconnect_charger_from_port(fixture); + charge_state = host_cmd_charge_state(0); + + zassert_false(charge_state.get_state.ac, "AC_OK not triggered"); + zassert_equal(charge_state.get_state.chg_current, 0, + "Max charge current expected 0mA, but was %dmA", + charge_state.get_state.chg_current); + zassert_equal(charge_state.get_state.chg_input_current, + CONFIG_PLATFORM_EC_CHARGER_INPUT_CURRENT, + "Charge input current limit expected %dmA, but was %dmA", + CONFIG_PLATFORM_EC_CHARGER_INPUT_CURRENT, + charge_state.get_state.chg_input_current); +} + +ZTEST_F(usb_attach_20v_3a_pd_charger, test_disconnect_typec_status) +{ + struct ec_response_typec_status typec_status; + + disconnect_charger_from_port(fixture); + typec_status = host_cmd_typec_status(0); + + zassert_false(typec_status.pd_enabled, NULL); + zassert_false(typec_status.dev_connected, NULL); + zassert_false(typec_status.sop_connected, NULL); + zassert_equal(typec_status.source_cap_count, 0, + "Expected 0 source caps, but got %d", + typec_status.source_cap_count); + zassert_equal(typec_status.power_role, USB_CHG_TYPE_NONE, + "Expected power role to be %d, but got %d", + USB_CHG_TYPE_NONE, typec_status.power_role); +} + +ZTEST_F(usb_attach_20v_3a_pd_charger, test_disconnect_power_info) +{ + struct ec_response_usb_pd_power_info power_info; + + disconnect_charger_from_port(fixture); + power_info = host_cmd_power_info(0); + + zassert_equal(power_info.role, USB_PD_PORT_POWER_DISCONNECTED, + "Expected power role to be %d, but got %d", + USB_PD_PORT_POWER_DISCONNECTED, power_info.role); + zassert_equal(power_info.type, USB_CHG_TYPE_NONE, + "Expected charger type to be %d, but got %s", + USB_CHG_TYPE_NONE, power_info.type); + zassert_equal(power_info.max_power, 0, + "Expected the maximum power to be 0uW, but got %duW", + power_info.max_power); + zassert_equal(power_info.meas.voltage_max, 0, + "Expected maximum voltage of 0mV, but got %dmV", + power_info.meas.voltage_max); + zassert_within(power_info.meas.voltage_now, 5, 5, + "Expected present voltage near 0mV, but got %dmV", + power_info.meas.voltage_now); + zassert_equal(power_info.meas.current_max, 0, + "Expected maximum current of 0mA, but got %dmA", + power_info.meas.current_max); + zassert_true(power_info.meas.current_lim >= 0, + "Expected the PD current limit to be >= 0, but got %dmA", + power_info.meas.current_lim); +} |