Commit 8f56e4eb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull char/misc driver updates from Greg KH:
 "Here is the big set of char/misc and other driver patches for 5.5-rc1

  Loads of different things in here, this feels like the catch-all of
  driver subsystems these days. Full details are in the shortlog, but
  nothing major overall, just lots of driver updates and additions.

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

* tag 'char-misc-5.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (198 commits)
  char: Fix Kconfig indentation, continued
  habanalabs: add more protection of device during reset
  habanalabs: flush EQ workers in hard reset
  habanalabs: make the reset code more consistent
  habanalabs: expose reset counters via existing INFO IOCTL
  habanalabs: make code more concise
  habanalabs: use defines for F/W files
  habanalabs: remove prints on successful device initialization
  habanalabs: remove unnecessary checks
  habanalabs: invalidate MMU cache only once
  habanalabs: skip VA block list update in reset flow
  habanalabs: optimize MMU unmap
  habanalabs: prevent read/write from/to the device during hard reset
  habanalabs: split MMU properties to PCI/DRAM
  habanalabs: re-factor MMU masks and documentation
  habanalabs: type specific MMU cache invalidation
  habanalabs: re-factor memory module code
  habanalabs: export uapi defines to user-space
  habanalabs: don't print error when queues are full
  habanalabs: increase max jobs number to 512
  ...
parents 59274c71 b78cda79

Documentation/ABI/testing/sysfs-bus-fsi

+8 −8
Original line number Diff line number Diff line 
What:           /sys/bus/platform/devices/fsi-master/rescan

What:           /sys/bus/platform/devices/../fsi-master/fsi0/rescan

Date:		May 2017

KernelVersion:  4.12

Contact:        cbostic@linux.vnet.ibm.com

Contact:        linux-fsi@lists.ozlabs.org

Description:

                Initiates a FSI master scan for all connected slave devices

		on its links.



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

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

Date:		May 2017

KernelVersion:  4.12

Contact:        cbostic@linux.vnet.ibm.com

Contact:        linux-fsi@lists.ozlabs.org

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

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

Date:		May 2017

KernelVersion:  4.12

Contact:        cbostic@linux.vnet.ibm.com

Contact:        linux-fsi@lists.ozlabs.org

Description:

		Sends an FSI terminate command from the master to its

		connected slave. A terminate resets the slave's state machines
@@ -29,10 +29,10 @@ Description: 
		ongoing operation in case of an expired 'Master Time Out'

		timer.



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

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

Date:		May 2017

KernelVersion:  4.12

Contact:        cbostic@linux.vnet.ibm.com

Contact:        linux-fsi@lists.ozlabs.org

Description:

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

		specified FSI bus address.

Documentation/ABI/testing/sysfs-bus-mei

+22 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ KernelVersion: 3.10 
Contact:	Samuel Ortiz <sameo@linux.intel.com>

		linux-mei@linux.intel.com

Description:	Stores the same MODALIAS value emitted by uevent

		Format: mei:<mei device name>:<device uuid>:

		Format: mei:<mei device name>:<device uuid>:<protocol version>



What:		/sys/bus/mei/devices/.../name

Date:		May 2015
@@ -26,3 +26,24 @@ KernelVersion: 4.3 
Contact:	Tomas Winkler <tomas.winkler@intel.com>

Description:	Stores mei client protocol version

		Format: %d



What:		/sys/bus/mei/devices/.../max_conn

Date:		Nov 2019

KernelVersion:	5.5

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

Description:	Stores mei client maximum number of connections

		Format: %d



What:		/sys/bus/mei/devices/.../fixed

Date:		Nov 2019

KernelVersion:	5.5

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

Description:	Stores mei client fixed address, if any

		Format: %d



What:		/sys/bus/mei/devices/.../max_len

Date:		Nov 2019

KernelVersion:	5.5

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

Description:	Stores mei client maximum message length

		Format: %d

Documentation/ABI/testing/sysfs-bus-thunderbolt

+36 −0
Original line number Diff line number Diff line
@@ -80,6 +80,14 @@ 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/.../generation

Date:		Jan 2020

KernelVersion:	5.5

Contact:	Christian Kellner <christian@kellner.me>

Description:	This attribute contains the generation of the Thunderbolt

		controller associated with the device. It will contain 4

		for USB4.



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

Date:		Sep 2017

KernelVersion:	4.13
@@ -104,6 +112,34 @@ Contact: thunderbolt-software@lists.01.org 
Description:	This attribute contains name of this device extracted from

		the device DROM.



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

Date:		Jan 2020

KernelVersion:	5.5

Contact:	Mika Westerberg <mika.westerberg@linux.intel.com>

Description:	This attribute reports the device RX speed per lane.

		All RX lanes run at the same speed.



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

Date:		Jan 2020

KernelVersion:	5.5

Contact:	Mika Westerberg <mika.westerberg@linux.intel.com>

Description:	This attribute reports number of RX lanes the device is

		using simultaneusly through its upstream port.



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

Date:		Jan 2020

KernelVersion:	5.5

Contact:	Mika Westerberg <mika.westerberg@linux.intel.com>

Description:	This attribute reports the TX speed per lane.

		All TX lanes run at the same speed.



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

Date:		Jan 2020

KernelVersion:	5.5

Contact:	Mika Westerberg <mika.westerberg@linux.intel.com>

Description:	This attribute reports number of TX lanes the device is

		using simultaneusly through its upstream port.



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

Date:		Sep 2017

KernelVersion:	4.13

Documentation/ABI/testing/sysfs-class-mei

+10 −0
Original line number Diff line number Diff line
@@ -80,3 +80,13 @@ Description: Display the ME device state. 
		DISABLED

		POWER_DOWN

		POWER_UP



What:		/sys/class/mei/meiN/trc

Date:		Nov 2019

KernelVersion:	5.5

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

Description:	Display trc status register content



		The ME FW writes Glitch Detection HW (TRC)

		status information into trc status register

		for BIOS and OS to monitor fw health.

Documentation/ABI/testing/sysfs-platform-dfl-fme

+132 −0
Original line number Diff line number Diff line
@@ -106,3 +106,135 @@ KernelVersion: 5.4 
Contact:	Wu Hao <hao.wu@intel.com>

Description:	Read-only. Read this file to get the second error detected by

		hardware.



What:		/sys/bus/platform/devices/dfl-fme.0/hwmon/hwmonX/name

Date:		October 2019

KernelVersion:	5.5

Contact:	Wu Hao <hao.wu@intel.com>

Description:	Read-Only. Read this file to get the name of hwmon device, it

		supports values:

		    'dfl_fme_thermal' - thermal hwmon device name

		    'dfl_fme_power'   - power hwmon device name



What:		/sys/bus/platform/devices/dfl-fme.0/hwmon/hwmonX/temp1_input

Date:		October 2019

KernelVersion:	5.5

Contact:	Wu Hao <hao.wu@intel.com>

Description:	Read-Only. It returns FPGA device temperature in millidegrees

		Celsius.



What:		/sys/bus/platform/devices/dfl-fme.0/hwmon/hwmonX/temp1_max

Date:		October 2019

KernelVersion:	5.5

Contact:	Wu Hao <hao.wu@intel.com>

Description:	Read-Only. It returns hardware threshold1 temperature in

		millidegrees Celsius. If temperature rises at or above this

		threshold, hardware starts 50% or 90% throttling (see

		'temp1_max_policy').



What:		/sys/bus/platform/devices/dfl-fme.0/hwmon/hwmonX/temp1_crit

Date:		October 2019

KernelVersion:	5.5

Contact:	Wu Hao <hao.wu@intel.com>

Description:	Read-Only. It returns hardware threshold2 temperature in

		millidegrees Celsius. If temperature rises at or above this

		threshold, hardware starts 100% throttling.



What:		/sys/bus/platform/devices/dfl-fme.0/hwmon/hwmonX/temp1_emergency

Date:		October 2019

KernelVersion:	5.5

Contact:	Wu Hao <hao.wu@intel.com>

Description:	Read-Only. It returns hardware trip threshold temperature in

		millidegrees Celsius. If temperature rises at or above this

		threshold, a fatal event will be triggered to board management

		controller (BMC) to shutdown FPGA.



What:		/sys/bus/platform/devices/dfl-fme.0/hwmon/hwmonX/temp1_max_alarm

Date:		October 2019

KernelVersion:	5.5

Contact:	Wu Hao <hao.wu@intel.com>

Description:	Read-only. It returns 1 if temperature is currently at or above

		hardware threshold1 (see 'temp1_max'), otherwise 0.



What:		/sys/bus/platform/devices/dfl-fme.0/hwmon/hwmonX/temp1_crit_alarm

Date:		October 2019

KernelVersion:	5.5

Contact:	Wu Hao <hao.wu@intel.com>

Description:	Read-only. It returns 1 if temperature is currently at or above

		hardware threshold2 (see 'temp1_crit'), otherwise 0.



What:		/sys/bus/platform/devices/dfl-fme.0/hwmon/hwmonX/temp1_max_policy

Date:		October 2019

KernelVersion:	5.5

Contact:	Wu Hao <hao.wu@intel.com>

Description:	Read-Only. Read this file to get the policy of hardware threshold1

		(see 'temp1_max'). It only supports two values (policies):

		    0 - AP2 state (90% throttling)

		    1 - AP1 state (50% throttling)



What:		/sys/bus/platform/devices/dfl-fme.0/hwmon/hwmonX/power1_input

Date:		October 2019

KernelVersion:	5.5

Contact:	Wu Hao <hao.wu@intel.com>

Description:	Read-Only. It returns current FPGA power consumption in uW.



What:		/sys/bus/platform/devices/dfl-fme.0/hwmon/hwmonX/power1_max

Date:		October 2019

KernelVersion:	5.5

Contact:	Wu Hao <hao.wu@intel.com>

Description:	Read-Write. Read this file to get current hardware power

		threshold1 in uW. If power consumption rises at or above

		this threshold, hardware starts 50% throttling.

		Write this file to set current hardware power threshold1 in uW.

		As hardware only accepts values in Watts, so input value will

		be round down per Watts (< 1 watts part will be discarded) and

		clamped within the range from 0 to 127 Watts. Write fails with

		-EINVAL if input parsing fails.



What:		/sys/bus/platform/devices/dfl-fme.0/hwmon/hwmonX/power1_crit

Date:		October 2019

KernelVersion:	5.5

Contact:	Wu Hao <hao.wu@intel.com>

Description:	Read-Write. Read this file to get current hardware power

		threshold2 in uW. If power consumption rises at or above

		this threshold, hardware starts 90% throttling.

		Write this file to set current hardware power threshold2 in uW.

		As hardware only accepts values in Watts, so input value will

		be round down per Watts (< 1 watts part will be discarded) and

		clamped within the range from 0 to 127 Watts. Write fails with

		-EINVAL if input parsing fails.



What:		/sys/bus/platform/devices/dfl-fme.0/hwmon/hwmonX/power1_max_alarm

Date:		October 2019

KernelVersion:	5.5

Contact:	Wu Hao <hao.wu@intel.com>

Description:	Read-only. It returns 1 if power consumption is currently at or

		above hardware threshold1 (see 'power1_max'), otherwise 0.



What:		/sys/bus/platform/devices/dfl-fme.0/hwmon/hwmonX/power1_crit_alarm

Date:		October 2019

KernelVersion:	5.5

Contact:	Wu Hao <hao.wu@intel.com>

Description:	Read-only. It returns 1 if power consumption is currently at or

		above hardware threshold2 (see 'power1_crit'), otherwise 0.



What:		/sys/bus/platform/devices/dfl-fme.0/hwmon/hwmonX/power1_xeon_limit

Date:		October 2019

KernelVersion:	5.5

Contact:	Wu Hao <hao.wu@intel.com>

Description:	Read-Only. It returns power limit for XEON in uW.



What:		/sys/bus/platform/devices/dfl-fme.0/hwmon/hwmonX/power1_fpga_limit

Date:		October 2019

KernelVersion:	5.5

Contact:	Wu Hao <hao.wu@intel.com>

Description:	Read-Only. It returns power limit for FPGA in uW.



What:		/sys/bus/platform/devices/dfl-fme.0/hwmon/hwmonX/power1_ltr

Date:		October 2019

KernelVersion:	5.5

Contact:	Wu Hao <hao.wu@intel.com>

Description:	Read-only. Read this file to get current Latency Tolerance

		Reporting (ltr) value. It returns 1 if all Accelerated

		Function Units (AFUs) can tolerate latency >= 40us for memory

		access or 0 if any AFU is latency sensitive (< 40us).

CRA Git | Maintained and supported by SUSTech CRA and CCSE