From: Yinghai Lu <yinghai@kernel.org>
To: Jesse Barnes <jbarnes@virtuousgeek.org>,
Ingo Molnar <mingo@elte.hu>,
Linus Torvalds <torvalds@linux-foundation.org>,
Ivan Kokshaysky <ink@jurassic.park.msu.ru>,
Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>,
Alex Chiang <achiang@hp.com>,
Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org,
Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH 09/11] pci: pci_bridge_release_res
Date: Fri, 15 Jan 2010 18:41:59 -0800 [thread overview]
Message-ID: <1263609721-3921-10-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1263609721-3921-1-git-send-email-yinghai@kernel.org>
prepare for pciehp_realloc
it will clear the resource size for bridge
-v2: patrick Keller pointed out need to export it...
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
drivers/pci/setup-bus.c | 43 +++++++++++++++++++++++++++++++++++++++++++
include/linux/pci.h | 1 +
2 files changed, 44 insertions(+), 0 deletions(-)
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 2ff34ca..89a531f 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -742,6 +742,49 @@ static void __ref __pci_bridge_assign_resources(const struct pci_dev *bridge,
break;
}
}
+
+void pci_bridge_release_res(struct pci_bus *bus)
+{
+ int idx;
+ bool changed = false;
+ struct pci_dev *dev;
+ struct resource *r;
+
+ /* The root bus? */
+ if (!bus->self)
+ return;
+
+ /* for pci bridges res only */
+ dev = bus->self;
+ if ((dev->class >> 8) != PCI_CLASS_BRIDGE_PCI)
+ return;
+
+ for (idx = PCI_BRIDGE_RESOURCES; idx < PCI_BRIDGE_RESOURCES + 3;
+ idx++) {
+ r = &dev->resource[idx];
+ if (!r->parent)
+ continue;
+
+ /* if there are children under that, we should not release it */
+ if (r->child)
+ continue;
+
+ if (!release_resource(r)) {
+ dev_printk(KERN_DEBUG, &dev->dev,
+ "resource %d %pR released\n", idx, r);
+ /* old size is not kept */
+ r->start = 0;
+ r->end = 0;
+ r->flags = 0;
+ changed = true;
+ }
+ }
+
+ if (changed)
+ pci_setup_bridge(bus);
+}
+EXPORT_SYMBOL_GPL(pci_bridge_release_res);
+
static void pci_bridge_release_resources(struct pci_bus *bus,
unsigned long type)
{
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 0e240ed..b8c7e45 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -805,6 +805,7 @@ int pci_vpd_truncate(struct pci_dev *dev, size_t size);
void pci_bus_assign_resources(const struct pci_bus *bus);
void pci_bus_size_bridges(struct pci_bus *bus);
int pci_claim_resource(struct pci_dev *, int);
+void pci_bridge_release_res(struct pci_bus *bus);
void pci_assign_unassigned_resources(void);
void pci_assign_unassigned_bridge_resources(struct pci_dev *bridge);
void pdev_enable_device(struct pci_dev *);
--
1.6.4.2
next prev parent reply other threads:[~2010-01-16 2:46 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-16 2:41 [PATCH 00/11] pci: update pci bridge resources Yinghai Lu
2010-01-16 2:41 ` [PATCH 01/11] pci: add pci_bridge_release_unused_res and pci_bus_release_unused_bridge_res Yinghai Lu
2010-01-16 3:57 ` Alex Chiang
2010-01-16 10:10 ` Yinghai Lu
2010-01-16 2:41 ` [PATCH 02/11] pci: add failed_list to record failed one for pci_bus_assign_resources Yinghai Lu
2010-01-16 4:05 ` Alex Chiang
2010-01-16 2:41 ` [PATCH 03/11] pci: reject mmio range start from 0 on pci_bridge read Yinghai Lu
2010-01-16 4:20 ` Alex Chiang
2010-01-16 2:41 ` [PATCH 04/11] pci: don't shrink bridge resources Yinghai Lu
2010-01-16 2:41 ` [PATCH 05/11] pci: update bridge res to get more big range in pci assign unssign Yinghai Lu
2010-01-16 4:38 ` Alex Chiang
2010-01-16 2:41 ` [PATCH 06/11] pci: introduce pci_assign_unassigned_bridge_resources Yinghai Lu
2010-01-16 4:47 ` Alex Chiang
2010-01-16 2:41 ` [PATCH 07/11] pci: pciehp clean flow in pciehp_configure_device Yinghai Lu
2010-01-16 2:41 ` [PATCH 08/11] pci: pciehp second try to get big range for pcie devices Yinghai Lu
2010-01-16 4:52 ` Alex Chiang
2010-01-16 2:41 ` Yinghai Lu [this message]
2010-01-16 4:57 ` [PATCH 09/11] pci: pci_bridge_release_res Alex Chiang
2010-01-16 2:42 ` [PATCH 10/11] pciehp: add support for bridge resource reallocation Yinghai Lu
2010-01-16 4:59 ` Alex Chiang
2010-01-16 5:22 ` Yinghai Lu
2010-01-16 9:34 ` Yinghai Lu
2010-01-16 23:14 ` Bjorn Helgaas
2010-01-17 17:34 ` Jesse Barnes
2010-01-17 22:35 ` Yinghai Lu
2010-01-16 2:42 ` [PATCH 11/11] pci: set PCI_PREF_RANGE_TYPE_64 in pci_bridge_check_ranges Yinghai Lu
2010-01-16 11:07 [PATCH 00/11] pci: update pci bridge resources Yinghai Lu
2010-01-16 11:07 ` [PATCH 09/11] pci: pci_bridge_release_res Yinghai Lu
2010-01-19 21:57 ` Alex Chiang
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=1263609721-3921-10-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=achiang@hp.com \
--cc=bjorn.helgaas@hp.com \
--cc=ink@jurassic.park.msu.ru \
--cc=jbarnes@virtuousgeek.org \
--cc=kaneshige.kenji@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=torvalds@linux-foundation.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).