USB fixes for 3.16-rc6
Here are 2 USB patches that resolve some reported issues, one with an odd HUB, and one in the chipidea driver. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iEYEABECAAYFAlPMHpMACgkQMUfUDdst+ymQIQCeOK2oC0C5h1P7HHAQ4UiGpSgt MHwAoJfAeqF77RajND+m4ds6hwc5h8IF =ufek -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
caa7c4e172
|
@ -1169,8 +1169,8 @@ static int ep_enable(struct usb_ep *ep,
|
||||||
|
|
||||||
if (hwep->type == USB_ENDPOINT_XFER_CONTROL)
|
if (hwep->type == USB_ENDPOINT_XFER_CONTROL)
|
||||||
cap |= QH_IOS;
|
cap |= QH_IOS;
|
||||||
if (hwep->num)
|
|
||||||
cap |= QH_ZLT;
|
cap |= QH_ZLT;
|
||||||
cap |= (hwep->ep.maxpacket << __ffs(QH_MAX_PKT)) & QH_MAX_PKT;
|
cap |= (hwep->ep.maxpacket << __ffs(QH_MAX_PKT)) & QH_MAX_PKT;
|
||||||
/*
|
/*
|
||||||
* For ISO-TX, we set mult at QH as the largest value, and use
|
* For ISO-TX, we set mult at QH as the largest value, and use
|
||||||
|
|
|
@ -889,6 +889,25 @@ static int hub_usb3_port_disable(struct usb_hub *hub, int port1)
|
||||||
if (!hub_is_superspeed(hub->hdev))
|
if (!hub_is_superspeed(hub->hdev))
|
||||||
return -EINVAL;
|
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);
|
ret = hub_set_port_link_state(hub, port1, USB_SS_PORT_LS_SS_DISABLED);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
Loading…
Reference in a new issue