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: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Benson Leung <bleung@chromium.org>
Link: https://lore.kernel.org/r/20241213153543.v5.1.Ie0d37646f18461234777d88b4c3e21faed92ed4f@changeid
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c
index 2f03190a9873acd52dd7703965a10d3e16aa4e28..3245e03d59e6561aba442332ce0466eafc420e30 100644 (file)
--- a/drivers/usb/typec/altmodes/displayport.c
+++ b/drivers/usb/typec/altmodes/displayport.c
@@ -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);

diff --git a/drivers/usb/typec/altmodes/nvidia.c b/drivers/usb/typec/altmodes/nvidia.c
index fe70b36f078f632f02bf6ae288e9f96892ca6c8f..2b77d931e4943a40790eaa9105971f60d158b020 100644 (file)
--- a/drivers/usb/typec/altmodes/nvidia.c
+++ b/drivers/usb/typec/altmodes/nvidia.c
@@ -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);

diff --git a/drivers/usb/typec/bus.c b/drivers/usb/typec/bus.c
index aa879253d3b8109239373f8398532b4ce07841d0..ae90688d23e400d08f895d2744bd68c89edc1f21 100644 (file)
--- a/drivers/usb/typec/bus.c
+++ b/drivers/usb/typec/bus.c
@@ -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)

diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c
index 4b3047e055a3737d3eb841e00fc976a70f8c9c3e..febe453b96be60b78a1ede7e982bedf1b5db09f8 100644 (file)
--- a/drivers/usb/typec/class.c
+++ b/drivers/usb/typec/class.c
@@ -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;

diff --git a/scripts/mod/devicetable-offsets.c b/scripts/mod/devicetable-offsets.c
index 9c7b404defbd72114013832dcf4e74da65c5c61d..d3d00e85edf73553ba3d9b5f9fccf1ff61c99026 100644 (file)
--- a/scripts/mod/devicetable-offsets.c
+++ b/scripts/mod/devicetable-offsets.c
@@ -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);

diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 5b5745f00eb306a93247c7bc1e33bf837bc3a152..7049c31062c693e06e37303296b0f1248d101aeb 100644 (file)
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -1221,17 +1221,12 @@ static void do_tbsvc_entry(struct module *mod, void *symval)
        module_alias_printf(mod, true, "tbsvc:%s", alias);
 }
 
-/* Looks like: typec:idNmN */
+/* Looks like: typec:idN */
 static void do_typec_entry(struct module *mod, void *symval)
 {
-       char alias[256] = {};
-
        DEF_FIELD(symval, typec_device_id, svid);
-       DEF_FIELD(symval, typec_device_id, mode);
-
-       ADD(alias, "m", mode != TYPEC_ANY_MODE, mode);
 
-       module_alias_printf(mod, false, "typec:id%04X%s", svid, alias);
+       module_alias_printf(mod, false, "typec:id%04X", svid);
 }
 
 /* Looks like: tee:uuid */