github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-07-27 09:36:22 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

usb: typec: ucsi: Add duplicate detection to nvidia registration path

Browse Source 
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: a79f16efcd ("usb: typec: ucsi: Add support for the partner USB Modes")
Cc: stable <stable@kernel.org>
Signed-off-by: Chia-Lin Kao (AceLan) <acelan.kao@canonical.com>
Link: https://patch.msgid.link/20260713084323.287516-2-acelan.kao@canonical.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Chia-Lin Kao (AceLan) 2026-07-13 16:43:22 +08:00 committed by Greg Kroah-Hartman
parent 67c92c6419
commit f1aa17f72f
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/usb/typec/ucsi/ucsi.c
View File

@ -706,19 +706,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;