diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/ia64/pci/pci.c | 11 | ||||
-rw-r--r-- | arch/x86/pci/acpi.c | 7 | ||||
-rw-r--r-- | arch/x86/pci/i386.c | 11 |
3 files changed, 17 insertions, 12 deletions
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c index 06413b827e97..df639db779f9 100644 --- a/arch/ia64/pci/pci.c +++ b/arch/ia64/pci/pci.c | |||
@@ -298,18 +298,19 @@ static __devinit acpi_status add_window(struct acpi_resource *res, void *data) | |||
298 | window->offset = offset; | 298 | window->offset = offset; |
299 | 299 | ||
300 | if (insert_resource(root, &window->resource)) { | 300 | if (insert_resource(root, &window->resource)) { |
301 | dev_err(&info->bridge->dev, "can't allocate %pRt\n", | 301 | dev_err(&info->bridge->dev, |
302 | "can't allocate host bridge window %pR\n", | ||
302 | &window->resource); | 303 | &window->resource); |
303 | } else { | 304 | } else { |
304 | if (offset) | 305 | if (offset) |
305 | dev_info(&info->bridge->dev, "host bridge window: %pRt " | 306 | dev_info(&info->bridge->dev, "host bridge window %pR " |
306 | "(PCI address [%#llx-%#llx])\n", | 307 | "(PCI address [%#llx-%#llx])\n", |
307 | &window->resource, | 308 | &window->resource, |
308 | window->resource.start - offset, | 309 | window->resource.start - offset, |
309 | window->resource.end - offset); | 310 | window->resource.end - offset); |
310 | else | 311 | else |
311 | dev_info(&info->bridge->dev, | 312 | dev_info(&info->bridge->dev, |
312 | "host bridge window: %pRt\n", | 313 | "host bridge window %pR\n", |
313 | &window->resource); | 314 | &window->resource); |
314 | } | 315 | } |
315 | 316 | ||
@@ -330,7 +331,9 @@ pcibios_setup_root_windows(struct pci_bus *bus, struct pci_controller *ctrl) | |||
330 | (res->end - res->start < 16)) | 331 | (res->end - res->start < 16)) |
331 | continue; | 332 | continue; |
332 | if (j >= PCI_BUS_NUM_RESOURCES) { | 333 | if (j >= PCI_BUS_NUM_RESOURCES) { |
333 | dev_warn(&bus->dev, "ignoring %pRf (no space)\n", res); | 334 | dev_warn(&bus->dev, |
335 | "ignoring host bridge window %pR (no space)\n", | ||
336 | res); | ||
334 | continue; | 337 | continue; |
335 | } | 338 | } |
336 | bus->resource[j++] = res; | 339 | bus->resource[j++] = res; |
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c index 9b3daf976732..6bf8091d2fd5 100644 --- a/arch/x86/pci/acpi.c +++ b/arch/x86/pci/acpi.c | |||
@@ -108,18 +108,19 @@ setup_resource(struct acpi_resource *acpi_res, void *data) | |||
108 | res->child = NULL; | 108 | res->child = NULL; |
109 | 109 | ||
110 | if (insert_resource(root, res)) { | 110 | if (insert_resource(root, res)) { |
111 | dev_err(&info->bridge->dev, "can't allocate %pRt\n", res); | 111 | dev_err(&info->bridge->dev, |
112 | "can't allocate host bridge window %pR\n", res); | ||
112 | } else { | 113 | } else { |
113 | info->bus->resource[info->res_num] = res; | 114 | info->bus->resource[info->res_num] = res; |
114 | info->res_num++; | 115 | info->res_num++; |
115 | if (addr.translation_offset) | 116 | if (addr.translation_offset) |
116 | dev_info(&info->bridge->dev, "host bridge window: %pRt " | 117 | dev_info(&info->bridge->dev, "host bridge window %pR " |
117 | "(PCI address [%#llx-%#llx])\n", | 118 | "(PCI address [%#llx-%#llx])\n", |
118 | res, res->start - addr.translation_offset, | 119 | res, res->start - addr.translation_offset, |
119 | res->end - addr.translation_offset); | 120 | res->end - addr.translation_offset); |
120 | else | 121 | else |
121 | dev_info(&info->bridge->dev, | 122 | dev_info(&info->bridge->dev, |
122 | "host bridge window: %pRt\n", res); | 123 | "host bridge window %pR\n", res); |
123 | } | 124 | } |
124 | return AE_OK; | 125 | return AE_OK; |
125 | } | 126 | } |
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, ®); | 187 | dev->rom_base_reg, ®); |