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

Commit 06dd3dfe authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'char-misc-4.17-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 set of char/misc driver patches for 4.17-rc1.

  There are a lot of little things in here, nothing huge, but all
  important to the different hardware types involved:

   -  thunderbolt driver updates

   -  parport updates (people still care...)

   -  nvmem driver updates

   -  mei updates (as always)

   -  hwtracing driver updates

   -  hyperv driver updates

   -  extcon driver updates

   -  ... and a handful of even smaller driver subsystem and individual
      driver updates

  All of these have been in linux-next with no reported issues"

* tag 'char-misc-4.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (149 commits)
  hwtracing: Add HW tracing support menu
  intel_th: Add ACPI glue layer
  intel_th: Allow forcing host mode through drvdata
  intel_th: Pick up irq number from resources
  intel_th: Don't touch switch routing in host mode
  intel_th: Use correct method of finding hub
  intel_th: Add SPDX GPL-2.0 header to replace GPLv2 boilerplate
  stm class: Make dummy's master/channel ranges configurable
  stm class: Add SPDX GPL-2.0 header to replace GPLv2 boilerplate
  MAINTAINERS: Bestow upon myself the care for drivers/hwtracing
  hv: add SPDX license id to Kconfig
  hv: add SPDX license to trace
  Drivers: hv: vmbus: do not mark HV_PCIE as perf_device
  Drivers: hv: vmbus: respect what we get from hv_get_synint_state()
  /dev/mem: Avoid overwriting "err" in read_mem()
  eeprom: at24: use SPDX identifier instead of GPL boiler-plate
  eeprom: at24: simplify the i2c functionality checking
  eeprom: at24: fix a line break
  eeprom: at24: tweak newlines
  eeprom: at24: refactor at24_probe()
  ...
parents 38047d5c 86f690e8

Documentation/ABI/stable/sysfs-bus-vmbus

+7 −0
Original line number Diff line number Diff line
@@ -132,3 +132,10 @@ KernelVersion: 4.16 
Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	Monitor bit associated with channel

Users:		Debugging tools and userspace drivers



What:		/sys/bus/vmbus/devices/vmbus_*/channels/NN/ring

Date:		January. 2018

KernelVersion:	4.16

Contact:	Stephen Hemminger <sthemmin@microsoft.com>

Description:	Binary file created by uio_hv_generic for ring buffer

Users:		Userspace drivers

Documentation/ABI/testing/sysfs-bus-thunderbolt

+33 −0
Original line number Diff line number Diff line 
What: /sys/bus/thunderbolt/devices/.../domainX/boot_acl

Date:		Jun 2018

KernelVersion:	4.17

Contact:	thunderbolt-software@lists.01.org

Description:	Holds a comma separated list of device unique_ids that

		are allowed to be connected automatically during system

		startup (e.g boot devices). The list always contains

		maximum supported number of unique_ids where unused

		entries are empty. This allows the userspace software

		to determine how many entries the controller supports.

		If there are multiple controllers, each controller has

		its own ACL list and size may be different between the

		controllers.



		System BIOS may have an option "Preboot ACL" or similar

		that needs to be selected before this list is taken into

		consideration.



		Software always updates a full list in each write.



		If a device is authorized automatically during boot its

		boot attribute is set to 1.



What: /sys/bus/thunderbolt/devices/.../domainX/security

Date:		Sep 2017

KernelVersion:	4.13
@@ -12,6 +35,9 @@ Description: This attribute holds current Thunderbolt security level 
			minimum. User needs to authorize each device.

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

			PCIe tunnels are created.

		usbonly: Automatically tunnel USB controller of the

			 connected Thunderbolt dock (and Display Port). All

			 PCIe links downstream of the dock are removed.



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

Date:		Sep 2017
@@ -38,6 +64,13 @@ Description: This attribute is used to authorize Thunderbolt devices 
		   the device did not contain a key at all, and

		   EKEYREJECTED if the challenge response did not match.



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

Date:		Jun 2018

KernelVersion:	4.17

Contact:	thunderbolt-software@lists.01.org

Description:	This attribute contains 1 if Thunderbolt device was already

		authorized on boot and 0 otherwise.



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

Date:		Sep 2017

KernelVersion:	4.13

Documentation/ABI/testing/sysfs-class-mei

+9 −0
Original line number Diff line number Diff line
@@ -45,3 +45,12 @@ Contact: Tomas Winkler <tomas.winkler@intel.com> 
Description:	Display the driver HBM protocol version.



		The HBM protocol version supported by the driver.



What:		/sys/class/mei/meiN/tx_queue_limit

Date:		Jan 2018

KernelVersion:	4.16

Contact:	Tomas Winkler <tomas.winkler@intel.com>

Description:	Configure tx queue limit



		Set maximal number of pending writes

		per opened session.

Documentation/ABI/testing/sysfs-driver-fsi-master-gpio

0 → 100644
+10 −0
Original line number Diff line number Diff line 
What:           /sys/bus/platform/devices/[..]/fsi-master-gpio/external_mode

Date:           Feb 2018

KernelVersion:  4.17

Contact:        jk@ozlabs.org

Description:

                Controls access arbitration for GPIO-based FSI master. A

		value of 0 (the default) sets normal mode, where the

		driver performs FSI bus transactions, 1 sets external mode,

		where the FSI bus is driven externally (for example, by

		a debug device).

Documentation/admin-guide/thunderbolt.rst

+10 −5
Original line number Diff line number Diff line
@@ -21,11 +21,11 @@ vulnerable to DMA attacks. 
Security levels and how to use them

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

Starting with Intel Falcon Ridge Thunderbolt controller there are 4

security levels available. The reason for these is the fact that the

connected devices can be DMA masters and thus read contents of the host

memory without CPU and OS knowing about it. There are ways to prevent

this by setting up an IOMMU but it is not always available for various

reasons.

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

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

be DMA masters and thus read contents of the host memory without CPU and OS

knowing about it. There are ways to prevent this by setting up an IOMMU but

it is not always available for various reasons.



The security levels are as follows:
@@ -52,6 +52,11 @@ The security levels are as follows: 
    USB. No PCIe tunneling is done. In BIOS settings this is

    typically called *Display Port Only*.



  usbonly

    The firmware automatically creates tunnels for the USB controller and

    Display Port in a dock. All PCIe links downstream of the dock are

    removed.



The current security level can be read from

``/sys/bus/thunderbolt/devices/domainX/security`` where ``domainX`` is

the Thunderbolt domain the host controller manages. There is typically