diff options
author | Aseda Aboagye <aaboagye@google.com> | 2019-11-27 23:59:24 -0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2019-12-10 22:49:35 +0000 |
commit | 5ebaed65363f96873a348bbf8468d6a6e67117bc (patch) | |
tree | 178a62de51ec3a3b29f499970d2792ec7c925c4d /board/twinkie | |
parent | 68650b554531de4cd2480b5cec5589d483bc0dba (diff) | |
download | chrome-ec-5ebaed65363f96873a348bbf8468d6a6e67117bc.tar.gz |
usb_pd_policy: Make a lot of objects common
There is a board specific usb_pd_policy.c file that contains a lot of
code for handling DisplayPort Alternate mode, Google Firmware Update
Alternate mode, as well as some PD policy functions such as deciding to
Accept or Reject a data role swap or a power role swap. Several boards
simply copy/paste this code from project to project as a lot of this
functionality is not actually board specific.
This commit tries to refactor this by pulling the functions that are not
mainly board specific into common code. The functions are made
overridable such that boards that truly do require a different
implementation may do so.
Additionally, this consolidation changes the policy behaviour for some
boards, but they should be for the better. Some examples include that
data swaps are always allowed if we are a UFP (no system image
requirement), power swaps are allowed to become a sink if we are no
longer dual role (e.g. - in suspend), and DisplayPort Alternate Mode is
not entered if the AP is off.
In order to facilitate this refactor, a couple CONFIG_* options were
introduced:
- CONFIG_USB_PD_DP_HPD_GPIO
/* HPD is sent to the GPU from the EC via a GPIO */
- CONFIG_USB_PD_CUSTOM_VDO
/*
* Define this if a board needs custom SNK and/or SRC PDOs.
*
* The default SRC PDO is a fixed 5V/1.5A with PDO_FIXED_FLAGS indicating
* Dual-Role power, USB Communication Capable, and Dual-Role data.
*
* The default SNK PDOs are:
* - Fixed 5V/500mA with the same PDO_FIXED_FLAGS
* - Variable (non-battery) min 4.75V, max PD_MAX_VOLTAGE_MV,
* operational current PD_MAX_CURRENT_MA,
* - Battery min 4.75V, max PD_MAX_VOLTAGE_MV, operational power
* PD_OPERATING_POWER_MW
*/
BUG=chromium:1021724,b:141458448
BRANCH=<as many as we can that are still supported>
TEST=`make -j buildall`
TEST=Flash a kohaku, verify that DP Alt Mode still works with a variety
of DP peripherals
TEST=Repeat above with a nocturne
TEST=Repeat above with an atlas
Change-Id: I18fd7e22dc77fe1dc6c21c38cd7f1bc53cae86cb
Signed-off-by: Aseda Aboagye <aaboagye@google.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1949052
Tested-by: Aseda Aboagye <aaboagye@chromium.org>
Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>
Reviewed-by: Diana Z <dzigterman@chromium.org>
Reviewed-by: Denis Brockus <dbrockus@chromium.org>
Commit-Queue: Aseda Aboagye <aaboagye@chromium.org>
Diffstat (limited to 'board/twinkie')
-rw-r--r-- | board/twinkie/board.h | 1 | ||||
-rw-r--r-- | board/twinkie/usb_pd_policy.c | 30 |
2 files changed, 6 insertions, 25 deletions
diff --git a/board/twinkie/board.h b/board/twinkie/board.h index 42944f37f1..1467871f34 100644 --- a/board/twinkie/board.h +++ b/board/twinkie/board.h @@ -21,6 +21,7 @@ #define CONFIG_WEBUSB_URL "storage.googleapis.com/webtwinkie.org/tool.html" #define CONFIG_USB_POWER_DELIVERY +#define CONFIG_USB_PD_CUSTOM_PDO #define CONFIG_USB_PD_DUAL_ROLE #define CONFIG_USB_PD_INTERNAL_COMP #define CONFIG_USB_PD_PORT_MAX_COUNT 1 diff --git a/board/twinkie/usb_pd_policy.c b/board/twinkie/usb_pd_policy.c index 1b1801fa43..d4fc43d3b9 100644 --- a/board/twinkie/usb_pd_policy.c +++ b/board/twinkie/usb_pd_policy.c @@ -44,16 +44,6 @@ void pd_set_input_current_limit(int port, uint32_t max_ma, gpio_set_level(GPIO_LED_B_L, !blue); } -int pd_is_valid_input_voltage(int mv) -{ - /* Any voltage less than the max is allowed */ - return 1; -} - -void pd_transition_voltage(int idx) -{ -} - int pd_set_power_supply_ready(int port) { return EC_SUCCESS; /* we are ready */ @@ -69,37 +59,27 @@ int pd_snk_is_vbus_provided(int port) return (gpio_get_level(GPIO_VBUS_ALERT_L) == 0); } -int pd_board_checks(void) -{ - return EC_SUCCESS; -} - -int pd_check_power_swap(int port) +__override int pd_check_power_swap(int port) { /* Always refuse power swap */ return 0; } -int pd_check_data_swap(int port, int data_role) +__override int pd_check_data_swap(int port, int data_role) { /* Always allow data swap */ return 1; } -void pd_check_pr_role(int port, int pr_role, int flags) -{ -} - -void pd_check_dr_role(int port, int dr_role, int flags) +__override void pd_check_pr_role(int port, int pr_role, int flags) { } -void pd_execute_data_swap(int port, int data_role) +__override void pd_check_dr_role(int port, int dr_role, int flags) { - /* Do nothing */ } -int pd_custom_vdm(int port, int cnt, uint32_t *payload, +__override int pd_custom_vdm(int port, int cnt, uint32_t *payload, uint32_t **rpayload) { return 0; |