From: Ram Pai <linuxram@us.ibm.com>
To: jbarnes@virtuousgeek.org
Cc: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org,
svenkatr@ti.com, yinghai@kernel.org, cjb@laptop.org,
linux-pci@vger.kernel.org, linux-net-drivers@solarflare.com,
bhutchings@solarflare.com, Ram Pai <linuxram@us.ibm.com>
Subject: [PATCH 3/4] PCI: make SRIOV resources nice-to-have
Date: Mon, 20 Jun 2011 15:47:16 -0700 [thread overview]
Message-ID: <1308610037-6261-4-git-send-email-linuxram@us.ibm.com> (raw)
In-Reply-To: <1308610037-6261-1-git-send-email-linuxram@us.ibm.com>
From: Yinghai Lu <yinghai@kernel.org>
Allocate resources to SRIOV BARs only after all other genuine resources
requests are satisfied. Dont retry if resource allocation for SRIOV BARs fail.
Signed-off-by: Ram Pai <linuxram@us.ibm.com>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
drivers/pci/setup-bus.c | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index c282c48..4f8873e 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -672,6 +672,16 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
if (r->parent || (r->flags & mask) != type)
continue;
r_size = resource_size(r);
+#ifdef CONFIG_PCI_IOV
+ /* add SRIOV BARs to nice-to-have list */
+ if (add_head && i >= PCI_IOV_RESOURCES &&
+ i <= PCI_IOV_RESOURCE_END) {
+ r->end = r->start - 1;
+ add_to_list(add_head, dev, r, r_size, 1);
+ children_add_size += r_size;
+ continue;
+ }
+#endif
/* For bridges size != alignment */
align = pci_resource_alignment(dev, r);
order = __ffs(align) - 20;
--
1.7.0.4
next prev parent reply other threads:[~2011-06-20 22:47 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-20 22:47 [PATCH 0/4] PCI: fix cardbus and sriov regressions Ram Pai
2011-06-20 22:47 ` [PATCH 1/4] PCI: honor child buses add_size in hot plug configuration Ram Pai
2011-06-20 22:47 ` [PATCH 2/4] PCI : ability to resize assigned pci-resource Ram Pai
2011-06-20 22:47 ` Ram Pai [this message]
2011-06-20 22:47 ` [PATCH 4/4] PCI: make cardbus-bridge resources nice-to-have Ram Pai
2011-06-21 7:57 ` Dominik Brodowski
2011-06-21 16:23 ` Ram Pai
2011-06-21 18:50 ` Jesse Barnes
2011-06-21 21:36 ` Jesse Barnes
2011-06-21 22:13 ` Dominik Brodowski
2011-06-22 0:48 ` Ram Pai
2011-06-23 20:31 ` Jesse Barnes
2011-06-23 20:42 ` Rafael J. Wysocki
2011-06-24 16:28 ` Ram Pai
2011-06-24 23:45 ` Rafael J. Wysocki
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=1308610037-6261-4-git-send-email-linuxram@us.ibm.com \
--to=linuxram@us.ibm.com \
--cc=bhutchings@solarflare.com \
--cc=cjb@laptop.org \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-net-drivers@solarflare.com \
--cc=linux-pci@vger.kernel.org \
--cc=svenkatr@ti.com \
--cc=yinghai@kernel.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: 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