Commit 4010e62b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB / Thunderbolt updates from Greg KH:
 "Here is the large set of USB and Thunderbolt changes for 6.4-rc1.

  The "biggest" thing in here is the removal of two obsolete drivers,
  u132-hcd and ftdi-elan, making this a net-removal of code overall.

  Other than the driver removals, included in here are:

   - Thunderbolt updates for new hardware and features

   - xhci driver updates and fixes

   - dwc3 driver updates and fixes

   - gadget core and driver updates and features added

   - mtu3 driver updates

   - dwc2 driver fixes and updates

   - usb-serial driver updates

   - typec driver updates and fixes

   - platform remove callback changes

   - dts updates and conversions

   - other small changes

  All have been in linux-next for a while with no reported problems"

* tag 'usb-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (177 commits)
  usb: dwc3: gadget: Refactor EP0 forced stall/restart into a separate API
  usb: dwc3: gadget: Execute gadget stop after halting the controller
  media: radio-shark: Add endpoint checks
  USB: sisusbvga: Add endpoint checks
  USB: core: Add routines for endpoint checks in old drivers
  usb: dwc3: gadget: Stall and restart EP0 if host is unresponsive
  dt-bindings: usb: snps,dwc3: Add 'snps,parkmode-disable-hs-quirk' quirk
  usb: dwc3: core: add support for disabling High-speed park mode
  dt-bindings: usb: ci-hdrc-usb2: allow multiple PHYs
  usb: mtu3: add optional clock xhci_ck and frmcnt_ck
  dt-bindings: usb: mtu3: add two optional clocks
  usb: mtu3: expose role-switch control to userspace
  usb: mtu3: unlock @mtu->lock just before giving back request
  usb: mtu3: fix kernel panic at qmu transfer done irq handler
  usb: mtu3: use boolean return value
  usb: mtu3: give back request when rx error happens
  usb: chipidea: fix missing goto in `ci_hdrc_probe`
  usb: gadget: udc: core: Prevent redundant calls to pullup
  usb: gadget: udc: core: Invoke usb_gadget_connect only when started
  usb: typec: ucsi: don't print PPM init deferred errors
  ...
parents b02847fc 8f40fc08

Documentation/ABI/testing/configfs-usb-gadget-uvc

+2 −2
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ Date: Dec 2014 
KernelVersion:	4.0

Description:	Default camera terminal descriptors



		All attributes read only:

		All attributes read only except bmControls, which is read/write:



		========================  ====================================

		bmControls		  bitmap specifying which controls are
@@ -101,7 +101,7 @@ Date: Dec 2014 
KernelVersion:	4.0

Description:	Default processing unit descriptors



		All attributes read only:

		All attributes read only except bmControls, which is read/write:



		===============	========================================

		iProcessing	index of string descriptor

Documentation/ABI/testing/sysfs-bus-pci-drivers-xhci_hcd

+52 −0
Original line number Diff line number Diff line
@@ -23,3 +23,55 @@ Description: 
		Reading this attribute gives the state of the DbC. It

		can be one of the following states: disabled, enabled,

		initialized, connected, configured and stalled.



What:		/sys/bus/pci/drivers/xhci_hcd/.../dbc_idVendor

Date:		March 2023

Contact:	Mathias Nyman <mathias.nyman@linux.intel.com>

Description:

		This dbc_idVendor attribute lets us change the idVendor field

		presented in the USB device descriptor by this xhci debug

		device.

		Value can only be changed while debug capability (DbC) is in

		disabled state to prevent USB device descriptor change while

		connected to a USB host.

		The default value is 0x1d6b (Linux Foundation).

		It can be any 16-bit integer.



What:		/sys/bus/pci/drivers/xhci_hcd/.../dbc_idProduct

Date:		March 2023

Contact:	Mathias Nyman <mathias.nyman@linux.intel.com>

Description:

		This dbc_idProduct attribute lets us change the idProduct field

		presented in the USB device descriptor by this xhci debug

		device.

		Value can only be changed while debug capability (DbC) is in

		disabled state to prevent USB device descriptor change while

		connected to a USB host.

		The default value is 0x0010. It can be any 16-bit integer.



What:		/sys/bus/pci/drivers/xhci_hcd/.../dbc_bcdDevice

Date:		March 2023

Contact:	Mathias Nyman <mathias.nyman@linux.intel.com>

Description:

		This dbc_bcdDevice attribute lets us change the bcdDevice field

		presented in the USB device descriptor by this xhci debug

		device.

		Value can only be changed while debug capability (DbC) is in

		disabled state to prevent USB device descriptor change while

		connected to a USB host.

		The default value is 0x0010. (device rev 0.10)

		It can be any 16-bit integer.



What:		/sys/bus/pci/drivers/xhci_hcd/.../dbc_bInterfaceProtocol

Date:		March 2023

Contact:	Mathias Nyman <mathias.nyman@linux.intel.com>

Description:

		This attribute lets us change the bInterfaceProtocol field

		presented in the USB Interface descriptor by the xhci debug

		device.

		Value can only be changed while debug capability (DbC) is in

		disabled state to prevent USB descriptor change while

		connected to a USB host.

		The default value is 1  (GNU Remote Debug command).

		Other permissible value is 0 which is for vendor defined debug

		target.

Documentation/devicetree/bindings/usb/amlogic,meson-g12a-usb-ctrl.yaml

+2 −2
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
# Copyright 2019 BayLibre, SAS

%YAML 1.2

---

$id: "http://devicetree.org/schemas/usb/amlogic,meson-g12a-usb-ctrl.yaml#"

$schema: "http://devicetree.org/meta-schemas/core.yaml#"

$id: http://devicetree.org/schemas/usb/amlogic,meson-g12a-usb-ctrl.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Amlogic Meson G12A DWC3 USB SoC Controller Glue

Documentation/devicetree/bindings/usb/brcm,bcm7445-ehci.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Broadcom STB USB EHCI Controller



allOf:

  - $ref: "usb-hcd.yaml"

  - $ref: usb-hcd.yaml



maintainers:

  - Al Cooper <alcooperx@gmail.com>

Documentation/devicetree/bindings/usb/ci-hdrc-usb2.txt

deleted100644 → 0
+0 −159
Original line number Diff line number Diff line 
* USB2 ChipIdea USB controller for ci13xxx



Required properties:

- compatible: should be one of:

	"fsl,imx23-usb"

	"fsl,imx27-usb"

	"fsl,imx28-usb"

	"fsl,imx6q-usb"

	"fsl,imx6sl-usb"

	"fsl,imx6sx-usb"

	"fsl,imx6ul-usb"

	"fsl,imx7d-usb"

	"fsl,imx7ulp-usb"

	"fsl,imx8mm-usb"

	"lsi,zevio-usb"

	"qcom,ci-hdrc"

	"chipidea,usb2"

	"xlnx,zynq-usb-2.20a"

	"nvidia,tegra20-udc"

	"nvidia,tegra30-udc"

	"nvidia,tegra114-udc"

	"nvidia,tegra124-udc"

- reg: base address and length of the registers

- interrupts: interrupt for the USB controller



Recommended properies:

- phy_type: the type of the phy connected to the core. Should be one

  of "utmi", "utmi_wide", "ulpi", "serial" or "hsic". Without this

  property the PORTSC register won't be touched.

- dr_mode: One of "host", "peripheral" or "otg". Defaults to "otg"



Deprecated properties:

- usb-phy:      phandle for the PHY device. Use "phys" instead.

- fsl,usbphy: phandle of usb phy that connects to the port. Use "phys" instead.



Optional properties:

- clocks: reference to the USB clock

- phys: reference to the USB PHY

- phy-names: should be "usb-phy"

- vbus-supply: reference to the VBUS regulator

- maximum-speed: limit the maximum connection speed to "full-speed".

- tpl-support: TPL (Targeted Peripheral List) feature for targeted hosts

- itc-setting: interrupt threshold control register control, the setting

  should be aligned with ITC bits at register USBCMD.

- ahb-burst-config: it is vendor dependent, the required value should be

  aligned with AHBBRST at SBUSCFG, the range is from 0x0 to 0x7. This

  property is used to change AHB burst configuration, check the chipidea

  spec for meaning of each value. If this property is not existed, it

  will use the reset value.

- tx-burst-size-dword: it is vendor dependent, the tx burst size in dword

  (4 bytes), This register represents the maximum length of a the burst

  in 32-bit words while moving data from system memory to the USB

  bus, the value of this property will only take effect if property

  "ahb-burst-config" is set to 0, if this property is missing the reset

  default of the hardware implementation will be used.

- rx-burst-size-dword: it is vendor dependent, the rx burst size in dword

  (4 bytes), This register represents the maximum length of a the burst

  in 32-bit words while moving data from the USB bus to system memory,

  the value of this property will only take effect if property

  "ahb-burst-config" is set to 0, if this property is missing the reset

  default of the hardware implementation will be used.

- extcon: phandles to external connector devices. First phandle should point to

  external connector, which provide "USB" cable events, the second should point

  to external connector device, which provide "USB-HOST" cable events. If one

  of the external connector devices is not required, empty <0> phandle should

  be specified.

- phy-clkgate-delay-us: the delay time (us) between putting the PHY into

  low power mode and gating the PHY clock.

- non-zero-ttctrl-ttha: after setting this property, the value of register

  ttctrl.ttha will be 0x7f; if not, the value will be 0x0, this is the default

  value. It needs to be very carefully for setting this property, it is

  recommended that consult with your IC engineer before setting this value.

  On the most of chipidea platforms, the "usage_tt" flag at RTL is 0, so this

  property only affects siTD.

  If this property is not set, the max packet size is 1023 bytes, and if

  the total of packet size for pervious transactions are more than 256 bytes,

  it can't accept any transactions within this frame. The use case is single

  transaction, but higher frame rate.

  If this property is set, the max packet size is 188 bytes, it can handle

  more transactions than above case, it can accept transactions until it

  considers the left room size within frame is less than 188 bytes, software

  needs to make sure it does not send more than 90%

  maximum_periodic_data_per_frame. The use case is multiple transactions, but

  less frame rate.

- mux-controls: The mux control for toggling host/device output of this

  controller. It's expected that a mux state of 0 indicates device mode and a

  mux state of 1 indicates host mode.

- mux-control-names: Shall be "usb_switch" if mux-controls is specified.

- pinctrl-names: Names for optional pin modes in "default", "host", "device".

  In case of HSIC-mode, "idle" and "active" pin modes are mandatory. In this

  case, the "idle" state needs to pull down the data and strobe pin

  and the "active" state needs to pull up the strobe pin.

- pinctrl-n: alternate pin modes



i.mx specific properties

- fsl,usbmisc: phandler of non-core register device, with one

  argument that indicate usb controller index

- disable-over-current: disable over current detect

- over-current-active-low: over current signal polarity is active low.

- over-current-active-high: over current signal polarity is active high.

  It's recommended to specify the over current polarity.

- power-active-high: power signal polarity is active high

- external-vbus-divider: enables off-chip resistor divider for Vbus

- samsung,picophy-pre-emp-curr-control: HS Transmitter Pre-Emphasis Current

  Control. This signal controls the amount of current sourced to the

  USB_OTG*_DP and USB_OTG*_DN pins after a J-to-K or K-to-J transition.

  The range is from 0x0 to 0x3, the default value is 0x1.

  Details can refer to TXPREEMPAMPTUNE0 bits of USBNC_n_PHY_CFG1.

- samsung,picophy-dc-vol-level-adjust: HS DC Voltage Level Adjustment.

  Adjust the high-speed transmitter DC level voltage.

  The range is from 0x0 to 0xf, the default value is 0x3.

  Details can refer to TXVREFTUNE0 bits of USBNC_n_PHY_CFG1.



Example:



	usb@f7ed0000 {

		compatible = "chipidea,usb2";

		reg = <0xf7ed0000 0x10000>;

		interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&chip CLKID_USB0>;

		phys = <&usb_phy0>;

		phy-names = "usb-phy";

		vbus-supply = <&reg_usb0_vbus>;

		itc-setting = <0x4>; /* 4 micro-frames */

		 /* Incremental burst of unspecified length */

		ahb-burst-config = <0x0>;

		tx-burst-size-dword = <0x10>; /* 64 bytes */

		rx-burst-size-dword = <0x10>;

		extcon = <0>, <&usb_id>;

		phy-clkgate-delay-us = <400>;

		mux-controls = <&usb_switch>;

		mux-control-names = "usb_switch";

	};



Example for HSIC:



	usb@2184400 {

		compatible = "fsl,imx6q-usb", "fsl,imx27-usb";

		reg = <0x02184400 0x200>;

		interrupts = <0 41 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clks IMX6QDL_CLK_USBOH3>;

		fsl,usbphy = <&usbphynop1>;

		fsl,usbmisc = <&usbmisc 2>;

		phy_type = "hsic";

		dr_mode = "host";

		ahb-burst-config = <0x0>;

		tx-burst-size-dword = <0x10>;

		rx-burst-size-dword = <0x10>;

		pinctrl-names = "idle", "active";

		pinctrl-0 = <&pinctrl_usbh2_idle>;

		pinctrl-1 = <&pinctrl_usbh2_active>;

		#address-cells = <1>;

		#size-cells = <0>;



		usbnet: ethernet@1 {

			compatible = "usb424,9730";

			reg = <1>;

		};

	};