From patchwork Fri Feb 9 06:02:38 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: 13550884 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 1F03757305 for ; Fri, 9 Feb 2024 06:05:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707458746; cv=none; b=Og6hiRTBGdM3R0uN9Nl7J52GYp8GCqDNH1LUsS9FZMJ90V5PuX/EmVl31QCSudP+D9SBmaLcrmF9P5LJXOHlY05ouahnXvgQENLb0fA5j5VR71VSqDd660gOEQVXh5WSh1bumGq0SxthpKdPr0WT/lFZyJdxmnunNbwlg+6XnLY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707458746; c=relaxed/simple; bh=noXh4QjalWPeIqmk88xgk+MT1Q1CPYJ7IGWY4FLlLYA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jvlcFctCmRB4ZbHrvoopI2jQ5FzLrEoS2Gf5lOwnH1pVN8Wyhfpr6toA7mj9oHASSDRP9sDeScd83GRsg4IOhSN54d/vWahJ09QlYIsqDBe9+eMev48aMYa0PqtStzcO8ps+JqAjwXA2bS9/d1BkHs9s9UJi56aQt4bwnWAolbE= 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=C2Q5HAcv; arc=none smtp.client-ip=209.85.214.176 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="C2Q5HAcv" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-1d72f71f222so5048785ad.1 for ; Thu, 08 Feb 2024 22:05:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1707458744; x=1708063544; 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=80VtU8v4yD1vE6SrhFnN3XZO/F8XU6EPJRSbswzy3Kk=; b=C2Q5HAcvO+drsh2r3n5w4p412q5Cq2KvvZpJIhOo9pLwt9YtmpT5l1istUsiq3WvZr icw6LPO0RXhxyNesgOw1qDD85wqJbdrOI8P5ehJl2L/o2pV9ZMJSV8DDVzM9OYS4cF1h /A1/3rEzEJtrlg9r4kIqfMTbqXVk46l2tVB1E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707458744; x=1708063544; 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=80VtU8v4yD1vE6SrhFnN3XZO/F8XU6EPJRSbswzy3Kk=; b=gOMmjLl7dcf+KydPaF4Lk3fE6aFQLztoi6GP68GheVEuRmNbYQ9JIVAPAPmcTac/Gv F/jcg9UFoyPvvZMsiYhvqT6fj+WPRGnrJlnjwQ09RnwLMFv7/ReUYkP1qBBCB+GnJVq3 7iztaDXMGKfL+BD1f8SGcO3Xvk/AhNd4GWeDUO7OHuUTOntPyi7OlB0S7eMwR4UNhLaa q1aWdYFTHxJHUt7lIKn4X+94LinddEMyZ9jirt/fh87U1Qx7voP9Sse9n77C64kXWAVK UafNDavTvlUT9kwp5nn+6IBsiMlqzdc0R3/2NwIk1KlLUAoPNZFaEWnOpYeVHdvbpqPB v+Bg== X-Gm-Message-State: AOJu0YySHxJmvzTQIj6wxoaJRrFhstD8ZOkmajYi2VZb9EaxXZj19v5N Jwq1tpAqXq64RNtXmt2PK5zwoq356kqeGfUx/GkR5IVzFSXD1kRh8PGmoFBPyoexEqmv0ss5uXc = X-Google-Smtp-Source: AGHT+IEU7HiPSSb8A2SmGJdVFDjjaEA47GKfjWxy4a8AykhqcDenW4A6+Xegy01QgLGONGMTlF9CEw== X-Received: by 2002:a17:902:650e:b0:1d9:c876:b840 with SMTP id b14-20020a170902650e00b001d9c876b840mr615798plk.2.1707458744421; Thu, 08 Feb 2024 22:05:44 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCWJsf3/BOHYsZ6Prh92L/Pt4yIQ338yOw2jB/FbNQKuPUywOFmyJJ4l3t6jRfQsssyox52TwNvuId11bgMbW25wEgRNmM0QZb1DHuv3OFC0anJjfRs6YcrJin6lGf3Wkg0XiU6fP90ywaBmzsQa/bDP3UrkS6cqk0yLNriWjaoT0s1VWEAC5NmNg4GUnwh+cYYhS5VR3Vdaqjq1MJBWU5sxQKADhgCz7Fq4FVHaUEpG4qScqVD9iOZZTh7Pu3sTzbnpJn29ekKla2zpcUEatZxt9Q+ZF5ublL3tnAibbuMvQWOvXg1t0p6OU+K5o3c5K4NoEK0eIgCTESGg8iPVl8xFUVIwFa+ugSF+P5FUsPeFptk5LNDdVtVBqL9qsRXw9iJ8BDp+ihrI4E8Jo3lUZkqUTN47Ns37fiolQkKa06D5e7gyK6H4oT0bFJ/ml8Ed13m/Hd6lGCVbuGSoNer4JFyQFcrro/4bxjOU0ZJbDhUld9vueQfGR5oBZw== Received: from localhost (209.148.168.34.bc.googleusercontent.com. [34.168.148.209]) by smtp.gmail.com with UTF8SMTPSA id kd5-20020a17090313c500b001d8ffe741basm753922plb.36.2024.02.08.22.05.43 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 08 Feb 2024 22:05:44 -0800 (PST) From: Abhishek Pandit-Subedi To: Heikki Krogerus , linux-usb@vger.kernel.org Cc: jthies@google.com, pmalani@chromium.org, Abhishek Pandit-Subedi , Neil Armstrong , Andy Shevchenko , Dmitry Baryshkov , Fabrice Gasnier , Greg Kroah-Hartman , Hans de Goede , Rajaram Regupathy , Saranya Gopal , linux-kernel@vger.kernel.org Subject: [PATCH v4 1/3] usb: typec: ucsi: Limit read size on v1.2 Date: Thu, 8 Feb 2024 22:02:38 -0800 Message-ID: <20240208220230.v4.1.Iacf5570a66b82b73ef03daa6557e2fc0db10266a@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-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Between UCSI 1.2 and UCSI 2.0, the size of the MESSAGE_IN region was increased from 16 to 256. In order to avoid overflowing reads for older systems, add a mechanism to use the read UCSI version to truncate read sizes on UCSI v1.2. Tested-by: Neil Armstrong Reviewed-by: Prashant Malani Reviewed-by: Heikki Krogerus Signed-off-by: Abhishek Pandit-Subedi --- Tested on 6.6 kernel. Dmesg output from this change: [ 105.058162] ucsi_um_test ucsi_um_test_device.0: Registered UCSI interface with version 3.0.0 Changes in v4: - Added missing Tested-By tags from v1 and reviewed-by tags. Changes in v2: - Changed log message to DEBUG drivers/usb/typec/ucsi/ucsi.c | 26 ++++++++++++++++++++++++-- drivers/usb/typec/ucsi/ucsi.h | 11 +++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c index 14f5a7bfae2e..d9a345ec62c3 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -36,6 +36,19 @@ */ #define UCSI_SWAP_TIMEOUT_MS 5000 +static int ucsi_read_message_in(struct ucsi *ucsi, void *buf, + size_t buf_size) +{ + /* + * Below UCSI 2.0, MESSAGE_IN was limited to 16 bytes. Truncate the + * reads here. + */ + if (ucsi->version <= UCSI_VERSION_1_2) + buf_size = min_t(size_t, 16, buf_size); + + return ucsi->ops->read(ucsi, UCSI_MESSAGE_IN, buf, buf_size); +} + static int ucsi_acknowledge_command(struct ucsi *ucsi) { u64 ctrl; @@ -72,7 +85,7 @@ static int ucsi_read_error(struct ucsi *ucsi) if (ret < 0) return ret; - ret = ucsi->ops->read(ucsi, UCSI_MESSAGE_IN, &error, sizeof(error)); + ret = ucsi_read_message_in(ucsi, &error, sizeof(error)); if (ret) return ret; @@ -170,7 +183,7 @@ int ucsi_send_command(struct ucsi *ucsi, u64 command, length = ret; if (data) { - ret = ucsi->ops->read(ucsi, UCSI_MESSAGE_IN, data, size); + ret = ucsi_read_message_in(ucsi, data, size); if (ret) goto out; } @@ -1558,6 +1571,15 @@ int ucsi_register(struct ucsi *ucsi) if (!ucsi->version) return -ENODEV; + /* + * Version format is JJ.M.N (JJ = Major version, M = Minor version, + * N = sub-minor version). + */ + dev_dbg(ucsi->dev, "Registered UCSI interface with version %x.%x.%x", + UCSI_BCD_GET_MAJOR(ucsi->version), + UCSI_BCD_GET_MINOR(ucsi->version), + UCSI_BCD_GET_SUBMINOR(ucsi->version)); + queue_delayed_work(system_long_wq, &ucsi->work, 0); ucsi_debugfs_register(ucsi); diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h index 6478016d5cb8..bec920fa6b8a 100644 --- a/drivers/usb/typec/ucsi/ucsi.h +++ b/drivers/usb/typec/ucsi/ucsi.h @@ -23,6 +23,17 @@ struct dentry; #define UCSI_CONTROL 8 #define UCSI_MESSAGE_IN 16 #define UCSI_MESSAGE_OUT 32 +#define UCSIv2_MESSAGE_OUT 272 + +/* UCSI versions */ +#define UCSI_VERSION_1_2 0x0120 +#define UCSI_VERSION_2_0 0x0200 +#define UCSI_VERSION_2_1 0x0210 +#define UCSI_VERSION_3_0 0x0300 + +#define UCSI_BCD_GET_MAJOR(_v_) (((_v_) >> 8) & 0xFF) +#define UCSI_BCD_GET_MINOR(_v_) (((_v_) >> 4) & 0x0F) +#define UCSI_BCD_GET_SUBMINOR(_v_) ((_v_) & 0x0F) /* Command Status and Connector Change Indication (CCI) bits */ #define UCSI_CCI_CONNECTOR(_c_) (((_c_) & GENMASK(7, 1)) >> 1) From patchwork Fri Feb 9 06:02:39 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: 13550885 Received: from mail-oo1-f52.google.com (mail-oo1-f52.google.com [209.85.161.52]) (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 8E7D857315 for ; Fri, 9 Feb 2024 06:05:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.161.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707458748; cv=none; b=qHvhZzRGyyQhyjwRyrBBDtjM2JC3QEuqi3i/ngUJ6LClm3yN4h9LvcZ+ZaEqH8czgH7G+/or70bPsqKjHm5Zqviy+B9H65dOubvKPfLnX3hH0VpTz8V9dJuJuLmdHRV+t9PT56q+tkP5behLbDeIXstHtVv1O4zI4A2+YigJ6D4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707458748; c=relaxed/simple; bh=v/nT8b1jYweKH7pv1wyqHS1aqwvFWTRrfh3SnZ5y8ZY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SUY/lYe4AHung7OSalo+ABbdFag4vU2xs5jalz5HYvBwfqzqIAjNOpSVXL1iwHAm0NXDOxFXRqQ0OEq+RTIKqESC+z6pA1dytSTW7MjaZp+tBBA9/q3MggMmum/6L9CB5HSyJjAStVdKr2ab1JaRigX55J9ZbxKLeWgvo4IgW/k= 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=AmuTqN5i; arc=none smtp.client-ip=209.85.161.52 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="AmuTqN5i" Received: by mail-oo1-f52.google.com with SMTP id 006d021491bc7-59a8b9b327aso235559eaf.2 for ; Thu, 08 Feb 2024 22:05:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1707458745; x=1708063545; 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=NXa++egn1I8A9aejMkYJFqgX4tfheQa1aOxxLsKxQ0w=; b=AmuTqN5im7fkdVxgg2FgKZqXluRiSzWNgJRiNTIP7ZErMbBri+jjf7LBy2sNPLvH1j BoNQ6LGzBYZif8qqOLcHy0IxGCiBR02VTlhoBJODbgimJpNUd61B05DxXm62zkIR11l1 qQQLvV2Wn89j1Kaa0NY39AX3tls45t5w/hDZ4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707458745; x=1708063545; 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=NXa++egn1I8A9aejMkYJFqgX4tfheQa1aOxxLsKxQ0w=; b=GcsPGCgeQHiSBcITZ4RZlLYUVzQO5aFgioPoLwR6XzqafK0BnlF9Y3w8wICCnqSTpM zIxz9GjD9TPYe/UW1jAoSUl4xZ7LXp9zXEcbReip/GcnOaakqVMaGMT5hul2mnU67tvi t5RngV0AP7VzBu9DVsxyYqww80NhvFdDU9YRzohtt6+mMvXNbS3iXHGyocK/d3gT4hTV Ut7beTxKaw4nLZywOBi5dPRZ9ofJK9HtJn9Dq2/cgwW7LdNdBiqq9K79+Cv+PAfSGScA z5JzteqbpaEvvvGudHpQUHfaQgkzuHsa9IEH/ncISRdBQuqQfz1Mt8WtwX+ON6f7GNbr 6DQQ== X-Gm-Message-State: AOJu0YyU6NpubCs6u76an904wleuvUqvoOAzHSYZUdA8x4+01Vb/QAL7 YNdqRuieZpASkgxcuT/esOcAqQhesl4aJQNwyDGZu0VmB8iKcSXZcc2+zY+cFQ== X-Google-Smtp-Source: AGHT+IF5CxCAWG/VNUGG1iIqxZegtuuT7f9cQSMghIVVa/CJhs4425T6h5CS/gS9J4mn1A8U87CbXw== X-Received: by 2002:a05:6359:459f:b0:178:70f0:5a47 with SMTP id no31-20020a056359459f00b0017870f05a47mr595965rwb.2.1707458745538; Thu, 08 Feb 2024 22:05:45 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCVcoxGYvdJdvOyr87l1IP50EKua3vOXqvYubDDDK/JcY/bGNDfu97x+B1NZ18UL7ruOYfTYjHIzjJ6keroBgdNBAWMSTfH1CD2qXxSulaW4i/zCFDubLqSuuU/D6KWmuQL5q1Pf+dMwAgr20ZCVXmo4NvmBw6FZUGA1FeSpJVo4mQB8Ksat/Mf3AomJwcASKjoatcnZhU6cxXLaK8j7uY+rpoPFwx7OcduA2xH01K1J0HFz1dQhYuWkoQr81UTZGHHyEWFqr2V96fwZDUQotLoGyi1TOXiXcfzihh4ADYS55glOvdn1rc6JpqsLyfaz7XO0jj/kZOnew7wIpNelZ2RkrB6oXYuMCA== Received: from localhost (209.148.168.34.bc.googleusercontent.com. [34.168.148.209]) by smtp.gmail.com with UTF8SMTPSA id v14-20020aa7850e000000b006ddb83e5e47sm827281pfn.90.2024.02.08.22.05.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 08 Feb 2024 22:05:45 -0800 (PST) From: Abhishek Pandit-Subedi To: Heikki Krogerus , linux-usb@vger.kernel.org Cc: jthies@google.com, pmalani@chromium.org, Abhishek Pandit-Subedi , Dmitry Baryshkov , Greg Kroah-Hartman , Neil Armstrong , Saranya Gopal , linux-kernel@vger.kernel.org Subject: [PATCH v4 2/3] usb: typec: ucsi: Update connector cap and status Date: Thu, 8 Feb 2024 22:02:39 -0800 Message-ID: <20240208220230.v4.2.I3d909e3c9a200621e3034686f068a3307945fd87@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-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Update the data structures for ucsi_connector_capability and ucsi_connector_status to UCSIv3. Reviewed-by: Prashant Malani Reviewed-by: Heikki Krogerus Signed-off-by: Abhishek Pandit-Subedi --- Changes in v4: - Fix BCD translation of PD Major Rev Changes in v3: - Change include to asm/unaligned.h and reorder include. drivers/usb/typec/ucsi/ucsi.h | 56 ++++++++++++++++++++++++++++++++--- 1 file changed, 52 insertions(+), 4 deletions(-) diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h index bec920fa6b8a..7e35ffbe0a6f 100644 --- a/drivers/usb/typec/ucsi/ucsi.h +++ b/drivers/usb/typec/ucsi/ucsi.h @@ -10,6 +10,7 @@ #include #include #include +#include /* -------------------------------------------------------------------------- */ @@ -35,6 +36,12 @@ struct dentry; #define UCSI_BCD_GET_MINOR(_v_) (((_v_) >> 4) & 0x0F) #define UCSI_BCD_GET_SUBMINOR(_v_) ((_v_) & 0x0F) +/* + * Per USB PD 3.2, Section 6.2.1.1.5, the spec revision is represented by 2 bits + * 0b00 = 1.0, 0b01 = 2.0, 0b10 = 3.0, 0b11 = Reserved, Shall NOT be used. + */ +#define UCSI_SPEC_REVISION_TO_BCD(_v_) (((_v_) + 1) << 8) + /* Command Status and Connector Change Indication (CCI) bits */ #define UCSI_CCI_CONNECTOR(_c_) (((_c_) & GENMASK(7, 1)) >> 1) #define UCSI_CCI_LENGTH(_c_) (((_c_) & GENMASK(15, 8)) >> 8) @@ -214,9 +221,29 @@ struct ucsi_connector_capability { #define UCSI_CONCAP_OPMODE_USB2 BIT(5) #define UCSI_CONCAP_OPMODE_USB3 BIT(6) #define UCSI_CONCAP_OPMODE_ALT_MODE BIT(7) - u8 flags; + u32 flags; #define UCSI_CONCAP_FLAG_PROVIDER BIT(0) #define UCSI_CONCAP_FLAG_CONSUMER BIT(1) +#define UCSI_CONCAP_FLAG_SWAP_TO_DFP BIT(2) +#define UCSI_CONCAP_FLAG_SWAP_TO_UFP BIT(3) +#define UCSI_CONCAP_FLAG_SWAP_TO_SRC BIT(4) +#define UCSI_CONCAP_FLAG_SWAP_TO_SINK BIT(5) +#define UCSI_CONCAP_FLAG_EX_OP_MODE(_f_) \ + (((_f_) & GENMASK(13, 6)) >> 6) +#define UCSI_CONCAP_EX_OP_MODE_USB4_GEN2 BIT(0) +#define UCSI_CONCAP_EX_OP_MODE_EPR_SRC BIT(1) +#define UCSI_CONCAP_EX_OP_MODE_EPR_SINK BIT(2) +#define UCSI_CONCAP_EX_OP_MODE_USB4_GEN3 BIT(3) +#define UCSI_CONCAP_EX_OP_MODE_USB4_GEN4 BIT(4) +#define UCSI_CONCAP_FLAG_MISC_CAPS(_f_) \ + (((_f_) & GENMASK(17, 14)) >> 14) +#define UCSI_CONCAP_MISC_CAP_FW_UPDATE BIT(0) +#define UCSI_CONCAP_MISC_CAP_SECURITY BIT(1) +#define UCSI_CONCAP_FLAG_REV_CURR_PROT_SUPPORT BIT(18) +#define UCSI_CONCAP_FLAG_PARTNER_PD_MAJOR_REV(_f_) \ + (((_f_) & GENMASK(20, 19)) >> 19) +#define UCSI_CONCAP_FLAG_PARTNER_PD_MAJOR_REV_AS_BCD(_f_) \ + UCSI_SPEC_REVISION_TO_BCD(UCSI_CONCAP_FLAG_PARTNER_PD_MAJOR_REV(_f_)) } __packed; struct ucsi_altmode { @@ -276,15 +303,36 @@ struct ucsi_connector_status { #define UCSI_CONSTAT_PARTNER_TYPE_DEBUG 5 #define UCSI_CONSTAT_PARTNER_TYPE_AUDIO 6 u32 request_data_obj; - u8 pwr_status; -#define UCSI_CONSTAT_BC_STATUS(_p_) ((_p_) & GENMASK(2, 0)) + + u8 pwr_status[3]; +#define UCSI_CONSTAT_BC_STATUS(_p_) ((_p_[0]) & GENMASK(1, 0)) #define UCSI_CONSTAT_BC_NOT_CHARGING 0 #define UCSI_CONSTAT_BC_NOMINAL_CHARGING 1 #define UCSI_CONSTAT_BC_SLOW_CHARGING 2 #define UCSI_CONSTAT_BC_TRICKLE_CHARGING 3 -#define UCSI_CONSTAT_PROVIDER_CAP_LIMIT(_p_) (((_p_) & GENMASK(6, 3)) >> 3) +#define UCSI_CONSTAT_PROVIDER_CAP_LIMIT(_p_) (((_p_[0]) & GENMASK(5, 2)) >> 2) #define UCSI_CONSTAT_CAP_PWR_LOWERED 0 #define UCSI_CONSTAT_CAP_PWR_BUDGET_LIMIT 1 +#define UCSI_CONSTAT_PROVIDER_PD_VERSION_OPER_MODE(_p_) \ + ((get_unaligned_le32(_p_) & GENMASK(21, 6)) >> 6) +#define UCSI_CONSTAT_ORIENTATION(_p_) (((_p_[2]) & GENMASK(6, 6)) >> 6) +#define UCSI_CONSTAT_ORIENTATION_DIRECT 0 +#define UCSI_CONSTAT_ORIENTATION_FLIPPED 1 +#define UCSI_CONSTAT_SINK_PATH_STATUS(_p_) (((_p_[2]) & GENMASK(7, 7)) >> 7) +#define UCSI_CONSTAT_SINK_PATH_DISABLED 0 +#define UCSI_CONSTAT_SINK_PATH_ENABLED 1 + u8 pwr_readings[9]; +#define UCSI_CONSTAT_REV_CURR_PROT_STATUS(_p_) ((_p_[0]) & 0x1) +#define UCSI_CONSTAT_PWR_READING_VALID(_p_) (((_p_[0]) & GENMASK(1, 1)) >> 1) +#define UCSI_CONSTAT_CURRENT_SCALE(_p_) (((_p_[0]) & GENMASK(4, 2)) >> 2) +#define UCSI_CONSTAT_PEAK_CURRENT(_p_) \ + ((get_unaligned_le32(_p_) & GENMASK(20, 5)) >> 5) +#define UCSI_CONSTAT_AVG_CURRENT(_p_) \ + ((get_unaligned_le32(&(_p_)[2]) & GENMASK(20, 5)) >> 5) +#define UCSI_CONSTAT_VOLTAGE_SCALE(_p_) \ + ((get_unaligned_le16(&(_p_)[4]) & GENMASK(8, 5)) >> 5) +#define UCSI_CONSTAT_VOLTAGE_READING(_p_) \ + ((get_unaligned_le32(&(_p_)[5]) & GENMASK(16, 1)) >> 1) } __packed; /* -------------------------------------------------------------------------- */ 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: 13550886 Received: from mail-io1-f42.google.com (mail-io1-f42.google.com [209.85.166.42]) (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 563AB5732B for ; Fri, 9 Feb 2024 06:05:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707458748; cv=none; b=M0QBkSuzp4RNsEDIKuuYu8SFw2ANFQTViYFL8fcB1nBEimkWAv8/agzvT7EMLHTpLc1sz4YRpTwcUfSRkwf/flPm4pUCja4HDVfFs/qNOKjTJaWWAwu5NyKLhw4RAT18GYdV76ApSae1sb+6lT8G3a1XypmAw9bjfBWbQxhMVCE= 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.42 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 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="Pt5FX2BL" Received: by mail-io1-f42.google.com with SMTP id ca18e2360f4ac-7bf2c826a5aso23445339f.0 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=Md1AqP9IRISk00TPshwBJFm+yAWGO6tFprBjGjBHFFSHiKwXvkZoFriO93BcSl0QlM pdcdHF8UseKxbWmt1vb46r6PRQtOiYGgiPMObtQNBrULJ8qd5KRypoxpDiSz84Fs0One kip/gFgBmM4tLqWfSfmEXP9a6yK6wYQLHEE6FEYd8GzncKq2tM8MSRV1uZ6qDD2JjiVG SKmkZeQQWTxIPElzF+agMA58qbfT2K93V2mrm8CAAEi53tYrLYbg9VN06yylRBCOJzYk vi1lEsNvy3TuP3XiT/g43JzpKh3c+WLM7ff0x80V+OagzyD2B1QEKwQ26QA+wnl/hJGc cWoA== X-Gm-Message-State: AOJu0YybqybWAs+ib4swJKS+R3rNsGY0TipWsQsv7gV9mImbMIysTBIS wuZCWXGSXoHYDmLgE2YrbSsvHFYXarX/7WE6OlvrMcl+VM21p4PcLCSKZWvnkA== X-Google-Smtp-Source: AGHT+IHP+NjS4yp7VoWj2By/R3AqIn7H5z3FI0hBMySpju7l+jOZ91KrI+JmLbXSUOeNmmmRlMYvvQ== 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-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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)