From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f50.google.com (mail-pj1-f50.google.com [209.85.216.50]) (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 E3C373B95E7 for ; Mon, 13 Jul 2026 08:43:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.50 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783932215; cv=none; b=Z2DB2i/syPkgcCblC7ZoKWb+9bDFv7DUHRquR6SbxK9WnKGJrFQjfhMy3rpJCZ9j/B5KkSPBmnxonbRgZ3eEHx6UbZ7eegcEJ5e9oKHF7QhI8ZosaJe95QXR4Eh6vixRIpuCP44Vmkk+8QNS3z37RS+NLXKP2E11zKlDR7WT+aM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783932215; c=relaxed/simple; bh=JDv9cvCfz0toNbSmDSr6BptzpJnAo43DD0S2XFnyi08=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iTb1jyUvqdsjs07arU9RS67SFkKqxkxAPFUnwG/kBaXK78MlZeOqczf5zgeX/YjG0Z3B+QtSsj4IdAhtKjpmbYyLxUoAieLidgjQU2N1rnEUdQ/RNhslWinBfUOdNRbGC4HVpGD4MEFkFuYPL9G5ohYS28fx/1XpTdeE2VyoNEA= 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=LffXOtB/; arc=none smtp.client-ip=209.85.216.50 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="LffXOtB/" Received: by mail-pj1-f50.google.com with SMTP id 98e67ed59e1d1-38a0c7e841fso3347298a91.2 for ; Mon, 13 Jul 2026 01:43:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783932213; x=1784537013; 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:content-type; bh=EyXVzMnf/nv4SeU/Mt7kZFwDd9i4afrIe4YGwvAaufo=; b=LffXOtB/oR8eWH/kKjTcKdKJP4tPgYldJxowGj6ZAXwypZK8ss1bAERtVq4mA9BqQt DbQjVCJmTxOrec602EzfcXLXtIYE078sbihK4iNug2VHiCDT+2Eev61d4tbFvgg08DtP +8sAIuRickVr5bEo5o4v6HA94pKAy8vIbUT8mL46+vOaVbMQo7/CFS1p8A+cht7hCFrD H9OuTG4qYSDf6Gt9SwhJfkCrGK2Y8wwh/wvmrh1iqbIyHAQJGbEwkjbv3BPDa1J33kBD 8dCYjHsZf+3cV6/gQ5H0L+xaFQyC6hTf/o3LpoeI00no4vew0nezivljHkF1worPmqqZ 2txg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783932213; x=1784537013; 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 :content-type; bh=EyXVzMnf/nv4SeU/Mt7kZFwDd9i4afrIe4YGwvAaufo=; b=P2ma60GjGbKfDDoqJSNsGDRBlNbtQtOCH/kCZg4TdTblAoPbONDMEWJ2k59pgep+i4 rfM7uxL+YT64adDs816VDVNSjcQMBbih3f32O/Ed1QQZAElBDI77vXHVSO6XG2Z2Of9f 6SOFzFi0EOZuT+r5UnxGnn1AfM27lLG+3gGf6UrPinuJNpk9tNg6NNIOdk4eG5vhmEJm oKuCFEl7vdKqjbDqQCuA0ZhjPdNHWuw2Dy2oWvLBgavHDO3Go2U6KI4L6DGU5RxuwSPR Fie0VoSXCgjdbWANrL2zSi9h3MIGVVFZL1FSgLPeKABuUOQAcT5DRz9jBa+gM20coCSJ pkdg== X-Forwarded-Encrypted: i=1; AHgh+Rre0eDHzoKeITFnqTL/7JJfbtKpeJIZu6VL4pE8DSpoTpiewQQS0eNFALf4awueUfWPru1Y+h0BSaERh4U=@vger.kernel.org X-Gm-Message-State: AOJu0YxJ//0K/8QTAUcsWyoO12M1/U2uYBRk6Bsz0ixuJGRTOq5dGem6 sJFkY7e059uIkKgVPmd361wR2pb8LefeYPnlwgebIFVDTaa6bI1JPQ3cLXclHw0y1gg= X-Gm-Gg: AfdE7clkpRoqcZkn/SBDRXX+9QERYWeCKAti1n7Zu1gYX6xmax0lfSysg9QZ51FaAx0 +VVFEdhRj0FIXmZRh8n2LswihAk0nmPjuCc9Lt5C1JkKkTcV4mvbFDCOkZT7N26tA+ObObWO9q5 MfNJQjtgG8QAg070rJERkqrXHB+hMLXPRABp2iZpQxNSEgLa8Pb1udd5BNV3gqrl3prltUEmRvr 5ELBU38maHeOEChjp+1ccyXe5+1eLbJKZFr84u29ZxaPjIzXRfZ+zbPwd7PKTgzjdO4tcQIl/vo 2BvOsLqWq8NFjmUWEULK46T/Zvn7m/0LNFuh0LP2V1LhDvJnqmVZXRgzjMIkhy5J+s5//9nY5Pd w/HOZQfmsbl7mVK+VgGeysaACJGiCBQHsit3vDNjrQYLceKKGHTisExCPRB8p2xHm3VhM96Kiri Cz4CYSYmdoBFO/PnWont+umANkNAkVXGofR4OqTmtsTA== X-Received: by 2002:a17:90b:3ccc:b0:37f:c2a8:ce45 with SMTP id 98e67ed59e1d1-38dc73b936emr7922432a91.4.1783932213308; Mon, 13 Jul 2026 01:43:33 -0700 (PDT) Received: from localhost (211-75-139-220.hinet-ip.hinet.net. [211.75.139.220]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-38a5506b47esm6066648a91.3.2026.07.13.01.43.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jul 2026 01:43:32 -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 v7 2/3] usb: typec: ucsi: Add duplicate detection to nvidia registration path Date: Mon, 13 Jul 2026 16:43:22 +0800 Message-ID: <20260713084323.287516-2-acelan.kao@canonical.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260713084323.287516-1-acelan.kao@canonical.com> References: <20260713084323.287516-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) --- 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 b9343bf67357..3ad7bc48a9c0 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -727,19 +727,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