Skip to content

Commit 4322612

Browse files
committed
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[]
2 parents ed0afd1 + 7cf28b3 commit 4322612

5 files changed

Lines changed: 397 additions & 331 deletions

File tree

drivers/acpi/acpi_pnp.c

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,6 @@ static const struct acpi_device_id acpi_pnp_device_ids[] = {
125125
{"PNP0401"}, /* ECP Printer Port */
126126
/* apple-gmux */
127127
{"APP000B"},
128-
/* system */
129-
{"PNP0c02"}, /* General ID for reserving resources */
130-
{"PNP0c01"}, /* memory controller */
131128
/* rtc_cmos */
132129
{"PNP0b00"},
133130
{"PNP0b01"},
@@ -346,24 +343,10 @@ static bool acpi_pnp_match(const char *idstr, const struct acpi_device_id **matc
346343
return false;
347344
}
348345

349-
/*
350-
* If one of the device IDs below is present in the list of device IDs of a
351-
* given ACPI device object, the PNP scan handler will not attach to that
352-
* object, because there is a proper non-PNP driver in the kernel for the
353-
* device represented by it.
354-
*/
355-
static const struct acpi_device_id acpi_nonpnp_device_ids[] = {
356-
{"INT3F0D"},
357-
{"INTC1080"},
358-
{"INTC1081"},
359-
{"INTC1099"},
360-
{""},
361-
};
362-
363346
static int acpi_pnp_attach(struct acpi_device *adev,
364347
const struct acpi_device_id *id)
365348
{
366-
return !!acpi_match_device_ids(adev, acpi_nonpnp_device_ids);
349+
return true;
367350
}
368351

369352
static struct acpi_scan_handler acpi_pnp_handler = {

0 commit comments

Comments
 (0)