diff options
| author | Shawn Nematbakhsh <shawnn@chromium.org> | 2016-04-10 15:46:39 -0700 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2016-04-11 14:36:40 -0700 |
| commit | d2e77ddbc913a34c14e87eaa9c3104f62ec40142 (patch) | |
| tree | e03164ade39f482235da299cc432fe0b44e28885 /board/samus_pd | |
| parent | a3341ee7e9bf93e3757684816b8319ae726d2044 (diff) | |
| download | chrome-ec-d2e77ddbc913a34c14e87eaa9c3104f62ec40142.tar.gz | |
pd: Add config to disable PD communication in locked RO
The scheme to disable PD communication in locked RO needs to be
implemented on other platforms, so move it to common code, behind
CONFIG_USB_PD_COMM_LOCKED.
BUG=chrome-os-partner:52157
BRANCH=glados
TEST=Manual on chell. Lock system and boot to recovery, then verify PD
communication is functional. Enable CONFIG_USB_PD_COMM_LOCKED and verify
PD communication isn't functional under the same test conditions.
Signed-off-by: Shawn Nematbakhsh <shawnn@chromium.org>
Change-Id: I8d1f24c0b60cf1c54e329af003b7083ee55ffc40
Reviewed-on: https://chromium-review.googlesource.com/338064
Commit-Ready: Shawn N <shawnn@chromium.org>
Tested-by: Shawn N <shawnn@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Reviewed-by: Duncan Laurie <dlaurie@chromium.org>
Diffstat (limited to 'board/samus_pd')
| -rw-r--r-- | board/samus_pd/board.c | 17 | ||||
| -rw-r--r-- | board/samus_pd/board.h | 3 |
2 files changed, 1 insertions, 19 deletions
diff --git a/board/samus_pd/board.c b/board/samus_pd/board.c index 8e574527c1..270c82e7e9 100644 --- a/board/samus_pd/board.c +++ b/board/samus_pd/board.c @@ -207,7 +207,6 @@ void board_config_pre_init(void) /* Initialize board. */ static void board_init(void) { - int pd_enable; int slp_s5 = gpio_get_level(GPIO_PCH_SLP_S5_L); int slp_s3 = gpio_get_level(GPIO_PCH_SLP_S3_L); @@ -254,22 +253,6 @@ static void board_init(void) if (system_get_image_copy() == SYSTEM_IMAGE_RW) pd_status_flags |= PD_STATUS_IN_RW; - /* - * Do not enable PD communication in RO as a security measure. - * We don't want to allow communication to outside world until - * we jump to RW. This can by overridden with the removal of - * the write protect screw to allow for easier testing, and for - * booting without a battery. - */ - if (system_get_image_copy() != SYSTEM_IMAGE_RW - && system_is_locked()) { - ccprintf("[%T PD comm disabled]\n"); - pd_enable = 0; - } else { - pd_enable = 1; - } - pd_comm_enable(pd_enable); - #ifdef CONFIG_PWM /* Enable ILIM PWM: initial duty cycle 0% = 500mA limit. */ pwm_enable(PWM_CH_ILIM, 1); diff --git a/board/samus_pd/board.h b/board/samus_pd/board.h index a1f34546e5..e0a7b4e929 100644 --- a/board/samus_pd/board.h +++ b/board/samus_pd/board.h @@ -52,8 +52,7 @@ #define CONFIG_USB_PD_ALT_MODE #define CONFIG_USB_PD_ALT_MODE_DFP #define CONFIG_USB_PD_CHECK_MAX_REQUEST_ALLOWED -#undef CONFIG_USB_PD_COMM_ENABLED -#define CONFIG_USB_PD_COMM_ENABLED 0 +#define CONFIG_USB_PD_COMM_LOCKED #define CONFIG_USB_PD_CUSTOM_VDM #define CONFIG_USB_PD_DUAL_ROLE #define CONFIG_USB_PD_TRY_SRC |