Commit aac96626 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull USB/Thunderbolt/PHY driver updates from Greg KH:
 "Here is the big USB and Thunderbolt and PHY driver updates for
  5.6-rc1.

  With the advent of USB4, "Thunderbolt" has really become USB4, so the
  renaming of the Kconfig option and starting to share subsystem code
  has begun, hence both subsystems coming in through the same tree here.

  PHY driver updates also touched USB drivers, so that is coming in
  through here as well.

  Major stuff included in here are:
   - USB 4 initial support added (i.e. Thunderbolt)
   - musb driver updates
   - USB gadget driver updates
   - PHY driver updates
   - USB PHY driver updates
   - lots of USB serial stuff fixed up
   - USB typec updates
   - USB-IP fixes
   - lots of other smaller USB driver updates

  All of these have been in linux-next for a while now (the usb-serial
  tree is already tested in linux-next on its own before merged into
  here), with no reported issues"

[ Removed an incorrect compile test enablement for PHY_EXYNOS5250_SATA
  that causes configuration warnings    - Linus ]

* tag 'usb-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (207 commits)
  Doc: ABI: add usb charger uevent
  usb: phy: show USB charger type for user
  usb: cdns3: fix spelling mistake and rework grammar in text
  usb: phy: phy-gpio-vbus-usb: Convert to GPIO descriptors
  USB: serial: cyberjack: fix spelling mistake "To" -> "Too"
  USB: serial: ir-usb: simplify endpoint check
  USB: serial: ir-usb: make set_termios synchronous
  USB: serial: ir-usb: fix IrLAP framing
  USB: serial: ir-usb: fix link-speed handling
  USB: serial: ir-usb: add missing endpoint sanity check
  usb: typec: fusb302: fix "op-sink-microwatt" default that was in mW
  usb: typec: wcove: fix "op-sink-microwatt" default that was in mW
  usb: dwc3: pci: add ID for the Intel Comet Lake -V variant
  usb: typec: tcpci: mask event interrupts when remove driver
  usb: host: xhci-tegra: set MODULE_FIRMWARE for tegra186
  usb: chipidea: add inline for ci_hdrc_host_driver_init if host is not defined
  usb: chipidea: handle single role for usb role class
  usb: musb: fix spelling mistake: "periperal" -> "peripheral"
  phy: ti: j721e-wiz: Fix build error without CONFIG_OF_ADDRESS
  USB: usbfs: Always unlink URBs in reverse order
  ...
parents 6ba3d706 eaa51998

Documentation/ABI/testing/configfs-usb-gadget

+4 −0
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ Description: 
				write UDC's name found in /sys/class/udc/*

				to bind a gadget, empty string "" to unbind.



		max_speed	- maximum speed the driver supports. Valid

				names are super-speed-plus, super-speed,

				high-speed, full-speed, and low-speed.



		bDeviceClass	- USB device class code

		bDeviceSubClass	- USB device subclass code

		bDeviceProtocol	- USB device protocol code

Documentation/ABI/testing/usb-charger-uevent

0 → 100644
+46 −0
Original line number Diff line number Diff line 
What:		Raise a uevent when a USB charger is inserted or removed

Date:		2020-01-14

KernelVersion:	5.6

Contact:	linux-usb@vger.kernel.org

Description:	There are two USB charger states:

		USB_CHARGER_ABSENT

		USB_CHARGER_PRESENT

		There are five USB charger types:

		USB_CHARGER_UNKNOWN_TYPE: Charger type is unknown

		USB_CHARGER_SDP_TYPE: Standard Downstream Port

		USB_CHARGER_CDP_TYPE: Charging Downstream Port

		USB_CHARGER_DCP_TYPE: Dedicated Charging Port

		USB_CHARGER_ACA_TYPE: Accessory Charging Adapter

		https://www.usb.org/document-library/battery-charging-v12-spec-and-adopters-agreement



		Here are two examples taken using udevadm monitor -p when

		USB charger is online:

		UDEV  change   /devices/soc0/usbphynop1 (platform)

		ACTION=change

		DEVPATH=/devices/soc0/usbphynop1

		DRIVER=usb_phy_generic

		MODALIAS=of:Nusbphynop1T(null)Cusb-nop-xceiv

		OF_COMPATIBLE_0=usb-nop-xceiv

		OF_COMPATIBLE_N=1

		OF_FULLNAME=/usbphynop1

		OF_NAME=usbphynop1

		SEQNUM=2493

		SUBSYSTEM=platform

		USB_CHARGER_STATE=USB_CHARGER_PRESENT

		USB_CHARGER_TYPE=USB_CHARGER_SDP_TYPE

		USEC_INITIALIZED=227422826



		USB charger is offline:

		KERNEL change   /devices/soc0/usbphynop1 (platform)

		ACTION=change

		DEVPATH=/devices/soc0/usbphynop1

		DRIVER=usb_phy_generic

		MODALIAS=of:Nusbphynop1T(null)Cusb-nop-xceiv

		OF_COMPATIBLE_0=usb-nop-xceiv

		OF_COMPATIBLE_N=1

		OF_FULLNAME=/usbphynop1

		OF_NAME=usbphynop1

		SEQNUM=2494

		SUBSYSTEM=platform

		USB_CHARGER_STATE=USB_CHARGER_ABSENT

		USB_CHARGER_TYPE=USB_CHARGER_UNKNOWN_TYPE

Documentation/admin-guide/thunderbolt.rst

+25 −5
Original line number Diff line number Diff line 
=============

 Thunderbolt

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

.. SPDX-License-Identifier: GPL-2.0



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

 USB4 and Thunderbolt

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

USB4 is the public specification based on Thunderbolt 3 protocol with

some differences at the register level among other things. Connection

manager is an entity running on the host router (host controller)

responsible for enumerating routers and establishing tunnels. A

connection manager can be implemented either in firmware or software.

Typically PCs come with a firmware connection manager for Thunderbolt 3

and early USB4 capable systems. Apple systems on the other hand use

software connection manager and the later USB4 compliant devices follow

the suit.



The Linux Thunderbolt driver supports both and can detect at runtime which

connection manager implementation is to be used. To be on the safe side the

software connection manager in Linux also advertises security level

``user`` which means PCIe tunneling is disabled by default. The

documentation below applies to both implementations with the exception that

the software connection manager only supports ``user`` security level and

is expected to be accompanied with an IOMMU based DMA protection.



Security levels and how to use them

-----------------------------------

The interface presented here is not meant for end users. Instead there

should be a userspace tool that handles all the low-level details, keeps

a database of the authorized devices and prompts users for new connections.
@@ -18,8 +40,6 @@ This will authorize all devices automatically when they appear. However, 
keep in mind that this bypasses the security levels and makes the system

vulnerable to DMA attacks.



Security levels and how to use them

-----------------------------------

Starting with Intel Falcon Ridge Thunderbolt controller there are 4

security levels available. Intel Titan Ridge added one more security level

(usbonly). The reason for these is the fact that the connected devices can

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

+2 −2
Original line number Diff line number Diff line 
USB Connector

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



USB connector node represents physical USB connector. It should be

a child of USB interface controller.

A USB connector node represents a physical USB connector. It should be

a child of a USB interface controller.



Required properties:

- compatible: describes type of the connector, must be one of:

Documentation/devicetree/bindings/phy/allwinner,sun9i-a80-usb-phy.yaml

0 → 100644
+135 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

$id: http://devicetree.org/schemas/phy/allwinner,sun9i-a80-usb-phy.yaml#

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



title: Allwinner A80 USB PHY Device Tree Bindings



maintainers:

  - Chen-Yu Tsai <wens@csie.org>

  - Maxime Ripard <mripard@kernel.org>



properties:

  "#phy-cells":

    const: 0



  compatible:

    const: allwinner,sun9i-a80-usb-phy



  reg:

    maxItems: 1



  clocks:

    anyOf:

      - description: Main PHY Clock



      - items:

          - description: Main PHY clock

          - description: HSIC 12MHz clock

          - description: HSIC 480MHz clock



  clock-names:

    oneOf:

      - const: phy



      - items:

          - const: phy

          - const: hsic_12M

          - const: hsic_480M



  resets:

    anyOf:

      - description: Normal USB PHY reset



      - items:

          - description: Normal USB PHY reset

          - description: HSIC Reset



  reset-names:

    oneOf:

      - const: phy



      - items:

          - const: phy

          - const: hsic



  phy_type:

    const: hsic

    description:

      When absent, the PHY type will be assumed to be normal USB.



  phy-supply:

    description:

      Regulator that powers VBUS



required:

  - "#phy-cells"

  - compatible

  - reg

  - clocks

  - clock-names

  - resets

  - reset-names



additionalProperties: false



if:

  properties:

    phy_type:

      const: hsic



  required:

    - phy_type



then:

  properties:

    clocks:

      maxItems: 3



    clock-names:

      maxItems: 3



    resets:

      maxItems: 2



    reset-names:

      maxItems: 2



examples:

  - |

    #include <dt-bindings/clock/sun9i-a80-usb.h>

    #include <dt-bindings/reset/sun9i-a80-usb.h>



    usbphy1: phy@a00800 {

        compatible = "allwinner,sun9i-a80-usb-phy";

        reg = <0x00a00800 0x4>;

        clocks = <&usb_clocks CLK_USB0_PHY>;

        clock-names = "phy";

        resets = <&usb_clocks RST_USB0_PHY>;

        reset-names = "phy";

        phy-supply = <&reg_usb1_vbus>;

        #phy-cells = <0>;

    };



  - |

    #include <dt-bindings/clock/sun9i-a80-usb.h>

    #include <dt-bindings/reset/sun9i-a80-usb.h>



    usbphy3: phy@a02800 {

        compatible = "allwinner,sun9i-a80-usb-phy";

        reg = <0x00a02800 0x4>;

        clocks = <&usb_clocks CLK_USB2_PHY>,

                 <&usb_clocks CLK_USB_HSIC>,

                 <&usb_clocks CLK_USB2_HSIC>;

        clock-names = "phy",

                      "hsic_12M",

                      "hsic_480M";

        resets = <&usb_clocks RST_USB2_PHY>,

                 <&usb_clocks RST_USB2_HSIC>;

        reset-names = "phy",

                      "hsic";

        phy_type = "hsic";

        phy-supply = <&reg_usb3_vbus>;

        #phy-cells = <0>;

    };

CRA Git | Maintained and supported by SUSTech CRA and CCSE