From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (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 35D4A3939D6 for ; Mon, 13 Apr 2026 07:36:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776065775; cv=none; b=EGUuv0huTqyujZTZigp4IXWx+yMJHcjLMmVXLsgQZBu3RkB5+rBL5zHIBMvJ0936y3B0QX1KuVbRtS9fBkyojLj6o05sVtentl8587NdKLGLZoH1TK/wglrvrYZ0u05GHfVV6gjsAUgbK9QqRVhX7CxXnffJST3sU2IOGC1yQDQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776065775; c=relaxed/simple; bh=z+GbI1Hi7HQ37EBywPZVYlS4GBPotKdTEHob6lKuBdw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=krU2RqRaGAaT4ZdqrPPorvhdrAyUD9c3a4KQgsdC5N1SW7deVFjR5ZaE6uly1H6Nog80D7vFhgUGUeqxX+yMnEIobdXzu6E+N8o6fiW10jap5JUlVh52VjLW2nAMNpnSbSRFHHVUlAJbvHGfr/UUV2okxt5MU2MIHlxyKnZ2SOk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=fail (p=reject dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=LrGwaFqy; arc=none smtp.client-ip=209.85.216.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=fail (p=reject dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LrGwaFqy" Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-358d80f60ccso2766941a91.3 for ; Mon, 13 Apr 2026 00:36:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776065773; x=1776670573; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=aFGrbwczSOoLilTCGKun4cKWo780pH2iZgTthq1aaeg=; b=LrGwaFqy+C5+BKNRrm14RVtzgoLYiczStXNBmA8/G7nfJD8KDt+gWqx88gAzqm5uNm swuHu+ugB3vSde9Q70WrbYB24KaFO1G0DZVHI5q+RQqi6DnpTY6wwwIuGi+NuuasE+ng CNMXQtv4NLZAETvALiCt1XwqEfOKmid/g0k+aUaMmL+E4yKREEM/SpQ9JjP3NHR36+Db NxMXgmagCfdJsaO/Qu89pXWVo1l3U1zP6ZaKjqvoXH5O5JmewU7ZMWP5Nu6xTnDV1PcG EGPmqSF0WIMoEZUzxxLkJwNILRX/1a4EsWIw+V6yDmCuBRgL0SbaQ5TNLgVdJWqKhE1g IAkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776065773; x=1776670573; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=aFGrbwczSOoLilTCGKun4cKWo780pH2iZgTthq1aaeg=; b=DcRk3N/6h4Qy1zGP5RzgrtTtw6rWQ7HRB+MNWt2OugGjuEfPMu1gIvSpGIIBX18nUg 6oA/hUE31WrNLmWaCYEOAu7y1hqEZ/QbwBENO+DeVNBKWR62GZmPz2IyZCTPK9/kOY8r 12706sEiqVGxNO/550zH26QZ4NndNieWxTN8j/29FnHaYhhHHxW/yP/zrDdymQPk1Rls caOLvJT6KAp2LHuVEyADyl1nrmxs5eyLIpigCkJxFBFfxX2qhUwx1l24GHZ1tN0x3Czu 7CCHOZxwxWU66Z2Kfqo0OVyXPJblLirxyib9wRwfmravi8wbT7NpcRhTkYPUwUoF6QzL Fn5A== X-Forwarded-Encrypted: i=1; AFNElJ/P2QeuF8cokA4S6REYREwWsccFwljR2ZJGAwvlnVqY4uA8vOquAEbzaCruiyPGqgpdUcgPFkPgBHS+yoU=@vger.kernel.org X-Gm-Message-State: AOJu0Yx6T0Dt/E9qj+llDmcaZYEuluVzWm0nDCn1LstkHNPH0znR52I/ DdQoZUPQQAiAO5Tt0LrJRF/n1HrrA1wlX6b/PEhOf1B3dp1xMIoRoH3W X-Gm-Gg: AeBDievOpCWgQRa64AfBlHiBWzzh40g83+RnE4Z8zdTm5UhPN43RSkfzKg3RBwDzXLA uMoaAea4rZ+5v0LTV1bTCWY5Tq4NQQTXpSdNRWfd/oXzGUXBlyqtS/2Urwd+SQi9MJ3IHc1YASp 8dUFWpkxqYgflpXShxm2vN8t+nbjdwihfE1UbmDl7lXVq28GSXQEtPgeLT10bbLekaIbu0GHoI3 lz7F4Y6loKayroE7qCfZqpCN2gAecRQrNWRPZDRSL/cZe8gXAxqgC3aRphDMWDNabwMxzwnc1+m mj+a9kznwYdG+g2F2VqdeGpB9cRyto8dqAhwfPSOU3d3Z7eF7z20Hwf/Y/d978yNdw3SQ5NEGQn KyxC6cu8wc6MqZpG2BMJY9nwmDw+8AhIZkS4twiEDXH/PUB+pkoQ2k6F31YA7yJyx/iuQT9Mopr LaNVcRbg== X-Received: by 2002:a17:90b:2fd0:b0:359:d54:846f with SMTP id 98e67ed59e1d1-35e4275f708mr13214200a91.7.1776065773438; Mon, 13 Apr 2026 00:36:13 -0700 (PDT) Received: from localhost ([2001:67c:1562:8007::aac:4468]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-35fb37d6e36sm3248823a91.16.2026.04.13.00.36.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Apr 2026 00:36:12 -0700 (PDT) Sender: AceLan Kao From: "Chia-Lin Kao (AceLan)" To: Heikki Krogerus , Greg Kroah-Hartman , Andrei Kuchynski , Johan Hovold , Jameson Thies , Pooja Katiyar , Hsin-Te Yuan , Dmitry Baryshkov Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 2/3] usb: typec: ucsi: Add duplicate detection to nvidia registration path Date: Mon, 13 Apr 2026 15:35:50 +0800 Message-ID: <20260413073552.894395-2-acelan.kao@canonical.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260413073552.894395-1-acelan.kao@canonical.com> References: <20260413073552.894395-1-acelan.kao@canonical.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Extend the duplicate altmode detection to ucsi_register_altmodes_nvidia() which is used when a driver provides the update_altmodes() callback. This ensures all drivers benefit from duplicate detection, whether they use the standard registration path or the nvidia path with update_altmodes callback. Without this fix, drivers using the nvidia path (like yoga_c630) would still encounter duplicate altmode registration errors from buggy firmware. Fixes: a79f16efcd00 ("usb: typec: ucsi: Add support for the partner USB Modes") Cc: stable@vger.kernel.org Signed-off-by: Chia-Lin Kao (AceLan) -- v4. rebase --- drivers/usb/typec/ucsi/ucsi.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c index eebbb80fae566..43389fc7e13f2 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -619,19 +619,25 @@ ucsi_register_altmodes_nvidia(struct ucsi_connector *con, u8 recipient) /* now register altmodes */ for (i = 0; i < max_altmodes; i++) { - memset(&desc, 0, sizeof(desc)); - if (multi_dp) { - desc.svid = updated[i].svid; - desc.vdo = updated[i].mid; - } else { - desc.svid = orig[i].svid; - desc.vdo = orig[i].mid; - } - desc.roles = TYPEC_PORT_DRD; + struct ucsi_altmode *altmode_array = multi_dp ? updated : orig; - if (!desc.svid) + if (!altmode_array[i].svid) return 0; + /* + * Check for duplicates in current array and already + * registered altmodes. Skip if duplicate found. + */ + if (ucsi_altmode_is_duplicate(con, recipient, altmode_array, i, + altmode_array[i].svid, + altmode_array[i].mid, i)) + continue; + + memset(&desc, 0, sizeof(desc)); + desc.svid = altmode_array[i].svid; + desc.vdo = altmode_array[i].mid; + desc.roles = TYPEC_PORT_DRD; + ret = ucsi_register_altmode(con, &desc, recipient); if (ret) return ret; -- 2.53.0