Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b67a6be authored by John Youn's avatar John Youn Committed by Felipe Balbi
Browse files

usb: gadget: composite: Exclude SS Dev Cap Desc 



Don't send the SuperSpeed USB Device Capability descriptor if
the gadget is not capable of SuperSpeed.

Signed-off-by: default avatarJohn Youn <johnyoun@synopsys.com>
Signed-off-by: default avatarSevak Arakelyan <sevaka@synopsys.com>
Signed-off-by: default avatarFelipe Balbi <felipe.balbi@linux.intel.com>
parent e16828cf

drivers/usb/gadget/composite.c

+28 −23
Original line number Diff line number Diff line
@@ -607,7 +607,6 @@ static int count_configs(struct usb_composite_dev *cdev, unsigned type) 
static int bos_desc(struct usb_composite_dev *cdev)

{

	struct usb_ext_cap_descriptor	*usb_ext;

	struct usb_ss_cap_descriptor	*ss_cap;

	struct usb_dcd_config_params	dcd_config_params;

	struct usb_bos_descriptor	*bos = cdev->req->buf;
@@ -633,6 +632,9 @@ static int bos_desc(struct usb_composite_dev *cdev) 
	 * The Superspeed USB Capability descriptor shall be implemented by all

	 * SuperSpeed devices.

	 */

	if (gadget_is_superspeed(cdev->gadget)) {

		struct usb_ss_cap_descriptor *ss_cap;



		ss_cap = cdev->req->buf + le16_to_cpu(bos->wTotalLength);

		bos->bNumDeviceCaps++;

		le16_add_cpu(&bos->wTotalLength, USB_DT_USB_SS_CAP_SIZE);
@@ -647,15 +649,18 @@ static int bos_desc(struct usb_composite_dev *cdev) 
		ss_cap->bFunctionalitySupport = USB_LOW_SPEED_OPERATION;



		/* Get Controller configuration */

	if (cdev->gadget->ops->get_config_params)

		cdev->gadget->ops->get_config_params(&dcd_config_params);

	else {

		dcd_config_params.bU1devExitLat = USB_DEFAULT_U1_DEV_EXIT_LAT;

		if (cdev->gadget->ops->get_config_params) {

			cdev->gadget->ops->get_config_params(

				&dcd_config_params);

		} else {

			dcd_config_params.bU1devExitLat =

				USB_DEFAULT_U1_DEV_EXIT_LAT;

			dcd_config_params.bU2DevExitLat =

				cpu_to_le16(USB_DEFAULT_U2_DEV_EXIT_LAT);

		}

		ss_cap->bU1devExitLat = dcd_config_params.bU1devExitLat;

		ss_cap->bU2DevExitLat = dcd_config_params.bU2DevExitLat;

	}



	/* The SuperSpeedPlus USB Device Capability descriptor */

	if (gadget_is_superspeed_plus(cdev->gadget)) {