Skip to content

Commit

Permalink
pci: Use new %pR to print resource ranges
Browse files Browse the repository at this point in the history 
This converts things in drivers/pci to use %pR to printout the
content of a struct resource instead of hand-casted %llx or
other variants.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
  • Loading branch information
Benjamin Herrenschmidt authored and Linus Torvalds committed Oct 20, 2008
1 parent 332d2e7 commit 096e6f6
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 54 deletions.
5 changes: 2 additions & 3 deletions drivers/pci/pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1358,11 +1358,10 @@ int pci_request_region(struct pci_dev *pdev, int bar, const char *res_name)
return 0;

err_out:
dev_warn(&pdev->dev, "BAR %d: can't reserve %s region [%#llx-%#llx]\n",
dev_warn(&pdev->dev, "BAR %d: can't reserve %s region %pR\n",
bar,
pci_resource_flags(pdev, bar) & IORESOURCE_IO ? "I/O" : "mem",
(unsigned long long)pci_resource_start(pdev, bar),
(unsigned long long)pci_resource_end(pdev, bar));
&pdev->resource[bar]);
return -EBUSY;
}

Expand Down
28 changes: 13 additions & 15 deletions drivers/pci/probe.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,9 +304,8 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
} else {
res->start = l64;
res->end = l64 + sz64;
printk(KERN_DEBUG "PCI: %s reg %x 64bit mmio: [%llx, %llx]\n",
pci_name(dev), pos, (unsigned long long)res->start,
(unsigned long long)res->end);
printk(KERN_DEBUG "PCI: %s reg %x 64bit mmio: %pR\n",
pci_name(dev), pos, res);
}
} else {
sz = pci_size(l, sz, mask);
Expand All @@ -316,9 +315,10 @@ static int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,

res->start = l;
res->end = l + sz;
printk(KERN_DEBUG "PCI: %s reg %x %s: [%llx, %llx]\n", pci_name(dev),
pos, (res->flags & IORESOURCE_IO) ? "io port":"32bit mmio",
(unsigned long long)res->start, (unsigned long long)res->end);
printk(KERN_DEBUG "PCI: %s reg %x %s: %pR\n",
pci_name(dev), pos,
(res->flags & IORESOURCE_IO) ? "io port":"32bit mmio",
res);
}

out:
Expand Down Expand Up @@ -389,9 +389,8 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)
res->start = base;
if (!res->end)
res->end = limit + 0xfff;
printk(KERN_DEBUG "PCI: bridge %s io port: [%llx, %llx]\n",
pci_name(dev), (unsigned long long) res->start,
(unsigned long long) res->end);
printk(KERN_DEBUG "PCI: bridge %s io port: %pR\n",
pci_name(dev), res);
}

res = child->resource[1];
Expand All @@ -403,9 +402,8 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)
res->flags = (mem_base_lo & PCI_MEMORY_RANGE_TYPE_MASK) | IORESOURCE_MEM;
res->start = base;
res->end = limit + 0xfffff;
printk(KERN_DEBUG "PCI: bridge %s 32bit mmio: [%llx, %llx]\n",
pci_name(dev), (unsigned long long) res->start,
(unsigned long long) res->end);
printk(KERN_DEBUG "PCI: bridge %s 32bit mmio: %pR\n",
pci_name(dev), res);
}

res = child->resource[2];
Expand Down Expand Up @@ -441,9 +439,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->start = base;
res->end = limit + 0xfffff;
printk(KERN_DEBUG "PCI: bridge %s %sbit mmio pref: [%llx, %llx]\n",
pci_name(dev), (res->flags & PCI_PREF_RANGE_TYPE_64) ? "64" : "32",
(unsigned long long) res->start, (unsigned long long) res->end);
printk(KERN_DEBUG "PCI: bridge %s %sbit mmio pref: %pR\n",
pci_name(dev),
(res->flags & PCI_PREF_RANGE_TYPE_64) ? "64":"32", res);
}
}

Expand Down
13 changes: 4 additions & 9 deletions drivers/pci/setup-bus.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -356,10 +356,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask, unsigned long
order = __ffs(align) - 20;
if (order > 11) {
dev_warn(&dev->dev, "BAR %d bad alignment %llx: "
"%#016llx-%#016llx\n", i,
(unsigned long long)align,
(unsigned long long)r->start,
(unsigned long long)r->end);
"%pR\n", i, (unsigned long long)align, r);
r->flags = 0;
continue;
}
Expand Down Expand Up @@ -539,11 +536,9 @@ static void pci_bus_dump_res(struct pci_bus *bus)
if (!res)
continue;

printk(KERN_INFO "bus: %02x index %x %s: [%llx, %llx]\n",
bus->number, i,
(res->flags & IORESOURCE_IO) ? "io port" : "mmio",
(unsigned long long) res->start,
(unsigned long long) res->end);
printk(KERN_INFO "bus: %02x index %x %s: %pR\n",
bus->number, i,
(res->flags & IORESOURCE_IO) ? "io port" : "mmio", res);
}
}

Expand Down
40 changes: 13 additions & 27 deletions drivers/pci/setup-res.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,8 @@ void pci_update_resource(struct pci_dev *dev, struct resource *res, int resno)

pcibios_resource_to_bus(dev, &region, res);

dev_dbg(&dev->dev, "BAR %d: got res [%#llx-%#llx] bus [%#llx-%#llx] "
"flags %#lx\n", resno,
(unsigned long long)res->start,
(unsigned long long)res->end,
dev_dbg(&dev->dev, "BAR %d: got res %pR bus [%#llx-%#llx] "
"flags %#lx\n", resno, res,
(unsigned long long)region.start,
(unsigned long long)region.end,
(unsigned long)res->flags);
Expand Down Expand Up @@ -114,13 +112,11 @@ int pci_claim_resource(struct pci_dev *dev, int resource)
err = insert_resource(root, res);

if (err) {
dev_err(&dev->dev, "BAR %d: %s of %s [%#llx-%#llx]\n",
dev_err(&dev->dev, "BAR %d: %s of %s %pR\n",
resource,
root ? "address space collision on" :
"no parent found for",
dtype,
(unsigned long long)res->start,
(unsigned long long)res->end);
dtype, res);
}

return err;
Expand All @@ -139,9 +135,8 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
align = resource_alignment(res);
if (!align) {
dev_err(&dev->dev, "BAR %d: can't allocate resource (bogus "
"alignment) [%#llx-%#llx] flags %#lx\n",
resno, (unsigned long long)res->start,
(unsigned long long)res->end, res->flags);
"alignment) %pR flags %#lx\n",
resno, res, res->flags);
return -EINVAL;
}

Expand All @@ -162,11 +157,8 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
}

if (ret) {
dev_err(&dev->dev, "BAR %d: can't allocate %s resource "
"[%#llx-%#llx]\n", resno,
res->flags & IORESOURCE_IO ? "I/O" : "mem",
(unsigned long long)res->start,
(unsigned long long)res->end);
dev_err(&dev->dev, "BAR %d: can't allocate %s resource %pR\n",
resno, res->flags & IORESOURCE_IO ? "I/O" : "mem", res);
} else {
res->flags &= ~IORESOURCE_STARTALIGN;
if (resno < PCI_BRIDGE_RESOURCES)
Expand Down Expand Up @@ -202,11 +194,8 @@ int pci_assign_resource_fixed(struct pci_dev *dev, int resno)
}

if (ret) {
dev_err(&dev->dev, "BAR %d: can't allocate %s resource "
"[%#llx-%#llx\n]", resno,
res->flags & IORESOURCE_IO ? "I/O" : "mem",
(unsigned long long)res->start,
(unsigned long long)res->end);
dev_err(&dev->dev, "BAR %d: can't allocate %s resource %pR\n",
resno, res->flags & IORESOURCE_IO ? "I/O" : "mem", res);
} else if (resno < PCI_BRIDGE_RESOURCES) {
pci_update_resource(dev, res, resno);
}
Expand Down Expand Up @@ -237,9 +226,8 @@ void pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)
r_align = resource_alignment(r);
if (!r_align) {
dev_warn(&dev->dev, "BAR %d: bogus alignment "
"[%#llx-%#llx] flags %#lx\n",
i, (unsigned long long)r->start,
(unsigned long long)r->end, r->flags);
"%pR flags %#lx\n",
i, r, r->flags);
continue;
}
for (list = head; ; list = list->next) {
Expand Down Expand Up @@ -287,9 +275,7 @@ int pci_enable_resources(struct pci_dev *dev, int mask)

if (!r->parent) {
dev_err(&dev->dev, "device not available because of "
"BAR %d [%#llx-%#llx] collisions\n", i,
(unsigned long long) r->start,
(unsigned long long) r->end);
"BAR %d %pR collisions\n", i, r);
return -EINVAL;
}

Expand Down

0 comments on commit 096e6f6

Please sign in to comment.