Commit 59fff63c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v6.7-1' of... 

Merge tag 'platform-drivers-x86-v6.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86

Pull x86 platform driver updates from Ilpo Järvinen:

 - asus-wmi: Support for screenpad and solve brightness key press
   duplication

 - int3472: Eliminate the last use of deprecated GPIO functions

 - mlxbf-pmc: New HW support

 - msi-ec: Support new EC configurations

 - thinkpad_acpi: Support reading aux MAC address during passthrough

 - wmi: Fixes & improvements

 - x86-android-tablets: Detection fix and avoid use of GPIO private APIs

 - Debug & metrics interface improvements

 - Miscellaneous cleanups / fixes / improvements

* tag 'platform-drivers-x86-v6.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86: (80 commits)
  platform/x86: inspur-platform-profile: Add platform profile support
  platform/x86: thinkpad_acpi: Add battery quirk for Thinkpad X120e
  platform/x86: wmi: Decouple WMI device removal from wmi_block_list
  platform/x86: wmi: Fix opening of char device
  platform/x86: wmi: Fix probe failure when failing to register WMI devices
  platform/x86: wmi: Fix refcounting of WMI devices in legacy functions
  platform/x86: wmi: Decouple probe deferring from wmi_block_list
  platform/x86/amd/hsmp: Fix iomem handling
  platform/x86: asus-wmi: Do not report brightness up/down keys when also reported by acpi_video
  platform/x86: thinkpad_acpi: replace deprecated strncpy with memcpy
  tools/power/x86/intel-speed-select: v1.18 release
  tools/power/x86/intel-speed-select: Use cgroup isolate for CPU 0
  tools/power/x86/intel-speed-select: Increase max CPUs in one request
  tools/power/x86/intel-speed-select: Display error for core-power support
  tools/power/x86/intel-speed-select: No TRL for non compute domains
  tools/power/x86/intel-speed-select: turbo-mode enable disable swapped
  tools/power/x86/intel-speed-select: Update help for TRL
  tools/power/x86/intel-speed-select: Sanitize integer arguments
  platform/x86: acer-wmi: Remove void function return
  platform/x86/amd/pmc: Add dump_custom_stb module parameter
  ...
parents 3475b91f 94ace9ed

Documentation/ABI/testing/sysfs-class-firmware-attributes

+30 −0
Original line number Diff line number Diff line
@@ -383,6 +383,36 @@ Description: 
		Note that any changes to this attribute requires a reboot

		for changes to take effect.



What:		/sys/class/firmware-attributes/*/attributes/save_settings

Date:		August 2023

KernelVersion:	6.6

Contact:	Mark Pearson <mpearson-lenovo@squebb.ca>

Description:

		On Lenovo platforms there is a limitation in the number of times an attribute can be

		saved. This is an architectural limitation and it limits the number of attributes

		that can be modified to 48.

		A solution for this is instead of the attribute being saved after every modification,

		to allow a user to bulk set the attributes, and then trigger a final save. This allows

		unlimited attributes.



		Read the attribute to check what save mode is enabled (single or bulk).

		E.g:

		# cat /sys/class/firmware-attributes/thinklmi/attributes/save_settings

		single



		Write the attribute with 'bulk' to enable bulk save mode.

		Write the attribute with 'single' to enable saving, after every attribute set.

		The default setting is single mode.

		E.g:

		# echo bulk > /sys/class/firmware-attributes/thinklmi/attributes/save_settings



		When in bulk mode write 'save' to trigger a save of all currently modified attributes.

		Note, once a save has been triggered, in bulk mode, attributes can no longer be set and

		will return a permissions error. This is to prevent users hitting the 48+ save limitation

		(which requires entering the BIOS to clear the error condition)

		E.g:

		# echo save > /sys/class/firmware-attributes/thinklmi/attributes/save_settings



What:		/sys/class/firmware-attributes/*/attributes/debug_cmd

Date:		July 2021

KernelVersion:	5.14

Documentation/admin-guide/laptops/thinkpad-acpi.rst

+20 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ detailed description): 
	- Lap mode sensor

	- Setting keyboard language

	- WWAN Antenna type

	- Auxmac



A compatibility table by model and feature is maintained on the web

site, http://ibm-acpi.sf.net/. I appreciate any success or failure
@@ -1511,6 +1512,25 @@ Currently 2 antenna types are supported as mentioned below: 
The property is read-only. If the platform doesn't have support the sysfs

class is not created.



Auxmac

------



sysfs: auxmac



Some newer Thinkpads have a feature called MAC Address Pass-through. This

feature is implemented by the system firmware to provide a system unique MAC,

that can override a dock or USB ethernet dongle MAC, when connected to a

network. This property enables user-space to easily determine the MAC address

if the feature is enabled.



The values of this auxiliary MAC are:



        cat /sys/devices/platform/thinkpad_acpi/auxmac



If the feature is disabled, the value will be 'disabled'.



This property is read-only.



Adaptive keyboard

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

Documentation/arch/x86/amd_hsmp.rst

+18 −0
Original line number Diff line number Diff line
@@ -41,6 +41,24 @@ In-kernel integration: 
 * Locking across callers is taken care by the driver.





HSMP sysfs interface

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



1. Metrics table binary sysfs



AMD MI300A MCM provides GET_METRICS_TABLE message to retrieve

most of the system management information from SMU in one go.



The metrics table is made available as hexadecimal sysfs binary file

under per socket sysfs directory created at

/sys/devices/platform/amd_hsmp/socket%d/metrics_bin



Note: lseek() is not supported as entire metrics table is read.



Metrics table definitions will be documented as part of Public PPR.

The same is defined in the amd_hsmp.h header.





An example

==========

arch/x86/include/asm/msr-index.h

+1 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ 
#define MSR_INTEGRITY_CAPS_ARRAY_BIST          BIT(MSR_INTEGRITY_CAPS_ARRAY_BIST_BIT)

#define MSR_INTEGRITY_CAPS_PERIODIC_BIST_BIT	4

#define MSR_INTEGRITY_CAPS_PERIODIC_BIST	BIT(MSR_INTEGRITY_CAPS_PERIODIC_BIST_BIT)

#define MSR_INTEGRITY_CAPS_SAF_GEN_MASK	GENMASK_ULL(10, 9)



#define MSR_LBR_NHM_FROM		0x00000680

#define MSR_LBR_NHM_TO			0x000006c0

arch/x86/include/uapi/asm/amd_hsmp.h

+109 −0
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ enum hsmp_message_ids { 
	HSMP_SET_PCI_RATE,		/* 20h Control link rate on PCIe devices */

	HSMP_SET_POWER_MODE,		/* 21h Select power efficiency profile policy */

	HSMP_SET_PSTATE_MAX_MIN,	/* 22h Set the max and min DF P-State  */

	HSMP_GET_METRIC_TABLE_VER,	/* 23h Get metrics table version */

	HSMP_GET_METRIC_TABLE,		/* 24h Get metrics table */

	HSMP_GET_METRIC_TABLE_DRAM_ADDR,/* 25h Get metrics table dram address */

	HSMP_MSG_ID_MAX,

};
@@ -64,6 +67,14 @@ enum hsmp_msg_type { 
	HSMP_GET  = 1,

};



enum hsmp_proto_versions {

	HSMP_PROTO_VER2	= 2,

	HSMP_PROTO_VER3,

	HSMP_PROTO_VER4,

	HSMP_PROTO_VER5,

	HSMP_PROTO_VER6

};



struct hsmp_msg_desc {

	int num_args;

	int response_sz;
@@ -295,6 +306,104 @@ static const struct hsmp_msg_desc hsmp_msg_desc_table[] = { 
	 * input: args[0] = min df pstate[15:8] + max df pstate[7:0]

	 */

	{1, 0, HSMP_SET},



	/*

	 * HSMP_GET_METRIC_TABLE_VER, num_args = 0, response_sz = 1

	 * output: args[0] = metrics table version

	 */

	{0, 1, HSMP_GET},



	/*

	 * HSMP_GET_METRIC_TABLE, num_args = 0, response_sz = 0

	 */

	{0, 0, HSMP_GET},



	/*

	 * HSMP_GET_METRIC_TABLE_DRAM_ADDR, num_args = 0, response_sz = 2

	 * output: args[0] = lower 32 bits of the address

	 * output: args[1] = upper 32 bits of the address

	 */

	{0, 2, HSMP_GET},

};



/* Metrics table (supported only with proto version 6) */

struct hsmp_metric_table {

	__u32 accumulation_counter;



	/* TEMPERATURE */

	__u32 max_socket_temperature;

	__u32 max_vr_temperature;

	__u32 max_hbm_temperature;

	__u64 max_socket_temperature_acc;

	__u64 max_vr_temperature_acc;

	__u64 max_hbm_temperature_acc;



	/* POWER */

	__u32 socket_power_limit;

	__u32 max_socket_power_limit;

	__u32 socket_power;



	/* ENERGY */

	__u64 timestamp;

	__u64 socket_energy_acc;

	__u64 ccd_energy_acc;

	__u64 xcd_energy_acc;

	__u64 aid_energy_acc;

	__u64 hbm_energy_acc;



	/* FREQUENCY */

	__u32 cclk_frequency_limit;

	__u32 gfxclk_frequency_limit;

	__u32 fclk_frequency;

	__u32 uclk_frequency;

	__u32 socclk_frequency[4];

	__u32 vclk_frequency[4];

	__u32 dclk_frequency[4];

	__u32 lclk_frequency[4];

	__u64 gfxclk_frequency_acc[8];

	__u64 cclk_frequency_acc[96];



	/* FREQUENCY RANGE */

	__u32 max_cclk_frequency;

	__u32 min_cclk_frequency;

	__u32 max_gfxclk_frequency;

	__u32 min_gfxclk_frequency;

	__u32 fclk_frequency_table[4];

	__u32 uclk_frequency_table[4];

	__u32 socclk_frequency_table[4];

	__u32 vclk_frequency_table[4];

	__u32 dclk_frequency_table[4];

	__u32 lclk_frequency_table[4];

	__u32 max_lclk_dpm_range;

	__u32 min_lclk_dpm_range;



	/* XGMI */

	__u32 xgmi_width;

	__u32 xgmi_bitrate;

	__u64 xgmi_read_bandwidth_acc[8];

	__u64 xgmi_write_bandwidth_acc[8];



	/* ACTIVITY */

	__u32 socket_c0_residency;

	__u32 socket_gfx_busy;

	__u32 dram_bandwidth_utilization;

	__u64 socket_c0_residency_acc;

	__u64 socket_gfx_busy_acc;

	__u64 dram_bandwidth_acc;

	__u32 max_dram_bandwidth;

	__u64 dram_bandwidth_utilization_acc;

	__u64 pcie_bandwidth_acc[4];



	/* THROTTLERS */

	__u32 prochot_residency_acc;

	__u32 ppt_residency_acc;

	__u32 socket_thm_residency_acc;

	__u32 vr_thm_residency_acc;

	__u32 hbm_thm_residency_acc;

	__u32 spare;



	/* New items at the end to maintain driver compatibility */

	__u32 gfxclk_frequency[8];

};



/* Reset to default packing */