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

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

Pull char/misc drivers updates from Greg KH:
 "Here is the "big" set of char/misc and other driver subsystems for
  6.4-rc1.

  It's pretty big, but due to the removal of pcmcia drivers, almost
  breaks even for number of lines added vs. removed, a nice change.

  Included in here are:

   - removal of unused PCMCIA drivers (finally!)

   - Interconnect driver updates and additions

   - Lots of IIO driver updates and additions

   - MHI driver updates

   - Coresight driver updates

   - NVMEM driver updates, which required some OF updates

   - W1 driver updates and a new maintainer to manage the subsystem

   - FPGA driver updates

   - New driver subsystem, CDX, for AMD systems

   - lots of other small driver updates and additions

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

* tag 'char-misc-6.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (196 commits)
  mcb-lpc: Reallocate memory region to avoid memory overlapping
  mcb-pci: Reallocate memory region to avoid memory overlapping
  mcb: Return actual parsed size when reading chameleon table
  kernel/configs: Drop Android config fragments
  virt: acrn: Replace obsolete memalign() with posix_memalign()
  spmi: Add a check for remove callback when removing a SPMI driver
  spmi: fix W=1 kernel-doc warnings
  spmi: mtk-pmif: Drop of_match_ptr for ID table
  spmi: pmic-arb: Convert to platform remove callback returning void
  spmi: mtk-pmif: Convert to platform remove callback returning void
  spmi: hisi-spmi-controller: Convert to platform remove callback returning void
  w1: gpio: remove unnecessary ENOMEM messages
  w1: omap-hdq: remove unnecessary ENOMEM messages
  w1: omap-hdq: add SPDX tag
  w1: omap-hdq: allow compile testing
  w1: matrox: remove unnecessary ENOMEM messages
  w1: matrox: use inline over __inline__
  w1: matrox: switch from asm to linux header
  w1: ds2482: do not use assignment in if condition
  w1: ds2482: drop unnecessary header
  ...
parents 556eb8b7 2025b2ca

CREDITS

+5 −0
Original line number Diff line number Diff line
@@ -3475,6 +3475,11 @@ D: several improvements to system programs 
S: Oldenburg

S: Germany



N: Mathieu Poirier

E: mathieu.poirier@linaro.org

D: CoreSight kernel subsystem, Maintainer 2014-2022

D: Perf tool support for CoreSight



N: Robert Schwebel

E: robert@schwebel.de

W: https://www.schwebel.de

Documentation/ABI/testing/sysfs-bus-cdx

0 → 100644
+56 −0
Original line number Diff line number Diff line 
What:		/sys/bus/cdx/rescan

Date:		March 2023

Contact:	nipun.gupta@amd.com

Description:

		Writing y/1/on to this file will cause rescan of the bus

		and devices on the CDX bus. Any new devices are scanned and

		added to the list of Linux devices and any devices removed are

		also deleted from Linux.



		For example::



		  # echo 1 > /sys/bus/cdx/rescan



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

Date:		March 2023

Contact:	nipun.gupta@amd.com

Description:

		Vendor ID for this CDX device, in hexadecimal. Vendor ID is

		16 bit identifier which is specific to the device manufacturer.

		Combination of Vendor ID and Device ID identifies a device.



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

Date:		March 2023

Contact:	nipun.gupta@amd.com

Description:

		Device ID for this CDX device, in hexadecimal. Device ID is

		16 bit identifier to identify a device type within the range

		of a device manufacturer.

		Combination of Vendor ID and Device ID identifies a device.



What:		/sys/bus/cdx/devices/.../reset

Date:		March 2023

Contact:	nipun.gupta@amd.com

Description:

		Writing y/1/on to this file resets the CDX device.

		On resetting the device, the corresponding driver is notified

		twice, once before the device is being reset, and again after

		the reset has been complete.



		For example::



		  # echo 1 > /sys/bus/cdx/.../reset



What:		/sys/bus/cdx/devices/.../remove

Date:		March 2023

Contact:	tarak.reddy@amd.com

Description:

		Writing y/1/on to this file removes the corresponding

		device from the CDX bus. If the device is to be reconfigured

		reconfigured in the Hardware, the device can be removed, so

		that the device driver does not access the device while it is

		being reconfigured.



		For example::



		  # echo 1 > /sys/bus/cdx/devices/.../remove

Documentation/ABI/testing/sysfs-bus-iio

+7 −6
Original line number Diff line number Diff line
@@ -1807,8 +1807,8 @@ What: /sys/bus/iio/devices/iio:deviceX/out_resistanceX_raw 
KernelVersion:	4.3

Contact:	linux-iio@vger.kernel.org

Description:

		Raw (unscaled no offset etc.) resistance reading that can be processed

		into an ohm value.

		Raw (unscaled no offset etc.) resistance reading.

		Units after application of scale and offset are ohms.



What:		/sys/bus/iio/devices/iio:deviceX/heater_enable

KernelVersion:	4.1.0
@@ -1894,8 +1894,9 @@ What: /sys/bus/iio/devices/iio:deviceX/in_electricalconductivity_raw 
KernelVersion:	4.8

Contact:	linux-iio@vger.kernel.org

Description:

		Raw (unscaled no offset etc.) electric conductivity reading that

		can be processed to siemens per meter.

		Raw (unscaled no offset etc.) electric conductivity reading.

		Units after application of scale and offset are siemens per

		meter.



What:		/sys/bus/iio/devices/iio:deviceX/in_countY_raw

KernelVersion:	4.10
@@ -1951,8 +1952,8 @@ What: /sys/bus/iio/devices/iio:deviceX/in_phaseY_raw 
KernelVersion:	4.18

Contact:	linux-iio@vger.kernel.org

Description:

		Raw (unscaled) phase difference reading from channel Y

		that can be processed to radians.

		Raw (unscaled) phase difference reading from channel Y.

		Units after application of scale and offset are radians.



What:		/sys/bus/iio/devices/iio:deviceX/in_massconcentration_pm1_input

What:		/sys/bus/iio/devices/iio:deviceX/in_massconcentrationY_pm1_input

Documentation/ABI/testing/sysfs-bus-platform-devices-ampere-smpro

+16 −3
Original line number Diff line number Diff line
@@ -234,8 +234,8 @@ Description: 
		For details, see section `5.10 RAS Internal Error Register Definitions,

		Altra Family Soc BMC Interface Specification`.



What:		/sys/bus/platform/devices/smpro-errmon.*/event_[vrd_warn_fault|vrd_hot|dimm_hot]

KernelVersion:	6.1

What:		/sys/bus/platform/devices/smpro-errmon.*/event_[vrd_warn_fault|vrd_hot|dimm_hot|dimm_2x_refresh]

KernelVersion:	6.1 (event_[vrd_warn_fault|vrd_hot|dimm_hot]), 6.4 (event_dimm_2x_refresh)

Contact:	Quan Nguyen <quan@os.amperecomputing.com>

Description:

		(RO) Contains the detail information in case of VRD/DIMM warning/hot events
@@ -258,8 +258,21 @@ Description: 
		+---------------+---------------------------------------------------------------+---------------------+

		| DIMM HOT      | /sys/bus/platform/devices/smpro-errmon.*/event_dimm_hot       | DIMM Hot            |

		+---------------+---------------------------------------------------------------+---------------------+

		| DIMM 2X       | /sys/bus/platform/devices/smpro-errmon.*/event_dimm_2x_refresh| DIMM 2x refresh rate|

		| REFRESH RATE  |                                                               | event in high temp  |

		+---------------+---------------------------------------------------------------+---------------------+



		For more details, see section `5.7 GPI Status Registers and 5.9 Memory Error Register Definitions,

		Altra Family Soc BMC Interface Specification`.



What:		/sys/bus/platform/devices/smpro-errmon.*/event_dimm[0-15]_syndrome

KernelVersion:	6.4

Contact:	Quan Nguyen <quan@os.amperecomputing.com>

Description:

		(RO) The sysfs returns the 2-byte DIMM failure syndrome data for slot

		0-15 if it failed to initialize.



		For more details, see section `5.7 GPI Status Registers,

		For more details, see section `5.11 Boot Stage Register Definitions,

		Altra Family Soc BMC Interface Specification`.



What:		/sys/bus/platform/devices/smpro-misc.*/boot_progress

Documentation/ABI/testing/sysfs-driver-zynqmp-fpga

0 → 100644
+73 −0
Original line number Diff line number Diff line 
What:		/sys/bus/platform/drivers/zynqmp_fpga_manager/firmware:zynqmp-firmware:pcap/status

Date:		February 2023

KernelVersion:	6.4

Contact:	Nava kishore Manne <nava.kishore.manne@amd.com>

Description:	(RO) Read fpga status.

		Read returns a hexadecimal value that tells the current status

		of the FPGA device. Each bit position in the status value is

		described Below(see ug570 chapter 9).

		https://docs.xilinx.com/v/u/en-US/ug570-ultrascale-configuration



		======================  ==============================================

		BIT(0)			0: No CRC error

					1: CRC error



		BIT(1)			0: Decryptor security not set

					1: Decryptor security set



		BIT(2)			0: MMCMs/PLLs are not locked

					1: MMCMs/PLLs are locked



		BIT(3)			0: DCI not matched

					1: DCI matched



		BIT(4)			0: Start-up sequence has not finished

					1: Start-up sequence has finished



		BIT(5)			0: All I/Os are placed in High-Z state

					1: All I/Os behave as configured



		BIT(6)			0: Flip-flops and block RAM are write disabled

					1: Flip-flops and block RAM are write enabled



		BIT(7)			0: GHIGH_B_STATUS asserted

					1: GHIGH_B_STATUS deasserted



		BIT(8) to BIT(10)	Status of the mode pins



		BIT(11)			0: Initialization has not finished

					1: Initialization finished



		BIT(12)			Value on INIT_B_PIN pin



		BIT(13)			0: Signal not released

					1: Signal released



		BIT(14)			Value on DONE_PIN pin.



		BIT(15)			0: No IDCODE_ERROR

					1: IDCODE_ERROR



		BIT(16)			0: No SECURITY_ERROR

					1: SECURITY_ERROR



		BIT(17)			System Monitor over-temperature if set



		BIT(18) to BIT(20)	Start-up state machine (0 to 7)

					Phase 0 = 000

					Phase 1 = 001

					Phase 2 = 011

					Phase 3 = 010

					Phase 4 = 110

					Phase 5 = 111

					Phase 6 = 101

					Phase 7 = 100



		BIT(25) to BIT(26)	Indicates the detected bus width

					00 = x1

					01 = x8

					10 = x16

					11 = x32

		======================  ==============================================



		The other bits are reserved.