From: "Rafael J. Wysocki" <rjw@rjwysocki.net>
To: Linux ACPI <linux-acpi@vger.kernel.org>
Cc: Hans De Goede <hdegoede@redhat.com>,
LKML <linux-kernel@vger.kernel.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Mika Westerberg <mika.westerberg@linux.intel.com>
Subject: [RFT][PATCH v1 3/3] ACPI: scan: Avoid unnecessary second pass in acpi_bus_scan()
Date: Mon, 14 Dec 2020 21:32:44 +0100 [thread overview]
Message-ID: <1954514.xqII67ylRR@kreacher> (raw)
In-Reply-To: <1646930.v2jOOB1UEN@kreacher>
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
If there are no devices whose enumeration has been deferred after
the first pass in acpi_bus_scan(), the second pass is not necssary,
so avoid it with the help of a new static variable.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
drivers/acpi/scan.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
Index: linux-pm/drivers/acpi/scan.c
===================================================================
--- linux-pm.orig/drivers/acpi/scan.c
+++ linux-pm/drivers/acpi/scan.c
@@ -1910,6 +1910,8 @@ static void acpi_scan_dep_init(struct ac
mutex_unlock(&acpi_dep_list_lock);
}
+static bool acpi_bus_scan_second_pass;
+
static acpi_status acpi_bus_check_add(acpi_handle handle, bool check_dep,
struct acpi_device **adev_p)
{
@@ -1934,8 +1936,10 @@ static acpi_status acpi_bus_check_add(ac
if (type == ACPI_BUS_TYPE_DEVICE && check_dep) {
u32 count = acpi_scan_check_dep(handle);
/* Bail out if the number of recorded dependencies is not 0. */
- if (count > 0)
+ if (count > 0) {
+ acpi_bus_scan_second_pass = true;
return AE_CTRL_DEPTH;
+ }
}
acpi_add_single_object(&device, handle, type, sta);
@@ -2136,6 +2140,8 @@ int acpi_bus_scan(acpi_handle handle)
{
struct acpi_device *device = NULL;
+ acpi_bus_scan_second_pass = false;
+
/* Pass 1: Avoid enumerating devices with missing dependencies. */
if (ACPI_SUCCESS(acpi_bus_check_add(handle, true, &device)))
@@ -2148,6 +2154,9 @@ int acpi_bus_scan(acpi_handle handle)
acpi_bus_attach(device, true);
+ if (!acpi_bus_scan_second_pass)
+ return 0;
+
/* Pass 2: Enumerate all of the remaining devices. */
device = NULL;
next prev parent reply other threads:[~2020-12-14 20:35 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-14 20:23 [RFT][PATCH v1 0/3] ACPI: scan: Defer enumeration of devices with significant dependencies Rafael J. Wysocki
2020-12-14 20:25 ` [RFT][PATCH v1 1/3] ACPI: scan: Evaluate _DEP before adding the device Rafael J. Wysocki
2020-12-14 20:27 ` [RFT][PATCH v1 2/3] ACPI: scan: Defer enumeration of devices with _DEP lists Rafael J. Wysocki
2020-12-14 20:32 ` Rafael J. Wysocki [this message]
2020-12-15 11:17 ` [RFT][PATCH v1 0/3] ACPI: scan: Defer enumeration of devices with significant dependencies Hans de Goede
2020-12-17 9:27 ` Mika Westerberg
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=1954514.xqII67ylRR@kreacher \
--to=rjw@rjwysocki.net \
--cc=hdegoede@redhat.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mika.westerberg@linux.intel.com \
--cc=rafael@kernel.org \
/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).