From patchwork Mon Oct 1 19:44:59 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: 10622673 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 60CA715E8 for ; Mon, 1 Oct 2018 19:45:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48FB628390 for ; Mon, 1 Oct 2018 19:45:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3B55C283C5; Mon, 1 Oct 2018 19:45:09 +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 D516D28390 for ; Mon, 1 Oct 2018 19:45:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726362AbeJBCY2 (ORCPT ); Mon, 1 Oct 2018 22:24:28 -0400 Received: from mail-pg1-f201.google.com ([209.85.215.201]:55950 "EHLO mail-pg1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726238AbeJBCY1 (ORCPT ); Mon, 1 Oct 2018 22:24:27 -0400 Received: by mail-pg1-f201.google.com with SMTP id d132-v6so16664157pgc.22 for ; Mon, 01 Oct 2018 12:45:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=udaP/p7JA9sNL+94no8kNxyGH61VvMpNqCPfAcizEOQ=; b=S0Ix9PzTeTETWVziFDdenMCFKp59d3063s6Q3p66CGtdDDrgLFYv//FBKxq9nreyDs 1DeDB/pGJDG6yFo2WurfoseLp8O5PDdzwDU4GconXQd/IsGVt65+XbELa6+rctijCUQX JVDn91lhYwdBZ9Jy3QJ+FyVlrVGg0gQ2ZWzcouzxsIjO5SGQk0F3BmLaXln8dHrdU+yV F9SVkgm2JpVBD7uQChCMli3fY54JlnZ/7dDj5Tc0380gtFHE84S1LCo0xF0eGqnxbu2f GD+JOPT0lr5LpgOXPmOaChPDL3CpKaFby1NF26+lUhml0hivoW3avhM2xZ9NKCfYDACT yptw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=udaP/p7JA9sNL+94no8kNxyGH61VvMpNqCPfAcizEOQ=; b=ftHI8ac3DiyCQwaEJpcFSfoIs24kTvB/7JXyIu969w9OxLmG/Ny+hYwQQHNNDKq/Kq TyyfCmLAXNQ8PW+Z1KdkslVrRDow9veWRtzevNoKNIoKYMri09Y+Lk9ZpVOoP7d37Hvj WjrdFu/bPY3Mwl2oObWnUThmP7+kyQNJ3oLjldQMQU9goM9hASpyc+wjNFrHMim4MjrE P79Ry0MEWeS3/XCWtokTKx+zRBEdljQr129d7BKTfyH5RZxlTCaKmePlSdLgRRl6XtGP +SVdfmIkfkB9OnII6kOl9yenFeFKO9oDFPN5u+ZUgYzdr8oymOY+EmCbE6ERd6Uutgm8 NlZQ== X-Gm-Message-State: ABuFfogGYhb4LSh6Ta9YIMVqGOMwRu4ggGbkPRmVrK/pAOrnpVe269Fb oBF9OFQfNMwWtkF5jEhdLJQ6k0EX+Ds= X-Google-Smtp-Source: ACcGV61R2rvneeiFmOjqbPXQy0Hxj0PyIruH0rAsK13hgcu2ZoZyzVfSvLmOKMua4msck+l210dCjqEWAeY= X-Received: by 2002:a62:ca1a:: with SMTP id n26-v6mr5695133pfg.15.1538423105823; Mon, 01 Oct 2018 12:45:05 -0700 (PDT) Date: Mon, 1 Oct 2018 12:44:59 -0700 Message-Id: <20181001194501.58338-1-badhri@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.19.0.605.g01d371f741-goog Subject: [PATCH v3 1/3] dt-bindings: connector: Add self-powered property 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 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. Therefore it is necessary to know whether the port belongs to a device which is self powered or bus powered. This change adds "self-powered" flag to the connector class which present indicates that the port belongs to a device that is self powered. Else it is bus powered usb device. Signed-off-by: Badhri Jagan Sridharan ------- Changes is v3: - Rebase on top of usb-next - no change w.r.t to this patch. Same as previous versions. No v2 version as the patch was introduced there. Reviewed-by: Heikki Krogerus Reviewed-by: Rob Herring --- Documentation/devicetree/bindings/connector/usb-connector.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Documentation/devicetree/bindings/connector/usb-connector.txt b/Documentation/devicetree/bindings/connector/usb-connector.txt index d90e17e2428b..a9a2f2fc44f2 100644 --- a/Documentation/devicetree/bindings/connector/usb-connector.txt +++ b/Documentation/devicetree/bindings/connector/usb-connector.txt @@ -14,6 +14,8 @@ Optional properties: - label: symbolic name for the connector, - type: size of the connector, should be specified in case of USB-A, USB-B non-fullsize connectors: "mini", "micro". +- self-powered: Set this property if the usb device that has its own power + source. Optional properties for usb-c-connector: - power-role: should be one of "source", "sink" or "dual"(DRP) if typec 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; }; From patchwork Mon Oct 1 19:45:01 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: 10622685 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 52EE36CB for ; Mon, 1 Oct 2018 19:45:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4079428390 for ; Mon, 1 Oct 2018 19:45:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 34815283C5; Mon, 1 Oct 2018 19:45:19 +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 CCF4C28390 for ; Mon, 1 Oct 2018 19:45:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726462AbeJBCYf (ORCPT ); Mon, 1 Oct 2018 22:24:35 -0400 Received: from mail-pf1-f202.google.com ([209.85.210.202]:47264 "EHLO mail-pf1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726445AbeJBCYe (ORCPT ); Mon, 1 Oct 2018 22:24:34 -0400 Received: by mail-pf1-f202.google.com with SMTP id i76-v6so3727136pfk.14 for ; Mon, 01 Oct 2018 12:45:14 -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=QnL/wTVd8g+QQeeekaKssRaFgYtQTuUuTzrOIXl9vSk=; b=dpqKwe5Jx6HO0cUzvwv0H7tzvpV3wpkeNtz/Ke092GpEnNuuOikG2YlGK0AHPileSq lXd1DzNXvtw/eJItv146cxyedGJxyOkan/mUQiiHNdBN/zfHG+PI1i3vCTgM0rxscIX+ Odj5CK5qqOI0YdMP7xmRWpRzJGJjpQZX8C0G1yB4ysJgcJ7JKz5IS8HOQvGrxSZV+7nT 7e4ztgfS5x9SHICPTqgIQpXfp22QixU8mI9uwhsNxtLcB20byNYUExTIUXCxwK1lphu+ NrkLwJr+CDpBrr+opME9s2rOdSCCl/n/7SuXJl4LMbPRYxqicfaamUGw+7UJUu9ImuC2 ofKw== 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=QnL/wTVd8g+QQeeekaKssRaFgYtQTuUuTzrOIXl9vSk=; b=LT+ud8iwwdfw10eNb+Km20NzD6MR/DecHYNpJCCFnrNYWSKU/wODDJMk/i/S1TBE0h ElyfgKblun7KZU85ppsZF/26hgB5rAwIEqTGQqWAa9WyL1A+gmZgOh6kqST5yYt2pGwr J0RjTl2p216x56QYvzA3gCt7qjMHgPPmi8kM8YzOU9v/lTmZrGdPFooRjPWyuSVxi7Xh mukSev1lbnAPT7VHOt4tbxu+MJTdfGbILMMtQIdwtojIzVrGIeriNScYTVd0GO7XQK1d FtKuFuMojcgzG0GiOx+3n/Z29R/e3xpUwAX9kKvz3hDRhfYS4wGrqvRVlAPmEO+oPMz2 Lm9Q== X-Gm-Message-State: ABuFfog/h/5BCp/qVuaTctffoeBkqAlcU2yVrAao0owJ4D4RAfvfGOp3 25w+5N1DLMAQXKcEP9YGTquWxpN5C1Y= X-Google-Smtp-Source: ACcGV60qsdXK9rO3A9sY2pXzzAk/S0SH0TV+mpPlUa2AYv0/Arbuk5qof6QLcwgxy129G1i2UOIikyd1XsY= X-Received: by 2002:a62:9c8d:: with SMTP id u13-v6mr2959384pfk.41.1538423113792; Mon, 01 Oct 2018 12:45:13 -0700 (PDT) Date: Mon, 1 Oct 2018 12:45:01 -0700 In-Reply-To: <20181001194501.58338-1-badhri@google.com> Message-Id: <20181001194501.58338-3-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 3/3] usb: typec: tcpm: charge current handling for sink during hard reset 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 the initial connect to a non-pd port, sink would hard reset twice before deeming that the port partner is non-pd. TCPM sets the the charge path to false during the hard reset. This causes unnecessary connects/disconnects of charge path and makes port take longer to charge from the non-pd ports. Avoid this by not setting the charge path to false unless the partner has already identified to be pd capable. When partner is a pd port, set the charge path to false in SNK_HARD_RESET_SINK_OFF. Set the current limits to default value based of CC pull up and resume the charge path when port enters SNK_HARD_RESET_SINK_ON. Signed-off-by: Badhri Jagan Sridharan -------- Changes in V3: Rebase on top of usb-next Changes in V2: Based on feedback of jackp@codeaurora.org - vsafe_5v_hard_reset flag from tcpc_config is removed - Patch only differentiates between pd port partner and non-pd port partner V1 version of the patch is here: https://lkml.org/lkml/2018/9/14/11 Reviewed-by: Rob Herring Reviewed-by: Heikki Krogerus --- drivers/usb/typec/tcpm/tcpm.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index c3ac0e46106b..c25a69922ee6 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -3273,7 +3273,8 @@ static void run_state_machine(struct tcpm_port *port) case SNK_HARD_RESET_SINK_OFF: memset(&port->pps_data, 0, sizeof(port->pps_data)); tcpm_set_vconn(port, false); - tcpm_set_charge(port, false); + if (port->pd_capable) + tcpm_set_charge(port, false); tcpm_set_roles(port, port->self_powered, TYPEC_SINK, TYPEC_DEVICE); /* @@ -3305,6 +3306,12 @@ static void run_state_machine(struct tcpm_port *port) * Similar, dual-mode ports in source mode should transition * to PE_SNK_Transition_to_default. */ + if (port->pd_capable) { + tcpm_set_current_limit(port, + tcpm_get_current_limit(port), + 5000); + tcpm_set_charge(port, true); + } tcpm_set_attached_state(port, true); tcpm_set_state(port, SNK_STARTUP, 0); break;