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

Merge tag 'platform-drivers-x86-v5.8-1' of git://git.infradead.org/linux-platform-drivers-x86 

Pull x86 platform driver updates from Andy Shevchenko:

 - Add a support of the media keys on the ASUS laptop UX325JA/UX425JA

 - ASUS WMI driver can now handle 2-in-1 models T100TA, T100CHI, T100HA,
   T200TA

 - Big refactoring of Intel SCU driver with Elkhart Lake support has
   been added

 - Slim Bootloarder firmware update signaling WMI driver has been added

 - Thinkpad ACPI driver can handle dual fan configuration on new P and X
   models

 - Touchscreen DMI driver has been extended to support
    - MP-man MPWIN895CL tablet
    - ONDA V891 v5 tablet
    - techBite Arc 11.6
    - Trekstor Twin 10.1
    - Trekstor Yourbook C11B
    - Vinga J116

 - Virtual Button driver got a few fixes to detect mode of 2-in-1 tablet
   models

 - Intel Speed Select tools update

 - Plenty of small cleanups here and there

* tag 'platform-drivers-x86-v5.8-1' of git://git.infradead.org/linux-platform-drivers-x86: (89 commits)
  platform/x86: dcdbas: Check SMBIOS for protected buffer address
  platform/x86: asus_wmi: Reserve more space for struct bias_args
  platform/x86: intel-vbtn: Only blacklist SW_TABLET_MODE on the 9 / "Laptop" chasis-type
  platform/x86: intel-hid: Add a quirk to support HP Spectre X2 (2015)
  platform/x86: touchscreen_dmi: Update Trekstor Twin 10.1 entry
  platform/x86: touchscreen_dmi: Add info for the Trekstor Yourbook C11B
  platform/x86: hp-wmi: Introduce HPWMI_POWER_FW_OR_HW as convenient shortcut
  platform/x86: hp-wmi: Convert simple_strtoul() to kstrtou32()
  platform/x86: hp-wmi: Refactor postcode_store() to follow standard patterns
  platform/x86: acerhdf: replace space by * in modalias
  platform/x86: ISST: Increase timeout
  tools/power/x86/intel-speed-select: Fix invalid core mask
  tools/power/x86/intel-speed-select: Increase CPU count
  tools/power/x86/intel-speed-select: Fix json perf-profile output output
  platform/x86: dell-wmi: Ignore keyboard attached / detached events
  platform/x86: dell-laptop: don't register micmute LED if there is no token
  platform/x86: thinkpad_acpi: Replace custom approach by kstrtoint()
  platform/x86: thinkpad_acpi: Use strndup_user() in dispatch_proc_write()
  platform/x86: thinkpad_acpi: Replace next_cmd(&buf) with strsep(&buf, ",")
  platform/x86: intel-vbtn: Detect switch position before registering the input-device
  ...
parents c5d6c138 47a94c55

Documentation/ABI/obsolete/sysfs-driver-intel_pmc_bxt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
These files allow sending arbitrary IPC commands to the PMC/SCU which

may be dangerous. These will be removed eventually and should not be

used in any new applications.



What:		/sys/bus/platform/devices/INT34D2:00/simplecmd

Date:		Jun 2015

KernelVersion:	4.1

Contact:	Mika Westerberg <mika.westerberg@linux.intel.com>

Description:	This interface allows userspace to send an arbitrary

		IPC command to the PMC/SCU.



		Format: %d %d where first number is command and

		second number is subcommand.



What:		/sys/bus/platform/devices/INT34D2:00/northpeak

Date:		Jun 2015

KernelVersion:	4.1

Contact:	Mika Westerberg <mika.westerberg@linux.intel.com>

Description:	This interface allows userspace to enable and disable

		Northpeak through the PMC/SCU.



		Format: %u.

Documentation/ABI/testing/sysfs-platform-intel-wmi-sbl-fw-update

0 → 100644
+12 −0
Original line number Diff line number Diff line 
What:		/sys/bus/wmi/devices/44FADEB1-B204-40F2-8581-394BBDC1B651/firmware_update_request

Date:		April 2020

KernelVersion:	5.7

Contact:	"Jithu Joseph" <jithu.joseph@intel.com>

Description:

		Allow user space entities to trigger update of Slim

		Bootloader (SBL). This attribute normally has a value

		of 0 and userspace can signal SBL to update firmware,

		on next reboot, by writing a value of 1.

		There are two available states:

		    * 0 -> Skip firmware update while rebooting

		    * 1 -> Attempt firmware update on next reboot

MAINTAINERS

+27 −9
Original line number Diff line number Diff line
@@ -8529,6 +8529,13 @@ L: platform-driver-x86@vger.kernel.org 
S:	Maintained

F:	drivers/platform/x86/intel_atomisp2_pm.c













INTEL BROXTON PMC DRIVER













M:	Mika Westerberg <mika.westerberg@linux.intel.com>













M:	Zha Qipeng <qipeng.zha@intel.com>













S:	Maintained













F:	drivers/mfd/intel_pmc_bxt.c













F:	include/linux/mfd/intel_pmc_bxt.h



























INTEL C600 SERIES SAS CONTROLLER DRIVER















M:	Intel SCU Linux support <intel-linux-scu@intel.com>















M:	Artur Paszkiewicz <artur.paszkiewicz@intel.com>










@@ -8736,6 +8743,13 @@ F:	include/uapi/linux/mic_common.h













F:	include/uapi/linux/mic_ioctl.h















F:	include/uapi/linux/scif_ioctl.h



























INTEL P-Unit IPC DRIVER













M:	Zha Qipeng <qipeng.zha@intel.com>













L:	platform-driver-x86@vger.kernel.org













S:	Maintained













F:	arch/x86/include/asm/intel_punit_ipc.h













F:	drivers/platform/x86/intel_punit_ipc.c



























INTEL PMC CORE DRIVER















M:	Rajneesh Bhardwaj <rajneesh.bhardwaj@intel.com>















M:	Vishwanath Somayaji <vishwanath.somayaji@intel.com>









@@ -8743,15 +8757,6 @@ L:	platform-driver-x86@vger.kernel.org













S:	Maintained















F:	drivers/platform/x86/intel_pmc_core*



























INTEL PMC/P-Unit IPC DRIVER













M:	Zha Qipeng<qipeng.zha@intel.com>













L:	platform-driver-x86@vger.kernel.org













S:	Maintained













F:	arch/x86/include/asm/intel_pmc_ipc.h













F:	arch/x86/include/asm/intel_punit_ipc.h













F:	drivers/platform/x86/intel_pmc_ipc.c













F:	drivers/platform/x86/intel_punit_ipc.c



























INTEL PMIC GPIO DRIVERS















M:	Andy Shevchenko <andy@kernel.org>















S:	Maintained










@@ -8790,6 +8795,12 @@ S:	Supported













F:	drivers/infiniband/hw/i40iw/















F:	include/uapi/rdma/i40iw-abi.h



























INTEL SCU DRIVERS













M:	Mika Westerberg <mika.westerberg@linux.intel.com>













S:	Maintained













F:	arch/x86/include/asm/intel_scu_ipc.h













F:	drivers/platform/x86/intel_scu_*



























INTEL SPEED SELECT TECHNOLOGY















M:	Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>















L:	platform-driver-x86@vger.kernel.org










@@ -8856,6 +8867,13 @@ F:	Documentation/admin-guide/wimax/i2400m.rst













F:	drivers/net/wimax/i2400m/















F:	include/uapi/linux/wimax/i2400m.h



























INTEL WMI SLIM BOOTLOADER (SBL) FIRMWARE UPDATE DRIVER













M:	Jithu Joseph <jithu.joseph@intel.com>













R:	Maurice Ma <maurice.ma@intel.com>













S:	Maintained













W:	https://slimbootloader.github.io/security/firmware-update.html













F:	drivers/platform/x86/intel-wmi-sbl-fw-update.c



























INTEL WMI THUNDERBOLT FORCE POWER DRIVER















M:	Mario Limonciello <mario.limonciello@dell.com>















S:	Maintained

































arch/x86/Kconfig



+1
−1






























Original line number
Diff line number
Diff line








@@ -597,7 +597,7 @@ config X86_INTEL_MID













	select I2C















	select DW_APB_TIMER















	select APB_TIMER













	select INTEL_SCU_IPC













	select INTEL_SCU_PCI















	select MFD_INTEL_MSIC















	---help---















	  Select to build a kernel capable of supporting Intel MID (Mobile

































arch/x86/include/asm/intel-mid.h



+6
−3






























Original line number
Diff line number
Diff line








@@ -88,11 +88,17 @@ static inline bool intel_mid_has_msic(void)













	return (intel_mid_identify_cpu() == INTEL_MID_CPU_CHIP_PENWELL);















}





























extern void intel_scu_devices_create(void);













extern void intel_scu_devices_destroy(void);





























#else /* !CONFIG_X86_INTEL_MID */































#define intel_mid_identify_cpu()	0















#define intel_mid_has_msic()		0





























static inline void intel_scu_devices_create(void) { }













static inline void intel_scu_devices_destroy(void) { }





























#endif /* !CONFIG_X86_INTEL_MID */































enum intel_mid_timer_options {









@@ -115,9 +121,6 @@ extern enum intel_mid_timer_options intel_mid_timer_options;













#define SFI_MTMR_MAX_NUM		8















#define SFI_MRTC_MAX			8





























extern void intel_scu_devices_create(void);













extern void intel_scu_devices_destroy(void);





























/* VRTC timer */















#define MRST_VRTC_MAP_SZ		1024















/* #define MRST_VRTC_PGOFFSET		0xc00 */









































































CRA Git | Maintained and supported by SUSTech CRA and CCSE