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,
linux-arch@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH -v3 05/11] PCI: Add host bridge release support
Date: Sun, 18 Mar 2012 22:40:18 -0700 [thread overview]
Message-ID: <1332135624-13528-6-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1332135624-13528-1-git-send-email-yinghai@kernel.org>
We need one hook to release host bridge resource that are allocated for host
bridge during creating root bus.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
drivers/pci/host-bridge.c | 8 ++++++++
drivers/pci/probe.c | 3 ++-
include/linux/pci.h | 5 +++++
3 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/drivers/pci/host-bridge.c b/drivers/pci/host-bridge.c
index a55c3f8..3b2cb40 100644
--- a/drivers/pci/host-bridge.c
+++ b/drivers/pci/host-bridge.c
@@ -27,6 +27,14 @@ static struct pci_host_bridge *find_pci_host_bridge(struct pci_dev *dev)
return to_pci_host_bridge(bus->bridge);
}
+void pci_set_host_bridge_release(struct pci_host_bridge *bridge,
+ void (*release_fn)(struct pci_host_bridge *),
+ void *release_data)
+{
+ bridge->release_fn = release_fn;
+ bridge->release_data = release_data;
+}
+
static bool resource_contains(struct resource *res1, struct resource *res2)
{
return res1->start <= res2->start && res1->end >= res2->end;
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 903ebe5..d30948d 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -1136,7 +1136,8 @@ static void pci_release_bus_bridge_dev(struct device *dev)
{
struct pci_host_bridge *bridge = to_pci_host_bridge(dev);
- /* TODO: need to free window->res */
+ if (bridge->release_fn)
+ bridge->release_fn(bridge);
pci_free_resource_list(&bridge->windows);
diff --git a/include/linux/pci.h b/include/linux/pci.h
index 310610e..d93d3ae 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -378,9 +378,14 @@ struct pci_host_bridge {
struct device dev;
struct pci_bus *bus; /* root bus */
struct list_head windows; /* pci_host_bridge_windows */
+ void (*release_fn)(struct pci_host_bridge *);
+ void *release_data;
};
#define to_pci_host_bridge(n) container_of(n, struct pci_host_bridge, dev)
+void pci_set_host_bridge_release(struct pci_host_bridge *bridge,
+ void (*release_fn)(struct pci_host_bridge *),
+ void *release_data);
/*
* The first PCI_BRIDGE_RESOURCE_NUM PCI bus resources (those that correspond
--
1.7.7
next prev parent reply other threads:[~2012-03-19 5:40 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-19 5:40 [PATCH -v3 00/11] PCI: pci_host_bridge related cleanup Yinghai Lu
2012-03-19 5:40 ` [PATCH -v3 01/11] PCI: Separate host_bridge code out from probe.c Yinghai Lu
2012-03-19 5:40 ` [PATCH -v3 02/11] x86, PCI: Fix memleak with get_current_resources() Yinghai Lu
2012-03-19 5:40 ` [PATCH -v3 03/11] PCI: Rename pci_host_bridge() to find_pci_root_bridge() Yinghai Lu
2012-03-19 5:40 ` [PATCH -v3 04/11] PCI: Add generic device into pci_host_bridge struct Yinghai Lu
2012-03-19 5:40 ` Yinghai Lu [this message]
2012-03-19 5:40 ` [PATCH -v3 06/11] x86, PCI: Break down get_current_resource() Yinghai Lu
2012-03-19 5:40 ` [PATCH -v3 07/11] x86, PCI: Add host bridge resource release for _CRS path Yinghai Lu
2012-03-19 5:40 ` [PATCH -v3 08/11] x86, PCI: Embed name into pci_root_info struct Yinghai Lu
2012-03-19 5:40 ` [PATCH -v3 09/11] x86, PCI: Embed pci_sysdata into pci_root_info on acpi path Yinghai Lu
2012-03-19 5:40 ` [PATCH -v3 10/11] x86, PCI: Allocate pci_root_info for not using _CRS path Yinghai Lu
2012-03-19 5:40 ` [PATCH -v3 11/11] x86, PCI: Merge root info printing " Yinghai Lu
2012-04-30 22:59 ` [PATCH -v3 00/11] PCI: pci_host_bridge related cleanup Bjorn Helgaas
2012-05-01 0:28 ` 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=1332135624-13528-6-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-arch@vger.kernel.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).