From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 5 Feb 2026 12:16:10 +0000 (+0100)
Subject: Merge branch 'acpi-bus'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4322612283fc735432d544631f90a498593f4560;p=thirdparty%2Flinux.git

Merge branch 'acpi-bus'

Merge ACPI support updates related to _OSC evaluation, the handling of
"system resource" device objects, and ACPI-based device enumeration
for 6.20-rc1/7.0-rc1:

 - Fix handling of _OSC errors in acpi_run_osc() to avoid failures on
   systems where _OSC error bits are set even though the _OSC return
   buffer contains acknowledged feature bits (Rafael Wysocki)

 - Clean up and rearrange \_SB._OSC handling for general platform
   features and USB4 features to avoid code duplication and unnecessary
   memory management overhead (Rafael Wysocki)

 - Make the ACPI core device enumeration code handle PNP0C01 and PNP0C02
   ("system resource") device objects directly instead of letting the
   legacy PNP system driver handle them to avoid device enumeration
   issues on systems where PNP0C02 is present in the _CID list under
   ACPI device objects with a _HID matching a proper device driver in
   Linux (Rafael Wysocki)

 - Drop workarounds for the known device enumeration issues related to
   _CID lists containing PNP0C02 (Rafael Wysocki)

 - Drop outdated comment regarding removed function in the ACPI-based
   device enumeration code (Julia Lawall)

 - Make PRP0001 device matching work as expected for ACPI device objects
   using it as a _HID for board development and similar purposes (Kartik
   Rajput)

 - Use async schedule function in acpi_scan_clear_dep_fn() to avoid
   races with user space initialization on some systems (Yicong Yang)

* acpi-bus:
  ACPI: scan: Use async schedule function in acpi_scan_clear_dep_fn()
  ACPI: bus: Align acpi_device_get_match_data() with driver match order
  ACPI: scan: Drop outdated comment regarding removed function
  ACPI: scan: Use resource_type() for resource type checking
  ACPI: bus: Fix typo under sizeof() in acpi_run_osc()
  ACPI: bus: Adjust acpi_osc_handshake() parameter list
  ACPI: bus: Rework the handling of \_SB._OSC USB4 features
  ACPI: bus: Adjust feature mask creation for \_SB._OSC
  ACPI: bus: Rework the handling of \_SB._OSC platform features
  ACPI: bus: Rename label and use ACPI_FREE() in acpi_run_osc()
  ACPI: bus: Split _OSC error processing out of acpi_run_osc()
  ACPI: bus: Split _OSC evaluation out of acpi_run_osc()
  ACPI: bus: Rework printing debug messages on _OSC errors
  ACPI: bus: Fix handling of _OSC errors in acpi_run_osc()
  ACPI: PNP: Drop acpi_nonpnp_device_ids[]
  platform/x86/intel/vbtn: Stop creating a platform device
  platform/x86/intel/hid: Stop creating a platform device
  ACPI: PNP: Drop PNP0C01 and PNP0C02 from acpi_pnp_device_ids[]
---

4322612283fc735432d544631f90a498593f4560