scottk/OpenCellular
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenCellular.git synced 2025-12-30 02:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enable PD communication in RO for external display

Browse Source 
This patch makes EC enable PD communication if it's running in
manual recovery mode. This is required to show recovery screen
on a type-c monitor.

This patch also makes EC-EFS ignore power availability. It will
make EC verify & jump to RW even if power is sourced by a barrel
jack adapter. This should allow depthcharge to show screens
(e.g. broken, warning) on a type-c monitor.

BUG=b:72387533
BRANCH=none
TEST=On Fizz with type-c monitor, verify
- Recovery screen is displayed in manual recovery mode.
- Critical update screen is displayed in normal mode.
- Warning screen is displayed in developer mode.
Monitors tested: Dingdong, Dell S2718D

Change-Id: Ib53e02d1e5c0f5b2d96d9a02fd33022f92e52b04
Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/898346
Reviewed-by: Randall Spangler <rspangler@chromium.org>
This commit is contained in:
Daisuke Nojiri
2018-01-25 12:47:33 -08:00
committed by chrome-bot
parent cd5173dfe0
commit 044cc72496
6 changed files with 57 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/main.c
View File

@@ -27,6 +27,7 @@
#include "timer.h"
#include "uart.h"
#include "util.h"
#include "vboot.h"
#include "watchdog.h"
/* Console output macros */
@@ -168,8 +169,15 @@ test_mockable __keep int main(void)
button_init();
#endif /* defined(CONFIG_DEDICATED_RECOVERY_BUTTON | CONFIG_VOLUME_BUTTONS) */
#if !defined(CONFIG_VBOOT_EFS) && \
defined(CONFIG_RWSIG) && !defined(HAS_TASK_RWSIG)
#if defined(CONFIG_VBOOT_EFS)
/*
* For RO, it behaves as follows:
* In recovery, it enables PD communication and returns.
* In normal boot, it verifies and jumps to RW.
* For RW, it returns immediately.
*/
vboot_main();
#elif defined(CONFIG_RWSIG) && !defined(HAS_TASK_RWSIG)
/*
* Check the RW firmware signature and jump to it if it is good.
*

5
common/usb_pd_protocol.c
View File

@@ -27,6 +27,7 @@
#include "usbc_ppc.h"
#include "tcpm.h"
#include "version.h"
#include "vboot.h"
#ifdef CONFIG_COMMON_RUNTIME
#define CPRINTF(format, args...) cprintf(CC_USBPD, format, ## args)
@@ -2010,6 +2011,10 @@ static void pd_init_tasks(void)
/* Disable PD communication at init if we're in RO and locked. */
if (!system_is_in_rw() && system_is_locked())
enable = 0;
#ifdef CONFIG_VBOOT_EFS
if (vboot_need_pd_comm())
enable = 1;
#endif
#endif
for (i = 0; i < CONFIG_USB_PD_PORT_COUNT; i++)
pd_comm_enabled[i] = enable;

54
common/vboot/vboot.c
View File

@@ -182,33 +182,16 @@ static int is_manual_recovery(void)
return host_is_event_set(EC_HOST_EVENT_KEYBOARD_RECOVERY);
}
static void vboot_main(void);
DECLARE_DEFERRED(vboot_main);
static void vboot_main(void)
static int pd_comm_enabled;
int vboot_need_pd_comm(void)
{
const int check_charge_manager_frequency_usec = 10 * MSEC;
int port = charge_manager_get_active_charge_port();
return pd_comm_enabled;
}
if (port == CHARGE_PORT_NONE) {
/* We loop here until charge manager is ready */
hook_call_deferred(&vboot_main_data,
check_charge_manager_frequency_usec);
return;
}
CPRINTS("Checking power");
if (system_can_boot_ap()) {
/*
* We are here for the two cases:
* 1. Booting on RO with a barrel jack adapter. We can continue
* to boot AP with EC-RO. We'll jump later in softsync.
* 2. Booting on RW with a type-c charger. PD negotiation is
* done and we can boot AP.
*/
CPRINTS("Got enough power");
return;
}
void vboot_main(void)
{
CPRINTS("Main");
if (system_is_in_rw() || !system_is_locked()) {
/*
@@ -217,23 +200,18 @@ static void vboot_main(void)
* or unlocked RO.
*
* This could be caused by a weak type-c charger. If that's
* the case, users need to plug a better charger. We could
* also be here because PD negotiation is still taking place.
* If so, we'll briefly show request power sign but it will
* be immediately corrected.
* the case, users need to plug a better charger.
*
* We can also get here because we called system_can_boot_ap too
* early. Power will be requested but it should be cancelled by
* board_set_charge_limit as soon as a PD contract is made.
* We could also be here because PD negotiation is still taking
* place. If so, we'll end up showing request power signal but
* it will be immediately corrected.
*/
request_power();
return;
}
CPRINTS("Booting RO on weak battery/charger");
if (is_manual_recovery()) {
CPRINTS("Manual recovery requested");
CPRINTS("Manual recovery");
if (battery_is_present() || has_matrix_keyboard()) {
request_power();
return;
@@ -243,8 +221,8 @@ static void vboot_main(void)
* hole by allowing EC-RO to do PD negotiation but attackers
* don't gain meaningful advantage on devices without a matrix
* keyboard */
CPRINTS("Enable C%d PD comm", port);
pd_comm_enable(port, 1);
CPRINTS("Enable PD comm");
pd_comm_enabled = 1;
return;
}
@@ -264,5 +242,3 @@ static void vboot_main(void)
/* Failed to jump. Need recovery. */
request_recovery();
}
DECLARE_HOOK(HOOK_INIT, vboot_main, HOOK_PRIO_DEFAULT);