From c8af732351cc5c7167f27e8390e26f0556f53a5a Mon Sep 17 00:00:00 2001 From: YH Lin Date: Sat, 3 Dec 2022 00:19:30 +0000 Subject: Revert "Merge remote-tracking branch cros/main into factory-brya-14517.B-main" This reverts commit af25602b15b22b9ef5821dcba9934311f2157c48. Reason for revert: broken build due to ec-utils. Original change's description: > Merge remote-tracking branch cros/main into factory-brya-14517.B-main > > Generated by: util/update_release_branch.py --baseboard brya --relevant_paths_file > baseboard/brya/relevant-paths.txt factory-brya-14517.B-main > > Relevant changes: > > git log --oneline 54462f034b..aa40b859b3 -- baseboard/brya board/agah > board/anahera board/banshee board/brya board/crota board/felwinter > board/gimble board/kano board/mithrax board/osiris board/primus > board/redrix board/taeko board/taniks board/vell board/volmar > driver/bc12/pi3usb9201_public.* driver/charger/bq25710.* > driver/ppc/nx20p348x.* driver/ppc/syv682x_public.* > driver/retimer/bb_retimer_public.* driver/tcpm/nct38xx.* > driver/tcpm/ps8xxx_public.* driver/tcpm/tcpci.* include/power/alderlake* > include/intel_x86.h power/alderlake* power/intel_x86.c > util/getversion.sh > > e6da633c38 driver: Sort header files > 234a87ae2d tcpci: Add FRS enable to driver structure > a56be59ccd tcpm_header: add test for tcpm_dump_registers > 57b3256963 Rename CONFIG_CHARGER_INPUT_CURRENT to _CHARGER_DEFAULT_CURRENT_LIMIT > e420c8ff9a marasov: Modify TypeC and TypeA configuration. > 43b53e0045 Add default implementation of board_set_charge_limit > b75dc90677 Add CONFIG_CHARGER_MIN_INPUT_CURRENT_LIMIT > f1b563c350 baseboard: Sort header files > 7d01b1e58d driver/retimer/ps8818.h: Add I2C ADDR FLAGS 0x30, 0x58, 0x70 > ec31407993 Add CONFIG_CHARGER_INPUT_CURRENT_DERATE_PCT > 8f89f69a5b crota: disable lid angle sensor for clamshell > > BRANCH=None > BUG=b:259002141 b:255184961 b:247100970 b:259354679 b:260630630 > BUG=b:163093572 b:254328661 > TEST=`emerge-brya chromeos-ec` > > Force-Relevant-Builds: all > Change-Id: Ia85a701fbf6b8e67ec214b9e25e0e55e980a6f47 > Signed-off-by: YH Lin Bug: b:259002141 b:255184961 b:247100970 b:259354679 b:260630630 Bug: b:163093572 b:254328661 Change-Id: I48d5aa4cc67a69ee1f6ac9255ac3087d34da4c72 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/4077248 Tested-by: YH Lin Commit-Queue: YH Lin Reviewed-by: Boris Mittelberg Auto-Submit: YH Lin --- common/usb_common.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) (limited to 'common/usb_common.c') diff --git a/common/usb_common.c b/common/usb_common.c index a92b1e380f..b4fefb6cf7 100644 --- a/common/usb_common.c +++ b/common/usb_common.c @@ -17,9 +17,9 @@ #include "ec_commands.h" #include "gpio.h" #include "hooks.h" -#include "host_command.h" #include "mkbp_event.h" #include "stdbool.h" +#include "host_command.h" #include "system.h" #include "task.h" #include "typec_control.h" @@ -27,7 +27,7 @@ #include "usb_common.h" #include "usb_mux.h" #include "usb_pd.h" -#include "usb_pd_dpm_sm.h" +#include "usb_pd_dpm.h" #include "usb_pd_flags.h" #include "usb_pd_tcpm.h" #include "usb_pe_sm.h" @@ -198,6 +198,18 @@ enum pd_cc_states pd_get_cc_state(enum tcpc_cc_voltage_status cc1, return PD_CC_NONE; } +/** + * This function checks the current CC status of the port partner + * and returns true if the attached partner is debug accessory. + */ +bool pd_is_debug_acc(int port) +{ + enum pd_cc_states cc_state = pd_get_task_cc_state(port); + + return cc_state == PD_CC_UFP_DEBUG_ACC || + cc_state == PD_CC_DFP_DEBUG_ACC; +} + __overridable int pd_board_check_request(uint32_t rdo, int pdo_cnt) { return EC_SUCCESS; @@ -622,17 +634,15 @@ void pd_set_vbus_discharge(int port, int enable) static mutex_t discharge_lock[CONFIG_USB_PD_PORT_MAX_COUNT]; #ifdef CONFIG_ZEPHYR static bool inited[CONFIG_USB_PD_PORT_MAX_COUNT]; -#endif - if (port >= board_get_usb_pd_port_count()) - return; - -#ifdef CONFIG_ZEPHYR if (!inited[port]) { (void)k_mutex_init(&discharge_lock[port]); inited[port] = true; } #endif + if (port >= board_get_usb_pd_port_count()) + return; + mutex_lock(&discharge_lock[port]); enable &= !board_vbus_source_enabled(port); -- cgit v1.2.1