mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-24 19:35:58 +00:00
Code Issues Releases Wiki Activity

vsprintf: use %pR, %pr instead of %pRt, %pRf

Browse source 
Jesse accidentally applied v1 [1] of the patchset instead of v2 [2].  This
is the diff between v1 and v2.

The changes in this patch are:
    - tidied vsprintf stack buffer to shrink and compute size more
      accurately
    - use %pR for decoding and %pr for "raw" (with type and flags) instead
      of adding %pRt and %pRf

[1] http://lkml.org/lkml/2009/10/6/491
[2] http://lkml.org/lkml/2009/10/13/441

Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Bjorn Helgaas 2009-10-27 13:26:47 -06:00 committed by Jesse Barnes
parent 4fd8bdc567
commit c7dabef8a2
13 changed files with 114 additions and 107 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
arch/ia64/pci/pci.c
View file

@ -298,18 +298,19 @@ static __devinit acpi_status add_window(struct acpi_resource *res, void *data)
window->offset = offset; window->offset = offset;
if (insert_resource(root, &window->resource)) { if (insert_resource(root, &window->resource)) {
dev_err(&info->bridge->dev, "can't allocate %pRt\n", dev_err(&info->bridge->dev,
"can't allocate host bridge window %pR\n",
&window->resource); &window->resource);
} else { } else {
if (offset) if (offset)
dev_info(&info->bridge->dev, "host bridge window: %pRt " dev_info(&info->bridge->dev, "host bridge window %pR "
"(PCI address [%#llx-%#llx])\n", "(PCI address [%#llx-%#llx])\n",
&window->resource, &window->resource,
window->resource.start - offset, window->resource.start - offset,
window->resource.end - offset); window->resource.end - offset);
else else
dev_info(&info->bridge->dev, dev_info(&info->bridge->dev,
"host bridge window: %pRt\n", "host bridge window %pR\n",
&window->resource); &window->resource);
} }
@ -330,7 +331,9 @@ pcibios_setup_root_windows(struct pci_bus *bus, struct pci_controller *ctrl)
(res->end - res->start < 16)) (res->end - res->start < 16))
continue; continue;
if (j >= PCI_BUS_NUM_RESOURCES) { if (j >= PCI_BUS_NUM_RESOURCES) {
dev_warn(&bus->dev, "ignoring %pRf (no space)\n", res); dev_warn(&bus->dev,
"ignoring host bridge window %pR (no space)\n",
res);
continue; continue;
} }
bus->resource[j++] = res; bus->resource[j++] = res;

7
arch/x86/pci/acpi.c
View file

@ -108,18 +108,19 @@ setup_resource(struct acpi_resource *acpi_res, void *data)
res->child = NULL; res->child = NULL;
if (insert_resource(root, res)) { if (insert_resource(root, res)) {
dev_err(&info->bridge->dev, "can't allocate %pRt\n", res); dev_err(&info->bridge->dev,
"can't allocate host bridge window %pR\n", res);
} else { } else {
info->bus->resource[info->res_num] = res; info->bus->resource[info->res_num] = res;
info->res_num++; info->res_num++;
if (addr.translation_offset) if (addr.translation_offset)
dev_info(&info->bridge->dev, "host bridge window: %pRt " dev_info(&info->bridge->dev, "host bridge window %pR "
"(PCI address [%#llx-%#llx])\n", "(PCI address [%#llx-%#llx])\n",
res, res->start - addr.translation_offset, res, res->start - addr.translation_offset,
res->end - addr.translation_offset); res->end - addr.translation_offset);
else else
dev_info(&info->bridge->dev, dev_info(&info->bridge->dev,
"host bridge window: %pRt\n", res); "host bridge window %pR\n", res);
} }
return AE_OK; return AE_OK;
} }

11
arch/x86/pci/i386.c
View file

@ -129,7 +129,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list)
continue; continue;
if (!r->start || if (!r->start ||
pci_claim_resource(dev, idx) < 0) { pci_claim_resource(dev, idx) < 0) {
dev_info(&dev->dev, "BAR %d: can't allocate %pRt\n", idx, r); dev_info(&dev->dev, "BAR %d: can't allocate %pR\n", idx, r);
/* /*
* Something is wrong with the region. * Something is wrong with the region.
* Invalidate the resource to prevent * Invalidate the resource to prevent
@ -164,10 +164,11 @@ static void __init pcibios_allocate_resources(int pass)
else else
disabled = !(command & PCI_COMMAND_MEMORY); disabled = !(command & PCI_COMMAND_MEMORY);
if (pass == disabled) { if (pass == disabled) {
dev_dbg(&dev->dev, "%pRf (d=%d, p=%d)\n", r, dev_dbg(&dev->dev,
disabled, pass); "BAR %d: claiming %pr (d=%d, p=%d)\n",
idx, r, disabled, pass);
if (pci_claim_resource(dev, idx) < 0) { if (pci_claim_resource(dev, idx) < 0) {
dev_info(&dev->dev, "BAR %d: can't allocate %pRt\n", idx, r); dev_info(&dev->dev, "BAR %d: can't claim %pR\n", idx, r);
/* We'll assign a new address later */ /* We'll assign a new address later */
r->end -= r->start; r->end -= r->start;
r->start = 0; r->start = 0;
@ -180,7 +181,7 @@ static void __init pcibios_allocate_resources(int pass)
/* Turn the ROM off, leave the resource region, /* Turn the ROM off, leave the resource region,
* but keep it unregistered. */ * but keep it unregistered. */
u32 reg; u32 reg;
dev_dbg(&dev->dev, "disabling ROM %pRt\n", r); dev_dbg(&dev->dev, "disabling ROM %pR\n", r);
r->flags &= ~IORESOURCE_ROM_ENABLE; r->flags &= ~IORESOURCE_ROM_ENABLE;
pci_read_config_dword(dev, pci_read_config_dword(dev,
dev->rom_base_reg, &reg); dev->rom_base_reg, &reg);

2
drivers/pci/pci.c
View file

@ -1713,7 +1713,7 @@ static int __pci_request_region(struct pci_dev *pdev, int bar, const char *res_n
return 0; return 0;
err_out: err_out:
dev_warn(&pdev->dev, "BAR %d: can't reserve %pRt\n", bar, dev_warn(&pdev->dev, "BAR %d: can't reserve %pR\n", bar,
&pdev->resource[bar]); &pdev->resource[bar]);
return -EBUSY; return -EBUSY;
} }

17
drivers/pci/probe.c
View file

@ -225,12 +225,13 @@ int __pci_read_base(struct pci_dev *dev, enum pci_bar_type type,
if (!sz64) if (!sz64)
goto fail; goto fail;
res->flags |= IORESOURCE_MEM_64;
if ((sizeof(resource_size_t) < 8) && (sz64 > 0x100000000ULL)) { if ((sizeof(resource_size_t) < 8) && (sz64 > 0x100000000ULL)) {
dev_err(&dev->dev, "can't handle 64-bit BAR\n"); dev_err(&dev->dev, "can't handle 64-bit BAR\n");
goto fail; goto fail;
} else if ((sizeof(resource_size_t) < 8) && l) { }
res->flags |= IORESOURCE_MEM_64;
if ((sizeof(resource_size_t) < 8) && l) {
/* Address above 32-bit boundary; disable the BAR */ /* Address above 32-bit boundary; disable the BAR */
pci_write_config_dword(dev, pos, 0); pci_write_config_dword(dev, pos, 0);
pci_write_config_dword(dev, pos + 4, 0); pci_write_config_dword(dev, pos + 4, 0);
@ -239,7 +240,7 @@ 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;
dev_printk(KERN_DEBUG, &dev->dev, "reg %x: %pRt\n", dev_printk(KERN_DEBUG, &dev->dev, "reg %x: %pR\n",
pos, res); pos, res);
} }
} else { } else {
@ -251,7 +252,7 @@ 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;
dev_printk(KERN_DEBUG, &dev->dev, "reg %x: %pRt\n", pos, res); dev_printk(KERN_DEBUG, &dev->dev, "reg %x: %pR\n", pos, res);
} }
out: out:
@ -319,7 +320,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;
dev_printk(KERN_DEBUG, &dev->dev, "bridge window: %pRt\n", res); dev_printk(KERN_DEBUG, &dev->dev, " bridge window %pR\n", res);
} }
res = child->resource[1]; res = child->resource[1];
@ -331,7 +332,7 @@ 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;
dev_printk(KERN_DEBUG, &dev->dev, "bridge window: %pRt\n", res); dev_printk(KERN_DEBUG, &dev->dev, " bridge window %pR\n", res);
} }
res = child->resource[2]; res = child->resource[2];
@ -370,7 +371,7 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child)
res->flags |= IORESOURCE_MEM_64; res->flags |= IORESOURCE_MEM_64;
res->start = base; res->start = base;
res->end = limit + 0xfffff; res->end = limit + 0xfffff;
dev_printk(KERN_DEBUG, &dev->dev, "bridge window: %pRt\n", res); dev_printk(KERN_DEBUG, &dev->dev, " bridge window %pR\n", res);
} }
} }

2
drivers/pci/quirks.c
View file

@ -357,7 +357,7 @@ static void __devinit quirk_io_region(struct pci_dev *dev, unsigned region,
pcibios_bus_to_resource(dev, res, &bus_region); pcibios_bus_to_resource(dev, res, &bus_region);
pci_claim_resource(dev, nr); pci_claim_resource(dev, nr);
dev_info(&dev->dev, "quirk: region %04x-%04x claimed by %s\n", region, region + size - 1, name); dev_info(&dev->dev, "quirk: %pR claimed by %s\n", res, name);
} }
} }

79
drivers/pci/setup-bus.c
View file

@ -71,53 +71,50 @@ static void pbus_assign_resources_sorted(const struct pci_bus *bus)
void pci_setup_cardbus(struct pci_bus *bus) void pci_setup_cardbus(struct pci_bus *bus)
{ {
struct pci_dev *bridge = bus->self; struct pci_dev *bridge = bus->self;
struct resource *res;
struct pci_bus_region region; struct pci_bus_region region;
dev_info(&bridge->dev, "CardBus bridge, secondary bus %04x:%02x\n", dev_info(&bridge->dev, "CardBus bridge, secondary bus %04x:%02x\n",
pci_domain_nr(bus), bus->number); pci_domain_nr(bus), bus->number);
pcibios_resource_to_bus(bridge, &region, bus->resource[0]); res = bus->resource[0];
if (bus->resource[0]->flags & IORESOURCE_IO) { pcibios_resource_to_bus(bridge, &region, res);
if (res->flags & IORESOURCE_IO) {
/* /*
* The IO resource is allocated a range twice as large as it * The IO resource is allocated a range twice as large as it
* would normally need. This allows us to set both IO regs. * would normally need. This allows us to set both IO regs.
*/ */
dev_info(&bridge->dev, " IO window: %#08lx-%#08lx\n", dev_info(&bridge->dev, " bridge window %pR\n", res);
(unsigned long)region.start,
(unsigned long)region.end);
pci_write_config_dword(bridge, PCI_CB_IO_BASE_0, pci_write_config_dword(bridge, PCI_CB_IO_BASE_0,
region.start); region.start);
pci_write_config_dword(bridge, PCI_CB_IO_LIMIT_0, pci_write_config_dword(bridge, PCI_CB_IO_LIMIT_0,
region.end); region.end);
} }
pcibios_resource_to_bus(bridge, &region, bus->resource[1]); res = bus->resource[1];
if (bus->resource[1]->flags & IORESOURCE_IO) { pcibios_resource_to_bus(bridge, &region, res);
dev_info(&bridge->dev, " IO window: %#08lx-%#08lx\n", if (res->flags & IORESOURCE_IO) {
(unsigned long)region.start, dev_info(&bridge->dev, " bridge window %pR\n", res);
(unsigned long)region.end);
pci_write_config_dword(bridge, PCI_CB_IO_BASE_1, pci_write_config_dword(bridge, PCI_CB_IO_BASE_1,
region.start); region.start);
pci_write_config_dword(bridge, PCI_CB_IO_LIMIT_1, pci_write_config_dword(bridge, PCI_CB_IO_LIMIT_1,
region.end); region.end);
} }
pcibios_resource_to_bus(bridge, &region, bus->resource[2]); res = bus->resource[2];
if (bus->resource[2]->flags & IORESOURCE_MEM) { pcibios_resource_to_bus(bridge, &region, res);
dev_info(&bridge->dev, " PREFETCH window: %#08lx-%#08lx\n", if (res->flags & IORESOURCE_MEM) {
(unsigned long)region.start, dev_info(&bridge->dev, " bridge window %pR\n", res);
(unsigned long)region.end);
pci_write_config_dword(bridge, PCI_CB_MEMORY_BASE_0, pci_write_config_dword(bridge, PCI_CB_MEMORY_BASE_0,
region.start); region.start);
pci_write_config_dword(bridge, PCI_CB_MEMORY_LIMIT_0, pci_write_config_dword(bridge, PCI_CB_MEMORY_LIMIT_0,
region.end); region.end);
} }
pcibios_resource_to_bus(bridge, &region, bus->resource[3]); res = bus->resource[3];
if (bus->resource[3]->flags & IORESOURCE_MEM) { pcibios_resource_to_bus(bridge, &region, res);
dev_info(&bridge->dev, " MEM window: %#08lx-%#08lx\n", if (res->flags & IORESOURCE_MEM) {
(unsigned long)region.start, dev_info(&bridge->dev, " bridge window %pR\n", res);
(unsigned long)region.end);
pci_write_config_dword(bridge, PCI_CB_MEMORY_BASE_1, pci_write_config_dword(bridge, PCI_CB_MEMORY_BASE_1,
region.start); region.start);
pci_write_config_dword(bridge, PCI_CB_MEMORY_LIMIT_1, pci_write_config_dword(bridge, PCI_CB_MEMORY_LIMIT_1,
@ -140,6 +137,7 @@ EXPORT_SYMBOL(pci_setup_cardbus);
static void pci_setup_bridge(struct pci_bus *bus) static void pci_setup_bridge(struct pci_bus *bus)
{ {
struct pci_dev *bridge = bus->self; struct pci_dev *bridge = bus->self;
struct resource *res;
struct pci_bus_region region; struct pci_bus_region region;
u32 l, bu, lu, io_upper16; u32 l, bu, lu, io_upper16;
int pref_mem64; int pref_mem64;
@ -151,23 +149,22 @@ static void pci_setup_bridge(struct pci_bus *bus)
pci_domain_nr(bus), bus->number); pci_domain_nr(bus), bus->number);
/* Set up the top and bottom of the PCI I/O segment for this bus. */ /* Set up the top and bottom of the PCI I/O segment for this bus. */
pcibios_resource_to_bus(bridge, &region, bus->resource[0]); res = bus->resource[0];
if (bus->resource[0]->flags & IORESOURCE_IO) { pcibios_resource_to_bus(bridge, &region, res);
if (res->flags & IORESOURCE_IO) {
pci_read_config_dword(bridge, PCI_IO_BASE, &l); pci_read_config_dword(bridge, PCI_IO_BASE, &l);
l &= 0xffff0000; l &= 0xffff0000;
l |= (region.start >> 8) & 0x00f0; l |= (region.start >> 8) & 0x00f0;
l |= region.end & 0xf000; l |= region.end & 0xf000;
/* Set up upper 16 bits of I/O base/limit. */ /* Set up upper 16 bits of I/O base/limit. */
io_upper16 = (region.end & 0xffff0000) | (region.start >> 16); io_upper16 = (region.end & 0xffff0000) | (region.start >> 16);
dev_info(&bridge->dev, " IO window: %#04lx-%#04lx\n", dev_info(&bridge->dev, " bridge window %pR\n", res);
(unsigned long)region.start,
(unsigned long)region.end);
} }
else { else {
/* Clear upper 16 bits of I/O base/limit. */ /* Clear upper 16 bits of I/O base/limit. */
io_upper16 = 0; io_upper16 = 0;
l = 0x00f0; l = 0x00f0;
dev_info(&bridge->dev, " IO window: disabled\n"); dev_info(&bridge->dev, " bridge window [io disabled]\n");
} }
/* Temporarily disable the I/O range before updating PCI_IO_BASE. */ /* Temporarily disable the I/O range before updating PCI_IO_BASE. */
pci_write_config_dword(bridge, PCI_IO_BASE_UPPER16, 0x0000ffff); pci_write_config_dword(bridge, PCI_IO_BASE_UPPER16, 0x0000ffff);
@ -178,17 +175,16 @@ static void pci_setup_bridge(struct pci_bus *bus)
/* Set up the top and bottom of the PCI Memory segment /* Set up the top and bottom of the PCI Memory segment
for this bus. */ for this bus. */
pcibios_resource_to_bus(bridge, &region, bus->resource[1]); res = bus->resource[1];
if (bus->resource[1]->flags & IORESOURCE_MEM) { pcibios_resource_to_bus(bridge, &region, res);
if (res->flags & IORESOURCE_MEM) {
l = (region.start >> 16) & 0xfff0; l = (region.start >> 16) & 0xfff0;
l |= region.end & 0xfff00000; l |= region.end & 0xfff00000;
dev_info(&bridge->dev, " MEM window: %#08lx-%#08lx\n", dev_info(&bridge->dev, " bridge window %pR\n", res);
(unsigned long)region.start,
(unsigned long)region.end);
} }
else { else {
l = 0x0000fff0; l = 0x0000fff0;
dev_info(&bridge->dev, " MEM window: disabled\n"); dev_info(&bridge->dev, " bridge window [mem disabled]\n");
} }
pci_write_config_dword(bridge, PCI_MEMORY_BASE, l); pci_write_config_dword(bridge, PCI_MEMORY_BASE, l);
@ -200,24 +196,21 @@ static void pci_setup_bridge(struct pci_bus *bus)
/* Set up PREF base/limit. */ /* Set up PREF base/limit. */
pref_mem64 = 0; pref_mem64 = 0;
bu = lu = 0; bu = lu = 0;
pcibios_resource_to_bus(bridge, &region, bus->resource[2]); res = bus->resource[2];
if (bus->resource[2]->flags & IORESOURCE_PREFETCH) { pcibios_resource_to_bus(bridge, &region, res);
int width = 8; if (res->flags & IORESOURCE_PREFETCH) {
l = (region.start >> 16) & 0xfff0; l = (region.start >> 16) & 0xfff0;
l |= region.end & 0xfff00000; l |= region.end & 0xfff00000;
if (bus->resource[2]->flags & IORESOURCE_MEM_64) { if (res->flags & IORESOURCE_MEM_64) {
pref_mem64 = 1; pref_mem64 = 1;
bu = upper_32_bits(region.start); bu = upper_32_bits(region.start);
lu = upper_32_bits(region.end); lu = upper_32_bits(region.end);
width = 16;
} }
dev_info(&bridge->dev, " PREFETCH window: %#0*llx-%#0*llx\n", dev_info(&bridge->dev, " bridge window %pR\n", res);
width, (unsigned long long)region.start,
width, (unsigned long long)region.end);
} }
else { else {
l = 0x0000fff0; l = 0x0000fff0;
dev_info(&bridge->dev, " PREFETCH window: disabled\n"); dev_info(&bridge->dev, " bridge window [mem pref disabled]\n");
} }
pci_write_config_dword(bridge, PCI_PREF_MEMORY_BASE, l); pci_write_config_dword(bridge, PCI_PREF_MEMORY_BASE, l);
@ -391,7 +384,7 @@ static int pbus_size_mem(struct pci_bus *bus, unsigned long mask,
order = __ffs(align) - 20; order = __ffs(align) - 20;
if (order > 11) { if (order > 11) {
dev_warn(&dev->dev, "BAR %d: bad alignment %llx: " dev_warn(&dev->dev, "BAR %d: bad alignment %llx: "
"%pRt\n", i, (unsigned long long)align, r); "%pR\n", i, (unsigned long long)align, r);
r->flags = 0; r->flags = 0;
continue; continue;
} }
@ -582,7 +575,7 @@ static void pci_bus_dump_res(struct pci_bus *bus)
if (!res || !res->end) if (!res || !res->end)
continue; continue;
dev_printk(KERN_DEBUG, &bus->dev, "resource %d %pRt\n", i, res); dev_printk(KERN_DEBUG, &bus->dev, "resource %d %pR\n", i, res);
} }
} }

20
drivers/pci/setup-res.c
View file

@ -51,9 +51,11 @@ void pci_update_resource(struct pci_dev *dev, int resno)
pcibios_resource_to_bus(dev, &region, res); pcibios_resource_to_bus(dev, &region, res);
dev_dbg(&dev->dev, "BAR %d: got %pRf (bus addr [%#llx-%#llx])\n", dev_dbg(&dev->dev, "BAR %d: got res %pR bus [%#llx-%#llx] "
resno, res, (unsigned long long)region.start, "flags %#lx\n", resno, res,
(unsigned long long)region.end); (unsigned long long)region.start,
(unsigned long long)region.end,
(unsigned long)res->flags);
new = region.start | (res->flags & PCI_REGION_FLAG_MASK); new = region.start | (res->flags & PCI_REGION_FLAG_MASK);
if (res->flags & IORESOURCE_IO) if (res->flags & IORESOURCE_IO)
@ -89,8 +91,8 @@ void pci_update_resource(struct pci_dev *dev, int resno)
} }
} }
res->flags &= ~IORESOURCE_UNSET; res->flags &= ~IORESOURCE_UNSET;
dev_dbg(&dev->dev, "BAR %d: moved to bus addr [%#llx-%#llx]\n", dev_dbg(&dev->dev, "BAR %d: moved to %pR (bus addr [%#llx-%#llx])\n",
resno, (unsigned long long)region.start, resno, res, (unsigned long long)region.start,
(unsigned long long)region.end); (unsigned long long)region.end);
} }
@ -108,7 +110,7 @@ int pci_claim_resource(struct pci_dev *dev, int resource)
if (err) { if (err) {
const char *dtype = resource < PCI_BRIDGE_RESOURCES ? "device" : "bridge"; const char *dtype = resource < PCI_BRIDGE_RESOURCES ? "device" : "bridge";
dev_err(&dev->dev, "BAR %d: %s %s %pRt\n", dev_err(&dev->dev, "BAR %d: %s of %s %pR\n",
resource, resource,
root ? "address space collision on" : root ? "address space collision on" :
"no parent found for", "no parent found for",
@ -179,7 +181,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
align = pci_resource_alignment(dev, res); align = pci_resource_alignment(dev, res);
if (!align) { if (!align) {
dev_info(&dev->dev, "BAR %d: can't allocate %pRf " dev_info(&dev->dev, "BAR %d: can't allocate %pR "
"(bogus alignment)\n", resno, res); "(bogus alignment)\n", resno, res);
return -EINVAL; return -EINVAL;
} }
@ -196,7 +198,7 @@ int pci_assign_resource(struct pci_dev *dev, int resno)
} }
if (ret) if (ret)
dev_info(&dev->dev, "BAR %d: can't allocate %pRt\n", dev_info(&dev->dev, "BAR %d: can't allocate %pR\n",
resno, res); resno, res);
return ret; return ret;
@ -222,7 +224,7 @@ void pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)
r_align = pci_resource_alignment(dev, r); r_align = pci_resource_alignment(dev, r);
if (!r_align) { if (!r_align) {
dev_warn(&dev->dev, "BAR %d: bogus alignment %pRf\n", dev_warn(&dev->dev, "BAR %d: %pR has bogus alignment\n",
i, r); i, r);
continue; continue;
} }

5
drivers/pnp/quirks.c
View file

@ -285,8 +285,9 @@ static void quirk_system_pci_resources(struct pnp_dev *dev)
* the PCI region, and that might prevent a PCI * the PCI region, and that might prevent a PCI
* driver from requesting its resources. * driver from requesting its resources.
*/ */
dev_warn(&dev->dev, "resource %pRt overlaps %s " dev_warn(&dev->dev,
"BAR %d %pRt, disabling\n", res, "disabling %pR because it overlaps "
"%s BAR %d %pR\n", res,
pci_name(pdev), i, &pdev->resource[i]); pci_name(pdev), i, &pdev->resource[i]);
res->flags |= IORESOURCE_DISABLED; res->flags |= IORESOURCE_DISABLED;
} }

8
drivers/pnp/resource.c
View file

@ -517,7 +517,7 @@ struct pnp_resource *pnp_add_irq_resource(struct pnp_dev *dev, int irq,
res->start = irq; res->start = irq;
res->end = irq; res->end = irq;
pnp_dbg(&dev->dev, " add %pRf\n", res); pnp_dbg(&dev->dev, " add %pr\n", res);
return pnp_res; return pnp_res;
} }
@ -538,7 +538,7 @@ struct pnp_resource *pnp_add_dma_resource(struct pnp_dev *dev, int dma,
res->start = dma; res->start = dma;
res->end = dma; res->end = dma;
pnp_dbg(&dev->dev, " add %pRf\n", res); pnp_dbg(&dev->dev, " add %pr\n", res);
return pnp_res; return pnp_res;
} }
@ -562,7 +562,7 @@ struct pnp_resource *pnp_add_io_resource(struct pnp_dev *dev,
res->start = start; res->start = start;
res->end = end; res->end = end;
pnp_dbg(&dev->dev, " add %pRf\n", res); pnp_dbg(&dev->dev, " add %pr\n", res);
return pnp_res; return pnp_res;
} }
@ -586,7 +586,7 @@ struct pnp_resource *pnp_add_mem_resource(struct pnp_dev *dev,
res->start = start; res->start = start;
res->end = end; res->end = end;
pnp_dbg(&dev->dev, " add %pRf\n", res); pnp_dbg(&dev->dev, " add %pr\n", res);
return pnp_res; return pnp_res;
} }

2
drivers/pnp/support.c
View file

@ -82,7 +82,7 @@ void dbg_pnp_show_resources(struct pnp_dev *dev, char *desc)
else { else {
pnp_dbg(&dev->dev, "%s: current resources:\n", desc); pnp_dbg(&dev->dev, "%s: current resources:\n", desc);
list_for_each_entry(pnp_res, &dev->resources, list) list_for_each_entry(pnp_res, &dev->resources, list)
pnp_dbg(&dev->dev, "%pRf\n", &pnp_res->res); pnp_dbg(&dev->dev, "%pr\n", &pnp_res->res);
} }
} }

2
drivers/pnp/system.c
View file

@ -48,7 +48,7 @@ static void reserve_range(struct pnp_dev *dev, struct resource *r, int port)
* example do reserve stuff they know about too, so we may well * example do reserve stuff they know about too, so we may well
* have double reservations. * have double reservations.
*/ */
dev_info(&dev->dev, "%pRt %s reserved\n", r, dev_info(&dev->dev, "%pR %s reserved\n", r,
res ? "has been" : "could not be"); res ? "has been" : "could not be");
} }

55
lib/vsprintf.c
View file

@ -624,13 +624,19 @@ static char *resource_string(char *buf, char *end, struct resource *res,
.precision = -1, .precision = -1,
.flags = SPECIAL | SMALL, .flags = SPECIAL | SMALL,
}; };
/*
* room for three actual numbers (decimal or hex), plus /* 32-bit res (sizeof==4): 10 chars in dec, 10 in hex ("0x" + 8)
* "[mem 0x-0x 64bit pref disabled flags 0x]\0" * 64-bit res (sizeof==8): 20 chars in dec, 18 in hex ("0x" + 16) */
*/ #define RSRC_BUF_SIZE ((2 * sizeof(resource_size_t)) + 4)
char sym[3*3*sizeof(resource_size_t) + 41]; #define FLAG_BUF_SIZE (2 * sizeof(res->flags))
#define DECODED_BUF_SIZE sizeof("[mem - 64bit pref disabled]")
#define RAW_BUF_SIZE sizeof("[mem - flags 0x]")
char sym[max(2*RSRC_BUF_SIZE + DECODED_BUF_SIZE,
2*RSRC_BUF_SIZE + FLAG_BUF_SIZE + RAW_BUF_SIZE)];
char *p = sym, *pend = sym + sizeof(sym); char *p = sym, *pend = sym + sizeof(sym);
int size = -1, addr = 0; int size = -1, addr = 0;
int decode = (fmt[0] == 'R') ? 1 : 0;
if (res->flags & IORESOURCE_IO) { if (res->flags & IORESOURCE_IO) {
size = IO_RSRC_PRINTK_SIZE; size = IO_RSRC_PRINTK_SIZE;
@ -641,15 +647,17 @@ static char *resource_string(char *buf, char *end, struct resource *res,
} }
*p++ = '['; *p++ = '[';
if (fmt[1] == 't' || fmt[1] == 'f') { if (res->flags & IORESOURCE_IO)
if (res->flags & IORESOURCE_IO) p = string(p, pend, "io ", str_spec);
p = string(p, pend, "io ", str_spec); else if (res->flags & IORESOURCE_MEM)
else if (res->flags & IORESOURCE_MEM) p = string(p, pend, "mem ", str_spec);
p = string(p, pend, "mem ", str_spec); else if (res->flags & IORESOURCE_IRQ)
else if (res->flags & IORESOURCE_IRQ) p = string(p, pend, "irq ", str_spec);
p = string(p, pend, "irq ", str_spec); else if (res->flags & IORESOURCE_DMA)
else if (res->flags & IORESOURCE_DMA) p = string(p, pend, "dma ", str_spec);
p = string(p, pend, "dma ", str_spec); else {
p = string(p, pend, "??? ", str_spec);
decode = 0;
} }
hex_spec.field_width = size; hex_spec.field_width = size;
p = number(p, pend, res->start, addr ? hex_spec : dec_spec); p = number(p, pend, res->start, addr ? hex_spec : dec_spec);
@ -657,21 +665,19 @@ static char *resource_string(char *buf, char *end, struct resource *res,
*p++ = '-'; *p++ = '-';
p = number(p, pend, res->end, addr ? hex_spec : dec_spec); p = number(p, pend, res->end, addr ? hex_spec : dec_spec);
} }
if (fmt[1] == 't' || fmt[1] == 'f') { if (decode) {
if (res->flags & IORESOURCE_MEM_64) if (res->flags & IORESOURCE_MEM_64)
p = string(p, pend, " 64bit", str_spec); p = string(p, pend, " 64bit", str_spec);
if (res->flags & IORESOURCE_PREFETCH) if (res->flags & IORESOURCE_PREFETCH)
p = string(p, pend, " pref", str_spec); p = string(p, pend, " pref", str_spec);
if (res->flags & IORESOURCE_DISABLED) if (res->flags & IORESOURCE_DISABLED)
p = string(p, pend, " disabled", str_spec); p = string(p, pend, " disabled", str_spec);
if (fmt[1] == 'f') { } else {
p = string(p, pend, " flags ", str_spec); p = string(p, pend, " flags ", str_spec);
p = number(p, pend, res->flags & ~IORESOURCE_TYPE_BITS, p = number(p, pend, res->flags, flag_spec);
flag_spec);
}
} }
*p++ = ']'; *p++ = ']';
*p = 0; *p = '\0';
return string(buf, end, sym, spec); return string(buf, end, sym, spec);
} }
@ -847,10 +853,8 @@ static char *ip4_addr_string(char *buf, char *end, const u8 *addr,
* - 'f' For simple symbolic function names without offset * - 'f' For simple symbolic function names without offset
* - 'S' For symbolic direct pointers with offset * - 'S' For symbolic direct pointers with offset
* - 's' For symbolic direct pointers without offset * - 's' For symbolic direct pointers without offset
* - 'R' For a struct resource pointer, print: * - 'R' For decoded struct resource, e.g., [mem 0x0-0x1f 64bit pref]
* R address range only ([0x0-0x1f]) * - 'r' For raw struct resource, e.g., [mem 0x0-0x1f flags 0x201]
* Rt type and range ([mem 0x0-0x1f 64bit pref])
* Rf type, range, and flags ([mem 0x0-0x1f 64bit pref flags 0x1])
* - 'M' For a 6-byte MAC address, it prints the address in the * - 'M' For a 6-byte MAC address, it prints the address in the
* usual colon-separated hex notation * usual colon-separated hex notation
* - 'm' For a 6-byte MAC address, it prints the hex address without colons * - 'm' For a 6-byte MAC address, it prints the hex address without colons
@ -881,6 +885,7 @@ static char *pointer(const char *fmt, char *buf, char *end, void *ptr,
case 'S': case 'S':
return symbol_string(buf, end, ptr, spec, *fmt); return symbol_string(buf, end, ptr, spec, *fmt);
case 'R': case 'R':
case 'r':
return resource_string(buf, end, ptr, spec, fmt); return resource_string(buf, end, ptr, spec, fmt);
case 'M': /* Colon separated: 00:01:02:03:04:05 */ case 'M': /* Colon separated: 00:01:02:03:04:05 */
case 'm': /* Contiguous: 000102030405 */ case 'm': /* Contiguous: 000102030405 */