aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/pci/i386.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/pci/i386.c')
-rw-r--r--arch/x86/pci/i386.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index 52e656f17781..d49d17de7b3f 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -129,7 +129,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list)
129 continue; 129 continue;
130 if (!r->start || 130 if (!r->start ||
131 pci_claim_resource(dev, idx) < 0) { 131 pci_claim_resource(dev, idx) < 0) {
132 dev_info(&dev->dev, "BAR %d: can't allocate %pRt\n", idx, r); 132 dev_info(&dev->dev, "BAR %d: can't allocate %pR\n", idx, r);
133 /* 133 /*
134 * Something is wrong with the region. 134 * Something is wrong with the region.
135 * Invalidate the resource to prevent 135 * Invalidate the resource to prevent
@@ -164,10 +164,11 @@ static void __init pcibios_allocate_resources(int pass)
164 else 164 else
165 disabled = !(command & PCI_COMMAND_MEMORY); 165 disabled = !(command & PCI_COMMAND_MEMORY);
166 if (pass == disabled) { 166 if (pass == disabled) {
167 dev_dbg(&dev->dev, "%pRf (d=%d, p=%d)\n", r, 167 dev_dbg(&dev->dev,
168 disabled, pass); 168 "BAR %d: claiming %pr (d=%d, p=%d)\n",
169 idx, r, disabled, pass);
169 if (pci_claim_resource(dev, idx) < 0) { 170 if (pci_claim_resource(dev, idx) < 0) {
170 dev_info(&dev->dev, "BAR %d: can't allocate %pRt\n", idx, r); 171 dev_info(&dev->dev, "BAR %d: can't claim %pR\n", idx, r);
171 /* We'll assign a new address later */ 172 /* We'll assign a new address later */
172 r->end -= r->start; 173 r->end -= r->start;
173 r->start = 0; 174 r->start = 0;
@@ -180,7 +181,7 @@ static void __init pcibios_allocate_resources(int pass)
180 /* Turn the ROM off, leave the resource region, 181 /* Turn the ROM off, leave the resource region,
181 * but keep it unregistered. */ 182 * but keep it unregistered. */
182 u32 reg; 183 u32 reg;
183 dev_dbg(&dev->dev, "disabling ROM %pRt\n", r); 184 dev_dbg(&dev->dev, "disabling ROM %pR\n", r);
184 r->flags &= ~IORESOURCE_ROM_ENABLE; 185 r->flags &= ~IORESOURCE_ROM_ENABLE;
185 pci_read_config_dword(dev, 186 pci_read_config_dword(dev,
186 dev->rom_base_reg, &reg); 187 dev->rom_base_reg, &reg);