From patchwork Fri Sep 28 23:47:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Badhri Jagan Sridharan X-Patchwork-Id: 10620563 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DA703913 for ; Fri, 28 Sep 2018 23:47:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CAB032B90F for ; Fri, 28 Sep 2018 23:47:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE7A62BB03; Fri, 28 Sep 2018 23:47:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5E65B2B919 for ; Fri, 28 Sep 2018 23:47:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727469AbeI2GN0 (ORCPT ); Sat, 29 Sep 2018 02:13:26 -0400 Received: from mail-io1-f74.google.com ([209.85.166.74]:42967 "EHLO mail-io1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727399AbeI2GNU (ORCPT ); Sat, 29 Sep 2018 02:13:20 -0400 Received: by mail-io1-f74.google.com with SMTP id m13-v6so7663036ioq.9 for ; Fri, 28 Sep 2018 16:47:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=VGBPC0+5MfgBeTwcQV7UNeHMjUpPM219+NLcZ6XjGzQ=; b=TTZVld6gH0rnDFS07wFl5BIabshz9wyHmQX1fIo59S4A+1ZXrwnvYEpoZEVoGLJKwN h7+ESC88kRrkaSfL3Dc0xlaE71v5ySVTtrWmUlM3xyOqs0HRhtLL7Gfne+VRIzN7b628 XVO4ud+Oo9zx3HNKIhBgGDm9YHyFduIHOK1+5f0BpDYT5p5QLr6xp0fDzoi+QtZ9bLWs YtjFDVFlhdd7WGTPJ2Adl9Gf04C2I7a8Ic6ggHu/tAY7UPDIyoGqz9eI3e1ndnWGGoh0 Mru1l5vNV/mM+GaC4xgTmltnav6sAlj2zH++dtep0hkYnXIBuhEMdcFfoYTNx2KhaUYx M6yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=VGBPC0+5MfgBeTwcQV7UNeHMjUpPM219+NLcZ6XjGzQ=; b=TZG/mxjMyUlrotRrJKzyw+eq11p4I3udrC5hMQUn89dgujla08OeuzZmVTUf8PlD6g WU8Aa7xrMEBBjfTbQs7CJRu0gHvA7cfnwxtZuZ05mZFOm9LIwJXy45Sc+e7CbrowPOZy k3vOea36n208Eeu/5qI6hgbAFUKkfgobAl2G3W/+enWTYjFOYFyviV70f5mgBVf5Tgti 3R1+IRjN6qiTX5BCJpI56MezgepWq5HWMelSOtIX0HAjhiT5So+5F4peD2+eTpmbK6/1 doMfzjFJUyLy44i+V67pAJQbeZWBal3NKk7E9JPR9qvShkdZMChLjinKM3RoZhN5M29H 4v1A== X-Gm-Message-State: ABuFfogHOgy7snnxm4DCBM3Md2Jz0R5r+J2enOXbyUsfQmHH9icGap+P dOqR/a6GQi2XW7neU4adKgQJvJ4TlYI= X-Google-Smtp-Source: ACcGV61EoIXoXQ3l/UoDyCC1vOcEIp5oOqNhIgZlbcfMkBRfrbWhNhCXjp8uaFVRUKwFqpCELVuJmRi1MC8= X-Received: by 2002:a24:2414:: with SMTP id f20-v6mr3495212ita.0.1538178433353; Fri, 28 Sep 2018 16:47:13 -0700 (PDT) Date: Fri, 28 Sep 2018 16:47:02 -0700 In-Reply-To: <20180928234703.15970-1-badhri@google.com> Message-Id: <20180928234703.15970-2-badhri@google.com> Mime-Version: 1.0 References: <20180928234703.15970-1-badhri@google.com> X-Mailer: git-send-email 2.19.0.605.g01d371f741-goog Subject: [PATCH 2/3] [PATCH v2 2/3] usb: typec: tcpm: Do not disconnect link for self powered devices From: Badhri Jagan Sridharan To: Rob Herring , Mark Rutland , Heikki Krogerus , Greg Kroah-Hartman , Chanwoo Choi , Andrzej Hajda , Li Jun , linux@roeck-us.net Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Badhri Jagan Sridharan Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP During HARD_RESET the data link is disconnected. For self powered device, the spec is advising against doing that. From USB_PD_R3_0 7.1.5 Response to Hard Resets Device operation during and after a Hard Reset is defined as follows: Self-powered devices Should Not disconnect from USB during a Hard Reset (see Section 9.1.2). Bus powered devices will disconnect from USB during a Hard Reset due to the loss of their power source. Tackle this by letting TCPM know whether the device is self or bus powered. This overcomes unnecessary port disconnections from hard reset. Also, speeds up the enumeration time when connected to Type-A ports. Signed-off-by: Badhri Jagan Sridharan --------- Version history: V2: Based on feedback from heikki.krogerus@linux.intel.com - self_powered added to the struct tcpm_port which is populated from a. "connector" node of the device tree in tcpm_fw_get_caps() b. "self_powered" node of the tcpc_config in tcpm_copy_caps Based on feedbase from linux@roeck-us.net - Code was refactored - SRC_HARD_RESET_VBUS_OFF sets the link state to false based on self_powered flag V1 located here: https://lkml.org/lkml/2018/9/13/94 Reviewed-by: Guenter Roeck Reviewed-by: Heikki Krogerus --- drivers/usb/typec/tcpm.c | 12 ++++++++++-- include/linux/usb/tcpm.h | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/usb/typec/tcpm.c b/drivers/usb/typec/tcpm.c index 4f1f4215f3d6e..c3ac0e46106b4 100644 --- a/drivers/usb/typec/tcpm.c +++ b/drivers/usb/typec/tcpm.c @@ -317,6 +317,9 @@ struct tcpm_port { /* Deadline in jiffies to exit src_try_wait state */ unsigned long max_wait; + /* port belongs to a self powered device */ + bool self_powered; + #ifdef CONFIG_DEBUG_FS struct dentry *dentry; struct mutex logbuffer_lock; /* log buffer access lock */ @@ -3257,7 +3260,8 @@ static void run_state_machine(struct tcpm_port *port) case SRC_HARD_RESET_VBUS_OFF: tcpm_set_vconn(port, true); tcpm_set_vbus(port, false); - tcpm_set_roles(port, false, TYPEC_SOURCE, TYPEC_HOST); + tcpm_set_roles(port, port->self_powered, TYPEC_SOURCE, + TYPEC_HOST); tcpm_set_state(port, SRC_HARD_RESET_VBUS_ON, PD_T_SRC_RECOVER); break; case SRC_HARD_RESET_VBUS_ON: @@ -3270,7 +3274,8 @@ static void run_state_machine(struct tcpm_port *port) memset(&port->pps_data, 0, sizeof(port->pps_data)); tcpm_set_vconn(port, false); tcpm_set_charge(port, false); - tcpm_set_roles(port, false, TYPEC_SINK, TYPEC_DEVICE); + tcpm_set_roles(port, port->self_powered, TYPEC_SINK, + TYPEC_DEVICE); /* * VBUS may or may not toggle, depending on the adapter. * If it doesn't toggle, transition to SNK_HARD_RESET_SINK_ON @@ -4409,6 +4414,8 @@ static int tcpm_fw_get_caps(struct tcpm_port *port, return -EINVAL; port->operating_snk_mw = mw / 1000; + port->self_powered = fwnode_property_read_bool(fwnode, "self-powered"); + return 0; } @@ -4717,6 +4724,7 @@ static int tcpm_copy_caps(struct tcpm_port *port, port->typec_caps.prefer_role = tcfg->default_role; port->typec_caps.type = tcfg->type; port->typec_caps.data = tcfg->data; + port->self_powered = port->tcpc->config->self_powered; return 0; } diff --git a/include/linux/usb/tcpm.h b/include/linux/usb/tcpm.h index 7e7fbfb84e8e3..50c74a77db55c 100644 --- a/include/linux/usb/tcpm.h +++ b/include/linux/usb/tcpm.h @@ -89,6 +89,7 @@ struct tcpc_config { enum typec_port_data data; enum typec_role default_role; bool try_role_hw; /* try.{src,snk} implemented in hardware */ + bool self_powered; /* port belongs to a self powered device */ const struct typec_altmode_desc *alt_modes; };