From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 1 Nov 2023 03:53:00 +0000 (-1000)
Subject: Merge tag 'platform-drivers-x86-v6.7-1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=59fff63cc2b75dcfe08f9eeb4b2187d73e53843d;p=linux.git

Merge tag 'platform-drivers-x86-v6.7-1' of git://git./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
  ...
---

59fff63cc2b75dcfe08f9eeb4b2187d73e53843d
diff --cc drivers/platform/x86/intel/ifs/runtest.c
index 43c864add778f,9c1a027bc5919..13ecd55c66680
--- a/drivers/platform/x86/intel/ifs/runtest.c
+++ b/drivers/platform/x86/intel/ifs/runtest.c
@@@ -331,15 -384,17 +384,18 @@@ int do_core_test(int cpu, struct devic
  	switch (test->test_num) {
  	case IFS_TYPE_SAF:
  		if (!ifsd->loaded)
 -			return -EPERM;
 -		ifs_test_core(cpu, dev);
 +			ret = -EPERM;
 +		else
 +			ifs_test_core(cpu, dev);
  		break;
  	case IFS_TYPE_ARRAY_BIST:
- 		ifs_array_test_core(cpu, dev);
+ 		if (ifsd->array_gen == ARRAY_GEN0)
+ 			ifs_array_test_core(cpu, dev);
+ 		else
+ 			ifs_array_test_gen1(cpu, dev);
  		break;
  	default:
 -		return -EINVAL;
 +		ret = -EINVAL;
  	}
  out:
  	cpus_read_unlock();