usb: gadget: Update config for SuperSpeedPlus

When a function is added to a configuration with usb_add_function(), the
configuration speed flags are updated. These flags indicate for which
speeds the configuration is valid for.

This patch adds a flag in the configuration for SuperSpeedPlus and
also updates this based on the existence of ssp_descriptors.

Signed-off-by: John Youn <johnyoun@synopsys.com>
Signed-off-by: Felipe Balbi <balbi@kernel.org>

diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c
index 11d243349ebff1461d397fc05904d63e0281b50b..560330f5457c02f589c33e5de2f8a119e8db8768 100644 (file)
--- a/drivers/usb/gadget/composite.c
+++ b/drivers/usb/gadget/composite.c
@@ -237,6 +237,8 @@ int usb_add_function(struct usb_configuration *config,
                config->highspeed = true;
        if (!config->superspeed && function->ss_descriptors)
                config->superspeed = true;
+       if (!config->superspeed_plus && function->ssp_descriptors)
+               config->superspeed_plus = true;
 
 done:
        if (value)

diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c
index 590c44989e5eb3dee6f751dc6ce109357eed19f6..c6cc15ebeed67138b54a4d98b76823e9ed10e014 100644 (file)
--- a/drivers/usb/gadget/configfs.c
+++ b/drivers/usb/gadget/configfs.c
@@ -1229,6 +1229,7 @@ static void purge_configs_funcs(struct gadget_info *gi)
                }
                c->next_interface_id = 0;
                memset(c->interface, 0, sizeof(c->interface));
+               c->superspeed_plus = 0;
                c->superspeed = 0;
                c->highspeed = 0;
                c->fullspeed = 0;

diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h
index 9ff1e465d307727ec46466a5a5fe002bb5af92a2..2b81b24eb5aa30d852046d7ab8ef39d46145250d 100644 (file)
--- a/include/linux/usb/composite.h
+++ b/include/linux/usb/composite.h
@@ -322,6 +322,7 @@ struct usb_configuration {
        unsigned                superspeed:1;
        unsigned                highspeed:1;
        unsigned                fullspeed:1;
+       unsigned                superspeed_plus:1;
        struct usb_function     *interface[MAX_CONFIG_INTERFACES];
 };