Commit 34fe4ccb authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

Merge remote-tracking branch 'torvalds/master' into perf/core 



To pick up fixes that went thru perf/urgent and now are fixed by an
upcoming patch.

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parents feff0839 51912904

Documentation/ABI/obsolete/procfs-i8k

0 → 100644
+10 −0
Original line number Diff line number Diff line 
What:		/proc/i8k

Date:		November 2001

KernelVersion:	2.4.14

Contact:	Pali Rohár <pali@kernel.org>

Description:	Legacy interface for getting/setting sensor information like

		fan speed, temperature, serial number, hotkey status etc

		on Dell Laptops.

		Since the driver is now using the standard hwmon sysfs interface,

		the procfs interface is deprecated.

Users:		https://github.com/vitorafsr/i8kutils

Documentation/ABI/stable/sysfs-block

+49 −0
Original line number Diff line number Diff line
@@ -155,6 +155,55 @@ Description: 
		last zone of the device which may be smaller.





What:		/sys/block/<disk>/queue/crypto/

Date:		February 2022

Contact:	linux-block@vger.kernel.org

Description:

		The presence of this subdirectory of /sys/block/<disk>/queue/

		indicates that the device supports inline encryption.  This

		subdirectory contains files which describe the inline encryption

		capabilities of the device.  For more information about inline

		encryption, refer to Documentation/block/inline-encryption.rst.





What:		/sys/block/<disk>/queue/crypto/max_dun_bits

Date:		February 2022

Contact:	linux-block@vger.kernel.org

Description:

		[RO] This file shows the maximum length, in bits, of data unit

		numbers accepted by the device in inline encryption requests.





What:		/sys/block/<disk>/queue/crypto/modes/<mode>

Date:		February 2022

Contact:	linux-block@vger.kernel.org

Description:

		[RO] For each crypto mode (i.e., encryption/decryption

		algorithm) the device supports with inline encryption, a file

		will exist at this location.  It will contain a hexadecimal

		number that is a bitmask of the supported data unit sizes, in

		bytes, for that crypto mode.



		Currently, the crypto modes that may be supported are:



		   * AES-256-XTS

		   * AES-128-CBC-ESSIV

		   * Adiantum



		For example, if a device supports AES-256-XTS inline encryption

		with data unit sizes of 512 and 4096 bytes, the file

		/sys/block/<disk>/queue/crypto/modes/AES-256-XTS will exist and

		will contain "0x1200".





What:		/sys/block/<disk>/queue/crypto/num_keyslots

Date:		February 2022

Contact:	linux-block@vger.kernel.org

Description:

		[RO] This file shows the number of keyslots the device has for

		use with inline encryption.





What:		/sys/block/<disk>/queue/dax

Date:		June 2016

Contact:	linux-block@vger.kernel.org

Documentation/ABI/stable/sysfs-devices-system-cpu

+4 −0
Original line number Diff line number Diff line
@@ -86,6 +86,10 @@ What: /sys/devices/system/cpu/cpuX/topology/die_cpus 
Description:    internal kernel map of CPUs within the same die.

Values:         hexadecimal bitmask.



What:           /sys/devices/system/cpu/cpuX/topology/ppin

Description:    per-socket protected processor inventory number

Values:         hexadecimal.



What:           /sys/devices/system/cpu/cpuX/topology/die_cpus_list

Description:    human-readable list of CPUs within the same die.

                The format is like 0-3, 8-11, 14,17.

Documentation/ABI/testing/debugfs-hisi-hpre

+94 −84
Original line number Diff line number Diff line
@@ -27,6 +27,16 @@ Description: One HPRE controller has one PF and multiple VFs, each function 
		has a QM. Select the QM which below qm refers to.

		Only available for PF.



What:		/sys/kernel/debug/hisi_hpre/<bdf>/alg_qos

Date:		Jun 2021

Contact:	linux-crypto@vger.kernel.org

Description:	The <bdf> is related the function for PF and VF.

		HPRE driver supports to configure each function's QoS, the driver

		supports to write <bdf> value to alg_qos in the host. Such as

		"echo <bdf> value > alg_qos". The qos value is 1~1000, means

		1/1000~1000/1000 of total QoS. The driver reading alg_qos to

		get related QoS in the host and VM, Such as "cat alg_qos".



What:		/sys/kernel/debug/hisi_hpre/<bdf>/regs

Date:		Sep 2019

Contact:	linux-crypto@vger.kernel.org

Documentation/ABI/testing/debugfs-hisi-sec

+78 −68
Original line number Diff line number Diff line
@@ -14,6 +14,16 @@ Description: One SEC controller has one PF and multiple VFs, each function 
		qm refers to.

		Only available for PF.



What:		/sys/kernel/debug/hisi_sec2/<bdf>/alg_qos

Date:		Jun 2021

Contact:	linux-crypto@vger.kernel.org

Description:	The <bdf> is related the function for PF and VF.

		SEC driver supports to configure each function's QoS, the driver

		supports to write <bdf> value to alg_qos in the host. Such as

		"echo <bdf> value > alg_qos". The qos value is 1~1000, means

		1/1000~1000/1000 of total QoS. The driver reading alg_qos to

		get related QoS in the host and VM, Such as "cat alg_qos".



What:		/sys/kernel/debug/hisi_sec2/<bdf>/qm/qm_regs

Date:		Oct 2019

Contact:	linux-crypto@vger.kernel.org