diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-09-19 03:15:50 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-09-19 03:15:50 -0400 |
commit | 5e51900be6c15488b80343d3c3e62d4d605ba9a9 (patch) | |
tree | 99e60bbc949e066503b598893998286c8a42861d /arch/x86/pci | |
parent | 998564789137921acae9e367b61c5a1dc295653d (diff) | |
parent | adee14b2e1557d0a8559f29681732d05a89dfc35 (diff) |
Merge commit 'v2.6.27-rc6' into x86/cleanups
Diffstat (limited to 'arch/x86/pci')
-rw-r--r-- | arch/x86/pci/i386.c | 87 |
1 files changed, 3 insertions, 84 deletions
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c index d765da913842..8791fc55e715 100644 --- a/arch/x86/pci/i386.c +++ b/arch/x86/pci/i386.c | |||
@@ -31,11 +31,8 @@ | |||
31 | #include <linux/ioport.h> | 31 | #include <linux/ioport.h> |
32 | #include <linux/errno.h> | 32 | #include <linux/errno.h> |
33 | #include <linux/bootmem.h> | 33 | #include <linux/bootmem.h> |
34 | #include <linux/acpi.h> | ||
35 | 34 | ||
36 | #include <asm/pat.h> | 35 | #include <asm/pat.h> |
37 | #include <asm/hpet.h> | ||
38 | #include <asm/io_apic.h> | ||
39 | 36 | ||
40 | #include "pci.h" | 37 | #include "pci.h" |
41 | 38 | ||
@@ -80,77 +77,6 @@ pcibios_align_resource(void *data, struct resource *res, | |||
80 | } | 77 | } |
81 | EXPORT_SYMBOL(pcibios_align_resource); | 78 | EXPORT_SYMBOL(pcibios_align_resource); |
82 | 79 | ||
83 | static int check_res_with_valid(struct pci_dev *dev, struct resource *res) | ||
84 | { | ||
85 | unsigned long base; | ||
86 | unsigned long size; | ||
87 | int i; | ||
88 | |||
89 | base = res->start; | ||
90 | size = (res->start == 0 && res->end == res->start) ? 0 : | ||
91 | (res->end - res->start + 1); | ||
92 | |||
93 | if (!base || !size) | ||
94 | return 0; | ||
95 | |||
96 | #ifdef CONFIG_HPET_TIMER | ||
97 | /* for hpet */ | ||
98 | if (base == hpet_address && (res->flags & IORESOURCE_MEM)) { | ||
99 | dev_info(&dev->dev, "BAR has HPET at %08lx-%08lx\n", | ||
100 | base, base + size - 1); | ||
101 | return 1; | ||
102 | } | ||
103 | #endif | ||
104 | |||
105 | #ifdef CONFIG_X86_IO_APIC | ||
106 | for (i = 0; i < nr_ioapics; i++) { | ||
107 | unsigned long ioapic_phys = mp_ioapics[i].mp_apicaddr; | ||
108 | |||
109 | if (base == ioapic_phys && (res->flags & IORESOURCE_MEM)) { | ||
110 | dev_info(&dev->dev, "BAR has ioapic at %08lx-%08lx\n", | ||
111 | base, base + size - 1); | ||
112 | return 1; | ||
113 | } | ||
114 | } | ||
115 | #endif | ||
116 | |||
117 | #ifdef CONFIG_PCI_MMCONFIG | ||
118 | for (i = 0; i < pci_mmcfg_config_num; i++) { | ||
119 | unsigned long addr; | ||
120 | |||
121 | addr = pci_mmcfg_config[i].address; | ||
122 | if (base == addr && (res->flags & IORESOURCE_MEM)) { | ||
123 | dev_info(&dev->dev, "BAR has MMCONFIG at %08lx-%08lx\n", | ||
124 | base, base + size - 1); | ||
125 | return 1; | ||
126 | } | ||
127 | } | ||
128 | #endif | ||
129 | |||
130 | return 0; | ||
131 | } | ||
132 | |||
133 | static int check_platform(struct pci_dev *dev, struct resource *res) | ||
134 | { | ||
135 | struct resource *root = NULL; | ||
136 | |||
137 | /* | ||
138 | * forcibly insert it into the | ||
139 | * resource tree | ||
140 | */ | ||
141 | if (res->flags & IORESOURCE_MEM) | ||
142 | root = &iomem_resource; | ||
143 | else if (res->flags & IORESOURCE_IO) | ||
144 | root = &ioport_resource; | ||
145 | |||
146 | if (root && check_res_with_valid(dev, res)) { | ||
147 | insert_resource(root, res); | ||
148 | |||
149 | return 1; | ||
150 | } | ||
151 | |||
152 | return 0; | ||
153 | } | ||
154 | /* | 80 | /* |
155 | * Handle resources of PCI devices. If the world were perfect, we could | 81 | * Handle resources of PCI devices. If the world were perfect, we could |
156 | * just allocate all the resource regions and do nothing more. It isn't. | 82 | * just allocate all the resource regions and do nothing more. It isn't. |
@@ -202,10 +128,7 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list) | |||
202 | pr = pci_find_parent_resource(dev, r); | 128 | pr = pci_find_parent_resource(dev, r); |
203 | if (!r->start || !pr || | 129 | if (!r->start || !pr || |
204 | request_resource(pr, r) < 0) { | 130 | request_resource(pr, r) < 0) { |
205 | if (check_platform(dev, r)) | 131 | dev_err(&dev->dev, "BAR %d: can't allocate resource\n", idx); |
206 | continue; | ||
207 | dev_err(&dev->dev, "BAR %d: can't " | ||
208 | "allocate resource\n", idx); | ||
209 | /* | 132 | /* |
210 | * Something is wrong with the region. | 133 | * Something is wrong with the region. |
211 | * Invalidate the resource to prevent | 134 | * Invalidate the resource to prevent |
@@ -240,17 +163,13 @@ static void __init pcibios_allocate_resources(int pass) | |||
240 | else | 163 | else |
241 | disabled = !(command & PCI_COMMAND_MEMORY); | 164 | disabled = !(command & PCI_COMMAND_MEMORY); |
242 | if (pass == disabled) { | 165 | if (pass == disabled) { |
243 | dev_dbg(&dev->dev, "resource %#08llx-%#08llx " | 166 | dev_dbg(&dev->dev, "resource %#08llx-%#08llx (f=%lx, d=%d, p=%d)\n", |
244 | "(f=%lx, d=%d, p=%d)\n", | ||
245 | (unsigned long long) r->start, | 167 | (unsigned long long) r->start, |
246 | (unsigned long long) r->end, | 168 | (unsigned long long) r->end, |
247 | r->flags, disabled, pass); | 169 | r->flags, disabled, pass); |
248 | pr = pci_find_parent_resource(dev, r); | 170 | pr = pci_find_parent_resource(dev, r); |
249 | if (!pr || request_resource(pr, r) < 0) { | 171 | if (!pr || request_resource(pr, r) < 0) { |
250 | if (check_platform(dev, r)) | 172 | dev_err(&dev->dev, "BAR %d: can't allocate resource\n", idx); |
251 | continue; | ||
252 | dev_err(&dev->dev, "BAR %d: can't " | ||
253 | "allocate resource\n", idx); | ||
254 | /* We'll assign a new address later */ | 173 | /* We'll assign a new address later */ |
255 | r->end -= r->start; | 174 | r->end -= r->start; |
256 | r->start = 0; | 175 | r->start = 0; |