aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/pci/mmconfig_64.c
diff options
context:
space:
mode:
authorBjorn Helgaas <bjorn.helgaas@hp.com>2009-11-13 19:34:59 -0500
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-11-24 18:30:30 -0500
commit8c57786ad3d921713c7ad8e44132aa537a1d0fec (patch)
treed9efcb06d650ac01987b19e0535c67fbcabcb8f6 /arch/x86/pci/mmconfig_64.c
parentba2afbabfc44d6322e8607c004f37868ff786cf8 (diff)
x86/PCI: MMCONFIG: clean up printks
No functional change; just tidy up printks and make them more consistent with the rest of PCI. Reviewed-by: Yinghai Lu <yinghai@kernel.org> Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com> Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'arch/x86/pci/mmconfig_64.c')
-rw-r--r--arch/x86/pci/mmconfig_64.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/x86/pci/mmconfig_64.c b/arch/x86/pci/mmconfig_64.c
index ed1f479b4d0e..cfa6cdb6d262 100644
--- a/arch/x86/pci/mmconfig_64.c
+++ b/arch/x86/pci/mmconfig_64.c
@@ -12,6 +12,8 @@
12#include <asm/e820.h> 12#include <asm/e820.h>
13#include <asm/pci_x86.h> 13#include <asm/pci_x86.h>
14 14
15#define PREFIX "PCI: "
16
15static char __iomem *get_virt(unsigned int seg, unsigned bus) 17static char __iomem *get_virt(unsigned int seg, unsigned bus)
16{ 18{
17 struct pci_mmcfg_region *cfg; 19 struct pci_mmcfg_region *cfg;
@@ -109,11 +111,8 @@ static void __iomem * __init mcfg_ioremap(struct pci_mmcfg_region *cfg)
109 num_buses = cfg->end_bus - cfg->start_bus + 1; 111 num_buses = cfg->end_bus - cfg->start_bus + 1;
110 size = PCI_MMCFG_BUS_OFFSET(num_buses); 112 size = PCI_MMCFG_BUS_OFFSET(num_buses);
111 addr = ioremap_nocache(start, size); 113 addr = ioremap_nocache(start, size);
112 if (addr) { 114 if (addr)
113 printk(KERN_INFO "PCI: Using MMCONFIG at %Lx - %Lx\n",
114 start, start + size - 1);
115 addr -= PCI_MMCFG_BUS_OFFSET(cfg->start_bus); 115 addr -= PCI_MMCFG_BUS_OFFSET(cfg->start_bus);
116 }
117 return addr; 116 return addr;
118} 117}
119 118
@@ -124,9 +123,8 @@ int __init pci_mmcfg_arch_init(void)
124 list_for_each_entry(cfg, &pci_mmcfg_list, list) { 123 list_for_each_entry(cfg, &pci_mmcfg_list, list) {
125 cfg->virt = mcfg_ioremap(cfg); 124 cfg->virt = mcfg_ioremap(cfg);
126 if (!cfg->virt) { 125 if (!cfg->virt) {
127 printk(KERN_ERR "PCI: Cannot map mmconfig aperture for " 126 printk(KERN_ERR PREFIX "can't map MMCONFIG at %pR\n",
128 "segment %d\n", 127 &cfg->res);
129 cfg->segment);
130 pci_mmcfg_arch_free(); 128 pci_mmcfg_arch_free();
131 return 0; 129 return 0;
132 } 130 }