Commit 6ba3bb33 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'platform-drivers-x86-v6.18-4' of... 

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

Pull x86 platform driver fixes from Ilpo Järvinen:
 "This one has lots of new HW entries which adds to the size in diffstat
  but the individual changes are simple.

  Fixes

   - acer-wmi: Ignore backlight event

   - alienware-wmi-wmax: Fix quirk match table order & drop redundant
     entries

   - amd/pmc:
      - Add Xbox Ally to spurious 8042 quirk list
      - Quirk list Lenovo Legion Go 2 NVMe resume

   - msi-wmi-platform:
      - Correct GUID to uppercase
      - GUID is uncleverly copy-pasted from an example so add a DMI
        whitelist

   - intel/speed_select_if: PCIBIOS_* return code conversion

   - intel-uncore-freq & ISST: Fix kernel doc warnings

  New HW support

   - alienware-wmi-wmax:
      - Alienware 16 Aurora support
      - Alienware M support
      - Alienware X support
      - Dell G support

   - amd/pmc:
      - ROG Xbox Ally (non-X) support

   - huaway-wmi: HONOR MagicBoox X16/X14 PrintScreen & YOYO keys

   - hp-wmi:
      - Omen 16-wf1xxx fan support
      - Omen MAX 16-ah0xx fan + thermal profile support
      - Victus 16-r0 and 16-s0 fan + thermal profile support

   - intel/hid: Intel Nova Lake support

   - intel-uncore-freq:
      - Intel Panther Lake support
      - Intel Wildcat Lake support
      - Intel Nova Lake support"

* tag 'platform-drivers-x86-v6.18-4' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86: (21 commits)
  platform/x86: intel-uncore-freq: fix all header kernel-doc warnings
  platform/x86: acer-wmi: Ignore backlight event
  platform/x86/intel/speed_select_if: Convert PCIBIOS_* return codes to errnos
  platform/x86/intel/hid: Add Nova Lake support
  platform/x86: alienware-wmi-wmax: Add AWCC support to Alienware 16 Aurora
  platform/x86: hp-wmi: Add Omen MAX 16-ah0xx fan support and thermal profile
  platform/x86: msi-wmi-platform: Fix typo in WMI GUID
  platform/x86: msi-wmi-platform: Only load on MSI devices
  platform/x86/amd: pmc: Add Lenovo Legion Go 2 to pmc quirk list
  platform/x86/amd/pmc: Add spurious_8042 to Xbox Ally
  platform/x86/amd/pmc: Add support for Van Gogh SoC
  platform/x86: alienware-wmi-wmax: Add support for the whole "G" family
  platform/x86: alienware-wmi-wmax: Add support for the whole "X" family
  platform/x86: alienware-wmi-wmax: Add support for the whole "M" family
  platform/x86: alienware-wmi-wmax: Drop redundant DMI entries
  platform/x86: alienware-wmi-wmax: Fix "Alienware m16 R1 AMD" quirk order
  platform/x86: ISST: isst_if.h: fix all kernel-doc warnings
  platform/x86: intel-uncore-freq: Add additional client processors
  platform/x86: hp-wmi: Add Omen 16-wf1xxx fan support
  platform/x86: huawei-wmi: add keys for HONOR models
  ...
parents 8e621c9a db302333

Documentation/wmi/driver-development-guide.rst

+1 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ to matching WMI devices using a struct wmi_device_id table: 
::



  static const struct wmi_device_id foo_id_table[] = {

         /* Only use uppercase letters! */

         { "936DA01F-9ABD-4D9D-80C7-02AF85C822A8", NULL },

         { }

  };

drivers/platform/x86/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -545,6 +545,7 @@ config MSI_WMI 
config MSI_WMI_PLATFORM

	tristate "MSI WMI Platform features"

	depends on ACPI_WMI

	depends on DMI

	depends on HWMON

	help

	  Say Y here if you want to have support for WMI-based platform features

drivers/platform/x86/acer-wmi.c

+4 −0
Original line number Diff line number Diff line
@@ -102,6 +102,7 @@ MODULE_ALIAS("wmi:676AA15E-6A47-4D9F-A2CC-1E6D18D14026"); 


enum acer_wmi_event_ids {

	WMID_HOTKEY_EVENT = 0x1,

	WMID_BACKLIGHT_EVENT = 0x4,

	WMID_ACCEL_OR_KBD_DOCK_EVENT = 0x5,

	WMID_GAMING_TURBO_KEY_EVENT = 0x7,

	WMID_AC_EVENT = 0x8,
@@ -2369,6 +2370,9 @@ static void acer_wmi_notify(union acpi_object *obj, void *context) 
			sparse_keymap_report_event(acer_wmi_input_dev, scancode, 1, true);

		}

		break;

	case WMID_BACKLIGHT_EVENT:

		/* Already handled by acpi-video */

		break;

	case WMID_ACCEL_OR_KBD_DOCK_EVENT:

		acer_gsensor_event();

		acer_kbd_dock_event(&return_value);

drivers/platform/x86/amd/pmc/pmc-quirks.c

+25 −0
Original line number Diff line number Diff line
@@ -122,6 +122,14 @@ static const struct dmi_system_id fwbug_list[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "21A1"),

		}

	},

	{

		.ident = "ROG Xbox Ally RC73YA",

		.driver_data = &quirk_spurious_8042,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK COMPUTER INC."),

			DMI_MATCH(DMI_BOARD_NAME, "RC73YA"),

		}

	},

	/* https://bugzilla.kernel.org/show_bug.cgi?id=218024 */

	{

		.ident = "V14 G4 AMN",
@@ -204,6 +212,23 @@ static const struct dmi_system_id fwbug_list[] = { 
			DMI_MATCH(DMI_PRODUCT_NAME, "82ND"),

		}

	},

	/* https://gitlab.freedesktop.org/drm/amd/-/issues/4618 */

	{

		.ident = "Lenovo Legion Go 2",

		.driver_data = &quirk_s2idle_bug,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "83N0"),

		}

	},

	{

		.ident = "Lenovo Legion Go 2",

		.driver_data = &quirk_s2idle_bug,

		.matches = {

			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),

			DMI_MATCH(DMI_PRODUCT_NAME, "83N1"),

		}

	},

	/* https://gitlab.freedesktop.org/drm/amd/-/issues/2684 */

	{

		.ident = "HP Laptop 15s-eq2xxx",

drivers/platform/x86/amd/pmc/pmc.c

+3 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ static void amd_pmc_get_ip_info(struct amd_pmc_dev *dev) 
	switch (dev->cpu_id) {

	case AMD_CPU_ID_PCO:

	case AMD_CPU_ID_RN:

	case AMD_CPU_ID_VG:

	case AMD_CPU_ID_YC:

	case AMD_CPU_ID_CB:

		dev->num_ips = 12;
@@ -517,6 +518,7 @@ static int amd_pmc_get_os_hint(struct amd_pmc_dev *dev) 
	case AMD_CPU_ID_PCO:

		return MSG_OS_HINT_PCO;

	case AMD_CPU_ID_RN:

	case AMD_CPU_ID_VG:

	case AMD_CPU_ID_YC:

	case AMD_CPU_ID_CB:

	case AMD_CPU_ID_PS:
@@ -717,6 +719,7 @@ static const struct pci_device_id pmc_pci_ids[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_RV) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_SP) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_SHP) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, AMD_CPU_ID_VG) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M20H_ROOT) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M60H_ROOT) },

	{ }