Commit 564fbee9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here are some USB fixes for 3.16-rc2 that resolve some reported
  issues.  All of these have been in linux-next for a while with no
  problems"

* tag 'usb-3.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  USB: usbtest: add a timeout for scatter-gather tests
  USB: EHCI: avoid BIOS handover on the HASEE E200
  usb: fix hub-port pm_runtime_enable() vs runtime pm transitions
  usb: quiet peer failure warning, disable poweroff
  usb: improve "not suspended yet" message in hub_suspend()
  xhci: Fix sleeping with IRQs disabled in xhci_stop_device()
  usb: fix ->update_hub_device() vs hdev->maxchild
parents 3c8fb504 32b36eea

drivers/usb/core/hub.c

+20 −13
Original line number Diff line number Diff line
@@ -1526,18 +1526,6 @@ static int hub_configure(struct usb_hub *hub, 
		dev_dbg(hub_dev, "%umA bus power budget for each child\n",

				hub->mA_per_port);



	/* Update the HCD's internal representation of this hub before khubd

	 * starts getting port status changes for devices under the hub.

	 */

	if (hcd->driver->update_hub_device) {

		ret = hcd->driver->update_hub_device(hcd, hdev,

				&hub->tt, GFP_KERNEL);

		if (ret < 0) {

			message = "can't update HCD hub info";

			goto fail;

		}

	}



	ret = hub_hub_status(hub, &hubstatus, &hubchange);

	if (ret < 0) {

		message = "can't get hub status";
@@ -1589,10 +1577,28 @@ static int hub_configure(struct usb_hub *hub, 
		}

	}

	hdev->maxchild = i;

	for (i = 0; i < hdev->maxchild; i++) {

		struct usb_port *port_dev = hub->ports[i];



		pm_runtime_put(&port_dev->dev);

	}



	mutex_unlock(&usb_port_peer_mutex);

	if (ret < 0)

		goto fail;



	/* Update the HCD's internal representation of this hub before khubd

	 * starts getting port status changes for devices under the hub.

	 */

	if (hcd->driver->update_hub_device) {

		ret = hcd->driver->update_hub_device(hcd, hdev,

				&hub->tt, GFP_KERNEL);

		if (ret < 0) {

			message = "can't update HCD hub info";

			goto fail;

		}

	}



	usb_hub_adjust_deviceremovable(hdev, hub->descriptor);



	hub_activate(hub, HUB_INIT);
@@ -3458,7 +3464,8 @@ static int hub_suspend(struct usb_interface *intf, pm_message_t msg) 
		struct usb_device *udev = port_dev->child;



		if (udev && udev->can_submit) {

			dev_warn(&port_dev->dev, "not suspended yet\n");

			dev_warn(&port_dev->dev, "device %s not suspended yet\n",

					dev_name(&udev->dev));

			if (PMSG_IS_AUTO(msg))

				return -EBUSY;

		}

drivers/usb/core/hub.h

+2 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ struct usb_hub { 
 * @dev: generic device interface

 * @port_owner: port's owner

 * @peer: related usb2 and usb3 ports (share the same connector)

 * @req: default pm qos request for hubs without port power control

 * @connect_type: port's connect type

 * @location: opaque representation of platform connector location

 * @status_lock: synchronize port_event() vs usb_port_{suspend|resume}
@@ -95,6 +96,7 @@ struct usb_port { 
	struct device dev;

	struct usb_dev_state *port_owner;

	struct usb_port *peer;

	struct dev_pm_qos_request *req;

	enum usb_port_connect_type connect_type;

	usb_port_location_t location;

	struct mutex status_lock;

drivers/usb/core/port.c

+65 −24
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 


#include "hub.h"



static int usb_port_block_power_off;



static const struct attribute_group *port_dev_group[];



static ssize_t connect_type_show(struct device *dev,
@@ -66,6 +68,7 @@ static void usb_port_device_release(struct device *dev) 
{

	struct usb_port *port_dev = to_usb_port(dev);



	kfree(port_dev->req);

	kfree(port_dev);

}
@@ -142,6 +145,9 @@ static int usb_port_runtime_suspend(struct device *dev) 
			== PM_QOS_FLAGS_ALL)

		return -EAGAIN;



	if (usb_port_block_power_off)

		return -EBUSY;



	usb_autopm_get_interface(intf);

	retval = usb_hub_set_port_power(hdev, hub, port1, false);

	usb_clear_port_feature(hdev, port1, USB_PORT_FEAT_C_CONNECTION);
@@ -190,11 +196,19 @@ static int link_peers(struct usb_port *left, struct usb_port *right) 
	if (left->peer || right->peer) {

		struct usb_port *lpeer = left->peer;

		struct usb_port *rpeer = right->peer;



		WARN(1, "failed to peer %s and %s (%s -> %p) (%s -> %p)\n",

			dev_name(&left->dev), dev_name(&right->dev),

			dev_name(&left->dev), lpeer,

			dev_name(&right->dev), rpeer);

		char *method;



		if (left->location && left->location == right->location)

			method = "location";

		else

			method = "default";



		pr_warn("usb: failed to peer %s and %s by %s (%s:%s) (%s:%s)\n",

			dev_name(&left->dev), dev_name(&right->dev), method,

			dev_name(&left->dev),

			lpeer ? dev_name(&lpeer->dev) : "none",

			dev_name(&right->dev),

			rpeer ? dev_name(&rpeer->dev) : "none");

		return -EBUSY;

	}
@@ -251,6 +265,7 @@ static void link_peers_report(struct usb_port *left, struct usb_port *right) 
		dev_warn(&left->dev, "failed to peer to %s (%d)\n",

				dev_name(&right->dev), rc);

		pr_warn_once("usb: port power management may be unreliable\n");

		usb_port_block_power_off = 1;

	}

}
@@ -386,9 +401,13 @@ int usb_hub_create_port_device(struct usb_hub *hub, int port1) 
	int retval;



	port_dev = kzalloc(sizeof(*port_dev), GFP_KERNEL);

	if (!port_dev) {

		retval = -ENOMEM;

		goto exit;

	if (!port_dev)

		return -ENOMEM;



	port_dev->req = kzalloc(sizeof(*(port_dev->req)), GFP_KERNEL);

	if (!port_dev->req) {

		kfree(port_dev);

		return -ENOMEM;

	}



	hub->ports[port1 - 1] = port_dev;
@@ -404,31 +423,53 @@ int usb_hub_create_port_device(struct usb_hub *hub, int port1) 
			port1);

	mutex_init(&port_dev->status_lock);

	retval = device_register(&port_dev->dev);

	if (retval)

		goto error_register;

	if (retval) {

		put_device(&port_dev->dev);

		return retval;

	}



	/* Set default policy of port-poweroff disabled. */

	retval = dev_pm_qos_add_request(&port_dev->dev, port_dev->req,

			DEV_PM_QOS_FLAGS, PM_QOS_FLAG_NO_POWER_OFF);

	if (retval < 0) {

		device_unregister(&port_dev->dev);

		return retval;

	}



	find_and_link_peer(hub, port1);



	/*

	 * Enable runtime pm and hold a refernce that hub_configure()

	 * will drop once the PM_QOS_NO_POWER_OFF flag state has been set

	 * and the hub has been fully registered (hdev->maxchild set).

	 */

	pm_runtime_set_active(&port_dev->dev);

	pm_runtime_get_noresume(&port_dev->dev);

	pm_runtime_enable(&port_dev->dev);

	device_enable_async_suspend(&port_dev->dev);



	/*

	 * Do not enable port runtime pm if the hub does not support

	 * power switching.  Also, userspace must have final say of

	 * whether a port is permitted to power-off.  Do not enable

	 * runtime pm if we fail to expose pm_qos_no_power_off.

	 * Keep hidden the ability to enable port-poweroff if the hub

	 * does not support power switching.

	 */

	if (hub_is_port_power_switchable(hub)

			&& dev_pm_qos_expose_flags(&port_dev->dev,

			PM_QOS_FLAG_NO_POWER_OFF) == 0)

		pm_runtime_enable(&port_dev->dev);

	if (!hub_is_port_power_switchable(hub))

		return 0;



	device_enable_async_suspend(&port_dev->dev);

	/* Attempt to let userspace take over the policy. */

	retval = dev_pm_qos_expose_flags(&port_dev->dev,

			PM_QOS_FLAG_NO_POWER_OFF);

	if (retval < 0) {

		dev_warn(&port_dev->dev, "failed to expose pm_qos_no_poweroff\n");

		return 0;

	}



error_register:

	put_device(&port_dev->dev);

exit:

	return retval;

	/* Userspace owns the policy, drop the kernel 'no_poweroff' request. */

	retval = dev_pm_qos_remove_request(port_dev->req);

	if (retval >= 0) {

		kfree(port_dev->req);

		port_dev->req = NULL;

	}

	return 0;

}



void usb_hub_remove_port_device(struct usb_hub *hub, int port1)

drivers/usb/host/pci-quirks.c

+16 −3
Original line number Diff line number Diff line
@@ -656,6 +656,14 @@ static const struct dmi_system_id ehci_dmi_nohandoff_table[] = { 
			DMI_MATCH(DMI_BIOS_VERSION, "Lucid-"),

		},

	},

	{

		/* HASEE E200 */

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "HASEE"),

			DMI_MATCH(DMI_BOARD_NAME, "E210"),

			DMI_MATCH(DMI_BIOS_VERSION, "6.00"),

		},

	},

	{ }

};
@@ -665,9 +673,14 @@ static void ehci_bios_handoff(struct pci_dev *pdev, 
{

	int try_handoff = 1, tried_handoff = 0;



	/* The Pegatron Lucid tablet sporadically waits for 98 seconds trying

	 * the handoff on its unused controller.  Skip it. */

	if (pdev->vendor == 0x8086 && pdev->device == 0x283a) {

	/*

	 * The Pegatron Lucid tablet sporadically waits for 98 seconds trying

	 * the handoff on its unused controller.  Skip it.

	 *

	 * The HASEE E200 hangs when the semaphore is set (bugzilla #77021).

	 */

	if (pdev->vendor == 0x8086 && (pdev->device == 0x283a ||

			pdev->device == 0x27cc)) {

		if (dmi_check_system(ehci_dmi_nohandoff_table))

			try_handoff = 0;

	}

drivers/usb/host/xhci-hub.c

+1 −1
Original line number Diff line number Diff line
@@ -287,7 +287,7 @@ static int xhci_stop_device(struct xhci_hcd *xhci, int slot_id, int suspend) 
		if (virt_dev->eps[i].ring && virt_dev->eps[i].ring->dequeue) {

			struct xhci_command *command;

			command = xhci_alloc_command(xhci, false, false,

						     GFP_NOIO);

						     GFP_NOWAIT);

			if (!command) {

				spin_unlock_irqrestore(&xhci->lock, flags);

				xhci_free_command(xhci, cmd);

CRA Git | Maintained and supported by SUSTech CRA and CCSE