From 36980ec169795231ba5ddaba86decb2e05512581 Mon Sep 17 00:00:00 2001 From: Aseda Aboagye Date: Fri, 23 Mar 2018 17:34:11 -0700 Subject: pd: Properly assign data role on reset According to PD spec: - Data role shall not be reset on soft reset. - Data role shall be reset to power-role default on hard reset. Implement the above. Even if both ports follow spec, it's still possible for a data role conflict to occur if, for example, data role swap occurs (data role mismatches power role default) followed by a hardware reset of one port (such that data role gets reset to power role default). Handle such cases by taking error recovery actions. BUG=b:71333840,chromium:805040 TEST=Connect scarlet to powered Apple accessory, verify scarlet comes up in SNK-DFP after soft reset and issuing "reboot" on EC console. After issuing a hard reset, the port comes up in SNK-UFP (which is the power-role default). BRANCH=None Signed-off-by: Shawn Nematbakhsh Signed-off-by: Aseda Aboagye Change-Id: I65139f277d59a0612f8323d711080f52425ff5e7 Reviewed-on: https://chromium-review.googlesource.com/885462 Commit-Ready: Aseda Aboagye Tested-by: Aseda Aboagye Reviewed-by: Jett Rink Reviewed-by: Vincent Palatin --- include/usb_pd.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'include/usb_pd.h') diff --git a/include/usb_pd.h b/include/usb_pd.h index 33a8c79121..acad78fb42 100644 --- a/include/usb_pd.h +++ b/include/usb_pd.h @@ -737,6 +737,7 @@ enum pd_states { /* Per-port battery backed RAM flags */ #define PD_BBRMFLG_EXPLICIT_CONTRACT (1 << 0) #define PD_BBRMFLG_POWER_ROLE (1 << 1) +#define PD_BBRMFLG_DATA_ROLE (1 << 2) enum pd_cc_states { PD_CC_NONE, @@ -915,11 +916,12 @@ enum pd_data_msg_type { ((id) << 9) | ((cnt) << 12) | ((ext) << 15)) /* Used for processing pd header */ -#define PD_HEADER_EXT(header) (((header) >> 15) & 1) -#define PD_HEADER_CNT(header) (((header) >> 12) & 7) -#define PD_HEADER_TYPE(header) ((header) & 0xF) -#define PD_HEADER_ID(header) (((header) >> 9) & 7) -#define PD_HEADER_REV(header) (((header) >> 6) & 3) +#define PD_HEADER_EXT(header) (((header) >> 15) & 1) +#define PD_HEADER_CNT(header) (((header) >> 12) & 7) +#define PD_HEADER_TYPE(header) ((header) & 0xF) +#define PD_HEADER_ID(header) (((header) >> 9) & 7) +#define PD_HEADER_REV(header) (((header) >> 6) & 3) +#define PD_HEADER_DROLE(header) (((header) >> 5) & 1) /* Used for processing pd extended header */ #define PD_EXT_HEADER_CHUNKED(header) (((header) >> 15) & 1) -- cgit v1.2.1