Merge tag 'for-usb-linus-2012-02-21' of... (9a9a71b7) · Commits · 戴 / test

drivers/usb/core/hub.c

+17 −13

Original line number	Diff line number	Diff line
		@@ -705,10 +705,26 @@ static void hub_activate(struct usb_hub *hub, enum hub_activation_type type)
		if (type == HUB_INIT3)
		goto init3;

		/* After a resume, port power should still be on.
		/* The superspeed hub except for root hub has to use Hub Depth
		* value as an offset into the route string to locate the bits
		* it uses to determine the downstream port number. So hub driver
		* should send a set hub depth request to superspeed hub after
		* the superspeed hub is set configuration in initialization or
		* reset procedure.
		*
		* After a resume, port power should still be on.
		* For any other type of activation, turn it on.
		*/
		if (type != HUB_RESUME) {
		if (hdev->parent && hub_is_superspeed(hdev)) {
		ret = usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
		HUB_SET_DEPTH, USB_RT_HUB,
		hdev->level - 1, 0, NULL, 0,
		USB_CTRL_SET_TIMEOUT);
		if (ret < 0)
		dev_err(hub->intfdev,
		"set hub depth failed\n");
		}

		/* Speed up system boot by using a delayed_work for the
		* hub's initial power-up delays. This is pretty awkward
		@@ -987,18 +1003,6 @@ static int hub_configure(struct usb_hub *hub,
		goto fail;
		}

		if (hub_is_superspeed(hdev) && (hdev->parent != NULL)) {
		ret = usb_control_msg(hdev, usb_sndctrlpipe(hdev, 0),
		HUB_SET_DEPTH, USB_RT_HUB,
		hdev->level - 1, 0, NULL, 0,
		USB_CTRL_SET_TIMEOUT);

		if (ret < 0) {
		message = "can't set hub depth";
		goto fail;
		}
		}

		/* Request the entire hub descriptor.
		* hub->descriptor can handle USB_MAXCHILDREN ports,
		* but the hub can/will return fewer bytes here.

drivers/usb/host/pci-quirks.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -872,7 +872,17 @@ static void __devinit quirk_usb_early_handoff(struct pci_dev *pdev)
		*/
		if (pdev->vendor == 0x184e) /* vendor Netlogic */
		return;
		if (pdev->class != PCI_CLASS_SERIAL_USB_UHCI &&
		pdev->class != PCI_CLASS_SERIAL_USB_OHCI &&
		pdev->class != PCI_CLASS_SERIAL_USB_EHCI &&
		pdev->class != PCI_CLASS_SERIAL_USB_XHCI)
		return;

		if (pci_enable_device(pdev) < 0) {
		dev_warn(&pdev->dev, "Can't enable PCI device, "
		"BIOS handoff failed.\n");
		return;
		}
		if (pdev->class == PCI_CLASS_SERIAL_USB_UHCI)
		quirk_usb_handoff_uhci(pdev);
		else if (pdev->class == PCI_CLASS_SERIAL_USB_OHCI)
		@@ -881,5 +891,6 @@ static void __devinit quirk_usb_early_handoff(struct pci_dev *pdev)
		quirk_usb_disable_ehci(pdev);
		else if (pdev->class == PCI_CLASS_SERIAL_USB_XHCI)
		quirk_usb_handoff_xhci(pdev);
		pci_disable_device(pdev);
		}
		DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, quirk_usb_early_handoff);

drivers/usb/host/xhci-mem.c

+24 −8

Original line number	Diff line number	Diff line
		@@ -1126,26 +1126,42 @@ static unsigned int xhci_parse_exponent_interval(struct usb_device *udev,
		}

		/*
		* Convert bInterval expressed in frames (in 1-255 range) to exponent of
		* Convert bInterval expressed in microframes (in 1-255 range) to exponent of
		* microframes, rounded down to nearest power of 2.
		*/
		static unsigned int xhci_parse_frame_interval(struct usb_device *udev,
		struct usb_host_endpoint *ep)
		static unsigned int xhci_microframes_to_exponent(struct usb_device *udev,
		struct usb_host_endpoint *ep, unsigned int desc_interval,
		unsigned int min_exponent, unsigned int max_exponent)
		{
		unsigned int interval;

		interval = fls(8 * ep->desc.bInterval) - 1;
		interval = clamp_val(interval, 3, 10);
		if ((1 << interval) != 8 * ep->desc.bInterval)
		interval = fls(desc_interval) - 1;
		interval = clamp_val(interval, min_exponent, max_exponent);
		if ((1 << interval) != desc_interval)
		dev_warn(&udev->dev,
		"ep %#x - rounding interval to %d microframes, ep desc says %d microframes\n",
		ep->desc.bEndpointAddress,
		1 << interval,
		8 * ep->desc.bInterval);
		desc_interval);

		return interval;
		}

		static unsigned int xhci_parse_microframe_interval(struct usb_device *udev,
		struct usb_host_endpoint *ep)
		{
		return xhci_microframes_to_exponent(udev, ep,
		ep->desc.bInterval, 0, 15);
		}


		static unsigned int xhci_parse_frame_interval(struct usb_device *udev,
		struct usb_host_endpoint *ep)
		{
		return xhci_microframes_to_exponent(udev, ep,
		ep->desc.bInterval * 8, 3, 10);
		}

		/* Return the polling or NAK interval.
		*
		* The polling interval is expressed in "microframes". If xHCI's Interval field
		@@ -1164,7 +1180,7 @@ static unsigned int xhci_get_endpoint_interval(struct usb_device *udev,
		/* Max NAK rate */
		if (usb_endpoint_xfer_control(&ep->desc) \|\|
		usb_endpoint_xfer_bulk(&ep->desc)) {
		interval = ep->desc.bInterval;
		interval = xhci_parse_microframe_interval(udev, ep);
		break;
		}
		/* Fall through - SS and HS isoc/int have same decoding */

Admin message