Commit 43cb5d49 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB fixes from Greg KH:
 "Here are a number of tiny USB fixes for 5.13-rc6.

  There are more than I would normally like, but there's been a bunch of
  people banging on the gadget and dwc3 and typec code recently for I
  think an Android release, which has resulted in a number of small
  fixes. It's nice to see companies send fixes upstream for this type of
  work, a notable change from years ago.

  Anyway, fixes in here are:

   - usb-serial device id updates

   - usb-serial cp210x driver fixes for broken firmware versions

   - typec fixes for crazy charging devices and other reported problems

   - dwc3 fixes for reported problems found

   - gadget fixes for reported problems

   - tiny xhci fixes

   - other small fixes for reported issues.

   - revert of a problem fix found by linux-next testing

  All of these have passed 0-day and linux-next testing with no reported
  problems (the revert for the found linux-next build problem included)"

* tag 'usb-5.13-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (44 commits)
  Revert "usb: gadget: fsl: Re-enable driver for ARM SoCs"
  usb: typec: mux: Fix copy-paste mistake in typec_mux_match
  usb: typec: ucsi: Clear PPM capability data in ucsi_init() error path
  usb: gadget: fsl: Re-enable driver for ARM SoCs
  usb: typec: wcove: Use LE to CPU conversion when accessing msg->header
  USB: serial: cp210x: fix CP2102N-A01 modem control
  USB: serial: cp210x: fix alternate function for CP2102N QFN20
  usb: misc: brcmstb-usb-pinmap: check return value after calling platform_get_resource()
  usb: dwc3: ep0: fix NULL pointer exception
  usb: gadget: eem: fix wrong eem header operation
  usb: typec: intel_pmc_mux: Put ACPI device using acpi_dev_put()
  usb: typec: intel_pmc_mux: Add missed error check for devm_ioremap_resource()
  usb: typec: intel_pmc_mux: Put fwnode in error case during ->probe()
  usb: typec: tcpm: Do not finish VDM AMS for retrying Responses
  usb: fix various gadget panics on 10gbps cabling
  usb: fix various gadgets null ptr deref on 10gbps cabling.
  usb: pci-quirks: disable D3cold on xhci suspend for s2idle on AMD Renoir
  usb: f_ncm: only first packet of aggregate needs to start timer
  USB: f_ncm: ncm_bitrate (speed) is unsigned
  MAINTAINERS: usb: add entry for isp1760
  ...
parents c46fe4aa 7c4363d3

Documentation/devicetree/bindings/connector/usb-connector.yaml

+15 −0
Original line number Diff line number Diff line
@@ -149,6 +149,17 @@ properties: 
    maxItems: 6

    $ref: /schemas/types.yaml#/definitions/uint32-array



  sink-vdos-v1:

    description: An array of u32 with each entry, a Vendor Defined Message Object (VDO),

      providing additional information corresponding to the product, the detailed bit

      definitions and the order of each VDO can be found in

      "USB Power Delivery Specification Revision 2.0, Version 1.3" chapter 6.4.4.3.1 Discover

      Identity. User can specify the VDO array via VDO_IDH/_CERT/_PRODUCT/_CABLE/_AMA defined in

      dt-bindings/usb/pd.h.

    minItems: 3

    maxItems: 6

    $ref: /schemas/types.yaml#/definitions/uint32-array



  op-sink-microwatt:

    description: Sink required operating power in microwatt, if source can't

      offer the power, Capability Mismatch is set. Required for power sink and
@@ -207,6 +218,10 @@ properties: 
      SNK_READY for non-pd link.

    type: boolean



dependencies:

  sink-vdos-v1: [ 'sink-vdos' ]

  sink-vdos: [ 'sink-vdos-v1' ]



required:

  - compatible

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -18873,6 +18873,13 @@ S: Maintained 
F:	drivers/usb/host/isp116x*

F:	include/linux/usb/isp116x.h









USB ISP1760 DRIVER









M:	Rui Miguel Silva <rui.silva@linaro.org>









L:	linux-usb@vger.kernel.org









S:	Maintained









F:	drivers/usb/isp1760/*









F:	Documentation/devicetree/bindings/usb/nxp,isp1760.yaml

















USB LAN78XX ETHERNET DRIVER









M:	Woojung Huh <woojung.huh@microchip.com>









M:	UNGLinuxDriver@microchip.com

























drivers/usb/cdns3/cdns3-gadget.c



+3
−5






























Original line number
Diff line number
Diff line







@@ -2007,7 +2007,7 @@ static void cdns3_configure_dmult(struct cdns3_device *priv_dev,







		else









			mask = BIT(priv_ep->num);



















		if (priv_ep->type != USB_ENDPOINT_XFER_ISOC) {









		if (priv_ep->type != USB_ENDPOINT_XFER_ISOC  && !priv_ep->dir) {









			cdns3_set_register_bit(&regs->tdl_from_trb, mask);









			cdns3_set_register_bit(&regs->tdl_beh, mask);









			cdns3_set_register_bit(&regs->tdl_beh2, mask);








@@ -2046,15 +2046,13 @@ int cdns3_ep_config(struct cdns3_endpoint *priv_ep, bool enable)







	case USB_ENDPOINT_XFER_INT:









		ep_cfg = EP_CFG_EPTYPE(USB_ENDPOINT_XFER_INT);



















		if ((priv_dev->dev_ver == DEV_VER_V2 && !priv_ep->dir) ||









		    priv_dev->dev_ver > DEV_VER_V2)









		if (priv_dev->dev_ver >= DEV_VER_V2 && !priv_ep->dir)









			ep_cfg |= EP_CFG_TDL_CHK;









		break;









	case USB_ENDPOINT_XFER_BULK:









		ep_cfg = EP_CFG_EPTYPE(USB_ENDPOINT_XFER_BULK);



















		if ((priv_dev->dev_ver == DEV_VER_V2  && !priv_ep->dir) ||









		    priv_dev->dev_ver > DEV_VER_V2)









		if (priv_dev->dev_ver >= DEV_VER_V2 && !priv_ep->dir)









			ep_cfg |= EP_CFG_TDL_CHK;









		break;









	default:
































drivers/usb/cdns3/cdnsp-ring.c



+4
−3






























Original line number
Diff line number
Diff line







@@ -1517,13 +1517,14 @@ irqreturn_t cdnsp_thread_irq_handler(int irq, void *data)







{









	struct cdnsp_device *pdev = (struct cdnsp_device *)data;









	union cdnsp_trb *event_ring_deq;









	unsigned long flags;









	int counter = 0;



















	spin_lock(&pdev->lock);









	spin_lock_irqsave(&pdev->lock, flags);



















	if (pdev->cdnsp_state & (CDNSP_STATE_HALTED | CDNSP_STATE_DYING)) {









		cdnsp_died(pdev);









		spin_unlock(&pdev->lock);









		spin_unlock_irqrestore(&pdev->lock, flags);









		return IRQ_HANDLED;









	}


















@@ -1539,7 +1540,7 @@ irqreturn_t cdnsp_thread_irq_handler(int irq, void *data)

















	cdnsp_update_erst_dequeue(pdev, event_ring_deq, 1);



















	spin_unlock(&pdev->lock);









	spin_unlock_irqrestore(&pdev->lock, flags);



















	return IRQ_HANDLED;









}
































drivers/usb/dwc3/core.c



+0
−6






























Original line number
Diff line number
Diff line







@@ -1690,11 +1690,6 @@ static int dwc3_remove(struct platform_device *pdev)







	return 0;









}



















static void dwc3_shutdown(struct platform_device *pdev)









{









	dwc3_remove(pdev);









}



















#ifdef CONFIG_PM









static int dwc3_core_init_for_resume(struct dwc3 *dwc)









{








@@ -2012,7 +2007,6 @@ MODULE_DEVICE_TABLE(acpi, dwc3_acpi_match);







static struct platform_driver dwc3_driver = {









	.probe		= dwc3_probe,









	.remove		= dwc3_remove,









	.shutdown   = dwc3_shutdown,









	.driver		= {









		.name	= "dwc3",









		.of_match_table	= of_match_ptr(of_dwc3_match),