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

Merge tag 'platform-drivers-x86-v6.16-3' of... 

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

Pull x86 platform drivers fixes from Ilpo Järvinen:
 "Mostly a few lines fixed here and there except amd/isp4 which improves
  swnodes relationships but that is a new driver not in any stable
  kernels yet. The think-lmi driver changes also look relatively large
  but there are just many fixes to it.

  The i2c/piix4 change is a effectively a revert of the commit
  7e173eb8 ("i2c: piix4: Make CONFIG_I2C_PIIX4 dependent on
  CONFIG_X86") but that required moving the header out from arch/x86
  under include/linux/platform_data/

  Summary:

   - amd/isp4: Improve swnode graph (new driver exception)

   - asus-nb-wmi: Use duo keyboard quirk for Zenbook Duo UX8406CA

   - dell-lis3lv02d: Add Latitude 5500 accelerometer address

   - dell-wmi-sysman: Fix WMI data block retrieval and class dev unreg

   - hp-bioscfg: Fix class device unregistration

   - i2c: piix4: Re-enable on non-x86 + move FCH header under platform_data/

   - intel/hid: Wildcat Lake support

   - mellanox:
      - mlxbf-pmc: Fix duplicate event ID
      - mlxbf-tmfifo: Fix vring_desc.len assignment
      - mlxreg-lc: Fix bit-not-set logic check
      - nvsw-sn2201: Fix bus number in error message & spelling errors

   - portwell-ec: Move watchdog device under correct platform hierarchy

   - think-lmi: Error handling fixes (sysfs, kset, kobject, class dev unreg)

   - thinkpad_acpi: Handle HKEY 0x1402 event (2025 Thinkpads)

   - wmi: Fix WMI event enablement"

* tag 'platform-drivers-x86-v6.16-3' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86: (22 commits)
  platform/x86: think-lmi: Fix sysfs group cleanup
  platform/x86: think-lmi: Fix kobject cleanup
  platform/x86: think-lmi: Create ksets consecutively
  platform/mellanox: mlxreg-lc: Fix logic error in power state check
  i2c: Re-enable piix4 driver on non-x86
  Move FCH header to a location accessible by all archs
  platform/x86/intel/hid: Add Wildcat Lake support
  platform/x86: dell-wmi-sysman: Fix class device unregistration
  platform/x86: think-lmi: Fix class device unregistration
  platform/x86: hp-bioscfg: Fix class device unregistration
  platform/x86: Update swnode graph for amd isp4
  platform/x86: dell-wmi-sysman: Fix WMI data block retrieval in sysfs callbacks
  platform/x86: wmi: Update documentation of WCxx/WExx ACPI methods
  platform/x86: wmi: Fix WMI event enablement
  platform/mellanox: nvsw-sn2201: Fix bus number in adapter error message
  platform/mellanox: Fix spelling and comment clarity in Mellanox drivers
  platform/mellanox: mlxbf-pmc: Fix duplicate event ID for CACHE_DATA1
  platform/x86: thinkpad_acpi: handle HKEY 0x1402 event
  platform/x86: asus-nb-wmi: add DMI quirk for ASUS Zenbook Duo UX8406CA
  platform/x86: dell-lis3lv02d: Add Latitude 5500
  ...
parents 3c2bd251 4f30f946

Documentation/wmi/acpi-interface.rst

+9 −5
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ Offset Size (in bytes) Content 


The WMI object flags control whether the method or notification ID is used:



- 0x1: Data block usage is expensive and must be explicitly enabled/disabled.

- 0x1: Data block is expensive to collect.

- 0x2: Data block contains WMI methods.

- 0x4: Data block contains ASCIZ string.

- 0x8: Data block describes a WMI event, use notification ID instead
@@ -83,14 +83,18 @@ event as hexadecimal value. Their first parameter is an integer with a value 
of 0 if the WMI event should be disabled, other values will enable

the WMI event.



Those ACPI methods are always called even for WMI events not registered as

being expensive to collect to match the behavior of the Windows driver.



WCxx ACPI methods

-----------------

Similar to the ``WExx`` ACPI methods, except that it controls data collection

instead of events and thus the last two characters of the ACPI method name are

the method ID of the data block to enable/disable.

Similar to the ``WExx`` ACPI methods, except that instead of WMI events it controls

data collection of data blocks registered as being expensive to collect. Thus the

last two characters of the ACPI method name are the method ID of the data block

to enable/disable.



Those ACPI methods are also called before setting data blocks to match the

behaviour of the Windows driver.

behavior of the Windows driver.



_WED ACPI method

----------------

arch/x86/kernel/cpu/amd.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <linux/sched/clock.h>

#include <linux/random.h>

#include <linux/topology.h>

#include <asm/amd/fch.h>

#include <linux/platform_data/x86/amd-fch.h>

#include <asm/processor.h>

#include <asm/apic.h>

#include <asm/cacheinfo.h>

drivers/i2c/busses/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ config I2C_ISMT 


config I2C_PIIX4

	tristate "Intel PIIX4 and compatible (ATI/AMD/Serverworks/Broadcom/SMSC)"

	depends on PCI && HAS_IOPORT && X86

	depends on PCI && HAS_IOPORT

	select I2C_SMBUS

	help

	  If you say yes to this option, support will be included for the Intel

drivers/i2c/busses/i2c-piix4.c

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
#include <linux/dmi.h>

#include <linux/acpi.h>

#include <linux/io.h>

#include <asm/amd/fch.h>

#include <linux/platform_data/x86/amd-fch.h>



#include "i2c-piix4.h"

drivers/platform/mellanox/mlxbf-pmc.c

+1 −1
Original line number Diff line number Diff line
@@ -715,7 +715,7 @@ static const struct mlxbf_pmc_events mlxbf_pmc_llt_events[] = { 
	{101, "GDC_BANK0_HIT_DCL_PARTIAL"},

	{102, "GDC_BANK0_EVICT_DCL"},

	{103, "GDC_BANK0_G_RSE_PIPE_CACHE_DATA0"},

	{103, "GDC_BANK0_G_RSE_PIPE_CACHE_DATA1"},

	{104, "GDC_BANK0_G_RSE_PIPE_CACHE_DATA1"},

	{105, "GDC_BANK0_ARB_STRB"},

	{106, "GDC_BANK0_ARB_WAIT"},

	{107, "GDC_BANK0_GGA_STRB"},