From: Hans de Goede <hdegoede@redhat.com>
To: "Rafael J . Wysocki" <rjw@rjwysocki.net>, Len Brown <lenb@kernel.org>
Cc: Hans de Goede <hdegoede@redhat.com>, linux-acpi@vger.kernel.org
Subject: [PATCH 1/7] ACPI: scan: Add an acpi_info_matches_hids() helper
Date: Sat, 21 Nov 2020 21:30:34 +0100 [thread overview]
Message-ID: <20201121203040.146252-2-hdegoede@redhat.com> (raw)
In-Reply-To: <20201121203040.146252-1-hdegoede@redhat.com>
acpi_device_dep_initialize() skips _DEPS with a HID of "INT3396"
and checks this using an acpi_device_info struct.
The upcoming changes splitting the scanning of the root into 2 steps,
deferring the addition of some devices which need access to OpRegions of
other devices during scanning to the second step, need to extend the
HIDs to skip during _DEP checking to a list of HIDs; and need to check
an acpi_device_info struct against a list of HIDs in more places.
Add an acpi_info_matches_hids() helper which checks a list of HIDs
for this and switch acpi_device_dep_initialize() over to this helper.
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
---
drivers/acpi/scan.c | 30 +++++++++++++++++++++++-------
1 file changed, 23 insertions(+), 7 deletions(-)
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index bc6a79e33220..e949265d5667 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -719,6 +719,28 @@ int acpi_device_add(struct acpi_device *device,
/* --------------------------------------------------------------------------
Device Enumeration
-------------------------------------------------------------------------- */
+static bool acpi_info_matches_hids(struct acpi_device_info *info,
+ const char * const hids[])
+{
+ int i;
+
+ if (!(info->valid & ACPI_VALID_HID))
+ return false;
+
+ for (i = 0; hids[i]; i++) {
+ if (!strcmp(info->hardware_id.string, hids[i]))
+ return true;
+ }
+
+ return false;
+}
+
+/* List of HIDs for which we ignore matching ACPI devices, when checking _DEP lists. */
+static const char * const acpi_ignore_dep_hids[] = {
+ "INT3396", /* Windows System Power Management Controller */
+ NULL
+};
+
static struct acpi_device *acpi_bus_get_parent(acpi_handle handle)
{
struct acpi_device *device = NULL;
@@ -1833,13 +1855,7 @@ static void acpi_device_dep_initialize(struct acpi_device *adev)
continue;
}
- /*
- * Skip the dependency of Windows System Power
- * Management Controller
- */
- skip = info->valid & ACPI_VALID_HID &&
- !strcmp(info->hardware_id.string, "INT3396");
-
+ skip = acpi_info_matches_hids(info, acpi_ignore_dep_hids);
kfree(info);
if (skip)
--
2.28.0
next prev parent reply other threads:[~2020-11-21 20:31 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-21 20:30 [PATCH 0/7] ACPI: scan: Split root scanning into 2 steps Hans de Goede
2020-11-21 20:30 ` Hans de Goede [this message]
2020-11-21 20:30 ` [PATCH 2/7] ACPI: scan: Call acpi_get_object_info() from acpi_add_single_object() Hans de Goede
2020-11-21 20:30 ` [PATCH 3/7] ACPI: scan: Add a separate cleanup exit-path to acpi_scan_init() Hans de Goede
2020-11-21 20:30 ` [PATCH 4/7] ACPI: scan: Split root scanning into 2 steps Hans de Goede
2020-11-21 20:30 ` [PATCH 5/7] ACPI: scan: Add support for deferring adding devices to the second scan phase based on the _DEP list Hans de Goede
2020-11-23 12:17 ` Rafael J. Wysocki
2020-11-23 13:30 ` Hans de Goede
2020-11-23 12:41 ` Rafael J. Wysocki
2020-11-23 13:49 ` Hans de Goede
2020-11-21 20:30 ` [PATCH 6/7] ACPI: scan: Fix battery devices not working with acpi.defer_scan_based_on_dep=1 Hans de Goede
2020-12-02 13:52 ` Rafael J. Wysocki
2020-11-21 20:30 ` [PATCH 7/7] ACPI: scan: Add some HIDs which are never bound on Cherry Trail devices to acpi_ignore_dep_hids Hans de Goede
2020-12-02 13:49 ` [PATCH 0/7] ACPI: scan: Split root scanning into 2 steps Rafael J. Wysocki
2020-12-02 15:51 ` Rafael J. Wysocki
2020-12-02 19:46 ` Rafael J. Wysocki
2020-12-02 19:39 ` Hans de Goede
2020-12-02 19:57 ` Rafael J. Wysocki
2020-12-03 9:53 ` Hans de Goede
2020-12-03 14:27 ` Rafael J. Wysocki
2020-12-05 15:44 ` Rafael J. Wysocki
2020-12-05 17:02 ` Hans de Goede
2020-12-07 17:27 ` Rafael J. Wysocki
2020-12-07 18:15 ` Hans de Goede
2021-04-29 3:43 ` [PATCH] ACPI: scan: Defer enumeration of devices with _DEP lists youling257
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201121203040.146252-2-hdegoede@redhat.com \
--to=hdegoede@redhat.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=rjw@rjwysocki.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).