Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

Merge tag 'platform-drivers-x86-v4.10-1' of... 

Merge tag 'platform-drivers-x86-v4.10-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86

Pull x86 platform driver updates from Darrent Hart:
 "Introduce one new driver for Mellanox platforms. Add support for
  various new models to existing drivers via quirks, hotkeys, etc.
  Significant updates to intel_pmc_core in support of Kabylake and
  Sunrise Point PCH power management debug. Some cleanup and refactoring
  across various drivers.

  Detailed summary:

  dell-laptop:
   - Use brightness_set_blocking for kbd_led_level_set

  thinkpad_acpi:
   - Initialize local in_tablet_mode and type
   - Fix old style declaration GCC warning
   - Adding new hotkey ID for Lenovo thinkpad
   - Add support for X1 Yoga (2016) Tablet Mode
   - Move tablet detection into separate function

  asus-nb-wmi:
   - Add X45U quirk
   - Make use of dmi->ident

  asus-wmi:
   - Set specified XUSB2PR value for X550LB

  intel_mid_thermal:
   - Fix suspend handlers unused warning

  intel-vbtn:
   - Switch to use devm_input_allocate_device

  dell-wmi:
   - Add events created by Dell Rugged 2-in-1s
   - Adjust wifi catcher to emit KEY_WLAN

  intel_pmc_core:
   - Add KBL CPUID support
   - Add LTR IGNORE debug feature
   - Add MPHY PLL clock gating status
   - ModPhy core lanes pg status
   - Add PCH IP Power Gating Status
   - Fix PWRMBASE mask and mmio reg len

  acer-wmi:
   - Only supports AMW0_GUID1 on acer family

  mlx-platform:
   - Introduce support for Mellanox hotplug driver

  platform/x86:
   - Use ACPI_FAILURE at appropriate places"

* tag 'platform-drivers-x86-v4.10-1' of git://git.infradead.org/users/dvhart/linux-platform-drivers-x86: (22 commits)
  platform/x86: thinkpad_acpi: Initialize local in_tablet_mode and type
  platform/x86: dell-laptop: Use brightness_set_blocking for kbd_led_level_set
  platform/x86: thinkpad_acpi: Fix old style declaration GCC warning
  platform/x86: thinkpad_acpi: Adding new hotkey ID for Lenovo thinkpad
  platform/x86: thinkpad_acpi: Add support for X1 Yoga (2016) Tablet Mode
  platform/x86: thinkpad_acpi: Move tablet detection into separate function
  platform/x86: asus-nb-wmi.c: Add X45U quirk
  platform/x86: asus-nb-wmi: Make use of dmi->ident
  platform/x86: asus-wmi: Set specified XUSB2PR value for X550LB
  platform/x86: intel_mid_thermal: Fix suspend handlers unused warning
  platform/x86: intel-vbtn: Switch to use devm_input_allocate_device
  platform/x86: Use ACPI_FAILURE at appropriate places
  platform/x86: dell-wmi: Add events created by Dell Rugged 2-in-1s
  platform/x86: dell-wmi: Adjust wifi catcher to emit KEY_WLAN
  platform/x86: intel_pmc_core: Add KBL CPUID support
  platform/x86: intel_pmc_core: Add LTR IGNORE debug feature
  platform/x86: intel_pmc_core: Add MPHY PLL clock gating status
  platform/x86: intel_pmc_core: ModPhy core lanes pg status
  platform/x86: intel_pmc_core: Add PCH IP Power Gating Status
  platform/x86: intel_pmc_core: Fix PWRMBASE mask and mmio reg len
  ...
parents 8600b697 cb2bf251

Documentation/laptops/thinkpad-acpi.txt

+1 −0
Original line number Diff line number Diff line
@@ -540,6 +540,7 @@ Events that are propagated by the driver to userspace: 
0x6022		ALARM: a sensor is extremely hot

0x6030		System thermal table changed

0x6040		Nvidia Optimus/AC adapter related (TO BE VERIFIED)

0x60C0		X1 Yoga 2016, Tablet mode status changed



Battery nearly empty alarms are a last resort attempt to get the

operating system to hibernate or shutdown cleanly (0x2313), or shutdown

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -8045,6 +8045,13 @@ L: platform-driver-x86@vger.kernel.org 
S:      Supported

F:      arch/x86/platform/mellanox/mlx-platform.c



MELLANOX MLX CPLD HOTPLUG DRIVER

M:	Vadim Pasternak <vadimp@mellanox.com>

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

S:	Supported

F:	drivers/platform/x86/mlxcpld-hotplug.c

F:	include/linux/platform_data/mlxcpld-hotplug.h



SOFT-ROCE DRIVER (rxe)

M:	Moni Shoua <monis@mellanox.com>

L:	linux-rdma@vger.kernel.org

drivers/platform/x86/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -1027,4 +1027,15 @@ config INTEL_TELEMETRY 
	  used to get various SoC events and parameters

	  directly via debugfs files. Various tools may use

	  this interface for SoC state monitoring.



config MLX_CPLD_PLATFORM

	tristate "Mellanox platform hotplug driver support"

	default n

	depends on MLX_PLATFORM

	select HWMON

	select I2C

	---help---

	  This driver handles hot-plug events for the power suppliers, power

	  cables and fans on the wide range Mellanox IB and Ethernet systems.



endif # X86_PLATFORM_DEVICES

drivers/platform/x86/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -71,3 +71,4 @@ obj-$(CONFIG_INTEL_TELEMETRY) += intel_telemetry_core.o \ 
				   intel_telemetry_pltdrv.o \

				   intel_telemetry_debugfs.o

obj-$(CONFIG_INTEL_PMC_CORE)    += intel_pmc_core.o

obj-$(CONFIG_MLX_CPLD_PLATFORM)	+= mlxcpld-hotplug.o

drivers/platform/x86/acer-wmi.c

+56 −0
Original line number Diff line number Diff line
@@ -355,6 +355,32 @@ static const struct dmi_system_id acer_blacklist[] __initconst = { 
	{}

};



static const struct dmi_system_id amw0_whitelist[] __initconst = {

	{

		.ident = "Acer",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Acer"),

		},

	},

	{

		.ident = "Gateway",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Gateway"),

		},

	},

	{

		.ident = "Packard Bell",

		.matches = {

			DMI_MATCH(DMI_SYS_VENDOR, "Packard Bell"),

		},

	},

	{}

};



/*

 * This quirk table is only for Acer/Gateway/Packard Bell family

 * that those machines are supported by acer-wmi driver.

 */

static const struct dmi_system_id acer_quirks[] __initconst = {

	{

		.callback = dmi_matched,
@@ -464,6 +490,17 @@ static const struct dmi_system_id acer_quirks[] __initconst = { 
		},

		.driver_data = &quirk_acer_travelmate_2490,

	},

	{}

};



/*

 * This quirk list is for those non-acer machines that have AMW0_GUID1

 * but supported by acer-wmi in past days. Keeping this quirk list here

 * is only for backward compatible. Please do not add new machine to

 * here anymore. Those non-acer machines should be supported by

 * appropriate wmi drivers.

 */

static const struct dmi_system_id non_acer_quirks[] __initconst = {

	{

		.callback = dmi_matched,

		.ident = "Fujitsu Siemens Amilo Li 1718",
@@ -598,6 +635,7 @@ static void __init find_quirks(void) 
{

	if (!force_series) {

		dmi_check_system(acer_quirks);

		dmi_check_system(non_acer_quirks);

	} else if (force_series == 2490) {

		quirks = &quirk_acer_travelmate_2490;

	}
@@ -2107,6 +2145,24 @@ static int __init acer_wmi_init(void) 


	find_quirks();



	/*

	 * The AMW0_GUID1 wmi is not only found on Acer family but also other

	 * machines like Lenovo, Fujitsu and Medion. In the past days,

	 * acer-wmi driver handled those non-Acer machines by quirks list.

	 * But actually acer-wmi driver was loaded on any machines that have

	 * AMW0_GUID1. This behavior is strange because those machines should

	 * be supported by appropriate wmi drivers. e.g. fujitsu-laptop,

	 * ideapad-laptop. So, here checks the machine that has AMW0_GUID1

	 * should be in Acer/Gateway/Packard Bell white list, or it's already

	 * in the past quirk list.

	 */

	if (wmi_has_guid(AMW0_GUID1) &&

	    !dmi_check_system(amw0_whitelist) &&

	    quirks == &quirk_unknown) {

		pr_err("Unsupported machine has AMW0_GUID1, unable to load\n");

		return -ENODEV;

	}



	/*

	 * Detect which ACPI-WMI interface we're using.

	 */