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

Commit 30ceb4ec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here are a number of USB driver fixes for 3.12-rc3.

  These are all for host controller issues that have been reported, and
  there's a fix for an annoying error message that gets printed every
  time you remove a USB 3 device from the system that's been bugging me
  for a while"

* tag 'usb-3.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
  usb: dwc3: add support for Merrifield
  USB: fsl/ehci: fix failure of checking PHY_CLK_VALID during reinitialization
  USB: Fix breakage in ffs_fs_mount()
  fsl/usb: Resolve PHY_CLK_VLD instability issue for ULPI phy
  usb/core/devio.c: Don't reject control message to endpoint with wrong direction bit
  usb: chipidea: USB_CHIPIDEA should depend on HAS_DMA
  usb: chipidea: udc: free pending TD at removal procedure
  usb: chipidea: imx: Add usb_phy_shutdown at probe's error path
  usb: chipidea: Fix memleak for ci->hw_bank.regmap when removal
  usb: chipidea: udc: fix the oops after rmmod gadget
  USB: fix PM config symbol in uhci-hcd, ehci-hcd, and xhci-hcd
  USB: OHCI: accept very late isochronous URBs
  USB: UHCI: accept very late isochronous URBs
  USB: iMX21: accept very late isochronous URBs
  usbcore: check usb device's state before sending a Set SEL control transfer
  xhci: Fix race between ep halt and URB cancellation
  usb: Fix xHCI host issues on remote wakeup.
  xhci: Ensure a command structure points to the correct trb on the command ring
  xhci: Fix oops happening after address device timeout
parents 26c019fc 85601f8c

drivers/usb/chipidea/Kconfig

+1 −1
Original line number Diff line number Diff line 
config USB_CHIPIDEA

	tristate "ChipIdea Highspeed Dual Role Controller"

	depends on (USB_EHCI_HCD && USB_GADGET) || (USB_EHCI_HCD && !USB_GADGET) || (!USB_EHCI_HCD && USB_GADGET)

	depends on ((USB_EHCI_HCD && USB_GADGET) || (USB_EHCI_HCD && !USB_GADGET) || (!USB_EHCI_HCD && USB_GADGET)) && HAS_DMA

	help

	  Say Y here if your system has a dual role high speed USB

	  controller based on ChipIdea silicon IP. Currently, only the

drivers/usb/chipidea/ci_hdrc_imx.c

+5 −2
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) 
		if (ret) {

			dev_err(&pdev->dev, "usbmisc init failed, ret=%d\n",

					ret);

			goto err_clk;

			goto err_phy;

		}

	}
@@ -143,7 +143,7 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) 
		dev_err(&pdev->dev,

			"Can't register ci_hdrc platform device, err=%d\n",

			ret);

		goto err_clk;

		goto err_phy;

	}



	if (data->usbmisc_data) {
@@ -164,6 +164,9 @@ static int ci_hdrc_imx_probe(struct platform_device *pdev) 


disable_device:

	ci_hdrc_remove_device(data->ci_pdev);

err_phy:

	if (data->phy)

		usb_phy_shutdown(data->phy);

err_clk:

	clk_disable_unprepare(data->clk);

	return ret;

drivers/usb/chipidea/core.c

+1 −0
Original line number Diff line number Diff line
@@ -605,6 +605,7 @@ static int ci_hdrc_remove(struct platform_device *pdev) 
	dbg_remove_files(ci);

	free_irq(ci->irq, ci);

	ci_role_destroy(ci);

	kfree(ci->hw_bank.regmap);



	return 0;

}

drivers/usb/chipidea/udc.c

+3 −1
Original line number Diff line number Diff line
@@ -1600,6 +1600,8 @@ static void destroy_eps(struct ci_hdrc *ci) 
	for (i = 0; i < ci->hw_ep_max; i++) {

		struct ci_hw_ep *hwep = &ci->ci_hw_ep[i];



		if (hwep->pending_td)

			free_pending_td(hwep);

		dma_pool_free(ci->qh_pool, hwep->qh.ptr, hwep->qh.dma);

	}

}
@@ -1667,13 +1669,13 @@ static int ci_udc_stop(struct usb_gadget *gadget, 
		if (ci->platdata->notify_event)

			ci->platdata->notify_event(ci,

			CI_HDRC_CONTROLLER_STOPPED_EVENT);

		ci->driver = NULL;

		spin_unlock_irqrestore(&ci->lock, flags);

		_gadget_stop_activity(&ci->gadget);

		spin_lock_irqsave(&ci->lock, flags);

		pm_runtime_put(&ci->gadget.dev);

	}



	ci->driver = NULL;

	spin_unlock_irqrestore(&ci->lock, flags);



	return 0;

drivers/usb/core/devio.c

+16 −0
Original line number Diff line number Diff line
@@ -742,6 +742,22 @@ static int check_ctrlrecip(struct dev_state *ps, unsigned int requesttype, 
		if ((index & ~USB_DIR_IN) == 0)

			return 0;

		ret = findintfep(ps->dev, index);

		if (ret < 0) {

			/*

			 * Some not fully compliant Win apps seem to get

			 * index wrong and have the endpoint number here

			 * rather than the endpoint address (with the

			 * correct direction). Win does let this through,

			 * so we'll not reject it here but leave it to

			 * the device to not break KVM. But we warn.

			 */

			ret = findintfep(ps->dev, index ^ 0x80);

			if (ret >= 0)

				dev_info(&ps->dev->dev,

					"%s: process %i (%s) requesting ep %02x but needs %02x\n",

					__func__, task_pid_nr(current),

					current->comm, index, index ^ 0x80);

		}

		if (ret >= 0)

			ret = checkintf(ps, ret);

		break;