From: Yinghai Lu <yinghai@kernel.org>
To: Bjorn Helgaas <bhelgaas@google.com>, Ram Pai <linuxram@us.ibm.com>
Cc: linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH v3 11/27] PCI: Use for_each_pci_resource() in pci_enable_dev
Date: Wed, 13 Mar 2013 16:28:06 -0700 [thread overview]
Message-ID: <1363217302-14383-12-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1363217302-14383-1-git-send-email-yinghai@kernel.org>
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
drivers/pci/pci.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index b099e00..c0473dc 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -440,8 +440,9 @@ static void
pci_restore_bars(struct pci_dev *dev)
{
int i;
+ struct resource *res;
- for (i = 0; i < PCI_BRIDGE_RESOURCES; i++)
+ for_each_pci_resource(dev, res, i, PCI_NOBRIDGE_RES)
pci_update_resource(dev, i);
}
@@ -1153,6 +1154,7 @@ static int pci_enable_device_flags(struct pci_dev *dev, unsigned long flags)
{
int err;
int i, bars = 0;
+ struct resource *res;
/*
* Power state could be unknown at this point, either due to a fresh
@@ -1170,12 +1172,11 @@ static int pci_enable_device_flags(struct pci_dev *dev, unsigned long flags)
return 0; /* already enabled */
/* only skip sriov related */
- for (i = 0; i <= PCI_ROM_RESOURCE; i++)
- if (dev->resource[i].flags & flags)
- bars |= (1 << i);
- for (i = PCI_BRIDGE_RESOURCES; i < DEVICE_COUNT_RESOURCE; i++)
- if (dev->resource[i].flags & flags)
+ for_each_pci_resource(dev, res, i, PCI_NOIOV_RES) {
+ /* TODO: check i with bits of bars */
+ if (res->flags & flags)
bars |= (1 << i);
+ }
err = do_pci_enable_device(dev, bars);
if (err < 0)
@@ -2557,7 +2558,7 @@ static int __pci_request_region(struct pci_dev *pdev, int bar, const char *res_n
err_out:
dev_warn(&pdev->dev, "BAR %d: can't reserve %pR\n", bar,
- &pdev->resource[bar]);
+ pci_dev_resource_n(pdev, bar));
return -EBUSY;
}
--
1.7.10.4
next prev parent reply other threads:[~2013-03-13 23:28 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-13 23:27 [PATCH v3 00/27] PCI: Add for_each_pci_resource and addon_res support Yinghai Lu
2013-03-13 23:27 ` [PATCH v3 01/27] PCI: Add pci_dev_resource_n() Yinghai Lu
2013-03-13 23:27 ` [PATCH v3 02/27] PCI: Add pci_dev_resource_idx() helper Yinghai Lu
2013-04-04 22:00 ` Bjorn Helgaas
2013-03-13 23:27 ` [PATCH v3 03/27] PCI: pci resource iterator Yinghai Lu
2013-04-04 22:18 ` Bjorn Helgaas
2013-04-09 4:51 ` Ram Pai
2013-04-10 15:22 ` Bjorn Helgaas
2013-04-25 3:55 ` Ram Pai
2013-04-25 17:22 ` Bjorn Helgaas
2013-04-28 6:08 ` Ram Pai
2013-04-10 16:12 ` Yinghai Lu
2013-03-13 23:27 ` [PATCH v3 04/27] PCI: Add is_pci_*_resource_idx() helpers Yinghai Lu
2013-04-04 22:23 ` Bjorn Helgaas
2013-03-13 23:28 ` [PATCH v3 05/27] PCI: Update pci_resource_start etc to use pci_dev_resource_n() Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 06/27] PCI, x86: Use for_each_pci_resource() with pci_allocate_bridge_resources Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 07/27] PCI, x86: Use for_each_pci_resource() with pci_allocate_dev_resources Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 08/27] PCI: Use for_each_pci_resource() with IOV releated functions Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 09/27] PCI, acpiphp: Use for_each_pci_resource() helper Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 10/27] PCI, pciehp: " Yinghai Lu
2013-03-13 23:28 ` Yinghai Lu [this message]
2013-03-13 23:28 ` [PATCH v3 12/27] PCI: Use for_each_pci_resource() in pci_reassigndev Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 13/27] PCI: Use for_each_pci_resource() with pci bar reassign funcs Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 14/27] PCI: Use for_each_pci_resource() in pci_assign_resource Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 15/27] PCI, x86: Use for_each_pci_resource() with noassign_bars Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 16/27] PCI: Use for_each_pci_resource() in pci_dev_driver() Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 17/27] PCI: Use for_each_pci_resource() in pci resource release Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 18/27] PCI: Use for_each_pci_resource() in pci bases reading Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 19/27] PCI, x86: Use for_each_pci_resource() with mrst Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 20/27] PCI, xen: Use for_each_pci_resource() with xen pci Yinghai Lu
2013-03-15 13:35 ` Konrad Rzeszutek Wilk
2013-03-13 23:28 ` [PATCH v3 21/27] PCI: Add addon_resource support for pci devices Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 22/27] PCI: Add helpers to add addon_resource Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 23/27] PCI: Update pci_resource_bar() to support addon_resource Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 24/27] PCI: Assign/update resource to addon_res Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 25/27] PCI: Make piix4 quirk to use addon_res Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 26/27] PCI: Make quirk_io_region " Yinghai Lu
2013-04-04 21:35 ` Bjorn Helgaas
2013-04-10 2:17 ` Yinghai Lu
2013-03-13 23:28 ` [PATCH v3 27/27] 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=1363217302-14383-12-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=bhelgaas@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linuxram@us.ibm.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).