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

Merge tag 'platform-drivers-x86-v6.15-3' of... 

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

Pull x86 platform drivers fixes from Ilpo Järvinen:
 "Fixes:
   - amd/pmf: Fix STT limits
   - asus-laptop: Fix an uninitialized variable
   - intel_pmc_ipc: Allow building without ACPI
   - mlxbf-bootctl: Use sysfs_emit_at() in secure_boot_fuse_state_show()
   - msi-wmi-platform: Add locking to workaround ACPI firmware bug

  New HW support:
   - alienware-wmi-wmax:
      - Extended thermal control support to:
         - Alienware Area-51m R2
         - Alienware m16 R1
         - Alienware m16 R2
         - Dell G16 7630
         - Dell G5 5505 SE
      - G-Mode support to Alienware m16 R1
   - x86-android-tablets: Add Vexia Edu Atla 10 tablet 5V data"

* tag 'platform-drivers-x86-v6.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  platform/x86: msi-wmi-platform: Workaround a ACPI firmware bug
  platform/x86: msi-wmi-platform: Rename "data" variable
  platform/x86: alienware-wmi-wmax: Extend support to more laptops
  platform/x86: alienware-wmi-wmax: Add G-Mode support to Alienware m16 R1
  platform/x86: amd: pmf: Fix STT limits
  mlxbf-bootctl: use sysfs_emit_at() in secure_boot_fuse_state_show()
  platform/x86: x86-android-tablets: Add Vexia Edu Atla 10 tablet 5V data
  platform/x86: x86-android-tablets: Add "9v" to Vexia EDU ATLA 10 tablet symbols
  asus-laptop: Fix an uninitialized variable
  platform/x86: intel_pmc_ipc: add option to build without ACPI
parents 7adf8b1a baf2f2c2

Documentation/wmi/devices/msi-wmi-platform.rst

+4 −0
Original line number Diff line number Diff line
@@ -138,6 +138,10 @@ input data, the meaning of which depends on the subfeature being accessed. 
The output buffer contains a single byte which signals success or failure (``0x00`` on failure)

and 31 bytes of output data, the meaning if which depends on the subfeature being accessed.



.. note::

   The ACPI control method responsible for handling the WMI method calls is not thread-safe.

   This is a firmware bug that needs to be handled inside the driver itself.



WMI method Get_EC()

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

drivers/platform/mellanox/mlxbf-bootctl.c

+2 −2
Original line number Diff line number Diff line
@@ -333,9 +333,9 @@ static ssize_t secure_boot_fuse_state_show(struct device *dev, 
			else

				status = valid ? "Invalid" : "Free";

		}

		buf_len += sysfs_emit(buf + buf_len, "%d:%s ", key, status);

		buf_len += sysfs_emit_at(buf, buf_len, "%d:%s ", key, status);

	}

	buf_len += sysfs_emit(buf + buf_len, "\n");

	buf_len += sysfs_emit_at(buf, buf_len, "\n");



	return buf_len;

}

drivers/platform/x86/amd/pmf/auto-mode.c

+2 −2
Original line number Diff line number Diff line
@@ -120,9 +120,9 @@ static void amd_pmf_set_automode(struct amd_pmf_dev *dev, int idx, 
	amd_pmf_send_cmd(dev, SET_SPPT_APU_ONLY, false, pwr_ctrl->sppt_apu_only, NULL);

	amd_pmf_send_cmd(dev, SET_STT_MIN_LIMIT, false, pwr_ctrl->stt_min, NULL);

	amd_pmf_send_cmd(dev, SET_STT_LIMIT_APU, false,

			 pwr_ctrl->stt_skin_temp[STT_TEMP_APU], NULL);

			 fixp_q88_fromint(pwr_ctrl->stt_skin_temp[STT_TEMP_APU]), NULL);

	amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, false,

			 pwr_ctrl->stt_skin_temp[STT_TEMP_HS2], NULL);

			 fixp_q88_fromint(pwr_ctrl->stt_skin_temp[STT_TEMP_HS2]), NULL);



	if (is_apmf_func_supported(dev, APMF_FUNC_SET_FAN_IDX))

		apmf_update_fan_idx(dev, config_store.mode_set[idx].fan_control.manual,

drivers/platform/x86/amd/pmf/cnqf.c

+4 −4
Original line number Diff line number Diff line
@@ -81,10 +81,10 @@ static int amd_pmf_set_cnqf(struct amd_pmf_dev *dev, int src, int idx, 
	amd_pmf_send_cmd(dev, SET_SPPT, false, pc->sppt, NULL);

	amd_pmf_send_cmd(dev, SET_SPPT_APU_ONLY, false, pc->sppt_apu_only, NULL);

	amd_pmf_send_cmd(dev, SET_STT_MIN_LIMIT, false, pc->stt_min, NULL);

	amd_pmf_send_cmd(dev, SET_STT_LIMIT_APU, false, pc->stt_skin_temp[STT_TEMP_APU],

			 NULL);

	amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, false, pc->stt_skin_temp[STT_TEMP_HS2],

			 NULL);

	amd_pmf_send_cmd(dev, SET_STT_LIMIT_APU, false,

			 fixp_q88_fromint(pc->stt_skin_temp[STT_TEMP_APU]), NULL);

	amd_pmf_send_cmd(dev, SET_STT_LIMIT_HS2, false,

			 fixp_q88_fromint(pc->stt_skin_temp[STT_TEMP_HS2]), NULL);



	if (is_apmf_func_supported(dev, APMF_FUNC_SET_FAN_IDX))

		apmf_update_fan_idx(dev,

drivers/platform/x86/amd/pmf/core.c

+14 −0
Original line number Diff line number Diff line
@@ -176,6 +176,20 @@ static void __maybe_unused amd_pmf_dump_registers(struct amd_pmf_dev *dev) 
	dev_dbg(dev->dev, "AMD_PMF_REGISTER_MESSAGE:%x\n", value);

}



/**

 * fixp_q88_fromint: Convert integer to Q8.8

 * @val: input value

 *

 * Converts an integer into binary fixed point format where 8 bits

 * are used for integer and 8 bits are used for the decimal.

 *

 * Return: unsigned integer converted to Q8.8 format

 */

u32 fixp_q88_fromint(u32 val)

{

	return val << 8;

}



int amd_pmf_send_cmd(struct amd_pmf_dev *dev, u8 message, bool get, u32 arg, u32 *data)

{

	int rc;