From: Sergey Miroshnichenko <s.miroshnichenko@yadro.com>
To: <linux-pci@vger.kernel.org>
Cc: Bjorn Helgaas <helgaas@kernel.org>,
Rajat Jain <rajatja@google.com>, <linux@yadro.com>,
Sergey Miroshnichenko <s.miroshnichenko@yadro.com>,
David Daney <david.daney@cavium.com>
Subject: [PATCH RFC v3 10/21] PCI: Fix assigning of fixed prefetchable resources
Date: Mon, 4 Feb 2019 18:35:50 +0300 [thread overview]
Message-ID: <20190204153601.7576-11-s.miroshnichenko@yadro.com> (raw)
In-Reply-To: <20190204153601.7576-1-s.miroshnichenko@yadro.com>
Allow matching them to non-prefetchable windows, as it is done for movable
resources.
Signed-off-by: Sergey Miroshnichenko <s.miroshnichenko@yadro.com>
---
drivers/pci/setup-bus.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index cca23c393e29..b1eec758d2c1 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -1338,15 +1338,20 @@ static void assign_fixed_resource_on_bus(struct pci_bus *b, struct resource *r)
{
int i;
struct resource *parent_r;
- unsigned long mask = IORESOURCE_IO | IORESOURCE_MEM |
- IORESOURCE_PREFETCH;
+ unsigned long mask = IORESOURCE_TYPE_BITS;
pci_bus_for_each_resource(b, parent_r, i) {
if (!parent_r)
continue;
- if ((r->flags & mask) == (parent_r->flags & mask) &&
- resource_contains(parent_r, r))
+ if ((r->flags & mask) != (parent_r->flags & mask))
+ continue;
+
+ if (parent_r->flags & IORESOURCE_PREFETCH &&
+ !(r->flags & IORESOURCE_PREFETCH))
+ continue;
+
+ if (resource_contains(parent_r, r))
request_resource(parent_r, r);
}
}
--
2.20.1
next prev parent reply other threads:[~2019-02-04 15:36 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-04 15:35 [PATCH RFC v3 00/21] PCI: Allow BAR movement during hotplug Sergey Miroshnichenko
2019-02-04 15:35 ` [PATCH RFC v3 01/21] PCI: Fix writing invalid BARs during pci_restore_state() Sergey Miroshnichenko
2019-02-04 15:35 ` [PATCH RFC v3 02/21] PCI: Fix race condition in pci_enable/disable_device() Sergey Miroshnichenko
2019-02-04 15:35 ` [PATCH RFC v3 03/21] PCI: Enable bridge's I/O and MEM access for hotplugged devices Sergey Miroshnichenko
2019-02-04 15:35 ` [PATCH RFC v3 04/21] PCI: Define PCI-specific version of the release_child_resources() Sergey Miroshnichenko
2019-02-04 15:35 ` [PATCH RFC v3 05/21] PCI: hotplug: Add a flag for the movable BARs feature Sergey Miroshnichenko
2019-02-04 15:35 ` [PATCH RFC v3 06/21] PCI: Pause the devices with movable BARs during rescan Sergey Miroshnichenko
2019-02-04 15:35 ` [PATCH RFC v3 07/21] PCI: Wake up bridges during rescan when movable BARs enabled Sergey Miroshnichenko
2019-02-04 15:35 ` [PATCH RFC v3 08/21] nvme-pci: Handle movable BARs Sergey Miroshnichenko
2019-02-04 15:35 ` [PATCH RFC v3 09/21] PCI: Mark immovable BARs with PCI_FIXED Sergey Miroshnichenko
2019-02-04 15:35 ` Sergey Miroshnichenko [this message]
2019-02-04 15:35 ` [PATCH RFC v3 11/21] PCI: Release and reassign the root bridge resources during rescan Sergey Miroshnichenko
2019-02-04 15:35 ` [PATCH RFC v3 12/21] PCI: Don't allow hotplugged devices to steal resources Sergey Miroshnichenko
2019-02-04 15:35 ` [PATCH RFC v3 13/21] PCI: Include fixed BARs into the bus size calculating Sergey Miroshnichenko
2019-02-04 15:35 ` [PATCH RFC v3 14/21] PCI: Don't reserve memory for hotplug when enabled movable BARs Sergey Miroshnichenko
2019-02-04 15:35 ` [PATCH RFC v3 15/21] PCI: Allow the failed resources to be reassigned later Sergey Miroshnichenko
2019-02-04 15:35 ` [PATCH RFC v3 16/21] PCI: Calculate fixed areas of bridge windows based on fixed BARs Sergey Miroshnichenko
2019-02-04 15:35 ` [PATCH RFC v3 17/21] PCI: Calculate boundaries for bridge windows Sergey Miroshnichenko
2019-02-04 15:35 ` [PATCH RFC v3 18/21] PCI: Make sure bridge windows include their fixed BARs Sergey Miroshnichenko
2019-02-04 15:35 ` [PATCH RFC v3 19/21] PCI: Prioritize fixed BAR assigning over the movable ones Sergey Miroshnichenko
2019-02-04 15:36 ` [PATCH RFC v3 20/21] PCI: pciehp: Add support for the movable BARs feature Sergey Miroshnichenko
2019-02-04 15:36 ` [PATCH RFC v3 21/21] powerpc/pci: Fix crash with enabled 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=20190204153601.7576-11-s.miroshnichenko@yadro.com \
--to=s.miroshnichenko@yadro.com \
--cc=david.daney@cavium.com \
--cc=helgaas@kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux@yadro.com \
--cc=rajatja@google.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).