Commit f393d9b1 authored by Vincent Legoll's avatar Vincent Legoll Committed by Jesse Barnes

PCI: probing debug message uniformization

This patch uniformizes PCI probing debug boot messages with dev_printk()
intead of manual printk()

It changes adress range output from [%llx, %llx] to [%#llx-%#llx], like
in pci_request_region().

For example, it goes from the mixed-style:

PCI: 0000:00:1b.0 reg 10 64bit mmio: [f4280000, f4283fff]
pci 0000:00:1b.0: PME# supported from D0 D3hot D3cold

to uniform:

pci 0000:00:1b.0: reg 10 64bit mmio: [0xf4280000-0xf4283fff]
pci 0000:00:1b.0: PME# supported from D0 D3hot D3cold

This patch has been runtime tested, boot log messages diffed, everything
looks OK.
Acked-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarVincent Legoll <vincent.legoll@gmail.com>
Signed-off-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
parent 58c3a727
...@@ -528,9 +528,9 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev) ...@@ -528,9 +528,9 @@ static int pcie_aspm_sanity_check(struct pci_dev *pdev)
pci_read_config_dword(child_dev, child_pos + PCI_EXP_DEVCAP, pci_read_config_dword(child_dev, child_pos + PCI_EXP_DEVCAP,
&reg32); &reg32);
if (!(reg32 & PCI_EXP_DEVCAP_RBER) && !aspm_force) { if (!(reg32 & PCI_EXP_DEVCAP_RBER) && !aspm_force) {
printk("Pre-1.1 PCIe device detected, " dev_printk(KERN_INFO, &child_dev->dev, "disabling ASPM"
"disable ASPM for %s. It can be enabled forcedly" " on pre-1.1 PCIe device. You can enable it"
" with 'pcie_aspm=force'\n", pci_name(pdev)); " with 'pcie_aspm=force'\n");
return -EINVAL; return -EINVAL;
} }
} }
......
...@@ -302,8 +302,8 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, ...@@ -302,8 +302,8 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
} else { } else {
res->start = l64; res->start = l64;
res->end = l64 + sz64; res->end = l64 + sz64;
printk(KERN_DEBUG "PCI: %s reg %x 64bit mmio: %pR\n", dev_printk(KERN_DEBUG, &dev->dev,
pci_name(dev), pos, res); "reg %x 64bit mmio: %pR\n", pos, res);
} }
} else { } else {
sz = pci_size(l, sz, mask); sz = pci_size(l, sz, mask);
...@@ -313,9 +313,9 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type, ...@@ -313,9 +313,9 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
res->start = l; res->start = l;
res->end = l + sz; res->end = l + sz;
printk(KERN_DEBUG "PCI: %s reg %x %s: %pR\n",
pci_name(dev), pos, dev_printk(KERN_DEBUG, &dev->dev, "reg %x %s: %pR\n", pos,
(res->flags & IORESOURCE_IO) ? "io port":"32bit mmio", (res->flags & IORESOURCE_IO) ? "io port" : "32bit mmio",
res); res);
} }
...@@ -387,8 +387,7 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) ...@@ -387,8 +387,7 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)
res->start = base; res->start = base;
if (!res->end) if (!res->end)
res->end = limit + 0xfff; res->end = limit + 0xfff;
printk(KERN_DEBUG "PCI: bridge %s io port: %pR\n", dev_printk(KERN_DEBUG, &dev->dev, "bridge io port: %pR\n", res);
pci_name(dev), res);
} }
res = child->resource[1]; res = child->resource[1];
...@@ -400,8 +399,8 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) ...@@ -400,8 +399,8 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)
res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM; res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM;
res->start = base; res->start = base;
res->end = limit + 0xfffff; res->end = limit + 0xfffff;
printk(KERN_DEBUG "PCI: bridge %s 32bit mmio: %pR\n", dev_printk(KERN_DEBUG, &dev->dev, "bridge 32bit mmio: %pR\n",
pci_name(dev), res); res);
} }
res = child->resource[2]; res = child->resource[2];
...@@ -437,9 +436,9 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) ...@@ -437,9 +436,9 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)
res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM | IORESOURCE_PREFETCH; res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM | IORESOURCE_PREFETCH;
res->start = base; res->start = base;
res->end = limit + 0xfffff; res->end = limit + 0xfffff;
printk(KERN_DEBUG "PCI: bridge %s %sbit mmio pref: %pR\n", dev_printk(KERN_DEBUG, &dev->dev, "bridge %sbit mmio pref: %pR\n",
pci_name(dev), (res->flags & PCI_PREF_RANGE_TYPE_64) ? "64" : "32",
(res->flags & PCI_PREF_RANGE_TYPE_64) ? "64":"32", res); res);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment