From: Jiang Liu <liuj97@gmail.com>
To: Bjorn Helgaas <bhelgaas@google.com>,
Yinghai Lu <yinghai@kernel.org>,
Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>,
Taku Izumi <izumi.taku@jp.fujitsu.com>,
Don Dutile <ddutile@redhat.com>
Cc: Jiang Liu <jiang.liu@huawei.com>,
Keping Chen <chenkeping@huawei.com>,
Yijing Wang <wangyijing@huawei.com>,
linux-pci@vger.kernel.org, Jiang Liu <liuj97@gmail.com>
Subject: [PATCH v10 02/13] x86/PCI: split out pci_mmconfig_alloc() for code reuse
Date: Fri, 22 Jun 2012 14:55:11 +0800 [thread overview]
Message-ID: <1340348122-29021-3-git-send-email-jiang.liu@huawei.com> (raw)
In-Reply-To: <1340348122-29021-1-git-send-email-jiang.liu@huawei.com>
From: Jiang Liu <jiang.liu@huawei.com>
Split out pci_mmconfig_alloc() for code reuse, which will be used
when supporting PCI root bridge hotplug.
Signed-off-by: Jiang Liu <liuj97@gmail.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
arch/x86/pci/mmconfig-shared.c | 19 +++++++++++++++----
1 file changed, 15 insertions(+), 4 deletions(-)
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index f799949..5e2cd2a 100644
--- a/arch/x86/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
@@ -61,8 +61,9 @@ static __init void list_add_sorted(struct pci_mmcfg_region *new)
list_add_tail(&new->list, &pci_mmcfg_list);
}
-static __init struct pci_mmcfg_region *pci_mmconfig_add(int segment, int start,
- int end, u64 addr)
+static __devinit struct pci_mmcfg_region *pci_mmconfig_alloc(int segment,
+ int start,
+ int end, u64 addr)
{
struct pci_mmcfg_region *new;
struct resource *res;
@@ -79,8 +80,6 @@ static __init struct pci_mmcfg_region *pci_mmconfig_add(int segment, int start,
new->start_bus = start;
new->end_bus = end;
- list_add_sorted(new);
-
res = &new->res;
res->start = addr + PCI_MMCFG_BUS_OFFSET(start);
res->end = addr + PCI_MMCFG_BUS_OFFSET(end + 1) - 1;
@@ -96,6 +95,18 @@ static __init struct pci_mmcfg_region *pci_mmconfig_add(int segment, int start,
return new;
}
+static __init struct pci_mmcfg_region *pci_mmconfig_add(int segment, int start,
+ int end, u64 addr)
+{
+ struct pci_mmcfg_region *new;
+
+ new = pci_mmconfig_alloc(segment, start, end, addr);
+ if (new)
+ list_add_sorted(new);
+
+ return new;
+}
+
struct pci_mmcfg_region *pci_mmconfig_lookup(int segment, int bus)
{
struct pci_mmcfg_region *cfg;
--
1.7.9.5
next prev parent reply other threads:[~2012-06-22 6:57 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-22 6:55 [PATCH v10 00/13] x86/PCI: update MMCFG information when hot-plugging PCI host bridges Jiang Liu
2012-06-22 6:55 ` [PATCH v10 01/13] x86/PCI: split out pci_mmcfg_check_reserved() for code reuse Jiang Liu
2012-06-22 6:55 ` Jiang Liu [this message]
2012-06-22 6:55 ` [PATCH v10 03/13] x86/PCI: use RCU list to protect mmconfig list Jiang Liu
2012-06-22 6:55 ` [PATCH v10 04/13] x86/PCI: introduce pci_mmcfg_arch_map()/pci_mmcfg_arch_unmap() Jiang Liu
2012-06-22 6:55 ` [PATCH v10 05/13] x86/PCI: prepare pci_mmcfg_check_reserved() to be called at runtime Jiang Liu
2012-06-22 6:55 ` [PATCH v10 06/13] x86/PCI: add pci_mmconfig_insert()/delete() for PCI root bridge hotplug Jiang Liu
2012-06-22 6:55 ` [PATCH v10 07/13] PCI/ACPI: provide MCFG address for PCI host bridges Jiang Liu
2012-06-22 6:55 ` [PATCH v10 08/13] x86/PCI: update MMCFG information when hot-plugging " Jiang Liu
2012-06-22 6:55 ` [PATCH v10 09/13] x86/PCI: simplify pci_mmcfg_late_insert_resources() Jiang Liu
2012-06-22 6:55 ` [PATCH v10 10/13] x86/PCI: get rid of redundant log messages Jiang Liu
2012-06-22 6:55 ` [PATCH v10 11/13] x86/PCI: refine __pci_mmcfg_init() for better code readability Jiang Liu
2012-06-22 6:55 ` [PATCH v10 12/13] ACPI: mark acpi_sfi_table_parse() as __init Jiang Liu
2012-06-22 6:55 ` [PATCH v10 13/13] x86/PCI: use pr_level() to replace printk(KERN_LEVEL) Jiang Liu
2012-06-22 17:33 ` Yinghai Lu
2012-06-22 21:41 ` [PATCH v10 00/13] x86/PCI: update MMCFG information when hot-plugging PCI host bridges 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=1340348122-29021-3-git-send-email-jiang.liu@huawei.com \
--to=liuj97@gmail.com \
--cc=bhelgaas@google.com \
--cc=chenkeping@huawei.com \
--cc=ddutile@redhat.com \
--cc=izumi.taku@jp.fujitsu.com \
--cc=jiang.liu@huawei.com \
--cc=kaneshige.kenji@jp.fujitsu.com \
--cc=linux-pci@vger.kernel.org \
--cc=wangyijing@huawei.com \
--cc=yinghai@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).