From patchwork Mon Oct 1 19:45:00 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: 10622683 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 461DC15E8 for ; Mon, 1 Oct 2018 19:45:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 32CB728390 for ; Mon, 1 Oct 2018 19:45:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 26A67283C5; Mon, 1 Oct 2018 19:45:15 +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 A31B428390 for ; Mon, 1 Oct 2018 19:45:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726427AbeJBCYc (ORCPT ); Mon, 1 Oct 2018 22:24:32 -0400 Received: from mail-io1-f74.google.com ([209.85.166.74]:37128 "EHLO mail-io1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726367AbeJBCYb (ORCPT ); Mon, 1 Oct 2018 22:24:31 -0400 Received: by mail-io1-f74.google.com with SMTP id i20-v6so2972006ioh.4 for ; Mon, 01 Oct 2018 12:45:11 -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=VsLpWLkkiWqIuUFM4cLoN5CQTLtydc9ja3E5Z5HjjMo=; b=OhTDxa2w4uKZrFOJYCTbu1Js7iVsgCZLRI2l23x7cZqEM9KIS9mcwBoYBcE6/trGC1 zR+IUmS+0Rj7WMKpcrb4V0aUC1JFAaZPR9CFR6/Mjk294vOBn7zehciDUghBsx1nIhRc IqOVKmsqo9AUATaOxTc/dIri3eY/7YuHVZHdZZANJ9+58WfL7EqXBEeZTQrdbnEEIZqz viHfQTC+nCbSJp2hSJvvee+FSrCqSjpBSapslACPi5MhszLwBaGxdgOD92xDzP6tZ+u+ OIiw2All8WURgaJGYkqvBGMA2F3woPsI7uJ282x3zS90aVFGBBKUGCHbB9NgDJAhff6j RORQ== 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=VsLpWLkkiWqIuUFM4cLoN5CQTLtydc9ja3E5Z5HjjMo=; b=ntDzVyfR/Jj1cAtY2OV5rdSci5tSCsJFL0TLq2VCngSZUH9dWA+W+F7Lpu/KARU5n/ 6SoBFND7p/pn5HhXMHv/FWiylwZqUDAcgR/acPLr5sWuzqbxZHGRPxAPgcQwi5yyw1N7 /6rrMDgjFMtNlZB5wN/+v6MtNzW71Km4aFHV1qrkTthIWnzM+p1iNE3QI0LWZsuaCMyF m7N8HhIsIBD90+8WIV2CfzTC54PFqnuucnytegk4BWUfx65ECfr0R5T6cu4FyeUN2DPd /plZ2LJEx6WjmnbiNLIyZWYHS312f7oSkGFrROcWAm9+4CYkqec6b6o4l43rtLyWzhA1 AVhA== X-Gm-Message-State: ABuFfoh0CexB8SmDfJlLHl/D00Llv/lXdqGkID7HUQHYQmnSwYpucujF SYp1ZbvqbP0qeX1/61SEVlqLDAtIokk= X-Google-Smtp-Source: ACcGV6366npxgpbP4UaXLJOMQTHar9EKGuQtigsEM5rXryITRI0dM3Y+vR0A0d0v1JrYLV0lu1omCXcxIcI= X-Received: by 2002:a24:7f05:: with SMTP id r5-v6mr5336500itc.2.1538423110363; Mon, 01 Oct 2018 12:45:10 -0700 (PDT) Date: Mon, 1 Oct 2018 12:45:00 -0700 In-Reply-To: <20181001194501.58338-1-badhri@google.com> Message-Id: <20181001194501.58338-2-badhri@google.com> Mime-Version: 1.0 References: <20181001194501.58338-1-badhri@google.com> X-Mailer: git-send-email 2.19.0.605.g01d371f741-goog Subject: [PATCH v3 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, jackp@codeaurora.org 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: V3: Rebase on top of usb-next 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: Heikki Krogerus --- drivers/usb/typec/tcpm/tcpm.c | 12 ++++++++++-- include/linux/usb/tcpm.h | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index 4f1f4215f3d6..c3ac0e46106b 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/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 7e7fbfb84e8e..50c74a77db55 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; };