Commit caa7c4e1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'usb-3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb 

Pull USB fixes from Greg KH:
 "Here are two USB patches that resolve some reported issues, one with
  an odd HUB, and one in the chipidea driver"

* tag 'usb-3.16-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: Check if port status is equal to RxDetect
  usb: chipidea: udc: Disable auto ZLP generation on ep0
parents f47d5bb0 bb86cf56

drivers/usb/chipidea/udc.c

+2 −2
Original line number Diff line number Diff line
@@ -1169,7 +1169,7 @@ static int ep_enable(struct usb_ep *ep, 


	if (hwep->type == USB_ENDPOINT_XFER_CONTROL)

		cap |= QH_IOS;

	if (hwep->num)



	cap |= QH_ZLT;

	cap |= (hwep->ep.maxpacket << __ffs(QH_MAX_PKT)) & QH_MAX_PKT;

	/*

drivers/usb/core/hub.c

+19 −0
Original line number Diff line number Diff line
@@ -889,6 +889,25 @@ static int hub_usb3_port_disable(struct usb_hub *hub, int port1) 
	if (!hub_is_superspeed(hub->hdev))

		return -EINVAL;



	ret = hub_port_status(hub, port1, &portstatus, &portchange);

	if (ret < 0)

		return ret;



	/*

	 * USB controller Advanced Micro Devices, Inc. [AMD] FCH USB XHCI

	 * Controller [1022:7814] will have spurious result making the following

	 * usb 3.0 device hotplugging route to the 2.0 root hub and recognized

	 * as high-speed device if we set the usb 3.0 port link state to

	 * Disabled. Since it's already in USB_SS_PORT_LS_RX_DETECT state, we

	 * check the state here to avoid the bug.

	 */

	if ((portstatus & USB_PORT_STAT_LINK_STATE) ==

				USB_SS_PORT_LS_RX_DETECT) {

		dev_dbg(&hub->ports[port1 - 1]->dev,

			 "Not disabling port; link state is RxDetect\n");

		return ret;

	}



	ret = hub_set_port_link_state(hub, port1, USB_SS_PORT_LS_SS_DISABLED);

	if (ret)

		return ret;

CRA Git | Maintained and supported by SUSTech CRA and CCSE