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

Merge tag 'platform-drivers-x86-v5.12-2' of... 

Merge tag 'platform-drivers-x86-v5.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86

Pull x86 platform drivers fixes from Hans de Goede:
 "A set of bug-fixes and some model specific quirks.

  Summary:

   - dell-wmi-sysman: A set of probe-error-exit-handling fixes to fix
     some systems which advertise the WMI GUIDs, but are not compatible,
     not booting

   - intel-vbtn/intel-hid: Misc. bugfixes

   - intel_pmc: Bug-fixes + a quirk to lower suspend power-consumption
     on Tiger Lake

   - thinkpad_acpi: misc bugfixes"

* tag 'platform-drivers-x86-v5.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
  platform/x86: intel_pmc_core: Ignore GBE LTR on Tiger Lake platforms
  platform/x86: intel_pmc_core: Update Kconfig
  platform/x86: intel_pmt_crashlog: Fix incorrect macros
  platform/x86: intel_pmt_class: Initial resource to 0
  platform/x86: intel-vbtn: Stop reporting SW_DOCK events
  platform/x86: dell-wmi-sysman: Cleanup create_attributes_level_sysfs_files()
  platform/x86: dell-wmi-sysman: Make sysman_init() return -ENODEV of the interfaces are not found
  platform/x86: dell-wmi-sysman: Cleanup sysman_init() error-exit handling
  platform/x86: dell-wmi-sysman: Fix release_attributes_data() getting called twice on init_bios_attributes() failure
  platform/x86: dell-wmi-sysman: Make it safe to call exit_foo_attributes() multiple times
  platform/x86: dell-wmi-sysman: Fix possible NULL pointer deref on exit
  platform/x86: dell-wmi-sysman: Fix crash caused by calling kset_unregister twice
  platform/x86: thinkpad_acpi: Disable DYTC CQL mode around switching to balanced mode
  platform/x86: thinkpad_acpi: Allow the FnLock LED to change state
  platform/x86: thinkpad_acpi: check dytc version for lapmode sysfs
  platform/x86: intel-hid: Support Lenovo ThinkPad X1 Tablet Gen 2
parents 8a9d2e13 d1635448

drivers/platform/x86/Kconfig

+8 −3
Original line number Diff line number Diff line
@@ -1173,15 +1173,20 @@ config INTEL_PMC_CORE 
	depends on PCI

	help

	  The Intel Platform Controller Hub for Intel Core SoCs provides access

	  to Power Management Controller registers via a PCI interface. This

	  to Power Management Controller registers via various interfaces. This

	  driver can utilize debugging capabilities and supported features as

	  exposed by the Power Management Controller.

	  exposed by the Power Management Controller. It also may perform some

	  tasks in the PMC in order to enable transition into the SLPS0 state.

	  It should be selected on all Intel platforms supported by the driver.



	  Supported features:

		- SLP_S0_RESIDENCY counter

		- PCH IP Power Gating status

		- LTR Ignore

		- LTR Ignore / LTR Show

		- MPHY/PLL gating status (Sunrisepoint PCH only)

		- SLPS0 Debug registers (Cannonlake/Icelake PCH)

		- Low Power Mode registers (Tigerlake and beyond)

		- PMC quirks as needed to enable SLPS0/S0ix



config INTEL_PMT_CLASS

	tristate

drivers/platform/x86/dell/dell-wmi-sysman/enum-attributes.c

+3 −0
Original line number Diff line number Diff line
@@ -185,5 +185,8 @@ void exit_enum_attributes(void) 
			sysfs_remove_group(wmi_priv.enumeration_data[instance_id].attr_name_kobj,

								&enumeration_attr_group);

	}

	wmi_priv.enumeration_instances_count = 0;



	kfree(wmi_priv.enumeration_data);

	wmi_priv.enumeration_data = NULL;

}

drivers/platform/x86/dell/dell-wmi-sysman/int-attributes.c

+3 −0
Original line number Diff line number Diff line
@@ -175,5 +175,8 @@ void exit_int_attributes(void) 
			sysfs_remove_group(wmi_priv.integer_data[instance_id].attr_name_kobj,

								&integer_attr_group);

	}

	wmi_priv.integer_instances_count = 0;



	kfree(wmi_priv.integer_data);

	wmi_priv.integer_data = NULL;

}

drivers/platform/x86/dell/dell-wmi-sysman/passobj-attributes.c

+3 −0
Original line number Diff line number Diff line
@@ -183,5 +183,8 @@ void exit_po_attributes(void) 
			sysfs_remove_group(wmi_priv.po_data[instance_id].attr_name_kobj,

								&po_attr_group);

	}

	wmi_priv.po_instances_count = 0;



	kfree(wmi_priv.po_data);

	wmi_priv.po_data = NULL;

}

drivers/platform/x86/dell/dell-wmi-sysman/string-attributes.c

+3 −0
Original line number Diff line number Diff line
@@ -155,5 +155,8 @@ void exit_str_attributes(void) 
			sysfs_remove_group(wmi_priv.str_data[instance_id].attr_name_kobj,

								&str_attr_group);

	}

	wmi_priv.str_instances_count = 0;



	kfree(wmi_priv.str_data);

	wmi_priv.str_data = NULL;

}