From patchwork Fri Feb 9 22:37:32 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: 199151 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:50ea:b0:106:860b:bbdd with SMTP id r10csp1170828dyd; Fri, 9 Feb 2024 14:39:56 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCU30ZTgKO3cJoQlvFiIn3m7JttT+bqEU0Fxvhr5fan/nTcK2U94CIpZy4Vj+D5TDPRNBZ5MZQXYumNbGRoPLlkByZEqSg== X-Google-Smtp-Source: AGHT+IFkrKOSV9zRv7XXvwui+YqE5ptlfgLGhM/y4gBcAVAW8vV4+L9kV/KfOvsCKClf5D1B08nR X-Received: by 2002:a05:620a:134d:b0:785:b87f:924 with SMTP id c13-20020a05620a134d00b00785b87f0924mr550861qkl.27.1707518396800; Fri, 09 Feb 2024 14:39:56 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707518396; cv=pass; d=google.com; s=arc-20160816; b=S/pqWK2apXA/N1wPctyNXXXkTNaM5TCcnHU8IybV2ld6da9E6J++h+3cb0RXqSf2ju lBxS/nLm4aCGTdj0rbQZDszLxCXiczvDrq1ZrcPVqwORf3CpgaZkyK79SP7ErQHcrCBW jd+bMmn8nilWQRUwcjmk4RzBWcGVGVCJxC7IyfKBUfVKQG7BtICdidszSpHj8uAlOw9w S0U6LIjOgPWAHbcjSgCqpw1nhEUfsUDgX8P3AzVR6+Cz3Iuax/JnAAwZJlwLaO9aeh9k pE033Ywwd0B467G2PyYg6rkXUc0u0gIbME7kdzQk9SMV5jPYQPI42mwVFhJsi1qAVyXK RmiA== 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=qBapnpxnnvVPFmrxNQOjLuxZFVASUjEQpu3IWq7x3K8=; fh=zCKM7tjRbbD/lPVLTFaIvGIY+C9H1GZ0ZkfSTvfYdPE=; b=JHRrAWcR+LGl7pkZDKAzF33ia+ETStiYDuBDc2RGzFAp+DTVrxCnwtik7o88k601Uf altXYR6SPio4mRhkdtsV+n2NY0cZq7JcKsUnIaqQiToicIvVaPRp535hgE/+LzljZjdD WpCFNUsOVObQPePWd6cMwNliR910vbMpY4pBmUah0WxB3NVshCBgEwTDUNGndFRmqbeF hiyGxks6Jwots/r/z3pbr/eraSwjveueHEIqJ339Iv8iTwFb/TvHttbMHK0m3Z6ox15j 1YIaWWFiDabGbqqgMWV6PaP533yhTvGAWfHW0jusLUpouAJsP5U7Skf8qfOTutQG0xj9 +FhA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=inmdu0UY; 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-60124-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-60124-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org X-Forwarded-Encrypted: i=2; AJvYcCUTzPFEqaaFnKhUyPKOvod8fPx8+ngwYfzq4VKr3NSEfaLtGawFIw+jqMG+aF7KddQ7lAIJTf+IQDjBAn95DtvFiWs+6A== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id dv16-20020a05620a1b9000b0078153cbf56fsi511951qkb.607.2024.02.09.14.39.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Feb 2024 14:39:56 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-60124-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=inmdu0UY; 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-60124-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-60124-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 843B21C23501 for ; Fri, 9 Feb 2024 22:39:56 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 317B939FEB; Fri, 9 Feb 2024 22:38:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="inmdu0UY" Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (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 60BB536AE3 for ; Fri, 9 Feb 2024 22:38:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707518310; cv=none; b=sQ4I35NA8MzW3cpZiw2MtjHP51W1cOqdwKqsa+0Q2cjVQGGkwNYpTJ7EZU2wSgG7j8wlN6+cOpMwcvpxv49YyxYozIMseTIfYfogmg0PfkqOdH11F4q+2PDTycvesthYInn50lfYll6VFXO/VaOclhS6Hz7inBti4jPh982aHH0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707518310; c=relaxed/simple; bh=DzKLDci93ApF7vfkyDoGWiESzva00+zLX2rytI+hW08=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XQY530bgw9+9shpDsFvLtmln/+WLOP3F2R9a2/v7MZ+Nv4a7HoiN7fEM6W77T59L+A89LDeOCqJeU/eg4A5OHX6KTvk++Mmz8MVDeHEek6UzJxv/B251TVp9WpJxRKRD71ty87VRGK3loYF2M57OvCck8M3YDFesSesqsUPnRTI= 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=inmdu0UY; arc=none smtp.client-ip=209.85.210.169 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-pf1-f169.google.com with SMTP id d2e1a72fcca58-6e08c16715fso686961b3a.0 for ; Fri, 09 Feb 2024 14:38:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1707518308; x=1708123108; 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=qBapnpxnnvVPFmrxNQOjLuxZFVASUjEQpu3IWq7x3K8=; b=inmdu0UYc2xhgSdtkb+SZ4gGIjT19U9GfZe4aplGwj39RljB4+Bau45a+cKvAkPsoZ dtDGJllBU6i+Fm2EdH8V3Y2n3L1rbX1IqtZ2Y4l8oFL/vJvEd9hTg50ee9kmdA7BpP/L Crya4Mt/pVUrFmjwNoxHopv3mFy6q0QdEQ1Kk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707518308; x=1708123108; 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=qBapnpxnnvVPFmrxNQOjLuxZFVASUjEQpu3IWq7x3K8=; b=pFhqTVCdg8ksoNj/Fj3Fg4YskANoA4/IdAAzeOQsO9OYEwo6cujTi8A8rDVurLEG4d P/1ySXu4fAgnaEzs+J8IXZ2mlOuhocHp/BDbHaTzh4izF+Wy+nRNKkiuPEpufzjhDcQh wa6hF4wI7kQ2IGcLfXEyNDssLmKgM3Hl8hRUh2EoUNAOYl/0tzEvgJKS2quGuKy2Gomq C/95tHlrgeY1civPi8+QX2IDvAS5xjGbzgM7LBlt18U4W9cvqDVvh4oHwRIpQi3JC4Hs AOt9XdJTF6PP9CtvROsCDDhomPmxsTcQWnXvnY1oHkIovvtxJZ9JkyO40sFIElKbAZKB b5EA== X-Forwarded-Encrypted: i=1; AJvYcCWZlZFpQYvbo9xnpo6DZMtoMP8KPCJxMHKc9kvjSqBnqTzTlm5YANF9sBiWsoqjOF0ktp0vfyecBMq4JqSmuI5ZByWLPO9fyj89Hl53 X-Gm-Message-State: AOJu0Yxwo1PXvN5RdsmO5o30qX8YZlK0Rhci2IINM8EM26XL8gVL6NNh SglcFAhKZQEVPqWxut3w3VynnyvNB1y7u7Z3cxz3q+e4s/bi4f1POetqIPocYQ== X-Received: by 2002:a05:6a00:26ec:b0:6e0:4697:a8f1 with SMTP id p44-20020a056a0026ec00b006e04697a8f1mr712031pfw.11.1707518308710; Fri, 09 Feb 2024 14:38:28 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCVp9Dz1zelnFPdV/3pwulYB9UFPGcc96Gc4BNeYpmdH5uHNF11FIH76+41mlIstjpF26M0Kpx//LQPmVs+9d2RXfydqmdpVJOTPTqwsIuMcrlur6AMbmbEUubjEozx/1VfPV6VnTTO57vCdqjkGtbYQFYYodVPE1SX3PeivEsb5dQ5e8ABs7ILsvNw/Aluql5hKw/3f3aWDGdVAF2VIWgvrdHDA0rzOymduuRtBvPqTFt4gCv4puP1SiFsNjz2qwFIZpTQ8vN9BZULIv6G0C7nVW/B9vhdlWYmhLmyh87YhE1qaZzFLxdHu/OjaSapHaad1Gf70nLofL8tZVZHNac08uMglP2N41eHlVfeGfTroRA2Lh+3DpF8uE1g7eyuLm024wXU+0g== Received: from localhost (209.148.168.34.bc.googleusercontent.com. [34.168.148.209]) by smtp.gmail.com with UTF8SMTPSA id z3-20020a62d103000000b006e03a64000esm1092546pfg.150.2024.02.09.14.38.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 09 Feb 2024 14:38:28 -0800 (PST) From: Abhishek Pandit-Subedi To: Heikki Krogerus , linux-usb@vger.kernel.org Cc: pmalani@chromium.org, jthies@google.com, Abhishek Pandit-Subedi , "Christian A. Ehrhardt" , Fabrice Gasnier , Greg Kroah-Hartman , Hans de Goede , Neil Armstrong , Saranya Gopal , linux-kernel@vger.kernel.org Subject: [PATCH v5 3/3] usb: typec: ucsi: Get PD revision for partner Date: Fri, 9 Feb 2024 14:37:32 -0800 Message-ID: <20240209143723.v5.3.Idf7d373c3cbb54058403cb951d644f1f09973d15@changeid> X-Mailer: git-send-email 2.43.0.687.g38aa6559b0-goog In-Reply-To: <20240209223824.622869-1-abhishekpandit@chromium.org> References: <20240209223824.622869-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: 1790462810499519990 X-GMAIL-MSGID: 1790462810499519990 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 (no changes since v4) 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 7c5cecdd93d6..ae105383e69e 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)