From: Sergey Miroshnichenko <s.miroshnichenko@yadro.com>
To: <linux-pci@vger.kernel.org>
Cc: <linux@yadro.com>, Sergey Miroshnichenko <s.miroshnichenko@yadro.com>
Subject: [PATCH RFC v2 02/21] PCI: Define PCI-specific version of the release_child_resources()
Date: Fri, 11 Jan 2019 18:36:48 +0300 [thread overview]
Message-ID: <20190111153707.10140-3-s.miroshnichenko@yadro.com> (raw)
In-Reply-To: <20190111153707.10140-1-s.miroshnichenko@yadro.com>
Make the released resources of a bridge valid for later re-assignment:
clear the STARTALIGN flad.
Resources marked with PCI_FIXED must preserve their offset and size.
Signed-off-by: Sergey Miroshnichenko <s.miroshnichenko@yadro.com>
---
drivers/pci/setup-bus.c | 44 ++++++++++++++++++++++++++++++++++++++++-
1 file changed, 43 insertions(+), 1 deletion(-)
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index ed960436df5e..bd728160c517 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1520,6 +1520,48 @@ static void __pci_bridge_assign_resources(const struct pci_dev *bridge,
(IORESOURCE_IO | IORESOURCE_MEM | IORESOURCE_PREFETCH |\
IORESOURCE_MEM_64)
+/*
+ * Similar to release_child_resources(), but aware of PCI_FIXED and STARTALIGN flags
+ */
+static void pci_release_child_resources(struct resource *r)
+{
+ struct resource *tmp, *p;
+
+ if (!r)
+ return;
+
+ p = r->child;
+ r->child = NULL;
+ while (p) {
+ resource_size_t size = resource_size(p);
+
+ tmp = p;
+ p = p->sibling;
+
+ tmp->parent = NULL;
+ tmp->sibling = NULL;
+ pci_release_child_resources(tmp);
+
+ if (!tmp->flags)
+ continue;
+
+ if (tmp->flags & IORESOURCE_PCI_FIXED) {
+ pr_debug("PCI: release fixed %pR (%s), keep its flags, base and size\n",
+ tmp, tmp->name);
+ continue;
+ }
+
+ pr_debug("PCI: release %pR (%s)\n", tmp, tmp->name);
+
+ /* need to restore size, and keep all the flags but STARTALIGN */
+ tmp->start = 0;
+ tmp->end = size - 1;
+
+ tmp->flags &= ~IORESOURCE_STARTALIGN;
+ tmp->flags |= IORESOURCE_SIZEALIGN;
+ }
+}
+
static void pci_bridge_release_resources(struct pci_bus *bus,
unsigned long type)
{
@@ -1565,7 +1607,7 @@ static void pci_bridge_release_resources(struct pci_bus *bus,
* if there are children under that, we should release them
* all
*/
- release_child_resources(r);
+ pci_release_child_resources(r);
if (!release_resource(r)) {
type = old_flags = r->flags & PCI_RES_TYPE_MASK;
pci_printk(KERN_DEBUG, dev, "resource %d %pR released\n",
--
2.20.1
next prev parent reply other threads:[~2019-01-11 15:44 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-11 15:36 [PATCH RFC v2 00/21] PCI: Allow BAR movement during hotplug Sergey Miroshnichenko
2019-01-11 15:36 ` [PATCH RFC v2 01/21] PCI: Fix writing invalid BARs during pci_restore_state() Sergey Miroshnichenko
2019-01-11 15:36 ` Sergey Miroshnichenko [this message]
2019-01-11 15:36 ` [PATCH RFC v2 03/21] PCI: hotplug: Add a flag for the movable BARs feature Sergey Miroshnichenko
2019-01-11 15:36 ` [PATCH RFC v2 04/21] PCI: Pause the devices with movable BARs during rescan Sergey Miroshnichenko
2019-01-11 15:36 ` [PATCH RFC v2 05/21] PCI: Release and reassign the root bridge resources " Sergey Miroshnichenko
2019-01-11 15:36 ` [PATCH RFC v2 06/21] PCI: Don't allow hotplugged devices to steal resources Sergey Miroshnichenko
2019-01-11 15:36 ` [PATCH RFC v2 07/21] PCI: Mark immovable BARs with PCI_FIXED Sergey Miroshnichenko
2019-01-11 15:36 ` [PATCH RFC v2 08/21] PCI: Include fixed BARs into the bus size calculating Sergey Miroshnichenko
2019-01-11 15:36 ` [PATCH RFC v2 09/21] PCI: Don't reserve memory for hotplug when enabled movable BARs Sergey Miroshnichenko
2019-01-11 15:36 ` [PATCH RFC v2 10/21] PCI: Allow the failed resources to be reassigned later Sergey Miroshnichenko
2019-01-11 15:36 ` [PATCH RFC v2 11/21] PCI: Calculate fixed areas of bridge windows based on fixed BARs Sergey Miroshnichenko
2019-01-11 15:36 ` [PATCH RFC v2 12/21] PCI: Calculate boundaries for bridge windows Sergey Miroshnichenko
2019-01-11 15:36 ` [PATCH RFC v2 13/21] PCI: Make sure bridge windows include their fixed BARs Sergey Miroshnichenko
2019-01-11 15:37 ` [PATCH RFC v2 14/21] PCI: Prioritize fixed BAR assigning over the movable ones Sergey Miroshnichenko
2019-01-11 15:37 ` [PATCH RFC v2 15/21] PCI: Fix race condition in pci_enable/disable_device() Sergey Miroshnichenko
2019-01-11 15:37 ` [PATCH RFC v2 16/21] PCI: Enable bridge's I/O and MEM access for hotplugged devices Sergey Miroshnichenko
2019-01-11 15:37 ` [PATCH RFC v2 17/21] PCI: pciehp: Add support for the movable BARs feature Sergey Miroshnichenko
2019-01-11 15:37 ` [PATCH RFC v2 18/21] nvme-pci: Handle movable BARs Sergey Miroshnichenko
2019-01-11 15:37 ` [PATCH RFC v2 19/21] powerpc/pci: Fix crash with enabled " Sergey Miroshnichenko
2019-01-11 15:37 ` [PATCH RFC v2 20/21] PCI: Wake up bridges during rescan when movable BARs enabled Sergey Miroshnichenko
2019-01-11 15:37 ` [PATCH RFC v2 21/21] x86: enable movable BARs Sergey Miroshnichenko
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=20190111153707.10140-3-s.miroshnichenko@yadro.com \
--to=s.miroshnichenko@yadro.com \
--cc=linux-pci@vger.kernel.org \
--cc=linux@yadro.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).