diff options
| author | Ayushee Shah <ayushee.shah@intel.com> | 2021-02-08 11:41:42 -0800 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2021-02-23 23:25:46 +0000 |
| commit | cbcc6536d54c8f9d9a7a74a7766d39c00bfeb477 (patch) | |
| tree | 218c11195dc51488bb781e82ae49b1001a1b41a5 | |
| parent | b19b32127dc87ffd4272cd48aa534a8215c50e9a (diff) | |
| download | chrome-ec-cbcc6536d54c8f9d9a7a74a7766d39c00bfeb477.tar.gz | |
BB Retimer: Cleanup setting USB4 speed
In the retimer_set_state_dfp() function, return either the
USB4 speed or Thunderbolt speed depending on the mux setting
BUG=None
BRANCH=None
TEST=make buildall -j
Change-Id: I725386d7d23d50637b46b389082d369b09b4df66
Signed-off-by: Ayushee Shah <ayushee.shah@intel.com>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2682840
Reviewed-by: Keith Short <keithshort@chromium.org>
| -rw-r--r-- | driver/retimer/bb_retimer.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/driver/retimer/bb_retimer.c b/driver/retimer/bb_retimer.c index b5d7fbf0ff..17c75a486d 100644 --- a/driver/retimer/bb_retimer.c +++ b/driver/retimer/bb_retimer.c @@ -241,7 +241,7 @@ static void retimer_set_state_dfp(int port, mux_state_t mux_state, *set_retimer_con |= BB_RETIMER_TBT_ACTIVE_LINK_TRAINING; /* - * Bit 27-25: TBT Cable speed + * Bit 27-25: USB4/TBT Cable speed * 000b - No functionality * 001b - USB3.1 Gen1 Cable * 010b - 10Gb/s @@ -249,7 +249,10 @@ static void retimer_set_state_dfp(int port, mux_state_t mux_state, * 10..11b - Reserved */ *set_retimer_con |= BB_RETIMER_USB4_TBT_CABLE_SPEED_SUPPORT( - get_tbt_cable_speed(port)); + mux_state & USB_PD_MUX_TBT_COMPAT_ENABLED ? + get_tbt_cable_speed(port) : + get_usb4_cable_speed(port)); + /* * Bits 29-28: TBT_GEN_SUPPORT * 00b - 3rd generation TBT (10.3125 and 20.625Gb/s) @@ -270,17 +273,6 @@ static void retimer_set_state_dfp(int port, mux_state_t mux_state, */ if (PD_PRODUCT_IS_TBT3(disc->identity.product_t1.raw_value)) *set_retimer_con |= BB_RETIMER_TBT_CONNECTION; - - /* - * Bit 27-25: USB4 Cable speed - * 000b - No functionality - * 001b - USB3.1 Gen1 Cable - * 010b - 10Gb/s - * 011b - 10Gb/s and 20Gb/s - * 10..11b - Reserved - */ - *set_retimer_con |= BB_RETIMER_USB4_TBT_CABLE_SPEED_SUPPORT( - get_usb4_cable_speed(port)); } } |