Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Potin Lai <potin.lai@quantatw.com>
To:     Guenter Roeck <linux@roeck-us.net>,
        Heikki Krogerus <heikki.krogerus@linux.intel.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc:     linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
        Patrick Williams <patrick@stwcx.xyz>,
        Potin Lai <potin.lai@quantatw.com>
Subject: [PATCH v2 1/2] usb: typec: tcpm: add interface for passing supported_pd_rev from tcpc_dev
Date:   Tue,  8 Feb 2022 19:22:25 +0800
Message-Id: <20220208112226.9108-2-potin.lai@quantatw.com>
In-Reply-To: <20220208112226.9108-1-potin.lai@quantatw.com>
References: <20220208082026.4855-1-potin.lai@quantatw.com>
 <20220208112226.9108-1-potin.lai@quantatw.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?ZNLbUzXMvwiOZEDMS08T8x7lz/LukVueJWdtftiKb/SZoXuCf8brDU+XPW/z?=
 =?us-ascii?Q?ad0GIxG6lRspEeyQAXwFJtbEP4oErFjg6GHYLThhfqKHBwG/UmfrcQeTcOiw?=
 =?us-ascii?Q?tI2YRj/u+IHBH3LMkBJnwH373btTR00/mEixzuDePU7Bz5SX47fkJODkwmmj?=
 =?us-ascii?Q?ikB3fzc5qjUXIS3Hxoqlb4/wQWwl6PH6uVtNy8F3T2hnuecXcMh598LzvOCn?=
 =?us-ascii?Q?w72OIBRvPsnYtDcbj+tNejWr1yXMe94HLmuhHTS8uxJ97Tn3gx/bh2gnUOUc?=
 =?us-ascii?Q?/FsDlBiHwPxfasLcp3hlsF+hcJ0ZTO2fobEQ5PvdvWBm2es0Bp5HxpJJha1A?=
 =?us-ascii?Q?Ka/Bkc0+TiK1zjsc2CK5yVp8FDyQLWgGgwtOnrzz8WJqMb7tdjUSPMivSvdT?=
 =?us-ascii?Q?Yk9snNQ1AmC6ojog10nZlII2UY6IlOzZrvIU8IptxKb3bdCojujQcbcGxdgo?=
 =?us-ascii?Q?zZFgd8Vp6Pum0mvNnBybTLnn5N5b+3vjny1liiqEXr+uwcfB5tuhYiERMaOq?=
 =?us-ascii?Q?SGOWjhSO5VgSMH9kr7cy1wTvMofLQvdTkVCLSCP1YMZQt2plVpJT5LyPBAK2?=
 =?us-ascii?Q?TGnrqzxNGTTg32ZuP344uUK3Sl6awn/eP3+QP5LgUH+JDQWGWe836QUER3tD?=
 =?us-ascii?Q?j+JP5ApYitAsvtN+UbB8+NCy3GUg3RAHR8R+sRuC/fZRcD+SNp8hYj58Duto?=
 =?us-ascii?Q?uhu0SUVCuQYF900L4KMIpqYw0SjnuBwMqP4uIQrxPgeDo70kVnrrwnlkcjlR?=
 =?us-ascii?Q?CADz+eVSmekuFyLBB3vPisLVuLzfsGq3/vyhHpzSvI+XWiWquJB+wy+GDYDB?=
 =?us-ascii?Q?UVMQIAum6P7Rl8cIoC2Hb8vDejW+SZGZobYkxDAhocsJolYlMHZvj5jrQv2/?=
 =?us-ascii?Q?xL+Ho9ZNBJy0h7o9NO4uCbjAmki200GBsOOJ1fhrKcNu4/08rOygmCRAKL/8?=
 =?us-ascii?Q?U+UEtet4DclMicx9yy8rfTwC2NxVGUpPxWYAhKUoXTVGgHrYUXiZ1TcW6vqX?=
 =?us-ascii?Q?7ZmE/2OotC7ompWFnm9fKMkLTvo2R+ifEIoGc7UTxdBPrfXVIAKP4GowaJU3?=
 =?us-ascii?Q?tEyGci9lxFr+JeF5hqAiyFTcpckl52WCXrctPUZzEa+bT4ICZ0usKM/0d3kf?=
 =?us-ascii?Q?DXopdUvBnb/3Dm4mLXSDi/Hu+/eO/4+H9NjQth9G1XcKbsHFhZUTJaVLmrCi?=
 =?us-ascii?Q?UrAmchRqkbQTVmQvR4bJsDSdNAINNiZ4J623rM+fc0EUg0mJYAx2Zm5q+f7D?=
 =?us-ascii?Q?OEaRSghMDHVbRIBEHrJ9WKi+GwDjFpaua8eEO9WM9NlSsY/Q96gajLp+SGR9?=
 =?us-ascii?Q?Z6WewJtQvP+9l8UjqwPkr6cDjxdD8DOT4CSNNUAMVuO8kOhyoRskYULaucp9?=
 =?us-ascii?Q?TcEImzr/rZmF+5vvhred9F0323LeNZ8h2BzI9oZ5GBwvFZsgHl8MMwvq/55A?=
 =?us-ascii?Q?cM5D34OixoaRONfidcHOZiDF2iFPeZyGCOLnabkAkJgmQCYIklbi0Ysjoi3r?=
 =?us-ascii?Q?o5HzDRSZm6wsxQsA0mDbnuoTVGc3AI+GVUimkRIN4cSgO37i1M/XVigm99qY?=
 =?us-ascii?Q?LipJtSZOsof+61PiNyoss87sDhDybpG4HATDdd+1spzR/xpYlCrD6DlUudyA?=
 =?us-ascii?Q?COF5F40HkwHkjJ3is4uvYoc=3D?=
X-OriginatorOrg: quantatw.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6fb8e16f-bb1f-4cde-008e-08d9eaf5520f
X-MS-Exchange-CrossTenant-AuthSource: HK0PR04MB3282.apcprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Feb 2022 11:22:41.6112
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 179b0327-07fc-4973-ac73-8de7313561b2
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: FkV0pvcNaJwGx3rFbDpABC0RB7YE/KkLIvO9V8p6Qb8+mV4rEm4VdbPQTrIaXqAYGbVGyOBgBOtbQol9+uBw2Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY2PR04MB3805
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Current TCPM allways assume using PD_MAX_REV for negotiation,
but for some USB controller only support PD 2.0, adding an interface
for passing supported_pd_rev from tcpc_dev.

Signed-off-by: Potin Lai <potin.lai@quantatw.com>
---
 drivers/usb/typec/tcpm/tcpm.c | 14 ++++++++++++--
 include/linux/usb/tcpm.h      |  4 ++++
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c
index 59d4fa2443f2..22e7d226826e 100644
--- a/drivers/usb/typec/tcpm/tcpm.c
+++ b/drivers/usb/typec/tcpm/tcpm.c
@@ -571,6 +571,16 @@ static bool tcpm_port_is_disconnected(struct tcpm_port *port)
 				    port->cc2 == TYPEC_CC_OPEN)));
 }
 
+static u32 tcpm_pd_supported_rev(struct tcpm_port *port)
+{
+	u32 rev = PD_MAX_REV;
+
+	if (port->tcpc->supported_pd_rev)
+		rev = port->tcpc->supported_pd_rev(port->tcpc);
+
+	return min(rev, PD_MAX_REV);
+}
+
 /*
  * Logging
  */
@@ -3932,7 +3942,7 @@ static void run_state_machine(struct tcpm_port *port)
 		typec_set_pwr_opmode(port->typec_port, opmode);
 		port->pwr_opmode = TYPEC_PWR_MODE_USB;
 		port->caps_count = 0;
-		port->negotiated_rev = PD_MAX_REV;
+		port->negotiated_rev = tcpm_pd_supported_rev(port);
 		port->message_id = 0;
 		port->rx_msgid = -1;
 		port->explicit_contract = false;
@@ -4167,7 +4177,7 @@ static void run_state_machine(struct tcpm_port *port)
 					      port->cc2 : port->cc1);
 		typec_set_pwr_opmode(port->typec_port, opmode);
 		port->pwr_opmode = TYPEC_PWR_MODE_USB;
-		port->negotiated_rev = PD_MAX_REV;
+		port->negotiated_rev = tcpm_pd_supported_rev(port);
 		port->message_id = 0;
 		port->rx_msgid = -1;
 		port->explicit_contract = false;
diff --git a/include/linux/usb/tcpm.h b/include/linux/usb/tcpm.h
index bffc8d3e14ad..36282b2a9d9c 100644
--- a/include/linux/usb/tcpm.h
+++ b/include/linux/usb/tcpm.h
@@ -114,6 +114,9 @@ enum tcpm_transmit_type {
  *              Optional; The USB Communications Capable bit indicates if port
  *              partner is capable of communication over the USB data lines
  *              (e.g. D+/- or SS Tx/Rx). Called to notify the status of the bit.
+ * @supported_pd_rev:
+ *              Optional; TCPM call this function to get supported PD revesion
+ *              from lower level driver.
  */
 struct tcpc_dev {
 	struct fwnode_handle *fwnode;
@@ -148,6 +151,7 @@ struct tcpc_dev {
 						 bool pps_active, u32 requested_vbus_voltage);
 	bool (*is_vbus_vsafe0v)(struct tcpc_dev *dev);
 	void (*set_partner_usb_comm_capable)(struct tcpc_dev *dev, bool enable);
+	u32 (*supported_pd_rev)(struct tcpc_dev *dev);
 };
 
 struct tcpm_port;
-- 
2.17.1