Unverified Commit 6343e067 authored by Ilpo Järvinen's avatar Ilpo Järvinen
Browse files

Merge branch 'fixes' of into for-next

parents 2ccbdb61 4b11f233

Documentation/admin-guide/laptops/alienware-wmi.rst

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ information. 


Manual fan control on the other hand, is not exposed directly by the AWCC

interface. Instead it let's us control a fan `boost` value. This `boost` value

has the following aproximate behavior over the fan pwm:

has the following approximate behavior over the fan pwm:



::

Documentation/arch/x86/amd_hsmp.rst

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ set of mailbox registers. 


More details on the interface can be found in chapter

"7 Host System Management Port (HSMP)" of the family/model PPR

Eg: https://www.amd.com/content/dam/amd/en/documents/epyc-technical-docs/programmer-references/55898_B1_pub_0_50.zip

Eg: https://docs.amd.com/v/u/en-US/55898_B1_pub_0_50





HSMP interface is supported on EPYC line of server CPUs and MI300A (APU).
@@ -185,7 +185,7 @@ what happened. The transaction returns 0 on success. 


More details on the interface and message definitions can be found in chapter

"7 Host System Management Port (HSMP)" of the respective family/model PPR

eg: https://www.amd.com/content/dam/amd/en/documents/epyc-technical-docs/programmer-references/55898_B1_pub_0_50.zip

eg: https://docs.amd.com/v/u/en-US/55898_B1_pub_0_50



User space C-APIs are made available by linking against the esmi library,

which is provided by the E-SMS project https://www.amd.com/en/developer/e-sms.html.

Documentation/misc-devices/amd-sbi.rst

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ and SB Temperature Sensor Interface (SB-TSI)). 
More details on the interface can be found in chapter

"5 Advanced Platform Management Link (APML)" of the family/model PPR [1]_.



.. [1] https://www.amd.com/content/dam/amd/en/documents/epyc-technical-docs/programmer-references/55898_B1_pub_0_50.zip

.. [1] https://docs.amd.com/v/u/en-US/55898_B1_pub_0_50





SBRMI device

drivers/platform/mellanox/mlx-platform.c

+1 −1
Original line number Diff line number Diff line
@@ -7381,7 +7381,7 @@ static int __init mlxplat_dmi_ng400_hi171_matched(const struct dmi_system_id *dm 
	mlxplat_hotplug = &mlxplat_mlxcpld_ng800_hi171_data;

	mlxplat_hotplug->deferred_nr =

		mlxplat_msn21xx_channels[MLXPLAT_CPLD_GRP_CHNL_NUM - 1];

	mlxplat_led = &mlxplat_default_ng_led_data;

	mlxplat_led = &mlxplat_xdr_led_data;

	mlxplat_regs_io = &mlxplat_default_ng_regs_io_data;

	mlxplat_fan = &mlxplat_xdr_fan_data;

drivers/platform/x86/acer-wmi.c

+10 −3
Original line number Diff line number Diff line
@@ -455,6 +455,11 @@ static struct quirk_entry quirk_acer_travelmate_2490 = { 
	.mailled = 1,

};



static struct quirk_entry quirk_acer_nitro_an515_58 = {

	.predator_v4 = 1,

	.pwm = 1,

};



static struct quirk_entry quirk_acer_predator_ph315_53 = {

	.turbo = 1,

	.cpu_fans = 1,
@@ -655,7 +660,7 @@ static const struct dmi_system_id acer_quirks[] __initconst = { 
			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),

			DMI_MATCH(DMI_PRODUCT_NAME, "Nitro AN515-58"),

		},

		.driver_data = &quirk_acer_predator_v4,

		.driver_data = &quirk_acer_nitro_an515_58,

	},

	{

		.callback = dmi_matched,
@@ -2065,6 +2070,7 @@ static int acer_toggle_turbo(void) 
		WMID_gaming_set_u64(0x1, ACER_CAP_TURBO_LED);



		/* Set FAN mode to auto */

		if (has_cap(ACER_CAP_TURBO_FAN))

			WMID_gaming_set_fan_mode(ACER_WMID_FAN_MODE_AUTO);



		/* Set OC to normal */
@@ -2079,6 +2085,7 @@ static int acer_toggle_turbo(void) 
		WMID_gaming_set_u64(0x10001, ACER_CAP_TURBO_LED);



		/* Set FAN mode to turbo */

		if (has_cap(ACER_CAP_TURBO_FAN))

			WMID_gaming_set_fan_mode(ACER_WMID_FAN_MODE_TURBO);



		/* Set OC to turbo mode */