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

Commit a5f0efab authored by Sarah Sharp's avatar Sarah Sharp Committed by Greg Kroah-Hartman
Browse files

USB: Add call to notify xHC of a device reset. 



Add a new host controller driver method, reset_device(), that the USB core
will use to notify the host of a successful device reset.  The call may
fail due to out-of-memory errors; attempt the port reset sequence again if
that happens.  Update hub_port_init() to allow resetting a configured
device.

Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2a8f82c4

drivers/usb/core/hcd.h

+1 −0
Original line number Diff line number Diff line
@@ -286,6 +286,7 @@ struct hc_driver { 
		 */

	int	(*update_hub_device)(struct usb_hcd *, struct usb_device *hdev,

			struct usb_tt *tt, gfp_t mem_flags);

	int	(*reset_device)(struct usb_hcd *, struct usb_device *);

};



extern int usb_hcd_link_urb_to_ep(struct usb_hcd *hcd, struct urb *urb);

drivers/usb/core/hub.c

+11 −8
Original line number Diff line number Diff line
@@ -2008,7 +2008,9 @@ static int hub_port_reset(struct usb_hub *hub, int port1, 
				struct usb_device *udev, unsigned int delay)

{

	int i, status;

	struct usb_hcd *hcd;



	hcd = bus_to_hcd(udev->bus);

	/* Block EHCI CF initialization during the port reset.

	 * Some companion controllers don't like it when they mix.

	 */
@@ -2036,6 +2038,14 @@ static int hub_port_reset(struct usb_hub *hub, int port1, 
			/* TRSTRCY = 10 ms; plus some extra */

			msleep(10 + 40);

			update_address(udev, 0);

			if (hcd->driver->reset_device) {

				status = hcd->driver->reset_device(hcd, udev);

				if (status < 0) {

					dev_err(&udev->dev, "Cannot reset "

							"HCD device state\n");

					break;

				}

			}

			/* FALL THROUGH */

		case -ENOTCONN:

		case -ENODEV:
@@ -2645,14 +2655,7 @@ hub_port_init (struct usb_hub *hub, struct usb_device *udev, int port1, 


	mutex_lock(&usb_address0_mutex);



	if ((hcd->driver->flags & HCD_USB3) && udev->config) {

		/* FIXME this will need special handling by the xHCI driver. */

		dev_dbg(&udev->dev,

				"xHCI reset of configured device "

				"not supported yet.\n");

		retval = -EINVAL;

		goto fail;

	} else if (!udev->config && oldspeed == USB_SPEED_SUPER) {

	if (!udev->config && oldspeed == USB_SPEED_SUPER) {

		/* Don't reset USB 3.0 devices during an initial setup */

		usb_set_device_state(udev, USB_STATE_DEFAULT);

	} else {

drivers/usb/host/xhci-pci.c

+1 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ static const struct hc_driver xhci_pci_hc_driver = { 
	.reset_bandwidth =	xhci_reset_bandwidth,

	.address_device =	xhci_address_device,

	.update_hub_device =	xhci_update_hub_device,

	.reset_device =		xhci_reset_device,



	/*

	 * scheduling support

drivers/usb/host/xhci.h

+1 −0
Original line number Diff line number Diff line
@@ -1270,6 +1270,7 @@ int xhci_urb_dequeue(struct usb_hcd *hcd, struct urb *urb, int status); 
int xhci_add_endpoint(struct usb_hcd *hcd, struct usb_device *udev, struct usb_host_endpoint *ep);

int xhci_drop_endpoint(struct usb_hcd *hcd, struct usb_device *udev, struct usb_host_endpoint *ep);

void xhci_endpoint_reset(struct usb_hcd *hcd, struct usb_host_endpoint *ep);

int xhci_reset_device(struct usb_hcd *hcd, struct usb_device *udev);

int xhci_check_bandwidth(struct usb_hcd *hcd, struct usb_device *udev);

void xhci_reset_bandwidth(struct usb_hcd *hcd, struct usb_device *udev);