From patchwork Fri Feb 19 09:04:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Badhri Jagan Sridharan X-Patchwork-Id: 12094845 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-26.3 required=3.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3CE7AC433E0 for ; Fri, 19 Feb 2021 09:07:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C27A764EB7 for ; Fri, 19 Feb 2021 09:07:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229952AbhBSJHI (ORCPT ); Fri, 19 Feb 2021 04:07:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58384 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230026AbhBSJEy (ORCPT ); Fri, 19 Feb 2021 04:04:54 -0500 Received: from mail-qk1-x74a.google.com (mail-qk1-x74a.google.com [IPv6:2607:f8b0:4864:20::74a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EFCC2C061574 for ; Fri, 19 Feb 2021 01:04:13 -0800 (PST) Received: by mail-qk1-x74a.google.com with SMTP id y79so3111894qka.23 for ; Fri, 19 Feb 2021 01:04:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=sender:date:message-id:mime-version:subject:from:to:cc; bh=CGR9fL8lkODALH6tI/Lf41dYAe2vopzjhEaC221RUXI=; b=kjOGxDOu4NduoHkNZJ5LhJIo1OQZSg66MwJ6dXv4ytV/830xQDy3BxpsODu1gi82lt Es2tAr6/Y61r3MG6prqQ0CeCon+3j9sNa8VWol2ZZHJbyB+/o+v0dZdbZnk/tpl84WAN /Jb0SBvJzS5lIxRB/zcxb+5YKxmPGtUEo4fj5377N9PJCsx3oqC+rcuHshQLBd2Vq0Ff drXKtsV53PYZQkbZfKQ0X4cNfu9QZab5kW+BgOmoPjznv1hvdQ9uW0VXma60ccTwrnXX XP1cFxXULULLtbfrSXAezmhzqKx75LNxU6YA+XzWZZra4c2UOM6fTV6tyPaEBL1eURR8 dVuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:message-id:mime-version:subject:from :to:cc; bh=CGR9fL8lkODALH6tI/Lf41dYAe2vopzjhEaC221RUXI=; b=lAWxI8Whlnmx7bBlrpsw1nHrT5DPs3iJ6/+Y8/K7oBDLot4Y3KtUBmgQXiKeb+dZLi tIgpcCRufC9UjKcREv/sEI5uzAH/AdISE3F9NRDDjw1mYd613MXjuLiZTI0+Oe/hSmVN /S+gSOT+Eqrw9cF0OxG/6PZ7/JqgNexltKqurQbbfOpK938mNqGHpICwKlzQPCB2h7W4 /vZIlzGh/c/ogPMH5eqi1ffPKjV/WCRi1YJYoRTKLJnAAITHLBKPlMZPtg3EhM4dyDAX 3+t/dPO8iYSaaeNozpCxurbspu8GDc9xWw6lrC1HbVTw2/L3nZ8tUU0vjjfb/9wvMKUy MRwQ== X-Gm-Message-State: AOAM530QJWcuvETpTxFi5eTZbMamDg/3FBcSp1VRYRIg2y5fRhmaq7sB cH5IJlEjjPeMjGRZpivL5YPU39PuNzw= X-Google-Smtp-Source: ABdhPJwaEYLuteNjKI4wu29MPPChLxdzE3fnRY8NmQMFADSE1kd+ZCIMilia0Dl9PJK8+BdokCGT0PpotBo= Sender: "badhri via sendgmr" X-Received: from badhri.mtv.corp.google.com ([2620:15c:211:201:4940:ba9e:2dc2:a4ce]) (user=badhri job=sendgmr) by 2002:a0c:8e8f:: with SMTP id x15mr8372883qvb.21.1613725452961; Fri, 19 Feb 2021 01:04:12 -0800 (PST) Date: Fri, 19 Feb 2021 01:04:09 -0800 Message-Id: <20210219090409.325492-1-badhri@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.30.0.617.g56c4b15f3c-goog Subject: [PATCH v2] usb: typec: tcpm: Wait for vbus discharge to VSAFE0V before toggling From: Badhri Jagan Sridharan To: Guenter Roeck , Heikki Krogerus , Greg Kroah-Hartman , Kyle Tso Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, Badhri Jagan Sridharan Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org When vbus auto discharge is enabled, TCPM can sometimes be faster than the TCPC i.e. TCPM can go ahead and move the port to unattached state (involves disabling vbus auto discharge) before TCPC could effectively discharge vbus to VSAFE0V. This leaves vbus with residual charge and increases the decay time which prevents tsafe0v from being met. This change introduces a new state VBUS_DISCHARGE where the TCPM waits for a maximum of tSafe0V(max) for vbus to discharge to VSAFE0V before transitioning to unattached state and re-enable toggling. If vbus discharges to vsafe0v sooner, then, transition to unattached state happens right away. Also, while in SNK_READY, when auto discharge is enabled, drive disconnect based on vbus turning off instead of Rp disappearing on CC pins. Rp disappearing on CC pins is almost instanteous compared to vbus decay. Fixes: f321a02caebd ("usb: typec: tcpm: Implement enabling Auto Discharge disconnect support") Signed-off-by: Badhri Jagan Sridharan --- Changes since V1: - Add Fixes tag --- drivers/usb/typec/tcpm/tcpm.c | 60 +++++++++++++++++++++++++++++++---- 1 file changed, 53 insertions(+), 7 deletions(-) diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index be0b6469dd3d..0ed71725980f 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -62,6 +62,8 @@ S(SNK_TRANSITION_SINK_VBUS), \ S(SNK_READY), \ \ + S(VBUS_DISCHARGE), \ + \ S(ACC_UNATTACHED), \ S(DEBUG_ACC_ATTACHED), \ S(AUDIO_ACC_ATTACHED), \ @@ -438,6 +440,9 @@ struct tcpm_port { enum tcpm_ams next_ams; bool in_ams; + /* Auto vbus discharge state */ + bool auto_vbus_discharge_enabled; + #ifdef CONFIG_DEBUG_FS struct dentry *dentry; struct mutex logbuffer_lock; /* log buffer access lock */ @@ -3413,6 +3418,8 @@ static int tcpm_src_attach(struct tcpm_port *port) if (port->tcpc->enable_auto_vbus_discharge) { ret = port->tcpc->enable_auto_vbus_discharge(port->tcpc, true); tcpm_log_force(port, "enable vbus discharge ret:%d", ret); + if (!ret) + port->auto_vbus_discharge_enabled = true; } ret = tcpm_set_roles(port, true, TYPEC_SOURCE, tcpm_data_role_for_source(port)); @@ -3495,6 +3502,8 @@ static void tcpm_reset_port(struct tcpm_port *port) if (port->tcpc->enable_auto_vbus_discharge) { ret = port->tcpc->enable_auto_vbus_discharge(port->tcpc, false); tcpm_log_force(port, "Disable vbus discharge ret:%d", ret); + if (!ret) + port->auto_vbus_discharge_enabled = false; } port->in_ams = false; port->ams = NONE_AMS; @@ -3568,6 +3577,8 @@ static int tcpm_snk_attach(struct tcpm_port *port) tcpm_set_auto_vbus_discharge_threshold(port, TYPEC_PWR_MODE_USB, false, VSAFE5V); ret = port->tcpc->enable_auto_vbus_discharge(port->tcpc, true); tcpm_log_force(port, "enable vbus discharge ret:%d", ret); + if (!ret) + port->auto_vbus_discharge_enabled = true; } ret = tcpm_set_roles(port, true, TYPEC_SINK, tcpm_data_role_for_sink(port)); @@ -3684,6 +3695,12 @@ static void run_state_machine(struct tcpm_port *port) switch (port->state) { case TOGGLING: break; + case VBUS_DISCHARGE: + if (port->port_type == TYPEC_PORT_SRC) + tcpm_set_state(port, SRC_UNATTACHED, PD_T_SAFE_0V); + else + tcpm_set_state(port, SNK_UNATTACHED, PD_T_SAFE_0V); + break; /* SRC states */ case SRC_UNATTACHED: if (!port->non_pd_role_swap) @@ -4669,7 +4686,9 @@ static void _tcpm_cc_change(struct tcpm_port *port, enum typec_cc_status cc1, case SRC_READY: if (tcpm_port_is_disconnected(port) || !tcpm_port_is_source(port)) { - if (port->port_type == TYPEC_PORT_SRC) + if (port->auto_vbus_discharge_enabled && !port->vbus_vsafe0v) + tcpm_set_state(port, VBUS_DISCHARGE, 0); + else if (port->port_type == TYPEC_PORT_SRC) tcpm_set_state(port, SRC_UNATTACHED, 0); else tcpm_set_state(port, SNK_UNATTACHED, 0); @@ -4703,7 +4722,18 @@ static void _tcpm_cc_change(struct tcpm_port *port, enum typec_cc_status cc1, tcpm_set_state(port, SNK_DEBOUNCED, 0); break; case SNK_READY: - if (tcpm_port_is_disconnected(port)) + /* + * When set_auto_vbus_discharge_threshold is enabled, CC pins go + * away before vbus decays to disconnect threshold. Allow + * disconnect to be driven by vbus disconnect when auto vbus + * discharge is enabled. + * + * EXIT condition is based primarily on vbus disconnect and CC is secondary. + * "A port that has entered into USB PD communications with the Source and + * has seen the CC voltage exceed vRd-USB may monitor the CC pin to detect + * cable disconnect in addition to monitoring VBUS. + */ + if (!port->auto_vbus_discharge_enabled && tcpm_port_is_disconnected(port)) tcpm_set_state(port, unattached_state(port), 0); else if (!port->pd_capable && (cc1 != old_cc1 || cc2 != old_cc2)) @@ -4803,9 +4833,16 @@ static void _tcpm_cc_change(struct tcpm_port *port, enum typec_cc_status cc1, */ break; + case VBUS_DISCHARGE: + /* Do nothing. Waiting for vsafe0v signal */ + break; default: - if (tcpm_port_is_disconnected(port)) - tcpm_set_state(port, unattached_state(port), 0); + if (tcpm_port_is_disconnected(port)) { + if (port->auto_vbus_discharge_enabled && !port->vbus_vsafe0v) + tcpm_set_state(port, VBUS_DISCHARGE, 0); + else + tcpm_set_state(port, unattached_state(port), 0); + } break; } } @@ -4988,9 +5025,12 @@ static void _tcpm_pd_vbus_off(struct tcpm_port *port) break; default: - if (port->pwr_role == TYPEC_SINK && - port->attached) - tcpm_set_state(port, SNK_UNATTACHED, 0); + if (port->pwr_role == TYPEC_SINK && port->attached) { + if (port->auto_vbus_discharge_enabled && !port->vbus_vsafe0v) + tcpm_set_state(port, VBUS_DISCHARGE, 0); + else + tcpm_set_state(port, SNK_UNATTACHED, 0); + } break; } } @@ -5012,6 +5052,12 @@ static void _tcpm_pd_vbus_vsafe0v(struct tcpm_port *port) tcpm_set_state(port, tcpm_try_snk(port) ? SNK_TRY : SRC_ATTACHED, PD_T_CC_DEBOUNCE); break; + case VBUS_DISCHARGE: + if (port->port_type == TYPEC_PORT_SRC) + tcpm_set_state(port, SRC_UNATTACHED, 0); + else + tcpm_set_state(port, SNK_UNATTACHED, 0); + break; default: break; }