From: Yinghai Lu <yinghai@kernel.org>
To: Jesse Barnes <jbarnes@virtuousgeek.org>, x86 <x86@kernel.org>
Cc: Bjorn Helgaas <bhelgaas@google.com>,
Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH -v2 07/26] PCI: Use for_each_res with IOV releated funcs
Date: Sun, 18 Mar 2012 22:48:30 -0700 [thread overview]
Message-ID: <1332136129-14010-8-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1332136129-14010-1-git-send-email-yinghai@kernel.org>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
drivers/pci/iov.c | 31 +++++++++++++++----------------
1 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/drivers/pci/iov.c b/drivers/pci/iov.c
index 6554e1a..f015764 100644
--- a/drivers/pci/iov.c
+++ b/drivers/pci/iov.c
@@ -99,17 +99,20 @@ static int virtfn_add(struct pci_dev *dev, int id, int reset)
pci_setup_device(virtfn);
virtfn->dev.parent = dev->dev.parent;
- for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) {
- res = dev->resource + PCI_IOV_RESOURCES + i;
+ for_each_pci_dev_iov_resource(dev, res, i) {
+ struct resource *virtfn_res;
+
if (!res->parent)
continue;
- virtfn->resource[i].name = pci_name(virtfn);
- virtfn->resource[i].flags = res->flags;
+
+ virtfn_res = pci_dev_resource_n(virtfn, i - PCI_IOV_RESOURCES);
+ virtfn_res->name = pci_name(virtfn);
+ virtfn_res->flags = res->flags;
size = resource_size(res);
do_div(size, iov->total);
- virtfn->resource[i].start = res->start + size * id;
- virtfn->resource[i].end = virtfn->resource[i].start + size - 1;
- rc = request_resource(res, &virtfn->resource[i]);
+ virtfn_res->start = res->start + size * id;
+ virtfn_res->end = virtfn_res->start + size - 1;
+ rc = request_resource(res, virtfn_res);
BUG_ON(rc);
}
@@ -313,9 +316,8 @@ static int sriov_enable(struct pci_dev *dev, int nr_virtfn)
return -EIO;
nres = 0;
- for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) {
- bars |= (1 << (i + PCI_IOV_RESOURCES));
- res = dev->resource + PCI_IOV_RESOURCES + i;
+ for_each_pci_dev_iov_resource(dev, res, i) {
+ bars |= 1 << i;
if (res->parent)
nres++;
}
@@ -473,10 +475,9 @@ found:
pci_write_config_dword(dev, pos + PCI_SRIOV_SYS_PGSIZE, pgsz);
nres = 0;
- for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) {
- res = dev->resource + PCI_IOV_RESOURCES + i;
+ for_each_pci_dev_iov_resource(dev, res, i) {
i += __pci_read_base(dev, pci_bar_unknown, res,
- pos + PCI_SRIOV_BAR + i * 4);
+ pos + PCI_SRIOV_BAR + (i - PCI_IOV_RESOURCES) * 4);
if (!res->flags)
continue;
if (resource_size(res) & (PAGE_SIZE - 1)) {
@@ -519,10 +520,8 @@ found:
return 0;
failed:
- for (i = 0; i < PCI_SRIOV_NUM_BARS; i++) {
- res = dev->resource + PCI_IOV_RESOURCES + i;
+ for_each_pci_dev_iov_resource(dev, res, i)
res->flags = 0;
- }
return rc;
}
--
1.7.7
next prev parent reply other threads:[~2012-03-19 5:48 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-19 5:48 [PATCH -v2 00/26] PCI, x86: Add for_each_res and addon resource support Yinghai Lu
2012-03-19 5:48 ` [PATCH -v2 01/26] PCI: Add pci_dev_resource_n() Yinghai Lu
2012-03-19 5:48 ` [PATCH -v2 02/26] PCI: Add for_each_resource helpers to make resource loop easier Yinghai Lu
2012-03-19 5:48 ` [PATCH -v2 03/26] PCI: Add pci_dev_resource_idx() Yinghai Lu
2012-03-19 5:48 ` [PATCH -v2 04/26] PCI: Update pci_resource_start to use pci_dev_resource_n() Yinghai Lu
2012-03-19 5:48 ` [PATCH -v2 05/26] x86, PCI: Use for_each_res with pci_allocate_bridge_resources Yinghai Lu
2012-03-19 5:48 ` [PATCH -v2 06/26] x86, PCI: Use for_each_res with pci_allocate_dev_resources Yinghai Lu
2012-03-19 5:48 ` Yinghai Lu [this message]
2012-03-19 5:48 ` [PATCH -v2 08/26] PCI, acpiphp: Use for_each_pci_dev_resource helper Yinghai Lu
2012-03-19 5:48 ` [PATCH -v2 09/26] PCI, pciehp: " Yinghai Lu
2012-03-19 5:48 ` [PATCH -v2 10/26] PCI: Use for_each_pci_dev_resource pci_enable_dev Yinghai Lu
2012-03-19 5:48 ` [PATCH -v2 11/26] PCI: Use for_each_pci_dev_resource pci_reassigndev Yinghai Lu
2012-03-19 5:48 ` [PATCH -v2 12/26] PCI: Use for_each_res with pci bar reassign funcs Yinghai Lu
2012-03-19 5:48 ` [PATCH -v2 13/26] PCI: Use for_each_res pci_assign_resource Yinghai Lu
2012-03-19 5:48 ` [PATCH -v2 14/26] PCI: Use for_each_res with noassign_bars Yinghai Lu
2012-03-19 5:48 ` [PATCH -v2 15/26] PCI: Use for_each_res pci bases pci_dev_driver() Yinghai Lu
2012-03-19 5:48 ` [PATCH -v2 16/26] PCI: Use for_each_res pci release release Yinghai Lu
2012-03-19 5:48 ` [PATCH -v2 17/26] PCI: Use for_each_res pci bases reading Yinghai Lu
2012-03-19 5:48 ` [PATCH -v2 18/26] PCI: Use for_each_res with mrs Yinghai Lu
2012-03-19 5:48 ` [PATCH -v2 19/26] PCI: Use for_each_res with xen pci Yinghai Lu
2012-03-19 5:48 ` [PATCH -v2 20/26] PCI: Add addon_resource support for pci_dev Yinghai Lu
2012-03-19 5:48 ` [PATCH -v2 21/26] PCI: Add helpers for add addon_resource Yinghai Lu
2012-03-19 5:48 ` [PATCH -v2 22/26] PCI: Update pci_resource_bar() to support addon_resource Yinghai Lu
2012-03-19 5:48 ` [PATCH -v2 23/26] PCI: Make assign/update resource to support addon_res Yinghai Lu
2012-03-19 5:48 ` [PATCH -v2 24/26] PCI: Make piix4 quirk to use addon_resource support Yinghai Lu
2012-03-19 5:48 ` [PATCH -v2 25/26] PCI: Make quirk_io_region " Yinghai Lu
2012-03-19 5:48 ` [PATCH -v2 26/26] PCI: Use addon_fixed_resource with ati fixed resource Yinghai Lu
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=1332136129-14010-8-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=bhelgaas@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=jbarnes@virtuousgeek.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
--cc=x86@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;
as well as URLs for NNTP newsgroup(s).