summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormadhusudanarao amara <madhusudanarao.amara@intel.com>2021-09-15 19:02:05 +0530
committerCommit Bot <commit-bot@chromium.org>2021-09-23 06:46:16 +0000
commitf5dc7104a1d034b1ea776691e34aaee1e90775b2 (patch)
tree547134c740d61b49906e9a91722c664690999c51
parentd1d82a24c4371ff10f9fb0c274169428a90fc554 (diff)
downloadchrome-ec-f5dc7104a1d034b1ea776691e34aaee1e90775b2.tar.gz
Revert "DP/TBT/USB4: Retimer WA resolved Brya TBT lane bonding issue in AP mode"
This reverts commit f0985f8a11585f6a704aa94a8354bd5b934619ac. Reason for revert: Issue is resolved after setting the Force BB Retimer GPIO (GPP_E4) to 0. It is a coreboot change. BUG=b:195375738 BRANCH=None TEST=TBT enumerated no lane bonding issue is observed with above coreboot code change with reverted EC WA. Signed-off-by: madhusudanarao amara <madhusudanarao.amara@intel.corp-partner.google.com> Change-Id: I09a8a53aec9ba3757189a091606922bc7a133ba7 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/3162936 Reviewed-by: Deepti Deshatty <deepti.deshatty@intel.corp-partner.google.com> Reviewed-by: caveh jalali <caveh@chromium.org> Reviewed-by: Vijay Hiremath <vijay.p.hiremath@intel.com> Commit-Queue: caveh jalali <caveh@chromium.org>
-rw-r--r--board/brya/usbc_config.c14
-rw-r--r--driver/retimer/bb_retimer.c20
-rw-r--r--include/driver/retimer/bb_retimer_public.h12
3 files changed, 0 insertions, 46 deletions
diff --git a/board/brya/usbc_config.c b/board/brya/usbc_config.c
index 667d1aaaab..1780e1e16d 100644
--- a/board/brya/usbc_config.c
+++ b/board/brya/usbc_config.c
@@ -270,20 +270,6 @@ __override int bb_retimer_power_enable(const struct usb_mux *me, bool enable)
return EC_SUCCESS;
}
-__override int bb_retimer_reset(const struct usb_mux *me)
-{
- /*
- * TODO(b/193402306, b/195375738): Remove this once transition to
- * QS Silicon is complete
- */
- bb_retimer_power_enable(me, false);
- msleep(5);
- bb_retimer_power_enable(me, true);
- msleep(25);
-
- return EC_SUCCESS;
-}
-
void board_reset_pd_mcu(void)
{
enum gpio_signal tcpc_rst;
diff --git a/driver/retimer/bb_retimer.c b/driver/retimer/bb_retimer.c
index 2e2e15f44f..bf3da60b32 100644
--- a/driver/retimer/bb_retimer.c
+++ b/driver/retimer/bb_retimer.c
@@ -365,18 +365,6 @@ static void retimer_set_state_ufp(int port, mux_state_t mux_state,
}
/**
- * Driver interface function: reset retimer
- */
-__overridable int bb_retimer_reset(const struct usb_mux *me)
-{
- /*
- * TODO(b/193402306, b/195375738): Remove this once transition to
- * QS Silicon is complete
- */
- return EC_SUCCESS;
-}
-
-/**
* Driver interface functions
*/
static int retimer_set_state(const struct usb_mux *me, mux_state_t mux_state,
@@ -479,14 +467,6 @@ static int retimer_set_state(const struct usb_mux *me, mux_state_t mux_state,
else
retimer_set_state_ufp(port, mux_state, &set_retimer_con);
- /*
- * In AP Mode DP exit to TBT entry is causing TBT lane bonding issue
- * Issue is not seen by calling the retimer reset as WA at the time of
- * disconnect mode configuration
- */
- if (mux_state == USB_PD_MUX_NONE)
- bb_retimer_reset(me);
-
/* Writing the register4 */
return bb_retimer_write(me, BB_RETIMER_REG_CONNECTION_STATE,
set_retimer_con);
diff --git a/include/driver/retimer/bb_retimer_public.h b/include/driver/retimer/bb_retimer_public.h
index 91c1a45636..f1a924f67e 100644
--- a/include/driver/retimer/bb_retimer_public.h
+++ b/include/driver/retimer/bb_retimer_public.h
@@ -44,18 +44,6 @@ __override_proto int bb_retimer_power_enable(const struct usb_mux *me,
bool enable);
/**
- * reset the BB retimer
- *
- * Define override function at board level if the platform specific changes
- * are needed to reset the BB retimer.
- *
- * @param me Pointer to USB mux
- *
- * @return EC_SUCCESS, or non-zero on error.
- */
-__override_proto int bb_retimer_reset(const struct usb_mux *me);
-
-/**
* Set HPD on the BB retimer
*
* Set the HPD related fields in the BB retimer