From patchwork Fri Dec 6 07:46:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Sunil Dhamne via B4 Relay X-Patchwork-Id: 13896576 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 791BF1DDC3F; Fri, 6 Dec 2024 07:46:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733471218; cv=none; b=b4nObeImMkcctl1VhTMIW6hc6OIczFaKMA8O/p0cDc0IcURzeoPLtvzmOMB2YPoFAicd9NvYINgEMiDkno7eG0MoaaWy/SigBVmeTyWQW7SD/U2lfORWeUEzC73yimWmV6tyPstQcf0wxp8HB+KbZCMbadV6svM+MFEXEBC9MmI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733471218; c=relaxed/simple; bh=Q0eQs9S1ZtP3dTPRCecbQHN1HOTEtAG6/4CUFgxubHg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=H5K0sP1WIgIMNWJ8T3dHX/UO+w/kx9abI9Xb2JBU4YKQPoGaj4ZI1wa02lFYCPvL88UAxGF6MVmxCinbf3SfreejBKrNILUWrIrJ3lwzUtXYuAwLCN2vv5HmZkziaqX/SOoyW1gYBmTKW688GZ4zy9wiGPtEJvK9/2L8A21a74o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Q4Tqnhd2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Q4Tqnhd2" Received: by smtp.kernel.org (Postfix) with ESMTPS id 1C45CC4CEE0; Fri, 6 Dec 2024 07:46:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733471218; bh=Q0eQs9S1ZtP3dTPRCecbQHN1HOTEtAG6/4CUFgxubHg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=Q4Tqnhd2vi/J5R/Rgc6Ix0D8D6F855NNH0kX/WLDsdkipxebG6cJvXhHEYhVGCmsN B/PmGulrmVS2jHw00cZAT3IqjBd/kHTw9kBfHxHLuCu5YXII1RUut1fq6ROLC3xA46 5u6YfpNHVg35sQCoRfq58rzrAtChi+8XU7UbTp15QCso7adoq+23HXsusZd+qamINY SbRM04yIMHCLvImn7Fhd6sQ4DZCRxI02AX3/i9wgbqGW/kWi6LplEdDEKQ7ewl4+lX hPqLeU6M08trk8RfzUlQFs4ThtaKy3st7vQzf+7JCF+Nll1YDpeSXBiFC3hhbyRzK0 kAaRCnphGBQ1A== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 055B8E77179; Fri, 6 Dec 2024 07:46:58 +0000 (UTC) From: Amit Sunil Dhamne via B4 Relay Date: Thu, 05 Dec 2024 23:46:08 -0800 Subject: [PATCH 1/3] dt-bindings: connector: Add pd-revision property Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241205-get_rev_upstream-v1-1-90158ee7d75f@google.com> References: <20241205-get_rev_upstream-v1-0-90158ee7d75f@google.com> In-Reply-To: <20241205-get_rev_upstream-v1-0-90158ee7d75f@google.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Greg Kroah-Hartman , Badhri Jagan Sridharan , Heikki Krogerus Cc: Kyle Tso , RD Babiera , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Amit Sunil Dhamne X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1733471217; l=1957; i=amitsd@google.com; s=20241031; h=from:subject:message-id; bh=KCmbTIYgv+x/jL3O6vDHgQvacNFdRGVm2+fsSGCWj+Y=; b=jKPvHiOi2wcPAm8xaOb259LiyLK7UT/7BuQMvOhx8IA0cMKZNgIm51ClNUs9rmjz50CQ7xG4R tlpJBr1FwDpBDP1ftV1lqliBLK/si3qmYxX8wNMmuMfAQyZllq3dKKK X-Developer-Key: i=amitsd@google.com; a=ed25519; pk=wD+XZSST4dmnNZf62/lqJpLm7fiyT8iv462zmQ3H6bI= X-Endpoint-Received: by B4 Relay for amitsd@google.com/20241031 with auth_id=262 X-Original-From: Amit Sunil Dhamne Reply-To: amitsd@google.com From: Amit Sunil Dhamne Add pd-revision property definition, to specify the maximum Power Delivery Revision and Version supported by the connector. Signed-off-by: Amit Sunil Dhamne --- Documentation/devicetree/bindings/connector/usb-connector.yaml | 6 ++++++ Documentation/devicetree/bindings/usb/maxim,max33359.yaml | 1 + 2 files changed, 7 insertions(+) diff --git a/Documentation/devicetree/bindings/connector/usb-connector.yaml b/Documentation/devicetree/bindings/connector/usb-connector.yaml index 67700440e23b5b7ca0db2c395c8a455bcf650864..341d2872e8d43450d219b7b72d48790051dc4e2b 100644 --- a/Documentation/devicetree/bindings/connector/usb-connector.yaml +++ b/Documentation/devicetree/bindings/connector/usb-connector.yaml @@ -293,6 +293,12 @@ properties: PD negotiation till BC1.2 detection completes. default: 0 + pd-revision: + description: Specifies the maximum USB PD revision and version supported by + the connector. This property is specified in the following order; + . + $ref: /schemas/types.yaml#/definitions/uint8-array + dependencies: sink-vdos-v1: [ sink-vdos ] sink-vdos: [ sink-vdos-v1 ] diff --git a/Documentation/devicetree/bindings/usb/maxim,max33359.yaml b/Documentation/devicetree/bindings/usb/maxim,max33359.yaml index 20b62228371bdedf2fe92767ffe443bec87babc5..350d39fbf2dcd4d99db07cb8f099467e6fc653ee 100644 --- a/Documentation/devicetree/bindings/usb/maxim,max33359.yaml +++ b/Documentation/devicetree/bindings/usb/maxim,max33359.yaml @@ -70,6 +70,7 @@ examples: PDO_FIXED_DUAL_ROLE) PDO_FIXED(9000, 2000, 0)>; sink-bc12-completion-time-ms = <500>; + pd-revision = /bits/ 8 <0x03 0x01 0x01 0x08>; }; }; }; From patchwork Fri Dec 6 07:46:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Sunil Dhamne via B4 Relay X-Patchwork-Id: 13896578 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9F7C61DE2B7; Fri, 6 Dec 2024 07:46:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733471218; cv=none; b=ke9NqgpqKNaCQgCNJi085lx6jp/TqavnLgKUwtfnMCkgwCUABRiZG1MzMQGidsDm3xcP0+8Z4y80eeAQjBdI3dfEKLe+Ukmc6wsOtdo4QvRBmWs5Z1z19fycJRt6OnUIo27c33Nb/C2enDZqSVifEZMtMCTvFuqtej6W1LvgLbA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733471218; c=relaxed/simple; bh=YnY9okmLhb2rO8nDQHC9+5DkEpZ8pF35PzYJ12Pfjgg=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DUCx+Uu6KmY8dBDwNxBKcyTHxFWToRztt4H4Wc3E3E4H8Jd0Rb9EIQLQw6xtcP9Jbdw8Kus1zOrSZ7vLrT/mct1eH4WFQbfOxjUclucw5ZZRrE3Ts6ORGDU/I8DIJQ0onlMqckDSk/IONBiHwr9a+WLgqL2RjV8xSmmowkMXvcM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WJLOpSE+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WJLOpSE+" Received: by smtp.kernel.org (Postfix) with ESMTPS id 44989C4CEE2; Fri, 6 Dec 2024 07:46:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733471218; bh=YnY9okmLhb2rO8nDQHC9+5DkEpZ8pF35PzYJ12Pfjgg=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=WJLOpSE+hFqypNmZGmqO5rQF6BCjjfId3vlfsh+RGxTT1rAdJaq2tOYUtynVpgx9r rakmqFgEOOsYtoRNSnxNOdNDxl58p6MT5bRqVubT31+AlXF75Ee/lyL9xqaIKBzGit 7dbQc+gTid0kwgmfG0MKPRT09fjtn5+nQtAQwHLYsC0KDdDKKvEKZ9EX4m7mplRDds AgL5D/1HHc9eUva7xXQeVfdMKMBObjYljID+mBqpRSQlPsSc2rNxikvXLrjXNG72zJ +nwhqDkjWjllE7n6ZN2iTJ9Us8yHpub05DKmbRw230SMd6yV6NGsSBDx/WJRDSJYOX RhUAR/Lk/COHg== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 17D37E7717D; Fri, 6 Dec 2024 07:46:58 +0000 (UTC) From: Amit Sunil Dhamne via B4 Relay Date: Thu, 05 Dec 2024 23:46:09 -0800 Subject: [PATCH 2/3] usb: typec: tcpm: Add support for parsing pd-revision DT property Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241205-get_rev_upstream-v1-2-90158ee7d75f@google.com> References: <20241205-get_rev_upstream-v1-0-90158ee7d75f@google.com> In-Reply-To: <20241205-get_rev_upstream-v1-0-90158ee7d75f@google.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Greg Kroah-Hartman , Badhri Jagan Sridharan , Heikki Krogerus Cc: Kyle Tso , RD Babiera , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Amit Sunil Dhamne X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1733471217; l=3819; i=amitsd@google.com; s=20241031; h=from:subject:message-id; bh=ZW21PLDCuXrKmljq+jN/SmgnnmS/lrVcV0OJXDrQ1ss=; b=QQpQdKPVDVgLOvWOVKIjUMdCy+MX63R5teB+pQd2qRFLUdUbJUrENM6y9wGq7ak3j7itQHrIG +iHPiI8YQuvBrbyVzIUFt7aoqv5/eaqPNfu+yOFNX54vbHIjKBwyrNm X-Developer-Key: i=amitsd@google.com; a=ed25519; pk=wD+XZSST4dmnNZf62/lqJpLm7fiyT8iv462zmQ3H6bI= X-Endpoint-Received: by B4 Relay for amitsd@google.com/20241031 with auth_id=262 X-Original-From: Amit Sunil Dhamne Reply-To: amitsd@google.com From: Amit Sunil Dhamne Add support for parsing "pd-revision" DT property in TCPM and store PD revision and version supported by the Type-C connnector. It should be noted that the PD revision is the maximum possible revision supported by the port. This is different from the 2 bit revision set in PD msg headers. The purpose of the 2 bit revision value is to negotiate between Rev 2.X & 3.X spec rev as part of contract negotiation, while this is used for Get_Revision AMS after a contract is in place. Signed-off-by: Amit Sunil Dhamne Reviewed-by: Badhri Jagan Sridharan --- drivers/usb/typec/tcpm/tcpm.c | 46 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index 6021eeb903fec53316dfa2d6b825c334d55b7cab..59621cfaee3d67a36f3ad6870bd1aa92d382f33a 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -310,6 +310,13 @@ struct pd_data { unsigned int operating_snk_mw; }; +struct pd_revision_info { + u8 rev_major; + u8 rev_minor; + u8 ver_major; + u8 ver_minor; +}; + /* * @sink_wait_cap_time: Deadline (in ms) for tTypeCSinkWaitCap timer * @ps_src_wait_off_time: Deadline (in ms) for tPSSourceOff timer @@ -567,6 +574,9 @@ struct tcpm_port { /* Timer deadline values configured at runtime */ struct pd_timings timings; + + /* Indicates maximum (revision, version) supported */ + struct pd_revision_info pd_rev; #ifdef CONFIG_DEBUG_FS struct dentry *dentry; struct mutex logbuffer_lock; /* log buffer access lock */ @@ -7036,7 +7046,9 @@ static void tcpm_port_unregister_pd(struct tcpm_port *port) static int tcpm_port_register_pd(struct tcpm_port *port) { - struct usb_power_delivery_desc desc = { port->typec_caps.pd_revision }; + u16 pd_revision = port->typec_caps.pd_revision; + u16 pd_version = port->pd_rev.ver_major << 8 | port->pd_rev.ver_minor; + struct usb_power_delivery_desc desc = { pd_revision, pd_version }; struct usb_power_delivery_capabilities *cap; int ret, i; @@ -7331,6 +7343,29 @@ static int tcpm_fw_get_snk_vdos(struct tcpm_port *port, struct fwnode_handle *fw return 0; } +static void tcpm_fw_get_pd_revision(struct tcpm_port *port, struct fwnode_handle *fwnode) +{ + int ret; + u8 val[4]; + + ret = fwnode_property_count_u8(fwnode, "pd-revision"); + if (!ret || ret != 4) { + tcpm_log(port, "Unable to find pd-revision property or incorrect array size"); + return; + } + + ret = fwnode_property_read_u8_array(fwnode, "pd-revision", val, 4); + if (ret) { + tcpm_log(port, "Failed to parse pd-revision, ret:(%d)", ret); + return; + } + + port->pd_rev.rev_major = val[0]; + port->pd_rev.rev_minor = val[1]; + port->pd_rev.ver_major = val[2]; + port->pd_rev.ver_minor = val[3]; +} + /* Power Supply access to expose source power information */ enum tcpm_psy_online_states { TCPM_PSY_OFFLINE = 0, @@ -7669,11 +7704,18 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc) goto out_destroy_wq; tcpm_fw_get_timings(port, tcpc->fwnode); + tcpm_fw_get_pd_revision(port, tcpc->fwnode); port->try_role = port->typec_caps.prefer_role; port->typec_caps.revision = 0x0120; /* Type-C spec release 1.2 */ - port->typec_caps.pd_revision = 0x0300; /* USB-PD spec release 3.0 */ + + if (port->pd_rev.rev_major) + port->typec_caps.pd_revision = port->pd_rev.rev_major << 8 | + port->pd_rev.rev_minor; + else + port->typec_caps.pd_revision = 0x0300; /* USB-PD spec release 3.0 */ + port->typec_caps.svdm_version = SVDM_VER_2_0; port->typec_caps.driver_data = port; port->typec_caps.ops = &tcpm_ops; From patchwork Fri Dec 6 07:46:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Sunil Dhamne via B4 Relay X-Patchwork-Id: 13896579 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DCAA91DE8A2; Fri, 6 Dec 2024 07:46:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733471219; cv=none; b=q3HldVLrBOKz0Ynmvu+CfzFAm7f5F3bw2ssrbpnHIIHlh++K08mCl9NeWX0Gna8KsmMBtHpjvO4IOFNWk03ODQRBvooc9nTnbEOHLJKEfRs3/1ro24G3ZbEvkJcHzsN3kiUkrsTSBBnwIHV+a7cInw8Ft+o0xZdyDs67z/0rnFU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733471219; c=relaxed/simple; bh=Z6X7dtscopNLoz8nldaGstB4IaOylCRwJyOS1rJBRL8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SPGmRbiAG5rrqJ+T4S5zrsB2KI8H1xGSDFNj+QAOjtSsEzchfzLsaMq3Y+iFvkifXJadC/ERxytyjW7kBUxZbJqQK+iG+ZWDaoxcJTndUdDFKdWyP3a6De3mtyh6oBSii3LvlhTy9gG5bJYhiAkM4c7tlqABMpXX+ak+4veVAxY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NWV5LSqH; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="NWV5LSqH" Received: by smtp.kernel.org (Postfix) with ESMTPS id 592DAC4CEE3; Fri, 6 Dec 2024 07:46:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1733471218; bh=Z6X7dtscopNLoz8nldaGstB4IaOylCRwJyOS1rJBRL8=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=NWV5LSqHfgUCoVAnvXP8z8CNO2CQLU4Ron9rH5qpmZBGjYBrVEUpnrKrr5DzT0Zwr TCKmqjLFwsZG78NrP61R6Sa47XHPqWYlwZycYOI936HYY6hWghVcvXDVGJ0TlciRKy BhDbMvVBbhguOLsrBanCmCttH2B5aAHin0X2Z7w6sJv88N9g+nwSRunB2rVrbhUK+o znVsgMDowb9OPOyKwVCAWLZR9dvWrtLSWYtQFHzrkXdP7x+FXIsQpEEl0w0n88FDEj Z7o8Ai+pPR/+dAThQyvOPMrfVJus5gLCd6n6c0VJkWZDcUBdFqlGvgPW9qhPnBaeuF R22W4wdLAb90w== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4BA4DE77173; Fri, 6 Dec 2024 07:46:58 +0000 (UTC) From: Amit Sunil Dhamne via B4 Relay Date: Thu, 05 Dec 2024 23:46:10 -0800 Subject: [PATCH 3/3] usb: typec: tcpm: Add new AMS for Get_Revision response Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20241205-get_rev_upstream-v1-3-90158ee7d75f@google.com> References: <20241205-get_rev_upstream-v1-0-90158ee7d75f@google.com> In-Reply-To: <20241205-get_rev_upstream-v1-0-90158ee7d75f@google.com> To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Greg Kroah-Hartman , Badhri Jagan Sridharan , Heikki Krogerus Cc: Kyle Tso , RD Babiera , devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Amit Sunil Dhamne X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1733471217; l=4930; i=amitsd@google.com; s=20241031; h=from:subject:message-id; bh=YvUI3CfbZ7WfPHWV3UO69yuWSZoIOQnnvLn9UUmlros=; b=3N8ucg4taqS49w3NRKMQNlCekKvCDkA9FWY8/U7VBwHc7Z/szcbXtIrJH+cdGFMpCDPdk0lT/ oRWxszd2HeoBGH7G/yxAkRl+WkRO3A70wW7n+ZJs+ot7p9t9r42kKAY X-Developer-Key: i=amitsd@google.com; a=ed25519; pk=wD+XZSST4dmnNZf62/lqJpLm7fiyT8iv462zmQ3H6bI= X-Endpoint-Received: by B4 Relay for amitsd@google.com/20241031 with auth_id=262 X-Original-From: Amit Sunil Dhamne Reply-To: amitsd@google.com From: Amit Sunil Dhamne This commit adds a new AMS for responding to a "Get_Revision" request. Revision message consists of the following fields: +----------------------------------------------------+ | Header | RMDO | | No. of data objects = 1 | | +----------------------------------------------------+ While RMDO consists of: * B31..28 Revision Major * B27..24 Revision Minor * B23..20 Version Major * B19..16 Version Minor * B15..0 Reserved, shall be set to zero. As per the PD spec ("8.3.3.16.2.1 PR_Give_Revision State"), a request is only expected when an explicit contract is established and the port is in ready state. This AMS is only supported for PD >= 3.0. Signed-off-by: Amit Sunil Dhamne Reviewed-by: Badhri Jagan Sridharan --- drivers/usb/typec/tcpm/tcpm.c | 41 ++++++++++++++++++++++++++++++++++++++++- include/linux/usb/pd.h | 22 ++++++++++++++++++++-- 2 files changed, 60 insertions(+), 3 deletions(-) diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index 59621cfaee3d67a36f3ad6870bd1aa92d382f33a..460dbde9fe2239b10c43cfb12dce92c736b1cea9 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -185,7 +185,8 @@ S(UNSTRUCTURED_VDMS), \ S(STRUCTURED_VDMS), \ S(COUNTRY_INFO), \ - S(COUNTRY_CODES) + S(COUNTRY_CODES), \ + S(REVISION_INFORMATION) #define GENERATE_ENUM(e) e #define GENERATE_STRING(s) #s @@ -225,6 +226,7 @@ enum pd_msg_request { PD_MSG_CTRL_NOT_SUPP, PD_MSG_DATA_SINK_CAP, PD_MSG_DATA_SOURCE_CAP, + PD_MSG_DATA_REV, }; enum adev_actions { @@ -1244,6 +1246,24 @@ static u32 tcpm_forge_legacy_pdo(struct tcpm_port *port, u32 pdo, enum typec_rol } } +static int tcpm_pd_send_revision(struct tcpm_port *port) +{ + struct pd_message msg; + u32 rmdo; + + memset(&msg, 0, sizeof(msg)); + rmdo = RMDO(port->pd_rev.rev_major, port->pd_rev.rev_minor, + port->pd_rev.ver_major, port->pd_rev.ver_minor); + msg.payload[0] = cpu_to_le32(rmdo); + msg.header = PD_HEADER_LE(PD_DATA_REVISION, + port->pwr_role, + port->data_role, + port->negotiated_rev, + port->message_id, + 1); + return tcpm_pd_transmit(port, TCPC_TX_SOP, &msg); +} + static int tcpm_pd_send_source_caps(struct tcpm_port *port) { struct pd_message msg; @@ -3547,6 +3567,17 @@ static void tcpm_pd_ctrl_request(struct tcpm_port *port, PD_MSG_CTRL_NOT_SUPP, NONE_AMS); break; + case PD_CTRL_GET_REVISION: + if (port->negotiated_rev >= PD_REV30 && port->pd_rev.rev_major) + tcpm_pd_handle_msg(port, PD_MSG_DATA_REV, + REVISION_INFORMATION); + else + tcpm_pd_handle_msg(port, + port->negotiated_rev < PD_REV30 ? + PD_MSG_CTRL_REJECT : + PD_MSG_CTRL_NOT_SUPP, + NONE_AMS); + break; default: tcpm_pd_handle_msg(port, port->negotiated_rev < PD_REV30 ? @@ -3791,6 +3822,14 @@ static bool tcpm_send_queued_message(struct tcpm_port *port) tcpm_ams_finish(port); } break; + case PD_MSG_DATA_REV: + ret = tcpm_pd_send_revision(port); + if (ret) + tcpm_log(port, + "Unable to send revision msg, ret=%d", + ret); + tcpm_ams_finish(port); + break; default: break; } diff --git a/include/linux/usb/pd.h b/include/linux/usb/pd.h index d50098fb16b5d2e2d9e39c55db4329224115e8b1..3068c3084eb6176d7d9184c3959a4110282a9fa0 100644 --- a/include/linux/usb/pd.h +++ b/include/linux/usb/pd.h @@ -33,7 +33,9 @@ enum pd_ctrl_msg_type { PD_CTRL_FR_SWAP = 19, PD_CTRL_GET_PPS_STATUS = 20, PD_CTRL_GET_COUNTRY_CODES = 21, - /* 22-31 Reserved */ + /* 22-23 Reserved */ + PD_CTRL_GET_REVISION = 24, + /* 25-31 Reserved */ }; enum pd_data_msg_type { @@ -46,7 +48,9 @@ enum pd_data_msg_type { PD_DATA_ALERT = 6, PD_DATA_GET_COUNTRY_INFO = 7, PD_DATA_ENTER_USB = 8, - /* 9-14 Reserved */ + /* 9-11 Reserved */ + PD_DATA_REVISION = 12, + /* 13-14 Reserved */ PD_DATA_VENDOR_DEF = 15, /* 16-31 Reserved */ }; @@ -453,6 +457,20 @@ static inline unsigned int rdo_max_power(u32 rdo) #define EUDO_TBT_SUPPORT BIT(14) #define EUDO_HOST_PRESENT BIT(13) +/* + * Request Message Data Object (PD Revision 3.1+ only) + * -------- + * <31:28> :: Revision Major + * <27:24> :: Revision Minor + * <23:20> :: Version Major + * <19:16> :: Version Minor + * <15:0> :: Reserved, Shall be set to zero + */ + +#define RMDO(rev_maj, rev_min, ver_maj, ver_min) \ + (((rev_maj) & 0xf) << 28 | ((rev_min) & 0xf) << 24 | \ + ((ver_maj) & 0xf) << 20 | ((ver_min) & 0xf) << 16) + /* USB PD timers and counters */ #define PD_T_NO_RESPONSE 5000 /* 4.5 - 5.5 seconds */ #define PD_T_DB_DETECT 10000 /* 10 - 15 seconds */