From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: linux-pci@vger.kernel.org
Cc: Bjorn Helgaas <helgaas@kernel.org>,
Ard Biesheuvel <ard.biesheuvel@linaro.org>,
Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>,
Sinan Kaya <okaya@kernel.org>, Ali Saidi <alisaidi@amazon.com>,
Zeev Zilberman <zeev@amazon.com>,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>
Subject: [PATCH 4/4] arm64: pci: acpi: Preserve PCI resources configuration when asked by ACPI
Date: Sat, 15 Jun 2019 10:23:59 +1000 [thread overview]
Message-ID: <20190615002359.29577-4-benh@kernel.crashing.org> (raw)
In-Reply-To: <20190615002359.29577-1-benh@kernel.crashing.org>
When _DSM #5 returns 0 for a host bridge, we need to claim the existing
resources rather than reassign everything.
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
---
arch/arm64/kernel/pci.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/arch/arm64/kernel/pci.c b/arch/arm64/kernel/pci.c
index 1419b1b4e9b9..a2c608a3fc41 100644
--- a/arch/arm64/kernel/pci.c
+++ b/arch/arm64/kernel/pci.c
@@ -168,6 +168,7 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
struct acpi_pci_generic_root_info *ri;
struct pci_bus *bus, *child;
struct acpi_pci_root_ops *root_ops;
+ struct pci_host_bridge *hb;
ri = kzalloc(sizeof(*ri), GFP_KERNEL);
if (!ri)
@@ -193,6 +194,16 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
if (!bus)
return NULL;
+ hb = pci_find_host_bridge(bus);
+
+ /* If ACPI tells us to preserve the resource configuration, claim now */
+ if (hb->preserve_config)
+ pci_bus_claim_resources(bus);
+
+ /*
+ * Assign whatever was left unassigned. If we didn't claim above, this will
+ * reassign everything.
+ */
pci_assign_unassigned_root_bus_resources(bus);
list_for_each_entry(child, &bus->children, node)
--
2.17.1
next prev parent reply other threads:[~2019-06-15 0:30 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-15 0:23 [PATCH 1/4] arm64: pci: acpi: Use pci_assign_unassigned_root_bus_resources() Benjamin Herrenschmidt
2019-06-15 0:23 ` [PATCH 2/4] pci: acpi: Read _DSM #5 from ACPI on root bridges Benjamin Herrenschmidt
2019-06-21 20:07 ` Bjorn Helgaas
2019-06-15 0:23 ` [PATCH 3/4] pci: Do not auto-enable PCI reallocation when _DSM #5 returns 0 Benjamin Herrenschmidt
2019-06-21 20:07 ` Bjorn Helgaas
2019-06-15 0:23 ` Benjamin Herrenschmidt [this message]
2019-06-21 14:57 ` [PATCH 4/4] arm64: pci: acpi: Preserve PCI resources configuration when asked by ACPI Lorenzo Pieralisi
2019-06-21 23:07 ` Benjamin Herrenschmidt
2019-06-21 15:44 ` Ard Biesheuvel
2019-06-21 20:08 ` Bjorn Helgaas
2019-06-20 17:13 ` [PATCH 1/4] arm64: pci: acpi: Use pci_assign_unassigned_root_bus_resources() Lorenzo Pieralisi
2019-06-20 22:55 ` Benjamin Herrenschmidt
2019-06-21 20:06 ` Bjorn Helgaas
2019-06-21 20:48 ` Bjorn Helgaas
2019-06-21 22:58 ` Benjamin Herrenschmidt
2019-06-21 23:00 ` Benjamin Herrenschmidt
2019-06-21 23:15 ` Bjorn Helgaas
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=20190615002359.29577-4-benh@kernel.crashing.org \
--to=benh@kernel.crashing.org \
--cc=alisaidi@amazon.com \
--cc=ard.biesheuvel@linaro.org \
--cc=helgaas@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-pci@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=okaya@kernel.org \
--cc=zeev@amazon.com \
/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).