From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-4058583-1522034145-2-2284569555476917773 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.249, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES roen, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='CN', FromHeader='net', MailFrom='org' X-Spam-charsets: plain='utf-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: linux-usb-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1522034144; b=R3grXgnSYWIpzAMO4dmYf9NHXSYrClLK6QqMSbnDfAZQZoe GcPh3Tk5uj/eeN+egE/Zkr+1qLfluXcyq44I+q2JXAS04Q+DFIRAVtDKF79H8ZRD 5YFyUg7xiGk7wQpswqOA2do0tlqzPZ4At5Z9vbkgxEeqo/P3Q3HF9LlHNwKpx6CE V0nqNCddNiv0CTUbDd9UU3u3LUlSKOZwLJKudfAtN9UZDozT8EsGeV7K+3H+3ShF DpOr3t4CqeAdaSlry/Zna7kDFKUvkB8LGoWQjNQGkVqYuhb170minNrfUc0FeGFH iqSB3sMAbRn6B3JbTWu2ZFDauvat2s3E0G8wc/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=subject:to:cc:references:from:message-id :date:mime-version:in-reply-to:content-type :content-transfer-encoding:sender:list-id; s=arctest; t= 1522034144; bh=4iF/OaTLAYp3DDIDY8zaSEL/TQn05O5dYYbcuHiQcVA=; b=s GgH2VGWUIzDmwAEYBSTJyWv7BLu/cdpGus9+CNVFm75t+AmWWmVy+tL88BKhCoZJ KPbMaMS++IWI6unuxeOCOhJ24H7fBpjdpJ03vy/RBSJVkDjm76d5l4LWnCONb4W4 qusiQt8zttF3kzyTi1BZVLGSz90pEZ5d0sVdfpDs63pZps2NfypMd0nK+BmgN7mf lfGZSbGKIQHffqXIgwHEUZNlEhT7kKjUsqqEme7jHkKNF+7ZLidtt2aSVBxv3utW uJL6PyQHvZC84wL0juDOdho3U8r2okyfk7XR9aou0qowuyBHxwYkqLhHQMCHm0Yd s5D2rXJUb+ozh/E7nDcFg== ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=fail (message has been altered, 2048-bit rsa key sha256) header.d=gmail.com header.i=@gmail.com header.b=RQ6L1LtL x-bits=2048 x-keytype=rsa x-algorithm=sha256 x-selector=20161025; dmarc=none (p=none,has-list-id=yes,d=none) header.from=roeck-us.net; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=linux-usb-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-google-dkim=fail (message has been altered, 2048-bit rsa key) header.d=1e100.net header.i=@1e100.net header.b=pDJRU+/I; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=roeck-us.net header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx4.messagingengine.com; arc=none (no signatures found); dkim=fail (message has been altered, 2048-bit rsa key sha256) header.d=gmail.com header.i=@gmail.com header.b=RQ6L1LtL x-bits=2048 x-keytype=rsa x-algorithm=sha256 x-selector=20161025; dmarc=none (p=none,has-list-id=yes,d=none) header.from=roeck-us.net; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=linux-usb-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-google-dkim=fail (message has been altered, 2048-bit rsa key) header.d=1e100.net header.i=@1e100.net header.b=pDJRU+/I; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=roeck-us.net header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751938AbeCZDPa (ORCPT ); Sun, 25 Mar 2018 23:15:30 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:37962 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750839AbeCZDP3 (ORCPT ); Sun, 25 Mar 2018 23:15:29 -0400 X-Google-Smtp-Source: AG47ELtJCe4riVdhknGNgeA+Jdl7zdg7jpwHxo0UGtpWLaJcNTirzwSD7S//XIGvPTGNycFBag0vfg== Subject: Re: [PATCH v7 6/6] typec: tcpm: Add support for sink PPS related messages To: Adam Thomson , Heikki Krogerus , Greg Kroah-Hartman , Sebastian Reichel , Hans de Goede , Jun Li Cc: linux-usb@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, support.opensource@diasemi.com References: <3750bdbd01434d4a6b0319a06eddda819272f604.1521799705.git.Adam.Thomson.Opensource@diasemi.com> From: Guenter Roeck Message-ID: Date: Sun, 25 Mar 2018 20:15:27 -0700 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <3750bdbd01434d4a6b0319a06eddda819272f604.1521799705.git.Adam.Thomson.Opensource@diasemi.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-usb-owner@vger.kernel.org X-Mailing-List: linux-usb@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: On 03/23/2018 03:12 AM, Adam Thomson wrote: > This commit adds sink side support for Get_Status, Status, > Get_PPS_Status and PPS_Status handling. As there's the > potential for a partner to respond with Not_Supported, > handling of this message is also added. Sending of > Not_Supported is added to handle messagescreceived but not > yet handled. > > Signed-off-by: Adam Thomson > Acked-by: Heikki Krogerus Reviewed-by: Guenter Roeck > --- > drivers/usb/typec/tcpm.c | 143 ++++++++++++++++++++++++++++++++++++++++++++--- > 1 file changed, 134 insertions(+), 9 deletions(-) > > diff --git a/drivers/usb/typec/tcpm.c b/drivers/usb/typec/tcpm.c > index 57a7d1a..7025a16 100644 > --- a/drivers/usb/typec/tcpm.c > +++ b/drivers/usb/typec/tcpm.c > @@ -19,7 +19,9 @@ > #include > #include > #include > +#include > #include > +#include > #include > #include > #include > @@ -113,6 +115,11 @@ > S(SNK_TRYWAIT_VBUS), \ > S(BIST_RX), \ > \ > + S(GET_STATUS_SEND), \ > + S(GET_STATUS_SEND_TIMEOUT), \ > + S(GET_PPS_STATUS_SEND), \ > + S(GET_PPS_STATUS_SEND_TIMEOUT), \ > + \ > S(ERROR_RECOVERY), \ > S(PORT_RESET), \ > S(PORT_RESET_WAIT_OFF) > @@ -143,6 +150,7 @@ enum pd_msg_request { > PD_MSG_NONE = 0, > PD_MSG_CTRL_REJECT, > PD_MSG_CTRL_WAIT, > + PD_MSG_CTRL_NOT_SUPP, > PD_MSG_DATA_SINK_CAP, > PD_MSG_DATA_SOURCE_CAP, > }; > @@ -1398,10 +1406,42 @@ static int tcpm_validate_caps(struct tcpm_port *port, const u32 *pdo, > /* > * PD (data, control) command handling functions > */ > +static inline enum tcpm_state ready_state(struct tcpm_port *port) > +{ > + if (port->pwr_role == TYPEC_SOURCE) > + return SRC_READY; > + else > + return SNK_READY; > +} > > static int tcpm_pd_send_control(struct tcpm_port *port, > enum pd_ctrl_msg_type type); > > +static void tcpm_handle_alert(struct tcpm_port *port, const __le32 *payload, > + int cnt) > +{ > + u32 p0 = le32_to_cpu(payload[0]); > + unsigned int type = usb_pd_ado_type(p0); > + > + if (!type) { > + tcpm_log(port, "Alert message received with no type"); > + return; > + } > + > + /* Just handling non-battery alerts for now */ > + if (!(type & USB_PD_ADO_TYPE_BATT_STATUS_CHANGE)) { > + switch (port->state) { > + case SRC_READY: > + case SNK_READY: > + tcpm_set_state(port, GET_STATUS_SEND, 0); > + break; > + default: > + tcpm_queue_message(port, PD_MSG_CTRL_WAIT); > + break; > + } > + } > +} > + > static void tcpm_pd_data_request(struct tcpm_port *port, > const struct pd_message *msg) > { > @@ -1489,6 +1529,14 @@ static void tcpm_pd_data_request(struct tcpm_port *port, > tcpm_set_state(port, BIST_RX, 0); > } > break; > + case PD_DATA_ALERT: > + tcpm_handle_alert(port, msg->payload, cnt); > + break; > + case PD_DATA_BATT_STATUS: > + case PD_DATA_GET_COUNTRY_INFO: > + /* Currently unsupported */ > + tcpm_queue_message(port, PD_MSG_CTRL_NOT_SUPP); > + break; > default: > tcpm_log(port, "Unhandled data message type %#x", type); > break; > @@ -1571,6 +1619,7 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, > break; > case PD_CTRL_REJECT: > case PD_CTRL_WAIT: > + case PD_CTRL_NOT_SUPP: > switch (port->state) { > case SNK_NEGOTIATE_CAPABILITIES: > /* USB PD specification, Figure 8-43 */ > @@ -1690,12 +1739,75 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, > break; > } > break; > + case PD_CTRL_GET_SOURCE_CAP_EXT: > + case PD_CTRL_GET_STATUS: > + case PD_CTRL_FR_SWAP: > + case PD_CTRL_GET_PPS_STATUS: > + case PD_CTRL_GET_COUNTRY_CODES: > + /* Currently not supported */ > + tcpm_queue_message(port, PD_MSG_CTRL_NOT_SUPP); > + break; > default: > tcpm_log(port, "Unhandled ctrl message type %#x", type); > break; > } > } > > +static void tcpm_pd_ext_msg_request(struct tcpm_port *port, > + const struct pd_message *msg) > +{ > + enum pd_ext_msg_type type = pd_header_type_le(msg->header); > + unsigned int data_size = pd_ext_header_data_size_le(msg->ext_msg.header); > + > + if (!(msg->ext_msg.header && PD_EXT_HDR_CHUNKED)) { > + tcpm_log(port, "Unchunked extended messages unsupported"); > + return; > + } > + > + if (data_size > PD_EXT_MAX_CHUNK_DATA) { > + tcpm_log(port, "Chunk handling not yet supported"); > + return; > + } > + > + switch (type) { > + case PD_EXT_STATUS: > + /* > + * If PPS related events raised then get PPS status to clear > + * (see USB PD 3.0 Spec, 6.5.2.4) > + */ > + if (msg->ext_msg.data[USB_PD_EXT_SDB_EVENT_FLAGS] & > + USB_PD_EXT_SDB_PPS_EVENTS) > + tcpm_set_state(port, GET_PPS_STATUS_SEND, 0); > + else > + tcpm_set_state(port, ready_state(port), 0); > + break; > + case PD_EXT_PPS_STATUS: > + /* > + * For now the PPS status message is used to clear events > + * and nothing more. > + */ > + tcpm_set_state(port, ready_state(port), 0); > + break; > + case PD_EXT_SOURCE_CAP_EXT: > + case PD_EXT_GET_BATT_CAP: > + case PD_EXT_GET_BATT_STATUS: > + case PD_EXT_BATT_CAP: > + case PD_EXT_GET_MANUFACTURER_INFO: > + case PD_EXT_MANUFACTURER_INFO: > + case PD_EXT_SECURITY_REQUEST: > + case PD_EXT_SECURITY_RESPONSE: > + case PD_EXT_FW_UPDATE_REQUEST: > + case PD_EXT_FW_UPDATE_RESPONSE: > + case PD_EXT_COUNTRY_INFO: > + case PD_EXT_COUNTRY_CODES: > + tcpm_queue_message(port, PD_MSG_CTRL_NOT_SUPP); > + break; > + default: > + tcpm_log(port, "Unhandled extended message type %#x", type); > + break; > + } > +} > + > static void tcpm_pd_rx_handler(struct work_struct *work) > { > struct pd_rx_event *event = container_of(work, > @@ -1736,7 +1848,9 @@ static void tcpm_pd_rx_handler(struct work_struct *work) > "Data role mismatch, initiating error recovery"); > tcpm_set_state(port, ERROR_RECOVERY, 0); > } else { > - if (cnt) > + if (msg->header & PD_HEADER_EXT_HDR) > + tcpm_pd_ext_msg_request(port, msg); > + else if (cnt) > tcpm_pd_data_request(port, msg); > else > tcpm_pd_ctrl_request(port, msg); > @@ -1797,6 +1911,9 @@ static bool tcpm_send_queued_message(struct tcpm_port *port) > case PD_MSG_CTRL_REJECT: > tcpm_pd_send_control(port, PD_CTRL_REJECT); > break; > + case PD_MSG_CTRL_NOT_SUPP: > + tcpm_pd_send_control(port, PD_CTRL_NOT_SUPP); > + break; > case PD_MSG_DATA_SINK_CAP: > tcpm_pd_send_sink_caps(port); > break; > @@ -2483,14 +2600,6 @@ static inline enum tcpm_state hard_reset_state(struct tcpm_port *port) > return SNK_UNATTACHED; > } > > -static inline enum tcpm_state ready_state(struct tcpm_port *port) > -{ > - if (port->pwr_role == TYPEC_SOURCE) > - return SRC_READY; > - else > - return SNK_READY; > -} > - > static inline enum tcpm_state unattached_state(struct tcpm_port *port) > { > if (port->port_type == TYPEC_PORT_DRP) { > @@ -3190,6 +3299,22 @@ static void run_state_machine(struct tcpm_port *port) > /* Always switch to unattached state */ > tcpm_set_state(port, unattached_state(port), 0); > break; > + case GET_STATUS_SEND: > + tcpm_pd_send_control(port, PD_CTRL_GET_STATUS); > + tcpm_set_state(port, GET_STATUS_SEND_TIMEOUT, > + PD_T_SENDER_RESPONSE); > + break; > + case GET_STATUS_SEND_TIMEOUT: > + tcpm_set_state(port, ready_state(port), 0); > + break; > + case GET_PPS_STATUS_SEND: > + tcpm_pd_send_control(port, PD_CTRL_GET_PPS_STATUS); > + tcpm_set_state(port, GET_PPS_STATUS_SEND_TIMEOUT, > + PD_T_SENDER_RESPONSE); > + break; > + case GET_PPS_STATUS_SEND_TIMEOUT: > + tcpm_set_state(port, ready_state(port), 0); > + break; > case ERROR_RECOVERY: > tcpm_swap_complete(port, -EPROTO); > tcpm_pps_complete(port, -EPROTO); >