From: Aaron Sierra <asierra@xes-inc.com>
To: linux-pci@vger.kernel.org
Cc: Bjorn Helgaas <bhelgaas@google.com>,
"Rafael J. Wysocki" <rjw@rjwysocki.net>,
Len Brown <lenb@kernel.org>
Subject: [PATCH v2 1/2] PCI/ACPI: Move _OSC test for native services to top
Date: Thu, 25 Oct 2018 11:01:31 -0500 [thread overview]
Message-ID: <1540483292-24049-2-git-send-email-asierra@xes-inc.com> (raw)
In-Reply-To: <1540483292-24049-1-git-send-email-asierra@xes-inc.com>
Move the simple test for when PCIe native services are disabled
closer to the top, prior to where things get more complicated.
Signed-off-by: Aaron Sierra <asierra@xes-inc.com>
---
drivers/acpi/pci_root.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 707aafc..eb9f14e 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -441,6 +441,12 @@ static void negotiate_os_control(struct acpi_pci_root *root, int *no_aspm,
return;
}
+ if (pcie_ports_disabled) {
+ dev_info(&device->dev,
+ "PCIe port services disabled; not requesting _OSC control\n");
+ return;
+ }
+
/*
* All supported architectures that use ACPI have support for
* PCI domains, so we indicate this in _OSC support capabilities.
@@ -468,11 +474,6 @@ static void negotiate_os_control(struct acpi_pci_root *root, int *no_aspm,
return;
}
- if (pcie_ports_disabled) {
- dev_info(&device->dev, "PCIe port services disabled; not requesting _OSC control\n");
- return;
- }
-
if ((support & ACPI_PCIE_REQ_SUPPORT) != ACPI_PCIE_REQ_SUPPORT) {
decode_osc_support(root, "not requesting OS control; OS requires",
ACPI_PCIE_REQ_SUPPORT);
--
2.7.4
next prev parent reply other threads:[~2018-10-25 16:01 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-15 22:23 [PATCH] PCI/ACPI: Improve _OSC control request granularity Aaron Sierra
2018-10-25 16:01 ` [PATCH v2 0/2] " Aaron Sierra
2018-10-25 16:01 ` Aaron Sierra [this message]
2019-01-30 22:44 ` [PATCH v2 1/2] PCI/ACPI: Move _OSC test for native services to top Bjorn Helgaas
2019-02-13 17:11 ` Aaron Sierra
2018-10-25 16:01 ` [PATCH v2 2/2] PCI/ACPI: Improve _OSC control request granularity Aaron Sierra
2019-01-30 22:57 ` Bjorn Helgaas
2019-02-13 17:31 ` Aaron Sierra
2019-02-13 17:36 ` Bjorn Helgaas
2019-02-13 21:32 ` [PATCH v3] " Aaron Sierra
2019-04-16 17:52 ` Aaron Sierra
2019-04-16 18:15 ` Bjorn Helgaas
2019-06-26 17:20 ` Bjorn Helgaas
2019-06-27 2:38 ` Aaron Sierra
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=1540483292-24049-2-git-send-email-asierra@xes-inc.com \
--to=asierra@xes-inc.com \
--cc=bhelgaas@google.com \
--cc=lenb@kernel.org \
--cc=linux-pci@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).