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

Merge tag 'char-misc-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc 

Pull char/misc updates from Greg KH:
 "Here is the "big" char/misc driver patchset for 4.13-rc1.

  Lots of stuff in here, a large thunderbolt update, w1 driver header
  reorg, the new mux driver subsystem, google firmware driver updates,
  and a raft of other smaller things. Full details in the shortlog.

  All of these have been in linux-next for a while with the only
  reported issue being a merge problem with this tree and the jc-docs
  tree in the w1 documentation area"

* tag 'char-misc-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (147 commits)
  misc: apds990x: Use sysfs_match_string() helper
  mei: drop unreachable code in mei_start
  mei: validate the message header only in first fragment.
  DocBook: w1: Update W1 file locations and names in DocBook
  mux: adg792a: always require I2C support
  nvmem: rockchip-efuse: add support for rk322x-efuse
  nvmem: core: add locking to nvmem_find_cell
  nvmem: core: Call put_device() in nvmem_unregister()
  nvmem: core: fix leaks on registration errors
  nvmem: correct Broadcom OTP controller driver writes
  w1: Add subsystem kernel public interface
  drivers/fsi: Add module license to core driver
  drivers/fsi: Use asynchronous slave mode
  drivers/fsi: Add hub master support
  drivers/fsi: Add SCOM FSI client device driver
  drivers/fsi/gpio: Add tracepoints for GPIO master
  drivers/fsi: Add GPIO based FSI master
  drivers/fsi: Document FSI master sysfs files in ABI
  drivers/fsi: Add error handling for slave
  drivers/fsi: Add tracepoints for low-level operations
  ...
parents 97466841 cbbdc608

Documentation/ABI/testing/sysfs-bus-fsi

0 → 100644
+38 −0
Original line number Diff line number Diff line 
What:           /sys/bus/platform/devices/fsi-master/rescan

Date:		May 2017

KernelVersion:  4.12

Contact:        cbostic@linux.vnet.ibm.com

Description:

                Initiates a FSI master scan for all connected slave devices

		on its links.



What:           /sys/bus/platform/devices/fsi-master/break

Date:		May 2017

KernelVersion:  4.12

Contact:        cbostic@linux.vnet.ibm.com

Description:

		Sends an FSI BREAK command on a master's communication

		link to any connnected slaves.  A BREAK resets connected

		device's logic and preps it to receive further commands

		from the master.



What:           /sys/bus/platform/devices/fsi-master/slave@00:00/term

Date:		May 2017

KernelVersion:  4.12

Contact:        cbostic@linux.vnet.ibm.com

Description:

		Sends an FSI terminate command from the master to its

		connected slave. A terminate resets the slave's state machines

		that control access to the internally connected engines.  In

		addition the slave freezes its internal error register for

		debugging purposes.  This command is also needed to abort any

		ongoing operation in case of an expired 'Master Time Out'

		timer.



What:           /sys/bus/platform/devices/fsi-master/slave@00:00/raw

Date:		May 2017

KernelVersion:  4.12

Contact:        cbostic@linux.vnet.ibm.com

Description:

		Provides a means of reading/writing a 32 bit value from/to a

		specified FSI bus address.

Documentation/ABI/testing/sysfs-bus-thunderbolt

0 → 100644
+110 −0
Original line number Diff line number Diff line 
What: /sys/bus/thunderbolt/devices/.../domainX/security

Date:		Sep 2017

KernelVersion:	4.13

Contact:	thunderbolt-software@lists.01.org

Description:	This attribute holds current Thunderbolt security level

		set by the system BIOS. Possible values are:



		none: All devices are automatically authorized

		user: Devices are only authorized based on writing

		      appropriate value to the authorized attribute

		secure: Require devices that support secure connect at

			minimum. User needs to authorize each device.

		dponly: Automatically tunnel Display port (and USB). No

			PCIe tunnels are created.



What: /sys/bus/thunderbolt/devices/.../authorized

Date:		Sep 2017

KernelVersion:	4.13

Contact:	thunderbolt-software@lists.01.org

Description:	This attribute is used to authorize Thunderbolt devices

		after they have been connected. If the device is not

		authorized, no devices such as PCIe and Display port are

		available to the system.



		Contents of this attribute will be 0 when the device is not

		yet authorized.



		Possible values are supported:

		1: The device will be authorized and connected



		When key attribute contains 32 byte hex string the possible

		values are:

		1: The 32 byte hex string is added to the device NVM and

		   the device is authorized.

		2: Send a challenge based on the 32 byte hex string. If the

		   challenge response from device is valid, the device is

		   authorized. In case of failure errno will be ENOKEY if

		   the device did not contain a key at all, and

		   EKEYREJECTED if the challenge response did not match.



What: /sys/bus/thunderbolt/devices/.../key

Date:		Sep 2017

KernelVersion:	4.13

Contact:	thunderbolt-software@lists.01.org

Description:	When a devices supports Thunderbolt secure connect it will

		have this attribute. Writing 32 byte hex string changes

		authorization to use the secure connection method instead.



What:		/sys/bus/thunderbolt/devices/.../device

Date:		Sep 2017

KernelVersion:	4.13

Contact:	thunderbolt-software@lists.01.org

Description:	This attribute contains id of this device extracted from

		the device DROM.



What:		/sys/bus/thunderbolt/devices/.../device_name

Date:		Sep 2017

KernelVersion:	4.13

Contact:	thunderbolt-software@lists.01.org

Description:	This attribute contains name of this device extracted from

		the device DROM.



What:		/sys/bus/thunderbolt/devices/.../vendor

Date:		Sep 2017

KernelVersion:	4.13

Contact:	thunderbolt-software@lists.01.org

Description:	This attribute contains vendor id of this device extracted

		from the device DROM.



What:		/sys/bus/thunderbolt/devices/.../vendor_name

Date:		Sep 2017

KernelVersion:	4.13

Contact:	thunderbolt-software@lists.01.org

Description:	This attribute contains vendor name of this device extracted

		from the device DROM.



What:		/sys/bus/thunderbolt/devices/.../unique_id

Date:		Sep 2017

KernelVersion:	4.13

Contact:	thunderbolt-software@lists.01.org

Description:	This attribute contains unique_id string of this device.

		This is either read from hardware registers (UUID on

		newer hardware) or based on UID from the device DROM.

		Can be used to uniquely identify particular device.



What:		/sys/bus/thunderbolt/devices/.../nvm_version

Date:		Sep 2017

KernelVersion:	4.13

Contact:	thunderbolt-software@lists.01.org

Description:	If the device has upgradeable firmware the version

		number is available here. Format: %x.%x, major.minor.

		If the device is in safe mode reading the file returns

		-ENODATA instead as the NVM version is not available.



What:		/sys/bus/thunderbolt/devices/.../nvm_authenticate

Date:		Sep 2017

KernelVersion:	4.13

Contact:	thunderbolt-software@lists.01.org

Description:	When new NVM image is written to the non-active NVM

		area (through non_activeX NVMem device), the

		authentication procedure is started by writing 1 to

		this file. If everything goes well, the device is

		restarted with the new NVM firmware. If the image

		verification fails an error code is returned instead.



		When read holds status of the last authentication

		operation if an error occurred during the process. This

		is directly the status value from the DMA configuration

		based mailbox before the device is power cycled. Writing

		0 here clears the status.

Documentation/ABI/testing/sysfs-class-mux

0 → 100644
+16 −0
Original line number Diff line number Diff line 
What:		/sys/class/mux/

Date:		April 2017

KernelVersion:	4.13

Contact:	Peter Rosin <peda@axentia.se>

Description:

		The mux/ class sub-directory belongs to the Generic MUX

		Framework and provides a sysfs interface for using MUX

		controllers.



What:		/sys/class/mux/muxchipN/

Date:		April 2017

KernelVersion:	4.13

Contact:	Peter Rosin <peda@axentia.se>

Description:

		A /sys/class/mux/muxchipN directory is created for each

		probed MUX chip where N is a simple enumeration.

Documentation/DocBook/w1.tmpl

+9 −9
Original line number Diff line number Diff line
@@ -51,9 +51,9 @@ 
    <sect1 id="w1_internal_api">

      <title>W1 API internal to the kernel</title>

      <sect2 id="w1.h">

        <title>drivers/w1/w1.h</title>

        <para>W1 core functions.</para>

!Idrivers/w1/w1.h

        <title>include/linux/w1.h</title>

        <para>W1 kernel API functions.</para>

!Iinclude/linux/w1.h

      </sect2>



      <sect2 id="w1.c">
@@ -62,18 +62,18 @@ 
!Idrivers/w1/w1.c

      </sect2>



      <sect2 id="w1_family.h">

        <title>drivers/w1/w1_family.h</title>

        <para>Allows registering device family operations.</para>

!Idrivers/w1/w1_family.h

      </sect2>



      <sect2 id="w1_family.c">

        <title>drivers/w1/w1_family.c</title>

        <para>Allows registering device family operations.</para>

!Edrivers/w1/w1_family.c

      </sect2>



      <sect2 id="w1_internal.h">

        <title>drivers/w1/w1_internal.h</title>

        <para>W1 internal initialization for master devices.</para>

!Idrivers/w1/w1_internal.h

      </sect2>



      <sect2 id="w1_int.c">

        <title>drivers/w1/w1_int.c</title>

        <para>W1 internal initialization for master devices.</para>

Documentation/admin-guide/devices.txt

+3 −1
Original line number Diff line number Diff line
@@ -369,8 +369,10 @@ 
		237 = /dev/loop-control Loopback control device

		238 = /dev/vhost-net	Host kernel accelerator for virtio net

		239 = /dev/uhid		User-space I/O driver support for HID subsystem

		240 = /dev/userio	Serio driver testing device

		241 = /dev/vhost-vsock	Host kernel driver for virtio vsock



		240-254			Reserved for local use

		242-254			Reserved for local use

		255			Reserved for MISC_DYNAMIC_MINOR



  11 char	Raw keyboard device	(Linux/SPARC only)

CRA Git | Maintained and supported by SUSTech CRA and CCSE