From patchwork Fri Feb 9 06:02:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhishek Pandit-Subedi X-Patchwork-Id: 198756 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp656058dyd; Thu, 8 Feb 2024 22:06:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IGgzFrGAuWYzGAJYRiFtCM7kwEcjJg1wjqRL5DXUqSDm7KNvSI+ORFvat01oA+IgED4Rx1K X-Received: by 2002:a05:6512:716:b0:511:2e97:add2 with SMTP id b22-20020a056512071600b005112e97add2mr278322lfs.66.1707458818267; Thu, 08 Feb 2024 22:06:58 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707458818; cv=pass; d=google.com; s=arc-20160816; b=jqpJZ4h1iK6EigHfbV3hMPGzpQJkXR6rqr71ajkpjQ6Pp1hTrX0hre9iGvvyGb3+VL Mo4nCaO3fSpOzmzqqNOfoYcG/Lt3T2cAkPbWqhKh9tKysIIkDZO+XlpoJ9fuSz7UTT5+ aJnSaMZnwrOXiBCKjIU7wWdaWf/UpQFxVS8wf/4mqqhF+D3l/t2yaNvC5LBUYe4uQFtX Ah+/RrJOGhLdbV2dz6waU3aZ8vHq+G/Y6efHCpCkFhaN7e8gW4iCkYtWypRA9OYg1O1l dLanbCcaRNhriM+nlJD5jLJ0Te65b4yufTh6evhs0wKCJg3doeQ0Ktl8wng4lU8K7bfs Tomw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=kU3WAfQM9Sfnlpso5o0A7y5vYgNomm9R2kIzE533//Q=; fh=YqVXynzDZMKhb67ekrLT3rzWN3ZN0vdo/skLgaMAEIo=; b=fCJCeMLo6TLNUGDWeHmCLZi7G5Nwby4jMo+6Kml09bPZBOa8G1lgcaK9PkeimauK+Z hsQSCMHCH7hN3Rp0mGjobnKqCGyQGY9bY8dXsY0QsoGSK849eFQH4r2jqRlGpcO99h5X ljz/J4R6Z33aXK4LnpQJhxvtr3FAXV9wTi8ni7r9g3eBdQJaBadJr4+ROzygj6OcUyz6 PPdw/mpuOgHVxBcwENqn82mhRz5iA3rkGZX+xfUYl7zj/Z2NcymtHzrg/l30K5y6B6EQ DZZpKVFlxLyonCvyF/1CD6k4wMBkJ10eNaViCBjbfI655KWbqxatbFnXtXI4pG+3NCqs l4SA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Pt5FX2BL; arc=pass (i=1 spf=pass spfdomain=chromium.org dkim=pass dkdomain=chromium.org dmarc=pass fromdomain=chromium.org); spf=pass (google.com: domain of linux-kernel+bounces-59034-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-59034-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org X-Forwarded-Encrypted: i=2; AJvYcCXMenLHnGVIErwR7vMehzvFysBsA19VSAVyvUfFnzSwJ3ypMzOH/UOq1kG2vSuzwBgPB+DQcvaX2L9BNxTP1gOr1uy0Qw== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id c19-20020a170906341300b00a3692a5f9bcsi462474ejb.665.2024.02.08.22.06.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Feb 2024 22:06:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-59034-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Pt5FX2BL; arc=pass (i=1 spf=pass spfdomain=chromium.org dkim=pass dkdomain=chromium.org dmarc=pass fromdomain=chromium.org); spf=pass (google.com: domain of linux-kernel+bounces-59034-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-59034-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id B0E961F21CFE for ; Fri, 9 Feb 2024 06:06:57 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 034CE57310; Fri, 9 Feb 2024 06:05:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Pt5FX2BL" Received: from mail-io1-f49.google.com (mail-io1-f49.google.com [209.85.166.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 62CC95732C for ; Fri, 9 Feb 2024 06:05:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707458748; cv=none; b=eRxaVqGjZjjJVH81eWS45ZnIeqZn3NoJCjmBNlJDshnGTvPk3JuQwq2yqf3Rzpb1JxXKHrTITWJafxzwA53uu0xVsN5e4WK26aGWMc/H/87iMYRuq0aAF+Z9/ruoRGXMo7qru/vrX1az2yyjgDuMb1TImBzkuXHby1Kd4bLpSWU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707458748; c=relaxed/simple; bh=CT/55tN9O9NYhHK5DTcn9HOMKpKvx8iNl9/zVWpYct8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CPen20hEskz+plmli9ZA1u4WoLv/RPcYzI+10mU8B6vmlk4wzHNz5hBpPvLNmLo7UB3UCaAMbxo0xpBUB90TCyu3c+GUbch+STjAQIip50xkBUeSA3G8CLcN3975l8bZ/DWXsHHRvOyKdp3hWgAoTHMvGPDFI7Y8N5F6ieIPenY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=Pt5FX2BL; arc=none smtp.client-ip=209.85.166.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Received: by mail-io1-f49.google.com with SMTP id ca18e2360f4ac-7bff28b2937so21094839f.1 for ; Thu, 08 Feb 2024 22:05:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1707458746; x=1708063546; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kU3WAfQM9Sfnlpso5o0A7y5vYgNomm9R2kIzE533//Q=; b=Pt5FX2BL+WdT+X/S1BzX+Drg3p8s3dmM+ARVTt3WafDvhefJD/0m0dLoOyfu1C/JGj L4ISxaDGt2q5WMP3Df+s7DdGMBD1m5d/KIJ+zAD3tKhFapAuepy8CSJtPPDbGnibGnax v4KPN8HuiQzcDj603YFbt89PStwygTEqoccJw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707458746; x=1708063546; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kU3WAfQM9Sfnlpso5o0A7y5vYgNomm9R2kIzE533//Q=; b=Qqt/5FKUHYxbqk+Catiq5cYM25o1gdwV6Nscgli/HZpqKFRZJel3bH7vvTCJta3D6H H8bcfsBXr+hPhqpZSrgJSKtpDyxzktn3f5J2aAgOoTgn96W5rjZSA1eN//mZLMXGUUB8 Kp7wG3cWdtBynBWJkHy2wvM1TPZGn1PdesQW3cy8IrXlN/TNtBOwQFuMOk1DuxQKusji OANNEZpT8dYCZYA4gxsQnFJOHEuP5iXw6fg2HslpaVPapR9bhuEwF5PURIW7rKFWgj+D hfoDOtmWuPPcAmR9oB9qlUOuIM+2VRsSaL53e2w0PCa4dQoWq16NT4raIo9c9W0W98VE Uw0A== X-Gm-Message-State: AOJu0YxQUbMwycZ1XVzjL+PtbI99ewVvClwN70EMjmdViAxgduwLQER1 WBzrocHTwxEWod/aIatlqoNincoCf85EvjBRUKlUk2l/xCNHbsWLIgeZckXxDA== X-Received: by 2002:a92:cd4c:0:b0:363:ad01:f052 with SMTP id v12-20020a92cd4c000000b00363ad01f052mr896942ilq.24.1707458746569; Thu, 08 Feb 2024 22:05:46 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCWaphZWR2HcRx/d5LRSMw8Ym1cUB+1VtpM/wc17o8hWhUpKC65d6RP5tTdJBwapePscSe+m58FHz4Grp/YuVpQx9LXvn6l7xULE3VtoUJx5SHhC4aX6qb3fhQjmlF7GHfzH0HRMQReywu3u5Jdlcb7oXpkn74YV0JQRfp+/IvlHJ3O6VpoKiTwbT7a9Dh3MHR24KDKA9DkcuLXns12hqJlfGeIsxWQsGD0V4GI5aKf+wMH+A7eYJzPt4LYsFZ5w8OeT9w7WWBMumkaPtggo2xRiphVUOXfKejlNKVU5PkR4N2y1RMZZjRjxTYKLZc4acYiusezGw/3PeSkk0aoWs3U/W+BjbAkzxmP1gc39LY+Jgur1QJNHevBCXNjxanTYQzLOr6WKMG65NVY7COa7Cfw5fvy/k1U= Received: from localhost (209.148.168.34.bc.googleusercontent.com. [34.168.148.209]) by smtp.gmail.com with UTF8SMTPSA id cf11-20020a056a02084b00b005dc26144d96sm753263pgb.75.2024.02.08.22.05.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 08 Feb 2024 22:05:46 -0800 (PST) From: Abhishek Pandit-Subedi To: Heikki Krogerus , linux-usb@vger.kernel.org Cc: jthies@google.com, pmalani@chromium.org, Abhishek Pandit-Subedi , Fabrice Gasnier , Greg Kroah-Hartman , Hans de Goede , Neil Armstrong , Prashanth K , Saranya Gopal , linux-kernel@vger.kernel.org Subject: [PATCH v4 3/3] usb: typec: ucsi: Get PD revision for partner Date: Thu, 8 Feb 2024 22:02:40 -0800 Message-ID: <20240208220230.v4.3.Idf7d373c3cbb54058403cb951d644f1f09973d15@changeid> X-Mailer: git-send-email 2.43.0.687.g38aa6559b0-goog In-Reply-To: <20240209060353.6613-1-abhishekpandit@chromium.org> References: <20240209060353.6613-1-abhishekpandit@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790400337940877287 X-GMAIL-MSGID: 1790400337940877287 PD major revision for the port partner is described in GET_CONNECTOR_CAPABILITY and is only valid on UCSI 2.0 and newer. Update the pd_revision on the partner if the UCSI version is 2.0 or newer. Reviewed-by: Heikki Krogerus Reviewed-by: Prashant Malani Signed-off-by: Abhishek Pandit-Subedi --- $ cat /sys/class/typec/port2-partner/usb_power_delivery_revision 3.0 Changes in v4: - Replace IS_MIN_VERSION macro and just compare version directly. Changes in v2: - Formatting changes and update macro to use brackets. - Fix incorrect guard condition when checking connector capability. drivers/usb/typec/ucsi/ucsi.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c index d9a345ec62c3..9d49dbeee9d5 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -782,6 +782,7 @@ static int ucsi_register_partner(struct ucsi_connector *con) } desc.usb_pd = pwr_opmode == UCSI_CONSTAT_PWR_OPMODE_PD; + desc.pd_revision = UCSI_CONCAP_FLAG_PARTNER_PD_MAJOR_REV_AS_BCD(con->cap.flags); partner = typec_register_partner(con->port, &desc); if (IS_ERR(partner)) { @@ -856,6 +857,27 @@ static void ucsi_partner_change(struct ucsi_connector *con) con->num, u_role); } +static int ucsi_check_connector_capability(struct ucsi_connector *con) +{ + u64 command; + int ret; + + if (!con->partner || con->ucsi->version < UCSI_VERSION_2_0) + return 0; + + command = UCSI_GET_CONNECTOR_CAPABILITY | UCSI_CONNECTOR_NUMBER(con->num); + ret = ucsi_send_command(con->ucsi, command, &con->cap, sizeof(con->cap)); + if (ret < 0) { + dev_err(con->ucsi->dev, "GET_CONNECTOR_CAPABILITY failed (%d)\n", ret); + return ret; + } + + typec_partner_set_pd_revision(con->partner, + UCSI_CONCAP_FLAG_PARTNER_PD_MAJOR_REV_AS_BCD(con->cap.flags)); + + return ret; +} + static int ucsi_check_connection(struct ucsi_connector *con) { u8 prev_flags = con->status.flags; @@ -925,6 +947,7 @@ static void ucsi_handle_connector_change(struct work_struct *work) if (con->status.flags & UCSI_CONSTAT_CONNECTED) { ucsi_register_partner(con); ucsi_partner_task(con, ucsi_check_connection, 1, HZ); + ucsi_partner_task(con, ucsi_check_connector_capability, 1, HZ); if (UCSI_CONSTAT_PWR_OPMODE(con->status.flags) == UCSI_CONSTAT_PWR_OPMODE_PD)