From: Sergey Miroshnichenko <s.miroshnichenko@yadro.com> To: <linux-pci@vger.kernel.org>, <linuxppc-dev@lists.ozlabs.org> Cc: Bjorn Helgaas <helgaas@kernel.org>, <linux@yadro.com>, Sergey Miroshnichenko <s.miroshnichenko@yadro.com> Subject: [PATCH v5 04/23] PCI: Define PCI-specific version of the release_child_resources() Date: Fri, 16 Aug 2019 19:50:42 +0300 [thread overview] Message-ID: <20190816165101.911-5-s.miroshnichenko@yadro.com> (raw) In-Reply-To: <20190816165101.911-1-s.miroshnichenko@yadro.com> If release the bridge resources with standard release_child_resources(), it drops the .start field of children's BARs to zero, but with the STARTALIGN flag remaining set, which makes the resource invalid for reassignment. Some resources must preserve their offset and size: those marked with the PCI_FIXED and the immovable ones - which are bound by drivers without support of the movable BARs feature. Add the pci_release_child_resources() to replace release_child_resources() in handling the described PCI-specific cases. Signed-off-by: Sergey Miroshnichenko <s.miroshnichenko@yadro.com> --- drivers/pci/setup-bus.c | 54 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 79b1fa6519be..6cb8b293c576 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -1482,6 +1482,55 @@ static void __pci_bridge_assign_resources(const struct pci_dev *bridge, (IORESOURCE_IO | IORESOURCE_MEM | IORESOURCE_PREFETCH |\ IORESOURCE_MEM_64) +/* + * Similar to generic release_child_resources(), but aware of immovable BARs and + * PCI_FIXED and STARTALIGN flags + */ +static void pci_release_child_resources(struct pci_bus *bus, struct resource *r) +{ + struct pci_dev *dev; + + if (!bus || !r) + return; + + if (r->flags & IORESOURCE_PCI_FIXED) + return; + + r->child = NULL; + + list_for_each_entry(dev, &bus->devices, bus_list) { + int i; + + for (i = 0; i < PCI_NUM_RESOURCES; i++) { + struct resource *tmp = &dev->resource[i]; + resource_size_t size = resource_size(tmp); + + if (!tmp->flags || tmp->parent != r) + continue; + + tmp->parent = NULL; + tmp->sibling = NULL; + + pci_release_child_resources(dev->subordinate, tmp); + + if ((tmp->flags & IORESOURCE_PCI_FIXED) || + !pci_dev_movable_bars_supported(dev)) { + pci_dbg(dev, "release immovable %pR (%s), keep its flags, base and size\n", + tmp, tmp->name); + continue; + } + + pci_dbg(dev, "release %pR (%s)\n", tmp, tmp->name); + + 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) { @@ -1522,7 +1571,10 @@ static void pci_bridge_release_resources(struct pci_bus *bus, return; /* If there are children, release them all */ - release_child_resources(r); + if (pci_movable_bars_enabled()) + pci_release_child_resources(bus, r); + else + release_child_resources(r); if (!release_resource(r)) { type = old_flags = r->flags & PCI_RES_TYPE_MASK; pci_info(dev, "resource %d %pR released\n", -- 2.21.0
WARNING: multiple messages have this Message-ID (diff)
From: Sergey Miroshnichenko <s.miroshnichenko@yadro.com> To: <linux-pci@vger.kernel.org>, <linuxppc-dev@lists.ozlabs.org> Cc: Sergey Miroshnichenko <s.miroshnichenko@yadro.com>, Bjorn Helgaas <helgaas@kernel.org>, linux@yadro.com Subject: [PATCH v5 04/23] PCI: Define PCI-specific version of the release_child_resources() Date: Fri, 16 Aug 2019 19:50:42 +0300 [thread overview] Message-ID: <20190816165101.911-5-s.miroshnichenko@yadro.com> (raw) In-Reply-To: <20190816165101.911-1-s.miroshnichenko@yadro.com> If release the bridge resources with standard release_child_resources(), it drops the .start field of children's BARs to zero, but with the STARTALIGN flag remaining set, which makes the resource invalid for reassignment. Some resources must preserve their offset and size: those marked with the PCI_FIXED and the immovable ones - which are bound by drivers without support of the movable BARs feature. Add the pci_release_child_resources() to replace release_child_resources() in handling the described PCI-specific cases. Signed-off-by: Sergey Miroshnichenko <s.miroshnichenko@yadro.com> --- drivers/pci/setup-bus.c | 54 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 53 insertions(+), 1 deletion(-) diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 79b1fa6519be..6cb8b293c576 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c @@ -1482,6 +1482,55 @@ static void __pci_bridge_assign_resources(const struct pci_dev *bridge, (IORESOURCE_IO | IORESOURCE_MEM | IORESOURCE_PREFETCH |\ IORESOURCE_MEM_64) +/* + * Similar to generic release_child_resources(), but aware of immovable BARs and + * PCI_FIXED and STARTALIGN flags + */ +static void pci_release_child_resources(struct pci_bus *bus, struct resource *r) +{ + struct pci_dev *dev; + + if (!bus || !r) + return; + + if (r->flags & IORESOURCE_PCI_FIXED) + return; + + r->child = NULL; + + list_for_each_entry(dev, &bus->devices, bus_list) { + int i; + + for (i = 0; i < PCI_NUM_RESOURCES; i++) { + struct resource *tmp = &dev->resource[i]; + resource_size_t size = resource_size(tmp); + + if (!tmp->flags || tmp->parent != r) + continue; + + tmp->parent = NULL; + tmp->sibling = NULL; + + pci_release_child_resources(dev->subordinate, tmp); + + if ((tmp->flags & IORESOURCE_PCI_FIXED) || + !pci_dev_movable_bars_supported(dev)) { + pci_dbg(dev, "release immovable %pR (%s), keep its flags, base and size\n", + tmp, tmp->name); + continue; + } + + pci_dbg(dev, "release %pR (%s)\n", tmp, tmp->name); + + 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) { @@ -1522,7 +1571,10 @@ static void pci_bridge_release_resources(struct pci_bus *bus, return; /* If there are children, release them all */ - release_child_resources(r); + if (pci_movable_bars_enabled()) + pci_release_child_resources(bus, r); + else + release_child_resources(r); if (!release_resource(r)) { type = old_flags = r->flags & PCI_RES_TYPE_MASK; pci_info(dev, "resource %d %pR released\n", -- 2.21.0
next prev parent reply other threads:[~2019-08-16 16:51 UTC|newest] Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-16 16:50 [PATCH v5 00/23] PCI: Allow BAR movement during hotplug Sergey Miroshnichenko 2019-08-16 16:50 ` Sergey Miroshnichenko 2019-08-16 16:50 ` [PATCH v5 01/23] PCI: Fix race condition in pci_enable/disable_device() Sergey Miroshnichenko 2019-08-16 16:50 ` Sergey Miroshnichenko 2019-08-22 12:37 ` Marta Rybczynska 2019-08-22 12:37 ` Marta Rybczynska 2019-09-27 21:59 ` Bjorn Helgaas 2019-09-27 21:59 ` Bjorn Helgaas 2019-09-30 8:53 ` Sergey Miroshnichenko 2019-09-30 8:53 ` Sergey Miroshnichenko 2019-08-16 16:50 ` [PATCH v5 02/23] PCI: Enable bridge's I/O and MEM access for hotplugged devices Sergey Miroshnichenko 2019-08-16 16:50 ` Sergey Miroshnichenko 2019-09-27 22:01 ` Bjorn Helgaas 2019-08-16 16:50 ` [PATCH v5 03/23] PCI: hotplug: Add a flag for the movable BARs feature Sergey Miroshnichenko 2019-08-16 16:50 ` Sergey Miroshnichenko 2019-09-27 22:02 ` Bjorn Helgaas 2019-09-27 22:02 ` Bjorn Helgaas 2019-09-30 8:44 ` David Laight 2019-09-30 16:17 ` Sergey Miroshnichenko 2019-09-30 12:59 ` Sergey Miroshnichenko 2019-09-30 12:59 ` Sergey Miroshnichenko 2019-10-15 22:14 ` Bjorn Helgaas 2019-10-15 22:14 ` Bjorn Helgaas 2019-10-16 15:50 ` Sergey Miroshnichenko 2019-10-16 15:50 ` Sergey Miroshnichenko 2019-10-16 17:29 ` Bjorn Helgaas 2019-10-16 17:29 ` Bjorn Helgaas 2019-08-16 16:50 ` Sergey Miroshnichenko [this message] 2019-08-16 16:50 ` [PATCH v5 04/23] PCI: Define PCI-specific version of the release_child_resources() Sergey Miroshnichenko 2019-08-16 16:50 ` [PATCH v5 05/23] PCI: hotplug: movable BARs: Fix reassigning the released bridge windows Sergey Miroshnichenko 2019-08-16 16:50 ` Sergey Miroshnichenko 2019-08-16 16:50 ` [PATCH v5 06/23] PCI: hotplug: movable BARs: Recalculate all bridge windows during rescan Sergey Miroshnichenko 2019-08-16 16:50 ` Sergey Miroshnichenko 2019-08-16 16:50 ` [PATCH v5 07/23] PCI: hotplug: movable BARs: Don't allow added devices to steal resources Sergey Miroshnichenko 2019-08-16 16:50 ` Sergey Miroshnichenko 2019-08-16 16:50 ` [PATCH v5 08/23] PCI: Include fixed and immovable BARs into the bus size calculating Sergey Miroshnichenko 2019-08-16 16:50 ` Sergey Miroshnichenko 2019-08-16 16:50 ` [PATCH v5 09/23] PCI: Prohibit assigning BARs and bridge windows to non-direct parents Sergey Miroshnichenko 2019-08-16 16:50 ` Sergey Miroshnichenko 2019-08-16 16:50 ` [PATCH v5 10/23] PCI: hotplug: movable BARs: Try to assign unassigned resources only once Sergey Miroshnichenko 2019-08-16 16:50 ` Sergey Miroshnichenko 2019-08-16 16:50 ` [PATCH v5 11/23] PCI: hotplug: movable BARs: Calculate immovable parts of bridge windows Sergey Miroshnichenko 2019-08-16 16:50 ` Sergey Miroshnichenko 2019-08-16 16:50 ` [PATCH v5 12/23] PCI: hotplug: movable BARs: Compute limits for relocated " Sergey Miroshnichenko 2019-08-16 16:50 ` Sergey Miroshnichenko 2019-08-16 16:50 ` [PATCH v5 13/23] PCI: Make sure bridge windows include their fixed BARs Sergey Miroshnichenko 2019-08-16 16:50 ` Sergey Miroshnichenko 2019-08-16 16:50 ` [PATCH v5 14/23] PCI: Fix assigning the fixed prefetchable resources Sergey Miroshnichenko 2019-08-16 16:50 ` Sergey Miroshnichenko 2019-08-16 16:50 ` [PATCH v5 15/23] PCI: hotplug: movable BARs: Assign fixed and immovable BARs before others Sergey Miroshnichenko 2019-08-16 16:50 ` Sergey Miroshnichenko 2019-08-16 16:50 ` [PATCH v5 16/23] PCI: hotplug: movable BARs: Don't reserve IO/mem bus space Sergey Miroshnichenko 2019-08-16 16:50 ` Sergey Miroshnichenko 2019-09-04 5:42 ` Oliver O'Halloran 2019-09-04 5:42 ` Oliver O'Halloran 2019-09-04 11:22 ` Sergey Miroshnichenko 2019-09-04 11:22 ` Sergey Miroshnichenko 2019-08-16 16:50 ` [PATCH v5 17/23] powerpc/pci: Fix crash with enabled movable BARs Sergey Miroshnichenko 2019-08-16 16:50 ` Sergey Miroshnichenko 2019-08-16 16:50 ` [PATCH v5 18/23] powerpc/pci: Handle BAR movement Sergey Miroshnichenko 2019-08-16 16:50 ` Sergey Miroshnichenko 2019-09-04 5:37 ` Oliver O'Halloran 2019-09-04 5:37 ` Oliver O'Halloran 2019-09-06 16:24 ` Sergey Miroshnichenko 2019-09-06 16:24 ` Sergey Miroshnichenko 2019-09-09 14:02 ` Oliver O'Halloran 2019-09-09 14:02 ` Oliver O'Halloran 2019-08-16 16:50 ` [PATCH v5 19/23] PCI: hotplug: Configure MPS for hot-added bridges during bus rescan Sergey Miroshnichenko 2019-08-16 16:50 ` Sergey Miroshnichenko 2019-08-16 16:50 ` [PATCH v5 20/23] PCI: hotplug: movable BARs: Enable the feature by default Sergey Miroshnichenko 2019-08-16 16:50 ` Sergey Miroshnichenko 2019-08-16 16:50 ` [PATCH v5 21/23] nvme-pci: Handle movable BARs Sergey Miroshnichenko 2019-08-16 16:50 ` Sergey Miroshnichenko 2019-08-16 16:50 ` Sergey Miroshnichenko 2019-08-16 16:51 ` [PATCH v5 22/23] PCI/portdrv: Declare support of " Sergey Miroshnichenko 2019-08-16 16:51 ` Sergey Miroshnichenko 2019-08-16 16:51 ` [PATCH v5 23/23] PCI: pciehp: movable BARs: Trigger a domain rescan on hp events Sergey Miroshnichenko 2019-08-16 16:51 ` 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=20190816165101.911-5-s.miroshnichenko@yadro.com \ --to=s.miroshnichenko@yadro.com \ --cc=helgaas@kernel.org \ --cc=linux-pci@vger.kernel.org \ --cc=linux@yadro.com \ --cc=linuxppc-dev@lists.ozlabs.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.