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 v4 23/29] PCI: Treat addon res as std resources
Date: Fri, 12 Apr 2013 15:44:37 -0700 [thread overview]
Message-ID: <1365806683-26717-24-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1365806683-26717-1-git-send-email-yinghai@kernel.org>
Replace PCI_STD_... with PCI_STD..._ADDON_... in the loop
of for_each_pci_resource.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
arch/x86/pci/i386.c | 2 +-
drivers/pci/hotplug/acpiphp_glue.c | 2 +-
drivers/pci/pci-driver.c | 3 ++-
drivers/pci/pci.c | 6 +++---
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index 4dafa08..a3a7e89 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -240,7 +240,7 @@ static void pcibios_allocate_dev_resources(struct pci_dev *dev, int pass)
struct resource *r;
pci_read_config_word(dev, PCI_COMMAND, &command);
- for_each_pci_resource(dev, r, idx, PCI_STD_IOV_RES) {
+ for_each_pci_resource(dev, r, idx, PCI_STD_IOV_ADDON_RES) {
if (r->parent) /* Already allocated */
continue;
if (!r->start) /* Address not assigned at all */
diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index c35b2b1..702871c 100644
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -1088,7 +1088,7 @@ static void acpiphp_sanitize_bus(struct pci_bus *bus)
struct resource *res;
list_for_each_entry(dev, &bus->devices, bus_list) {
- for_each_pci_resource(dev, res, i, PCI_STD_ROM_IOV_RES) {
+ for_each_pci_resource(dev, res, i, PCI_STD_ROM_IOV_ADDON_RES) {
if ((res->flags & type_mask) && !res->start &&
res->end) {
/* Could not assign a required resources
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c
index 009f6c2..73238a8 100644
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
@@ -1173,7 +1173,8 @@ pci_dev_driver(const struct pci_dev *dev)
struct resource *res;
int i;
- for_each_pci_resource((struct pci_dev *)dev, res, i, PCI_STD_ROM_RES)
+ for_each_pci_resource((struct pci_dev *)dev, res, i,
+ PCI_STD_ROM_ADDON_RES)
if (res->flags & IORESOURCE_BUSY)
return &pci_compat_driver;
}
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index d6203e9..c1010be 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -442,7 +442,7 @@ pci_restore_bars(struct pci_dev *dev)
int i;
struct resource *res;
- for_each_pci_resource(dev, res, i, PCI_STD_ROM_IOV_RES)
+ for_each_pci_resource(dev, res, i, PCI_STD_ROM_IOV_ADDON_RES)
pci_update_resource(dev, i);
}
@@ -1172,7 +1172,7 @@ static int pci_enable_device_flags(struct pci_dev *dev, unsigned long flags)
return 0; /* already enabled */
/* only skip sriov related */
- for_each_pci_resource(dev, res, i, PCI_STD_ROM_BRIDGE_RES) {
+ for_each_pci_resource(dev, res, i, PCI_STD_ROM_BRIDGE_ADDON_RES) {
/* TODO: check i with bits of bars */
if (res->flags & flags)
bars |= (1 << i);
@@ -3782,7 +3782,7 @@ void pci_reassigndev_resource_alignment(struct pci_dev *dev)
command &= ~PCI_COMMAND_MEMORY;
pci_write_config_word(dev, PCI_COMMAND, command);
- for_each_pci_resource(dev, r, i, PCI_STD_ROM_IOV_RES) {
+ for_each_pci_resource(dev, r, i, PCI_STD_ROM_IOV_ADDON_RES) {
r = &dev->resource[i];
if (!(r->flags & IORESOURCE_MEM))
continue;
--
1.8.1.4
next prev parent reply other threads:[~2013-04-12 22:45 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-12 22:44 [PATCH v4 00/29] PCI: Add for_each_pci_resource and addon_res support Yinghai Lu
2013-04-12 22:44 ` [PATCH v4 01/29] PCI: Clean up quirk_io_region Yinghai Lu
2013-04-15 18:23 ` Bjorn Helgaas
2013-04-12 22:44 ` [PATCH v4 02/29] PCI: Add pci_dev_resource_n() Yinghai Lu
2013-04-12 22:44 ` [PATCH v4 03/29] PCI: Update pci_resource_start etc to use pci_dev_resource_n() Yinghai Lu
2013-04-12 22:44 ` [PATCH v4 04/29] PCI: Add pci_dev_resource_idx() helper Yinghai Lu
2013-04-12 22:44 ` [PATCH v4 05/29] PCI: Add is_pci_*_resource_idx() helpers Yinghai Lu
2013-04-12 22:44 ` [PATCH v4 06/29] PCI: pci resource iterator Yinghai Lu
2013-04-12 22:44 ` [PATCH v4 07/29] PCI, x86: Use for_each_pci_resource() with pci_allocate_bridge_resources Yinghai Lu
2013-04-12 22:44 ` [PATCH v4 08/29] PCI, x86: Use for_each_pci_resource() with pci_allocate_dev_resources Yinghai Lu
2013-04-12 22:44 ` [PATCH v4 09/29] PCI: Use for_each_pci_resource() with IOV releated functions Yinghai Lu
2013-04-12 22:44 ` [PATCH v4 10/29] PCI, acpiphp: Use for_each_pci_resource() helper Yinghai Lu
2013-04-12 22:44 ` [PATCH v4 11/29] PCI, pciehp: " Yinghai Lu
2013-04-12 22:44 ` [PATCH v4 12/29] PCI: Use for_each_pci_resource() in pci_enable_dev Yinghai Lu
2013-04-12 22:44 ` [PATCH v4 13/29] PCI: Use for_each_pci_resource() in pci_reassigndev Yinghai Lu
2013-04-12 22:44 ` [PATCH v4 14/29] PCI: Use for_each_pci_resource() with pci bar reassign funcs Yinghai Lu
2013-04-12 22:44 ` [PATCH v4 15/29] PCI: Use for_each_pci_resource() in pci_assign_resource Yinghai Lu
2013-04-12 22:44 ` [PATCH v4 16/29] PCI, x86: Use for_each_pci_resource() with noassign_bars Yinghai Lu
2013-04-12 22:44 ` [PATCH v4 17/29] PCI: Use for_each_pci_resource() in pci_dev_driver() Yinghai Lu
2013-04-12 22:44 ` [PATCH v4 18/29] PCI: Use for_each_pci_resource() in pci resource release Yinghai Lu
2013-04-12 22:44 ` [PATCH v4 19/29] PCI: Use for_each_pci_resource() in pci bases reading Yinghai Lu
2013-04-12 22:44 ` [PATCH v4 20/29] PCI, x86: Use for_each_pci_resource() with mrst Yinghai Lu
2013-04-12 22:44 ` [PATCH v4 21/29] PCI, xen: Use for_each_pci_resource() with xen pci Yinghai Lu
2013-04-12 22:44 ` [PATCH v4 22/29] PCI: Add addon_resource support for pci devices Yinghai Lu
2013-04-12 22:44 ` Yinghai Lu [this message]
2013-04-12 22:44 ` [PATCH v4 24/29] PCI: Add helpers to add addon_resource Yinghai Lu
2013-04-12 22:44 ` [PATCH v4 25/29] PCI: Update pci_resource_bar() to support addon_resource Yinghai Lu
2013-04-12 22:44 ` [PATCH v4 26/29] PCI: Assign/update resource to addon_res Yinghai Lu
2013-04-12 22:44 ` [PATCH v4 27/29] PCI: Make piix4 quirk to use addon_res Yinghai Lu
2013-04-25 20:39 ` Bjorn Helgaas
2013-04-26 15:22 ` Bjorn Helgaas
2013-04-26 20:29 ` Rafael J. Wysocki
2013-04-12 22:44 ` [PATCH v4 28/29] PCI: Make quirk_io_region " Yinghai Lu
2013-04-12 22:44 ` [PATCH v4 29/29] PCI: Use addon_fixed_resource with ati fixed resource Yinghai Lu
2013-04-25 19:53 ` [PATCH v4 00/29] PCI: Add for_each_pci_resource and addon_res support Bjorn Helgaas
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=1365806683-26717-24-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
Powered by JetHome