Commit 5f8f8574 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge branch 'next' into for-linus

Prepare input updates for 6.1 merge window.
parents e62563db fe5b6aae
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -516,6 +516,7 @@ ForEachMacros:
  - 'of_property_for_each_string'
  - 'of_property_for_each_u32'
  - 'pci_bus_for_each_resource'
  - 'pci_doe_for_each_off'
  - 'pcl_for_each_chunk'
  - 'pcl_for_each_segment'
  - 'pcm_for_each_format'
+12 −1
Original line number Diff line number Diff line
@@ -60,10 +60,17 @@ Arnd Bergmann <arnd@arndb.de>
Atish Patra <atishp@atishpatra.org> <atish.patra@wdc.com>
Axel Dyks <xl@xlsigned.net>
Axel Lin <axel.lin@gmail.com>
Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@linaro.org>
Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@spreadtrum.com>
Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang@unisoc.com>
Baolin Wang <baolin.wang@linux.alibaba.com> <baolin.wang7@gmail.com>
Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>
Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>
Ben Gardner <bgardner@wabtec.com>
Ben M Cahill <ben.m.cahill@intel.com>
Ben Widawsky <bwidawsk@kernel.org> <ben@bwidawsk.net>
Ben Widawsky <bwidawsk@kernel.org> <ben.widawsky@intel.com>
Ben Widawsky <bwidawsk@kernel.org> <benjamin.widawsky@intel.com>
Björn Steinbrink <B.Steinbrink@gmx.de>
Björn Töpel <bjorn@kernel.org> <bjorn.topel@gmail.com>
Björn Töpel <bjorn@kernel.org> <bjorn.topel@intel.com>
@@ -71,6 +78,7 @@ Boris Brezillon <bbrezillon@kernel.org> <b.brezillon.dev@gmail.com>
Boris Brezillon <bbrezillon@kernel.org> <b.brezillon@overkiz.com>
Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@bootlin.com>
Boris Brezillon <bbrezillon@kernel.org> <boris.brezillon@free-electrons.com>
Brendan Higgins <brendan.higgins@linux.dev> <brendanhiggins@google.com>
Brian Avery <b.avery@hp.com>
Brian King <brking@us.ibm.com>
Brian Silverman <bsilver16384@gmail.com> <brian.silverman@bluerivertech.com>
@@ -132,6 +140,8 @@ Frank Rowand <frowand.list@gmail.com> <frowand@mvista.com>
Frank Zago <fzago@systemfabricworks.com>
Gao Xiang <xiang@kernel.org> <gaoxiang25@huawei.com>
Gao Xiang <xiang@kernel.org> <hsiangkao@aol.com>
Gao Xiang <xiang@kernel.org> <hsiangkao@linux.alibaba.com>
Gao Xiang <xiang@kernel.org> <hsiangkao@redhat.com>
Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@de.ibm.com>
Gerald Schaefer <gerald.schaefer@linux.ibm.com> <gerald.schaefer@de.ibm.com>
Gerald Schaefer <gerald.schaefer@linux.ibm.com> <geraldsc@linux.vnet.ibm.com>
@@ -221,7 +231,7 @@ Kees Cook <keescook@chromium.org> <kees@ubuntu.com>
Keith Busch <kbusch@kernel.org> <keith.busch@intel.com>
Keith Busch <kbusch@kernel.org> <keith.busch@linux.intel.com>
Kenneth W Chen <kenneth.w.chen@intel.com>
Kirill Tkhai <kirill.tkhai@openvz.org> <ktkhai@virtuozzo.com>
Kirill Tkhai <tkhai@ya.ru> <ktkhai@virtuozzo.com>
Konstantin Khlebnikov <koct9i@gmail.com> <khlebnikov@yandex-team.ru>
Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com>
Koushik <raghavendra.koushik@neterion.com>
@@ -368,6 +378,7 @@ Sean Nyekjaer <sean@geanix.com> <sean.nyekjaer@prevas.dk>
Sebastian Reichel <sre@kernel.org> <sebastian.reichel@collabora.co.uk>
Sebastian Reichel <sre@kernel.org> <sre@debian.org>
Sedat Dilek <sedat.dilek@gmail.com> <sedat.dilek@credativ.de>
Seth Forshee <sforshee@kernel.org> <seth.forshee@canonical.com>
Shiraz Hashim <shiraz.linux.kernel@gmail.com> <shiraz.hashim@st.com>
Shuah Khan <shuah@kernel.org> <shuahkhan@gmail.com>
Shuah Khan <shuah@kernel.org> <shuah.khan@hp.com>
+8 −0
Original line number Diff line number Diff line
@@ -627,6 +627,10 @@ S: 48287 Sawleaf
S: Fremont, California 94539
S: USA

N: Tomas Cech
E: sleep_walker@suse.com
D: arm/palm treo support

N: Florent Chabaud
E: florent.chabaud@polytechnique.org
D: software suspend
@@ -3491,6 +3495,10 @@ D: wd33c93 SCSI driver (linux-m68k)
S: San Jose, California
S: USA

N: Joonyoung Shim
E: y0922.shim@samsung.com
D: Samsung Exynos DRM drivers

N: Robert Siemer
E: Robert.Siemer@gmx.de
P: 2048/C99A4289 2F DC 17 2E 56 62 01 C8  3D F2 AC 09 F2 E5 DD EE
+9 −0
Original line number Diff line number Diff line
@@ -260,6 +260,15 @@ Description:
		for discards, and don't read this file.


What:		/sys/block/<disk>/queue/dma_alignment
Date:		May 2022
Contact:	linux-block@vger.kernel.org
Description:
		Reports the alignment that user space addresses must have to be
		used for raw block device access with O_DIRECT and other driver
		specific passthrough mechanisms.


What:		/sys/block/<disk>/queue/fua
Date:		May 2018
Contact:	linux-block@vger.kernel.org
+60 −21
Original line number Diff line number Diff line
What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/asic_health
Date:		June 2018
KernelVersion:	4.19
Contact:	Vadim Pasternak <vadimpmellanox.com>
Contact:	Vadim Pasternak <vadimp@nvidia.com>
Description:	This file shows ASIC health status. The possible values are:
		0 - health failed, 2 - health OK, 3 - ASIC in booting state.

@@ -11,7 +11,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld1_version
What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld2_version
Date:		June 2018
KernelVersion:	4.19
Contact:	Vadim Pasternak <vadimpmellanox.com>
Contact:	Vadim Pasternak <vadimp@nvidia.com>
Description:	These files show with which CPLD versions have been burned
		on carrier and switch boards.

@@ -20,7 +20,7 @@ Description: These files show with which CPLD versions have been burned
What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/fan_dir
Date:		December 2018
KernelVersion:	5.0
Contact:	Vadim Pasternak <vadimpmellanox.com>
Contact:	Vadim Pasternak <vadimp@nvidia.com>
Description:	This file shows the system fans direction:
		forward direction - relevant bit is set 0;
		reversed direction - relevant bit is set 1.
@@ -30,7 +30,7 @@ Description: This file shows the system fans direction:
What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld3_version
Date:		November 2018
KernelVersion:	5.0
Contact:	Vadim Pasternak <vadimpmellanox.com>
Contact:	Vadim Pasternak <vadimp@nvidia.com>
Description:	These files show with which CPLD versions have been burned
		on LED or Gearbox board.

@@ -39,7 +39,7 @@ Description: These files show with which CPLD versions have been burned
What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/jtag_enable
Date:		November 2018
KernelVersion:	5.0
Contact:	Vadim Pasternak <vadimpmellanox.com>
Contact:	Vadim Pasternak <vadimp@nvidia.com>
Description:	These files enable and disable the access to the JTAG domain.
		By default access to the JTAG domain is disabled.

@@ -48,7 +48,7 @@ Description: These files enable and disable the access to the JTAG domain.
What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/select_iio
Date:		June 2018
KernelVersion:	4.19
Contact:	Vadim Pasternak <vadimpmellanox.com>
Contact:	Vadim Pasternak <vadimp@nvidia.com>
Description:	This file allows iio devices selection.

		Attribute select_iio can be written with 0 or with 1. It
@@ -62,7 +62,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/psu1_on
		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/pwr_down
Date:		June 2018
KernelVersion:	4.19
Contact:	Vadim Pasternak <vadimpmellanox.com>
Contact:	Vadim Pasternak <vadimp@nvidia.com>
Description:	These files allow asserting system power cycling, switching
		power supply units on and off and system's main power domain
		shutdown.
@@ -89,7 +89,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_short_pb
What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_sw_reset
Date:		June 2018
KernelVersion:	4.19
Contact:	Vadim Pasternak <vadimpmellanox.com>
Contact:	Vadim Pasternak <vadimp@nvidia.com>
Description:	These files show the system reset cause, as following: power
		auxiliary outage or power refresh, ASIC thermal shutdown, halt,
		hotswap, watchdog, firmware reset, long press power button,
@@ -106,7 +106,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_system
What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_voltmon_upgrade_fail
Date:		November 2018
KernelVersion:	5.0
Contact:	Vadim Pasternak <vadimpmellanox.com>
Contact:	Vadim Pasternak <vadimp@nvidia.com>
Description:	These files show the system reset cause, as following: ComEx
		power fail, reset from ComEx, system platform reset, reset
		due to voltage monitor devices upgrade failure,
@@ -119,7 +119,7 @@ Description: These files show the system reset cause, as following: ComEx
What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld4_version
Date:		November 2018
KernelVersion:	5.0
Contact:	Vadim Pasternak <vadimpmellanox.com>
Contact:	Vadim Pasternak <vadimp@nvidia.com>
Description:	These files show with which CPLD versions have been burned
		on LED board.

@@ -133,7 +133,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_sff_wd
What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_swb_wd
Date:		June 2019
KernelVersion:	5.3
Contact:	Vadim Pasternak <vadimpmellanox.com>
Contact:	Vadim Pasternak <vadimp@nvidia.com>
Description:	These files show the system reset cause, as following:
		COMEX thermal shutdown; wathchdog power off or reset was derived
		by one of the next components: COMEX, switch board or by Small Form
@@ -148,7 +148,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/config1
What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/config2
Date:		January 2020
KernelVersion:	5.6
Contact:	Vadim Pasternak <vadimpmellanox.com>
Contact:	Vadim Pasternak <vadimp@nvidia.com>
Description:	These files show system static topology identification
		like system's static I2C topology, number and type of FPGA
		devices within the system and so on.
@@ -161,7 +161,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_soc
What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/reset_sw_pwr_off
Date:		January 2020
KernelVersion:	5.6
Contact:	Vadim Pasternak <vadimpmellanox.com>
Contact:	Vadim Pasternak <vadimp@nvidia.com>
Description:	These files show the system reset causes, as following: reset
		due to AC power failure, reset invoked from software by
		assertion reset signal through CPLD. reset caused by signal
@@ -173,7 +173,7 @@ Description: These files show the system reset causes, as following: reset
What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/pcie_asic_reset_dis
Date:		January 2020
KernelVersion:	5.6
Contact:	Vadim Pasternak <vadimpmellanox.com>
Contact:	Vadim Pasternak <vadimp@nvidia.com>
Description:	This file allows to retain ASIC up during PCIe root complex
		reset, when attribute is set 1.

@@ -182,7 +182,7 @@ Description: This file allows to retain ASIC up during PCIe root complex
What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/vpd_wp
Date:		January 2020
KernelVersion:	5.6
Contact:	Vadim Pasternak <vadimpmellanox.com>
Contact:	Vadim Pasternak <vadimp@nvidia.com>
Description:	This file allows to overwrite system VPD hardware write
		protection when attribute is set 1.

@@ -191,7 +191,7 @@ Description: This file allows to overwrite system VPD hardware write
What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/voltreg_update_status
Date:		January 2020
KernelVersion:	5.6
Contact:	Vadim Pasternak <vadimpmellanox.com>
Contact:	Vadim Pasternak <vadimp@nvidia.com>
Description:	This file exposes the configuration update status of burnable
		voltage regulator devices. The status values are as following:
		0 - OK; 1 - CRC failure; 2 = I2C failure; 3 - in progress.
@@ -201,7 +201,7 @@ Description: This file exposes the configuration update status of burnable
What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/ufm_version
Date:		January 2020
KernelVersion:	5.6
Contact:	Vadim Pasternak <vadimpmellanox.com>
Contact:	Vadim Pasternak <vadimp@nvidia.com>
Description:	This file exposes the firmware version of burnable voltage
		regulator devices.

@@ -217,7 +217,7 @@ What: /sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld3_version_min
What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/cpld4_version_min
Date:		July 2020
KernelVersion:	5.9
Contact:	Vadim Pasternak <vadimpmellanox.com>
Contact:	Vadim Pasternak <vadimp@nvidia.com>
Description:	These files show with which CPLD part numbers and minor
		versions have been burned CPLD devices equipped on a
		system.
@@ -471,7 +471,7 @@ Description: These files provide the maximum powered required for line card
What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/phy_reset
Date:		May 2022
KernelVersion:	5.19
Contact:	Vadim Pasternak <vadimpmellanox.com>
Contact:	Vadim Pasternak <vadimp@nvidia.com>
Description:	This file allows to reset PHY 88E1548 when attribute is set 0
		due to some abnormal PHY behavior.
		Expected behavior:
@@ -483,7 +483,7 @@ Description: This file allows to reset PHY 88E1548 when attribute is set 0
What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/mac_reset
Date:		May 2022
KernelVersion:	5.19
Contact:	Vadim Pasternak <vadimpmellanox.com>
Contact:	Vadim Pasternak <vadimp@nvidia.com>
Description:	This file allows to reset ASIC MT52132 when attribute is set 0
		due to some abnormal ASIC behavior.
		Expected behavior:
@@ -495,7 +495,7 @@ Description: This file allows to reset ASIC MT52132 when attribute is set 0
What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/qsfp_pwr_good
Date:		May 2022
KernelVersion:	5.19
Contact:	Vadim Pasternak <vadimpmellanox.com>
Contact:	Vadim Pasternak <vadimp@nvidia.com>
Description:	This file shows QSFP ports power status. The value is set to 0
		when one of any QSFP ports is plugged. The value is set to 1 when
		there are no any QSFP ports are plugged.
@@ -503,3 +503,42 @@ Description: This file shows QSFP ports power status. The value is set to 0
		0 - Power good, 1 - Not power good.

		The files are read only.

What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/asic2_health
Date:		July 2022
KernelVersion:	5.20
Contact:	Vadim Pasternak <vadimp@nvidia.com>
Description:	This file shows 2-nd ASIC health status. The possible values are:
		0 - health failed, 2 - health OK, 3 - ASIC in booting state.

		The file is read only.

What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/asic_reset
What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/asic2_reset
Date:		July 2022
KernelVersion:	5.20
Contact:	Vadim Pasternak <vadimp@nvidia.com>
Description:	These files allow to each of ASICs by writing 1.

		The files are write only.


What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/comm_chnl_ready
Date:		July 2022
KernelVersion:	5.20
Contact:	Vadim Pasternak <vadimp@nvidia.com>
Description:	This file is used to indicate remote end (for example BMC) that system
	        host CPU is ready for sending telemetry data to remote end.
		For indication the file should be written 1.

		The file is write only.

What:		/sys/devices/platform/mlxplat/mlxreg-io/hwmon/hwmon*/config3
Date:		January 2020
KernelVersion:	5.6
Contact:	Vadim Pasternak <vadimp@nvidia.com>
Description:	The file indicates COME module hardware configuration.
		The value is pushed by hardware through GPIO pins.
		The purpose is to expose some minor BOM changes for the same system SKU.

		The file is read only.
Loading