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)