Commit 8541bf02 authored by Abhishek Pandit-Subedi's avatar Abhishek Pandit-Subedi Committed by Greg Kroah-Hartman
Browse files

usb: typec: Only use SVID for matching altmodes 



Mode in struct typec_altmode is used to indicate the index of the
altmode on a port, partner or plug. It is used in enter mode VDMs but
doesn't make much sense for matching against altmode drivers or for
matching partner to port altmodes.

Signed-off-by: default avatarAbhishek Pandit-Subedi <abhishekpandit@chromium.org>
Reviewed-by: default avatarHeikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: default avatarBenson Leung <bleung@chromium.org>
Link: https://lore.kernel.org/r/20241213153543.v5.1.Ie0d37646f18461234777d88b4c3e21faed92ed4f@changeid


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1ff24d40

drivers/usb/typec/altmodes/displayport.c

+1 −1
Original line number Diff line number Diff line
@@ -791,7 +791,7 @@ void dp_altmode_remove(struct typec_altmode *alt) 
EXPORT_SYMBOL_GPL(dp_altmode_remove);



static const struct typec_device_id dp_typec_id[] = {

	{ USB_TYPEC_DP_SID, USB_TYPEC_DP_MODE },

	{ USB_TYPEC_DP_SID },

	{ },

};

MODULE_DEVICE_TABLE(typec, dp_typec_id);

drivers/usb/typec/altmodes/nvidia.c

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ static void nvidia_altmode_remove(struct typec_altmode *alt) 
}



static const struct typec_device_id nvidia_typec_id[] = {

	{ USB_TYPEC_NVIDIA_VLINK_SID, TYPEC_ANY_MODE },

	{ USB_TYPEC_NVIDIA_VLINK_SID },

	{ },

};

MODULE_DEVICE_TABLE(typec, nvidia_typec_id);

drivers/usb/typec/bus.c

+2 −4
Original line number Diff line number Diff line
@@ -454,8 +454,7 @@ static int typec_match(struct device *dev, const struct device_driver *driver) 
	const struct typec_device_id *id;



	for (id = drv->id_table; id->svid; id++)

		if (id->svid == altmode->svid &&

		    (id->mode == TYPEC_ANY_MODE || id->mode == altmode->mode))

		if (id->svid == altmode->svid)

			return 1;

	return 0;

}
@@ -470,8 +469,7 @@ static int typec_uevent(const struct device *dev, struct kobj_uevent_env *env) 
	if (add_uevent_var(env, "MODE=%u", altmode->mode))

		return -ENOMEM;



	return add_uevent_var(env, "MODALIAS=typec:id%04Xm%02X",

			      altmode->svid, altmode->mode);

	return add_uevent_var(env, "MODALIAS=typec:id%04X", altmode->svid);

}



static int typec_altmode_create_links(struct altmode *alt)

drivers/usb/typec/class.c

+2 −2
Original line number Diff line number Diff line
@@ -237,13 +237,13 @@ static int altmode_match(struct device *dev, void *data) 
	if (!is_typec_altmode(dev))

		return 0;



	return ((adev->svid == id->svid) && (adev->mode == id->mode));

	return (adev->svid == id->svid);

}



static void typec_altmode_set_partner(struct altmode *altmode)

{

	struct typec_altmode *adev = &altmode->adev;

	struct typec_device_id id = { adev->svid, adev->mode, };

	struct typec_device_id id = { adev->svid };

	struct typec_port *port = typec_altmode2port(adev);

	struct altmode *partner;

	struct device *dev;

scripts/mod/devicetable-offsets.c

+0 −1
Original line number Diff line number Diff line
@@ -237,7 +237,6 @@ int main(void) 


	DEVID(typec_device_id);

	DEVID_FIELD(typec_device_id, svid);

	DEVID_FIELD(typec_device_id, mode);



	DEVID(tee_client_device_id);

	DEVID_FIELD(tee_client_device_id, uuid);