Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit e9fe9e188118a0a34c6200d9b10ea6247f53592d

Authored by Bjorn Helgaas
Committed by Len Brown
1 parent 0638bc8dc0
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

pnpacpi: fix IRQ flag decoding 

When decoding IRQ trigger mode and polarity, it is not enough to mask by
IORESOURCE_BITS because there are now additional bits defined.  For
example, if IORESOURCE_IRQ_SHAREABLE was set, we failed to set *triggering
and *polarity at all.

I can't point to a failure that this patch fixes, but
bugs in this area have caused problems when resuming after
suspend, for example:

    http://bugzilla.kernel.org/show_bug.cgi?id=6316
    http://bugzilla.kernel.org/show_bug.cgi?id=9487
    https://bugs.launchpad.net/ubuntu/+source/linux-source-2.6.22/+bug/152187

This is based on a patch by Tom Jaeger:
    http://bugzilla.kernel.org/show_bug.cgi?id=9487#c32

[rene.herman@keyaccess.nl: fix comment]
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>

Showing 2 changed files with 15 additions and 7 deletions Inline Diff

drivers/pnp/pnpacpi/rsparser.c
Diff comments   View file @ e9fe9e1
1 /* 1 /*
2 * pnpacpi -- PnP ACPI driver 2 * pnpacpi -- PnP ACPI driver
3 * 3 *
4 * Copyright (c) 2004 Matthieu Castet <castet.matthieu@free.fr> 4 * Copyright (c) 2004 Matthieu Castet <castet.matthieu@free.fr>
5 * Copyright (c) 2004 Li Shaohua <shaohua.li@intel.com> 5 * Copyright (c) 2004 Li Shaohua <shaohua.li@intel.com>
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify it 7 * This program is free software; you can redistribute it and/or modify it
8 * under the terms of the GNU General Public License as published by the 8 * under the terms of the GNU General Public License as published by the
9 * Free Software Foundation; either version 2, or (at your option) any 9 * Free Software Foundation; either version 2, or (at your option) any
10 * later version. 10 * later version.
11 * 11 *
12 * This program is distributed in the hope that it will be useful, but 12 * This program is distributed in the hope that it will be useful, but
13 * WITHOUT ANY WARRANTY; without even the implied warranty of 13 * WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * General Public License for more details. 15 * General Public License for more details.
16 * 16 *
17 * You should have received a copy of the GNU General Public License 17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software 18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
20 */ 20 */
21 #include <linux/kernel.h> 21 #include <linux/kernel.h>
22 #include <linux/acpi.h> 22 #include <linux/acpi.h>
23 #include <linux/pci.h> 23 #include <linux/pci.h>
24 #include <linux/pnp.h> 24 #include <linux/pnp.h>
25 #include "../base.h" 25 #include "../base.h"
26 #include "pnpacpi.h" 26 #include "pnpacpi.h"
27 27
28 #ifdef CONFIG_IA64 28 #ifdef CONFIG_IA64
29 #define valid_IRQ(i) (1) 29 #define valid_IRQ(i) (1)
30 #else 30 #else
31 #define valid_IRQ(i) (((i) != 0) && ((i) != 2)) 31 #define valid_IRQ(i) (((i) != 0) && ((i) != 2))
32 #endif 32 #endif
33 33
34 /* 34 /*
35 * Allocated Resources 35 * Allocated Resources
36 */ 36 */
37 static int irq_flags(int triggering, int polarity, int shareable) 37 static int irq_flags(int triggering, int polarity, int shareable)
38 { 38 {
39 int flags; 39 int flags;
40 40
41 if (triggering == ACPI_LEVEL_SENSITIVE) { 41 if (triggering == ACPI_LEVEL_SENSITIVE) {
42 if (polarity == ACPI_ACTIVE_LOW) 42 if (polarity == ACPI_ACTIVE_LOW)
43 flags = IORESOURCE_IRQ_LOWLEVEL; 43 flags = IORESOURCE_IRQ_LOWLEVEL;
44 else 44 else
45 flags = IORESOURCE_IRQ_HIGHLEVEL; 45 flags = IORESOURCE_IRQ_HIGHLEVEL;
46 } else { 46 } else {
47 if (polarity == ACPI_ACTIVE_LOW) 47 if (polarity == ACPI_ACTIVE_LOW)
48 flags = IORESOURCE_IRQ_LOWEDGE; 48 flags = IORESOURCE_IRQ_LOWEDGE;
49 else 49 else
50 flags = IORESOURCE_IRQ_HIGHEDGE; 50 flags = IORESOURCE_IRQ_HIGHEDGE;
51 } 51 }
52 52
53 if (shareable) 53 if (shareable)
54 flags |= IORESOURCE_IRQ_SHAREABLE; 54 flags |= IORESOURCE_IRQ_SHAREABLE;
55 55
56 return flags; 56 return flags;
57 } 57 }
58 58
59 static void decode_irq_flags(int flag, int *triggering, int *polarity) 59 static void decode_irq_flags(struct pnp_dev *dev, int flags, int *triggering,
60 int *polarity)
60 { 61 {
61 switch (flag) { 62 switch (flags & (IORESOURCE_IRQ_LOWLEVEL | IORESOURCE_IRQ_HIGHLEVEL |
63 IORESOURCE_IRQ_LOWEDGE | IORESOURCE_IRQ_HIGHEDGE)) {
62 case IORESOURCE_IRQ_LOWLEVEL: 64 case IORESOURCE_IRQ_LOWLEVEL:
63 *triggering = ACPI_LEVEL_SENSITIVE; 65 *triggering = ACPI_LEVEL_SENSITIVE;
64 *polarity = ACPI_ACTIVE_LOW; 66 *polarity = ACPI_ACTIVE_LOW;
65 break; 67 break;
66 case IORESOURCE_IRQ_HIGHLEVEL: 68 case IORESOURCE_IRQ_HIGHLEVEL:
67 *triggering = ACPI_LEVEL_SENSITIVE; 69 *triggering = ACPI_LEVEL_SENSITIVE;
68 *polarity = ACPI_ACTIVE_HIGH; 70 *polarity = ACPI_ACTIVE_HIGH;
69 break; 71 break;
70 case IORESOURCE_IRQ_LOWEDGE: 72 case IORESOURCE_IRQ_LOWEDGE:
71 *triggering = ACPI_EDGE_SENSITIVE; 73 *triggering = ACPI_EDGE_SENSITIVE;
72 *polarity = ACPI_ACTIVE_LOW; 74 *polarity = ACPI_ACTIVE_LOW;
73 break; 75 break;
74 case IORESOURCE_IRQ_HIGHEDGE: 76 case IORESOURCE_IRQ_HIGHEDGE:
75 *triggering = ACPI_EDGE_SENSITIVE; 77 *triggering = ACPI_EDGE_SENSITIVE;
76 *polarity = ACPI_ACTIVE_HIGH; 78 *polarity = ACPI_ACTIVE_HIGH;
77 break; 79 break;
80 default:
81 dev_err(&dev->dev, "can't encode invalid IRQ mode %#x\n",
82 flags);
83 *triggering = ACPI_EDGE_SENSITIVE;
84 *polarity = ACPI_ACTIVE_HIGH;
85 break;
78 } 86 }
79 } 87 }
80 88
81 static void pnpacpi_parse_allocated_irqresource(struct pnp_dev *dev, 89 static void pnpacpi_parse_allocated_irqresource(struct pnp_dev *dev,
82 u32 gsi, int triggering, 90 u32 gsi, int triggering,
83 int polarity, int shareable) 91 int polarity, int shareable)
84 { 92 {
85 int irq, flags; 93 int irq, flags;
86 int p, t; 94 int p, t;
87 95
88 if (!valid_IRQ(gsi)) 96 if (!valid_IRQ(gsi))
89 return; 97 return;
90 98
91 /* 99 /*
92 * in IO-APIC mode, use overrided attribute. Two reasons: 100 * in IO-APIC mode, use overrided attribute. Two reasons:
93 * 1. BIOS bug in DSDT 101 * 1. BIOS bug in DSDT
94 * 2. BIOS uses IO-APIC mode Interrupt Source Override 102 * 2. BIOS uses IO-APIC mode Interrupt Source Override
95 */ 103 */
96 if (!acpi_get_override_irq(gsi, &t, &p)) { 104 if (!acpi_get_override_irq(gsi, &t, &p)) {
97 t = t ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE; 105 t = t ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE;
98 p = p ? ACPI_ACTIVE_LOW : ACPI_ACTIVE_HIGH; 106 p = p ? ACPI_ACTIVE_LOW : ACPI_ACTIVE_HIGH;
99 107
100 if (triggering != t || polarity != p) { 108 if (triggering != t || polarity != p) {
101 dev_warn(&dev->dev, "IRQ %d override to %s, %s\n", 109 dev_warn(&dev->dev, "IRQ %d override to %s, %s\n",
102 gsi, t ? "edge":"level", p ? "low":"high"); 110 gsi, t ? "edge":"level", p ? "low":"high");
103 triggering = t; 111 triggering = t;
104 polarity = p; 112 polarity = p;
105 } 113 }
106 } 114 }
107 115
108 flags = irq_flags(triggering, polarity, shareable); 116 flags = irq_flags(triggering, polarity, shareable);
109 irq = acpi_register_gsi(gsi, triggering, polarity); 117 irq = acpi_register_gsi(gsi, triggering, polarity);
110 if (irq >= 0) 118 if (irq >= 0)
111 pcibios_penalize_isa_irq(irq, 1); 119 pcibios_penalize_isa_irq(irq, 1);
112 else 120 else
113 flags |= IORESOURCE_DISABLED; 121 flags |= IORESOURCE_DISABLED;
114 122
115 pnp_add_irq_resource(dev, irq, flags); 123 pnp_add_irq_resource(dev, irq, flags);
116 } 124 }
117 125
118 static int dma_flags(int type, int bus_master, int transfer) 126 static int dma_flags(int type, int bus_master, int transfer)
119 { 127 {
120 int flags = 0; 128 int flags = 0;
121 129
122 if (bus_master) 130 if (bus_master)
123 flags |= IORESOURCE_DMA_MASTER; 131 flags |= IORESOURCE_DMA_MASTER;
124 switch (type) { 132 switch (type) {
125 case ACPI_COMPATIBILITY: 133 case ACPI_COMPATIBILITY:
126 flags |= IORESOURCE_DMA_COMPATIBLE; 134 flags |= IORESOURCE_DMA_COMPATIBLE;
127 break; 135 break;
128 case ACPI_TYPE_A: 136 case ACPI_TYPE_A:
129 flags |= IORESOURCE_DMA_TYPEA; 137 flags |= IORESOURCE_DMA_TYPEA;
130 break; 138 break;
131 case ACPI_TYPE_B: 139 case ACPI_TYPE_B:
132 flags |= IORESOURCE_DMA_TYPEB; 140 flags |= IORESOURCE_DMA_TYPEB;
133 break; 141 break;
134 case ACPI_TYPE_F: 142 case ACPI_TYPE_F:
135 flags |= IORESOURCE_DMA_TYPEF; 143 flags |= IORESOURCE_DMA_TYPEF;
136 break; 144 break;
137 default: 145 default:
138 /* Set a default value ? */ 146 /* Set a default value ? */
139 flags |= IORESOURCE_DMA_COMPATIBLE; 147 flags |= IORESOURCE_DMA_COMPATIBLE;
140 pnp_err("Invalid DMA type"); 148 pnp_err("Invalid DMA type");
141 } 149 }
142 switch (transfer) { 150 switch (transfer) {
143 case ACPI_TRANSFER_8: 151 case ACPI_TRANSFER_8:
144 flags |= IORESOURCE_DMA_8BIT; 152 flags |= IORESOURCE_DMA_8BIT;
145 break; 153 break;
146 case ACPI_TRANSFER_8_16: 154 case ACPI_TRANSFER_8_16:
147 flags |= IORESOURCE_DMA_8AND16BIT; 155 flags |= IORESOURCE_DMA_8AND16BIT;
148 break; 156 break;
149 case ACPI_TRANSFER_16: 157 case ACPI_TRANSFER_16:
150 flags |= IORESOURCE_DMA_16BIT; 158 flags |= IORESOURCE_DMA_16BIT;
151 break; 159 break;
152 default: 160 default:
153 /* Set a default value ? */ 161 /* Set a default value ? */
154 flags |= IORESOURCE_DMA_8AND16BIT; 162 flags |= IORESOURCE_DMA_8AND16BIT;
155 pnp_err("Invalid DMA transfer type"); 163 pnp_err("Invalid DMA transfer type");
156 } 164 }
157 165
158 return flags; 166 return flags;
159 } 167 }
160 168
161 static void pnpacpi_parse_allocated_ioresource(struct pnp_dev *dev, u64 start, 169 static void pnpacpi_parse_allocated_ioresource(struct pnp_dev *dev, u64 start,
162 u64 len, int io_decode) 170 u64 len, int io_decode)
163 { 171 {
164 int flags = 0; 172 int flags = 0;
165 u64 end = start + len - 1; 173 u64 end = start + len - 1;
166 174
167 if (io_decode == ACPI_DECODE_16) 175 if (io_decode == ACPI_DECODE_16)
168 flags |= PNP_PORT_FLAG_16BITADDR; 176 flags |= PNP_PORT_FLAG_16BITADDR;
169 if (len == 0 || end >= 0x10003) 177 if (len == 0 || end >= 0x10003)
170 flags |= IORESOURCE_DISABLED; 178 flags |= IORESOURCE_DISABLED;
171 179
172 pnp_add_io_resource(dev, start, end, flags); 180 pnp_add_io_resource(dev, start, end, flags);
173 } 181 }
174 182
175 static void pnpacpi_parse_allocated_memresource(struct pnp_dev *dev, 183 static void pnpacpi_parse_allocated_memresource(struct pnp_dev *dev,
176 u64 start, u64 len, 184 u64 start, u64 len,
177 int write_protect) 185 int write_protect)
178 { 186 {
179 int flags = 0; 187 int flags = 0;
180 u64 end = start + len - 1; 188 u64 end = start + len - 1;
181 189
182 if (len == 0) 190 if (len == 0)
183 flags |= IORESOURCE_DISABLED; 191 flags |= IORESOURCE_DISABLED;
184 if (write_protect == ACPI_READ_WRITE_MEMORY) 192 if (write_protect == ACPI_READ_WRITE_MEMORY)
185 flags |= IORESOURCE_MEM_WRITEABLE; 193 flags |= IORESOURCE_MEM_WRITEABLE;
186 194
187 pnp_add_mem_resource(dev, start, end, flags); 195 pnp_add_mem_resource(dev, start, end, flags);
188 } 196 }
189 197
190 static void pnpacpi_parse_allocated_address_space(struct pnp_dev *dev, 198 static void pnpacpi_parse_allocated_address_space(struct pnp_dev *dev,
191 struct acpi_resource *res) 199 struct acpi_resource *res)
192 { 200 {
193 struct acpi_resource_address64 addr, *p = &addr; 201 struct acpi_resource_address64 addr, *p = &addr;
194 acpi_status status; 202 acpi_status status;
195 203
196 status = acpi_resource_to_address64(res, p); 204 status = acpi_resource_to_address64(res, p);
197 if (!ACPI_SUCCESS(status)) { 205 if (!ACPI_SUCCESS(status)) {
198 dev_warn(&dev->dev, "failed to convert resource type %d\n", 206 dev_warn(&dev->dev, "failed to convert resource type %d\n",
199 res->type); 207 res->type);
200 return; 208 return;
201 } 209 }
202 210
203 if (p->producer_consumer == ACPI_PRODUCER) 211 if (p->producer_consumer == ACPI_PRODUCER)
204 return; 212 return;
205 213
206 if (p->resource_type == ACPI_MEMORY_RANGE) 214 if (p->resource_type == ACPI_MEMORY_RANGE)
207 pnpacpi_parse_allocated_memresource(dev, 215 pnpacpi_parse_allocated_memresource(dev,
208 p->minimum, p->address_length, 216 p->minimum, p->address_length,
209 p->info.mem.write_protect); 217 p->info.mem.write_protect);
210 else if (p->resource_type == ACPI_IO_RANGE) 218 else if (p->resource_type == ACPI_IO_RANGE)
211 pnpacpi_parse_allocated_ioresource(dev, 219 pnpacpi_parse_allocated_ioresource(dev,
212 p->minimum, p->address_length, 220 p->minimum, p->address_length,
213 p->granularity == 0xfff ? ACPI_DECODE_10 : 221 p->granularity == 0xfff ? ACPI_DECODE_10 :
214 ACPI_DECODE_16); 222 ACPI_DECODE_16);
215 } 223 }
216 224
217 static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res, 225 static acpi_status pnpacpi_allocated_resource(struct acpi_resource *res,
218 void *data) 226 void *data)
219 { 227 {
220 struct pnp_dev *dev = data; 228 struct pnp_dev *dev = data;
221 struct acpi_resource_irq *irq; 229 struct acpi_resource_irq *irq;
222 struct acpi_resource_dma *dma; 230 struct acpi_resource_dma *dma;
223 struct acpi_resource_io *io; 231 struct acpi_resource_io *io;
224 struct acpi_resource_fixed_io *fixed_io; 232 struct acpi_resource_fixed_io *fixed_io;
225 struct acpi_resource_memory24 *memory24; 233 struct acpi_resource_memory24 *memory24;
226 struct acpi_resource_memory32 *memory32; 234 struct acpi_resource_memory32 *memory32;
227 struct acpi_resource_fixed_memory32 *fixed_memory32; 235 struct acpi_resource_fixed_memory32 *fixed_memory32;
228 struct acpi_resource_extended_irq *extended_irq; 236 struct acpi_resource_extended_irq *extended_irq;
229 int i, flags; 237 int i, flags;
230 238
231 switch (res->type) { 239 switch (res->type) {
232 case ACPI_RESOURCE_TYPE_IRQ: 240 case ACPI_RESOURCE_TYPE_IRQ:
233 /* 241 /*
234 * Per spec, only one interrupt per descriptor is allowed in 242 * Per spec, only one interrupt per descriptor is allowed in
235 * _CRS, but some firmware violates this, so parse them all. 243 * _CRS, but some firmware violates this, so parse them all.
236 */ 244 */
237 irq = &res->data.irq; 245 irq = &res->data.irq;
238 for (i = 0; i < irq->interrupt_count; i++) { 246 for (i = 0; i < irq->interrupt_count; i++) {
239 pnpacpi_parse_allocated_irqresource(dev, 247 pnpacpi_parse_allocated_irqresource(dev,
240 irq->interrupts[i], 248 irq->interrupts[i],
241 irq->triggering, 249 irq->triggering,
242 irq->polarity, 250 irq->polarity,
243 irq->sharable); 251 irq->sharable);
244 } 252 }
245 break; 253 break;
246 254
247 case ACPI_RESOURCE_TYPE_DMA: 255 case ACPI_RESOURCE_TYPE_DMA:
248 dma = &res->data.dma; 256 dma = &res->data.dma;
249 if (dma->channel_count > 0) { 257 if (dma->channel_count > 0) {
250 flags = dma_flags(dma->type, dma->bus_master, 258 flags = dma_flags(dma->type, dma->bus_master,
251 dma->transfer); 259 dma->transfer);
252 if (dma->channels[0] == (u8) -1) 260 if (dma->channels[0] == (u8) -1)
253 flags |= IORESOURCE_DISABLED; 261 flags |= IORESOURCE_DISABLED;
254 pnp_add_dma_resource(dev, dma->channels[0], flags); 262 pnp_add_dma_resource(dev, dma->channels[0], flags);
255 } 263 }
256 break; 264 break;
257 265
258 case ACPI_RESOURCE_TYPE_IO: 266 case ACPI_RESOURCE_TYPE_IO:
259 io = &res->data.io; 267 io = &res->data.io;
260 pnpacpi_parse_allocated_ioresource(dev, 268 pnpacpi_parse_allocated_ioresource(dev,
261 io->minimum, 269 io->minimum,
262 io->address_length, 270 io->address_length,
263 io->io_decode); 271 io->io_decode);
264 break; 272 break;
265 273
266 case ACPI_RESOURCE_TYPE_START_DEPENDENT: 274 case ACPI_RESOURCE_TYPE_START_DEPENDENT:
267 case ACPI_RESOURCE_TYPE_END_DEPENDENT: 275 case ACPI_RESOURCE_TYPE_END_DEPENDENT:
268 break; 276 break;
269 277
270 case ACPI_RESOURCE_TYPE_FIXED_IO: 278 case ACPI_RESOURCE_TYPE_FIXED_IO:
271 fixed_io = &res->data.fixed_io; 279 fixed_io = &res->data.fixed_io;
272 pnpacpi_parse_allocated_ioresource(dev, 280 pnpacpi_parse_allocated_ioresource(dev,
273 fixed_io->address, 281 fixed_io->address,
274 fixed_io->address_length, 282 fixed_io->address_length,
275 ACPI_DECODE_10); 283 ACPI_DECODE_10);
276 break; 284 break;
277 285
278 case ACPI_RESOURCE_TYPE_VENDOR: 286 case ACPI_RESOURCE_TYPE_VENDOR:
279 break; 287 break;
280 288
281 case ACPI_RESOURCE_TYPE_END_TAG: 289 case ACPI_RESOURCE_TYPE_END_TAG:
282 break; 290 break;
283 291
284 case ACPI_RESOURCE_TYPE_MEMORY24: 292 case ACPI_RESOURCE_TYPE_MEMORY24:
285 memory24 = &res->data.memory24; 293 memory24 = &res->data.memory24;
286 pnpacpi_parse_allocated_memresource(dev, 294 pnpacpi_parse_allocated_memresource(dev,
287 memory24->minimum, 295 memory24->minimum,
288 memory24->address_length, 296 memory24->address_length,
289 memory24->write_protect); 297 memory24->write_protect);
290 break; 298 break;
291 case ACPI_RESOURCE_TYPE_MEMORY32: 299 case ACPI_RESOURCE_TYPE_MEMORY32:
292 memory32 = &res->data.memory32; 300 memory32 = &res->data.memory32;
293 pnpacpi_parse_allocated_memresource(dev, 301 pnpacpi_parse_allocated_memresource(dev,
294 memory32->minimum, 302 memory32->minimum,
295 memory32->address_length, 303 memory32->address_length,
296 memory32->write_protect); 304 memory32->write_protect);
297 break; 305 break;
298 case ACPI_RESOURCE_TYPE_FIXED_MEMORY32: 306 case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
299 fixed_memory32 = &res->data.fixed_memory32; 307 fixed_memory32 = &res->data.fixed_memory32;
300 pnpacpi_parse_allocated_memresource(dev, 308 pnpacpi_parse_allocated_memresource(dev,
301 fixed_memory32->address, 309 fixed_memory32->address,
302 fixed_memory32->address_length, 310 fixed_memory32->address_length,
303 fixed_memory32->write_protect); 311 fixed_memory32->write_protect);
304 break; 312 break;
305 case ACPI_RESOURCE_TYPE_ADDRESS16: 313 case ACPI_RESOURCE_TYPE_ADDRESS16:
306 case ACPI_RESOURCE_TYPE_ADDRESS32: 314 case ACPI_RESOURCE_TYPE_ADDRESS32:
307 case ACPI_RESOURCE_TYPE_ADDRESS64: 315 case ACPI_RESOURCE_TYPE_ADDRESS64:
308 pnpacpi_parse_allocated_address_space(dev, res); 316 pnpacpi_parse_allocated_address_space(dev, res);
309 break; 317 break;
310 318
311 case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64: 319 case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64:
312 if (res->data.ext_address64.producer_consumer == ACPI_PRODUCER) 320 if (res->data.ext_address64.producer_consumer == ACPI_PRODUCER)
313 return AE_OK; 321 return AE_OK;
314 break; 322 break;
315 323
316 case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: 324 case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
317 extended_irq = &res->data.extended_irq; 325 extended_irq = &res->data.extended_irq;
318 if (extended_irq->producer_consumer == ACPI_PRODUCER) 326 if (extended_irq->producer_consumer == ACPI_PRODUCER)
319 return AE_OK; 327 return AE_OK;
320 328
321 for (i = 0; i < extended_irq->interrupt_count; i++) { 329 for (i = 0; i < extended_irq->interrupt_count; i++) {
322 pnpacpi_parse_allocated_irqresource(dev, 330 pnpacpi_parse_allocated_irqresource(dev,
323 extended_irq->interrupts[i], 331 extended_irq->interrupts[i],
324 extended_irq->triggering, 332 extended_irq->triggering,
325 extended_irq->polarity, 333 extended_irq->polarity,
326 extended_irq->sharable); 334 extended_irq->sharable);
327 } 335 }
328 break; 336 break;
329 337
330 case ACPI_RESOURCE_TYPE_GENERIC_REGISTER: 338 case ACPI_RESOURCE_TYPE_GENERIC_REGISTER:
331 break; 339 break;
332 340
333 default: 341 default:
334 dev_warn(&dev->dev, "unknown resource type %d in _CRS\n", 342 dev_warn(&dev->dev, "unknown resource type %d in _CRS\n",
335 res->type); 343 res->type);
336 return AE_ERROR; 344 return AE_ERROR;
337 } 345 }
338 346
339 return AE_OK; 347 return AE_OK;
340 } 348 }
341 349
342 int pnpacpi_parse_allocated_resource(struct pnp_dev *dev) 350 int pnpacpi_parse_allocated_resource(struct pnp_dev *dev)
343 { 351 {
344 acpi_handle handle = dev->data; 352 acpi_handle handle = dev->data;
345 acpi_status status; 353 acpi_status status;
346 354
347 dev_dbg(&dev->dev, "parse allocated resources\n"); 355 dev_dbg(&dev->dev, "parse allocated resources\n");
348 356
349 pnp_init_resources(dev); 357 pnp_init_resources(dev);
350 358
351 status = acpi_walk_resources(handle, METHOD_NAME__CRS, 359 status = acpi_walk_resources(handle, METHOD_NAME__CRS,
352 pnpacpi_allocated_resource, dev); 360 pnpacpi_allocated_resource, dev);
353 361
354 if (ACPI_FAILURE(status)) { 362 if (ACPI_FAILURE(status)) {
355 if (status != AE_NOT_FOUND) 363 if (status != AE_NOT_FOUND)
356 dev_err(&dev->dev, "can't evaluate _CRS: %d", status); 364 dev_err(&dev->dev, "can't evaluate _CRS: %d", status);
357 return -EPERM; 365 return -EPERM;
358 } 366 }
359 return 0; 367 return 0;
360 } 368 }
361 369
362 static __init void pnpacpi_parse_dma_option(struct pnp_dev *dev, 370 static __init void pnpacpi_parse_dma_option(struct pnp_dev *dev,
363 struct pnp_option *option, 371 struct pnp_option *option,
364 struct acpi_resource_dma *p) 372 struct acpi_resource_dma *p)
365 { 373 {
366 int i; 374 int i;
367 struct pnp_dma *dma; 375 struct pnp_dma *dma;
368 376
369 if (p->channel_count == 0) 377 if (p->channel_count == 0)
370 return; 378 return;
371 dma = kzalloc(sizeof(struct pnp_dma), GFP_KERNEL); 379 dma = kzalloc(sizeof(struct pnp_dma), GFP_KERNEL);
372 if (!dma) 380 if (!dma)
373 return; 381 return;
374 382
375 for (i = 0; i < p->channel_count; i++) 383 for (i = 0; i < p->channel_count; i++)
376 dma->map |= 1 << p->channels[i]; 384 dma->map |= 1 << p->channels[i];
377 385
378 dma->flags = dma_flags(p->type, p->bus_master, p->transfer); 386 dma->flags = dma_flags(p->type, p->bus_master, p->transfer);
379 387
380 pnp_register_dma_resource(dev, option, dma); 388 pnp_register_dma_resource(dev, option, dma);
381 } 389 }
382 390
383 static __init void pnpacpi_parse_irq_option(struct pnp_dev *dev, 391 static __init void pnpacpi_parse_irq_option(struct pnp_dev *dev,
384 struct pnp_option *option, 392 struct pnp_option *option,
385 struct acpi_resource_irq *p) 393 struct acpi_resource_irq *p)
386 { 394 {
387 int i; 395 int i;
388 struct pnp_irq *irq; 396 struct pnp_irq *irq;
389 397
390 if (p->interrupt_count == 0) 398 if (p->interrupt_count == 0)
391 return; 399 return;
392 irq = kzalloc(sizeof(struct pnp_irq), GFP_KERNEL); 400 irq = kzalloc(sizeof(struct pnp_irq), GFP_KERNEL);
393 if (!irq) 401 if (!irq)
394 return; 402 return;
395 403
396 for (i = 0; i < p->interrupt_count; i++) 404 for (i = 0; i < p->interrupt_count; i++)
397 if (p->interrupts[i]) 405 if (p->interrupts[i])
398 __set_bit(p->interrupts[i], irq->map); 406 __set_bit(p->interrupts[i], irq->map);
399 irq->flags = irq_flags(p->triggering, p->polarity, p->sharable); 407 irq->flags = irq_flags(p->triggering, p->polarity, p->sharable);
400 408
401 pnp_register_irq_resource(dev, option, irq); 409 pnp_register_irq_resource(dev, option, irq);
402 } 410 }
403 411
404 static __init void pnpacpi_parse_ext_irq_option(struct pnp_dev *dev, 412 static __init void pnpacpi_parse_ext_irq_option(struct pnp_dev *dev,
405 struct pnp_option *option, 413 struct pnp_option *option,
406 struct acpi_resource_extended_irq *p) 414 struct acpi_resource_extended_irq *p)
407 { 415 {
408 int i; 416 int i;
409 struct pnp_irq *irq; 417 struct pnp_irq *irq;
410 418
411 if (p->interrupt_count == 0) 419 if (p->interrupt_count == 0)
412 return; 420 return;
413 irq = kzalloc(sizeof(struct pnp_irq), GFP_KERNEL); 421 irq = kzalloc(sizeof(struct pnp_irq), GFP_KERNEL);
414 if (!irq) 422 if (!irq)
415 return; 423 return;
416 424
417 for (i = 0; i < p->interrupt_count; i++) 425 for (i = 0; i < p->interrupt_count; i++)
418 if (p->interrupts[i]) 426 if (p->interrupts[i])
419 __set_bit(p->interrupts[i], irq->map); 427 __set_bit(p->interrupts[i], irq->map);
420 irq->flags = irq_flags(p->triggering, p->polarity, p->sharable); 428 irq->flags = irq_flags(p->triggering, p->polarity, p->sharable);
421 429
422 pnp_register_irq_resource(dev, option, irq); 430 pnp_register_irq_resource(dev, option, irq);
423 } 431 }
424 432
425 static __init void pnpacpi_parse_port_option(struct pnp_dev *dev, 433 static __init void pnpacpi_parse_port_option(struct pnp_dev *dev,
426 struct pnp_option *option, 434 struct pnp_option *option,
427 struct acpi_resource_io *io) 435 struct acpi_resource_io *io)
428 { 436 {
429 struct pnp_port *port; 437 struct pnp_port *port;
430 438
431 if (io->address_length == 0) 439 if (io->address_length == 0)
432 return; 440 return;
433 port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL); 441 port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL);
434 if (!port) 442 if (!port)
435 return; 443 return;
436 port->min = io->minimum; 444 port->min = io->minimum;
437 port->max = io->maximum; 445 port->max = io->maximum;
438 port->align = io->alignment; 446 port->align = io->alignment;
439 port->size = io->address_length; 447 port->size = io->address_length;
440 port->flags = ACPI_DECODE_16 == io->io_decode ? 448 port->flags = ACPI_DECODE_16 == io->io_decode ?
441 PNP_PORT_FLAG_16BITADDR : 0; 449 PNP_PORT_FLAG_16BITADDR : 0;
442 pnp_register_port_resource(dev, option, port); 450 pnp_register_port_resource(dev, option, port);
443 } 451 }
444 452
445 static __init void pnpacpi_parse_fixed_port_option(struct pnp_dev *dev, 453 static __init void pnpacpi_parse_fixed_port_option(struct pnp_dev *dev,
446 struct pnp_option *option, 454 struct pnp_option *option,
447 struct acpi_resource_fixed_io *io) 455 struct acpi_resource_fixed_io *io)
448 { 456 {
449 struct pnp_port *port; 457 struct pnp_port *port;
450 458
451 if (io->address_length == 0) 459 if (io->address_length == 0)
452 return; 460 return;
453 port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL); 461 port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL);
454 if (!port) 462 if (!port)
455 return; 463 return;
456 port->min = port->max = io->address; 464 port->min = port->max = io->address;
457 port->size = io->address_length; 465 port->size = io->address_length;
458 port->align = 0; 466 port->align = 0;
459 port->flags = PNP_PORT_FLAG_FIXED; 467 port->flags = PNP_PORT_FLAG_FIXED;
460 pnp_register_port_resource(dev, option, port); 468 pnp_register_port_resource(dev, option, port);
461 } 469 }
462 470
463 static __init void pnpacpi_parse_mem24_option(struct pnp_dev *dev, 471 static __init void pnpacpi_parse_mem24_option(struct pnp_dev *dev,
464 struct pnp_option *option, 472 struct pnp_option *option,
465 struct acpi_resource_memory24 *p) 473 struct acpi_resource_memory24 *p)
466 { 474 {
467 struct pnp_mem *mem; 475 struct pnp_mem *mem;
468 476
469 if (p->address_length == 0) 477 if (p->address_length == 0)
470 return; 478 return;
471 mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL); 479 mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
472 if (!mem) 480 if (!mem)
473 return; 481 return;
474 mem->min = p->minimum; 482 mem->min = p->minimum;
475 mem->max = p->maximum; 483 mem->max = p->maximum;
476 mem->align = p->alignment; 484 mem->align = p->alignment;
477 mem->size = p->address_length; 485 mem->size = p->address_length;
478 486
479 mem->flags = (ACPI_READ_WRITE_MEMORY == p->write_protect) ? 487 mem->flags = (ACPI_READ_WRITE_MEMORY == p->write_protect) ?
480 IORESOURCE_MEM_WRITEABLE : 0; 488 IORESOURCE_MEM_WRITEABLE : 0;
481 489
482 pnp_register_mem_resource(dev, option, mem); 490 pnp_register_mem_resource(dev, option, mem);
483 } 491 }
484 492
485 static __init void pnpacpi_parse_mem32_option(struct pnp_dev *dev, 493 static __init void pnpacpi_parse_mem32_option(struct pnp_dev *dev,
486 struct pnp_option *option, 494 struct pnp_option *option,
487 struct acpi_resource_memory32 *p) 495 struct acpi_resource_memory32 *p)
488 { 496 {
489 struct pnp_mem *mem; 497 struct pnp_mem *mem;
490 498
491 if (p->address_length == 0) 499 if (p->address_length == 0)
492 return; 500 return;
493 mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL); 501 mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
494 if (!mem) 502 if (!mem)
495 return; 503 return;
496 mem->min = p->minimum; 504 mem->min = p->minimum;
497 mem->max = p->maximum; 505 mem->max = p->maximum;
498 mem->align = p->alignment; 506 mem->align = p->alignment;
499 mem->size = p->address_length; 507 mem->size = p->address_length;
500 508
501 mem->flags = (ACPI_READ_WRITE_MEMORY == p->write_protect) ? 509 mem->flags = (ACPI_READ_WRITE_MEMORY == p->write_protect) ?
502 IORESOURCE_MEM_WRITEABLE : 0; 510 IORESOURCE_MEM_WRITEABLE : 0;
503 511
504 pnp_register_mem_resource(dev, option, mem); 512 pnp_register_mem_resource(dev, option, mem);
505 } 513 }
506 514
507 static __init void pnpacpi_parse_fixed_mem32_option(struct pnp_dev *dev, 515 static __init void pnpacpi_parse_fixed_mem32_option(struct pnp_dev *dev,
508 struct pnp_option *option, 516 struct pnp_option *option,
509 struct acpi_resource_fixed_memory32 *p) 517 struct acpi_resource_fixed_memory32 *p)
510 { 518 {
511 struct pnp_mem *mem; 519 struct pnp_mem *mem;
512 520
513 if (p->address_length == 0) 521 if (p->address_length == 0)
514 return; 522 return;
515 mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL); 523 mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
516 if (!mem) 524 if (!mem)
517 return; 525 return;
518 mem->min = mem->max = p->address; 526 mem->min = mem->max = p->address;
519 mem->size = p->address_length; 527 mem->size = p->address_length;
520 mem->align = 0; 528 mem->align = 0;
521 529
522 mem->flags = (ACPI_READ_WRITE_MEMORY == p->write_protect) ? 530 mem->flags = (ACPI_READ_WRITE_MEMORY == p->write_protect) ?
523 IORESOURCE_MEM_WRITEABLE : 0; 531 IORESOURCE_MEM_WRITEABLE : 0;
524 532
525 pnp_register_mem_resource(dev, option, mem); 533 pnp_register_mem_resource(dev, option, mem);
526 } 534 }
527 535
528 static __init void pnpacpi_parse_address_option(struct pnp_dev *dev, 536 static __init void pnpacpi_parse_address_option(struct pnp_dev *dev,
529 struct pnp_option *option, 537 struct pnp_option *option,
530 struct acpi_resource *r) 538 struct acpi_resource *r)
531 { 539 {
532 struct acpi_resource_address64 addr, *p = &addr; 540 struct acpi_resource_address64 addr, *p = &addr;
533 acpi_status status; 541 acpi_status status;
534 struct pnp_mem *mem; 542 struct pnp_mem *mem;
535 struct pnp_port *port; 543 struct pnp_port *port;
536 544
537 status = acpi_resource_to_address64(r, p); 545 status = acpi_resource_to_address64(r, p);
538 if (!ACPI_SUCCESS(status)) { 546 if (!ACPI_SUCCESS(status)) {
539 pnp_warn("PnPACPI: failed to convert resource type %d", 547 pnp_warn("PnPACPI: failed to convert resource type %d",
540 r->type); 548 r->type);
541 return; 549 return;
542 } 550 }
543 551
544 if (p->address_length == 0) 552 if (p->address_length == 0)
545 return; 553 return;
546 554
547 if (p->resource_type == ACPI_MEMORY_RANGE) { 555 if (p->resource_type == ACPI_MEMORY_RANGE) {
548 mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL); 556 mem = kzalloc(sizeof(struct pnp_mem), GFP_KERNEL);
549 if (!mem) 557 if (!mem)
550 return; 558 return;
551 mem->min = mem->max = p->minimum; 559 mem->min = mem->max = p->minimum;
552 mem->size = p->address_length; 560 mem->size = p->address_length;
553 mem->align = 0; 561 mem->align = 0;
554 mem->flags = (p->info.mem.write_protect == 562 mem->flags = (p->info.mem.write_protect ==
555 ACPI_READ_WRITE_MEMORY) ? IORESOURCE_MEM_WRITEABLE 563 ACPI_READ_WRITE_MEMORY) ? IORESOURCE_MEM_WRITEABLE
556 : 0; 564 : 0;
557 pnp_register_mem_resource(dev, option, mem); 565 pnp_register_mem_resource(dev, option, mem);
558 } else if (p->resource_type == ACPI_IO_RANGE) { 566 } else if (p->resource_type == ACPI_IO_RANGE) {
559 port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL); 567 port = kzalloc(sizeof(struct pnp_port), GFP_KERNEL);
560 if (!port) 568 if (!port)
561 return; 569 return;
562 port->min = port->max = p->minimum; 570 port->min = port->max = p->minimum;
563 port->size = p->address_length; 571 port->size = p->address_length;
564 port->align = 0; 572 port->align = 0;
565 port->flags = PNP_PORT_FLAG_FIXED; 573 port->flags = PNP_PORT_FLAG_FIXED;
566 pnp_register_port_resource(dev, option, port); 574 pnp_register_port_resource(dev, option, port);
567 } 575 }
568 } 576 }
569 577
570 struct acpipnp_parse_option_s { 578 struct acpipnp_parse_option_s {
571 struct pnp_option *option; 579 struct pnp_option *option;
572 struct pnp_option *option_independent; 580 struct pnp_option *option_independent;
573 struct pnp_dev *dev; 581 struct pnp_dev *dev;
574 }; 582 };
575 583
576 static __init acpi_status pnpacpi_option_resource(struct acpi_resource *res, 584 static __init acpi_status pnpacpi_option_resource(struct acpi_resource *res,
577 void *data) 585 void *data)
578 { 586 {
579 int priority = 0; 587 int priority = 0;
580 struct acpipnp_parse_option_s *parse_data = data; 588 struct acpipnp_parse_option_s *parse_data = data;
581 struct pnp_dev *dev = parse_data->dev; 589 struct pnp_dev *dev = parse_data->dev;
582 struct pnp_option *option = parse_data->option; 590 struct pnp_option *option = parse_data->option;
583 591
584 switch (res->type) { 592 switch (res->type) {
585 case ACPI_RESOURCE_TYPE_IRQ: 593 case ACPI_RESOURCE_TYPE_IRQ:
586 pnpacpi_parse_irq_option(dev, option, &res->data.irq); 594 pnpacpi_parse_irq_option(dev, option, &res->data.irq);
587 break; 595 break;
588 596
589 case ACPI_RESOURCE_TYPE_DMA: 597 case ACPI_RESOURCE_TYPE_DMA:
590 pnpacpi_parse_dma_option(dev, option, &res->data.dma); 598 pnpacpi_parse_dma_option(dev, option, &res->data.dma);
591 break; 599 break;
592 600
593 case ACPI_RESOURCE_TYPE_START_DEPENDENT: 601 case ACPI_RESOURCE_TYPE_START_DEPENDENT:
594 switch (res->data.start_dpf.compatibility_priority) { 602 switch (res->data.start_dpf.compatibility_priority) {
595 case ACPI_GOOD_CONFIGURATION: 603 case ACPI_GOOD_CONFIGURATION:
596 priority = PNP_RES_PRIORITY_PREFERRED; 604 priority = PNP_RES_PRIORITY_PREFERRED;
597 break; 605 break;
598 606
599 case ACPI_ACCEPTABLE_CONFIGURATION: 607 case ACPI_ACCEPTABLE_CONFIGURATION:
600 priority = PNP_RES_PRIORITY_ACCEPTABLE; 608 priority = PNP_RES_PRIORITY_ACCEPTABLE;
601 break; 609 break;
602 610
603 case ACPI_SUB_OPTIMAL_CONFIGURATION: 611 case ACPI_SUB_OPTIMAL_CONFIGURATION:
604 priority = PNP_RES_PRIORITY_FUNCTIONAL; 612 priority = PNP_RES_PRIORITY_FUNCTIONAL;
605 break; 613 break;
606 default: 614 default:
607 priority = PNP_RES_PRIORITY_INVALID; 615 priority = PNP_RES_PRIORITY_INVALID;
608 break; 616 break;
609 } 617 }
610 /* TBD: Consider performance/robustness bits */ 618 /* TBD: Consider performance/robustness bits */
611 option = pnp_register_dependent_option(dev, priority); 619 option = pnp_register_dependent_option(dev, priority);
612 if (!option) 620 if (!option)
613 return AE_ERROR; 621 return AE_ERROR;
614 parse_data->option = option; 622 parse_data->option = option;
615 break; 623 break;
616 624
617 case ACPI_RESOURCE_TYPE_END_DEPENDENT: 625 case ACPI_RESOURCE_TYPE_END_DEPENDENT:
618 /*only one EndDependentFn is allowed */ 626 /*only one EndDependentFn is allowed */
619 if (!parse_data->option_independent) { 627 if (!parse_data->option_independent) {
620 dev_warn(&dev->dev, "more than one EndDependentFn " 628 dev_warn(&dev->dev, "more than one EndDependentFn "
621 "in _PRS\n"); 629 "in _PRS\n");
622 return AE_ERROR; 630 return AE_ERROR;
623 } 631 }
624 parse_data->option = parse_data->option_independent; 632 parse_data->option = parse_data->option_independent;
625 parse_data->option_independent = NULL; 633 parse_data->option_independent = NULL;
626 dev_dbg(&dev->dev, "end dependent options\n"); 634 dev_dbg(&dev->dev, "end dependent options\n");
627 break; 635 break;
628 636
629 case ACPI_RESOURCE_TYPE_IO: 637 case ACPI_RESOURCE_TYPE_IO:
630 pnpacpi_parse_port_option(dev, option, &res->data.io); 638 pnpacpi_parse_port_option(dev, option, &res->data.io);
631 break; 639 break;
632 640
633 case ACPI_RESOURCE_TYPE_FIXED_IO: 641 case ACPI_RESOURCE_TYPE_FIXED_IO:
634 pnpacpi_parse_fixed_port_option(dev, option, 642 pnpacpi_parse_fixed_port_option(dev, option,
635 &res->data.fixed_io); 643 &res->data.fixed_io);
636 break; 644 break;
637 645
638 case ACPI_RESOURCE_TYPE_VENDOR: 646 case ACPI_RESOURCE_TYPE_VENDOR:
639 case ACPI_RESOURCE_TYPE_END_TAG: 647 case ACPI_RESOURCE_TYPE_END_TAG:
640 break; 648 break;
641 649
642 case ACPI_RESOURCE_TYPE_MEMORY24: 650 case ACPI_RESOURCE_TYPE_MEMORY24:
643 pnpacpi_parse_mem24_option(dev, option, &res->data.memory24); 651 pnpacpi_parse_mem24_option(dev, option, &res->data.memory24);
644 break; 652 break;
645 653
646 case ACPI_RESOURCE_TYPE_MEMORY32: 654 case ACPI_RESOURCE_TYPE_MEMORY32:
647 pnpacpi_parse_mem32_option(dev, option, &res->data.memory32); 655 pnpacpi_parse_mem32_option(dev, option, &res->data.memory32);
648 break; 656 break;
649 657
650 case ACPI_RESOURCE_TYPE_FIXED_MEMORY32: 658 case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
651 pnpacpi_parse_fixed_mem32_option(dev, option, 659 pnpacpi_parse_fixed_mem32_option(dev, option,
652 &res->data.fixed_memory32); 660 &res->data.fixed_memory32);
653 break; 661 break;
654 662
655 case ACPI_RESOURCE_TYPE_ADDRESS16: 663 case ACPI_RESOURCE_TYPE_ADDRESS16:
656 case ACPI_RESOURCE_TYPE_ADDRESS32: 664 case ACPI_RESOURCE_TYPE_ADDRESS32:
657 case ACPI_RESOURCE_TYPE_ADDRESS64: 665 case ACPI_RESOURCE_TYPE_ADDRESS64:
658 pnpacpi_parse_address_option(dev, option, res); 666 pnpacpi_parse_address_option(dev, option, res);
659 break; 667 break;
660 668
661 case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64: 669 case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64:
662 break; 670 break;
663 671
664 case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: 672 case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
665 pnpacpi_parse_ext_irq_option(dev, option, 673 pnpacpi_parse_ext_irq_option(dev, option,
666 &res->data.extended_irq); 674 &res->data.extended_irq);
667 break; 675 break;
668 676
669 case ACPI_RESOURCE_TYPE_GENERIC_REGISTER: 677 case ACPI_RESOURCE_TYPE_GENERIC_REGISTER:
670 break; 678 break;
671 679
672 default: 680 default:
673 dev_warn(&dev->dev, "unknown resource type %d in _PRS\n", 681 dev_warn(&dev->dev, "unknown resource type %d in _PRS\n",
674 res->type); 682 res->type);
675 return AE_ERROR; 683 return AE_ERROR;
676 } 684 }
677 685
678 return AE_OK; 686 return AE_OK;
679 } 687 }
680 688
681 int __init pnpacpi_parse_resource_option_data(struct pnp_dev *dev) 689 int __init pnpacpi_parse_resource_option_data(struct pnp_dev *dev)
682 { 690 {
683 acpi_handle handle = dev->data; 691 acpi_handle handle = dev->data;
684 acpi_status status; 692 acpi_status status;
685 struct acpipnp_parse_option_s parse_data; 693 struct acpipnp_parse_option_s parse_data;
686 694
687 dev_dbg(&dev->dev, "parse resource options\n"); 695 dev_dbg(&dev->dev, "parse resource options\n");
688 696
689 parse_data.option = pnp_register_independent_option(dev); 697 parse_data.option = pnp_register_independent_option(dev);
690 if (!parse_data.option) 698 if (!parse_data.option)
691 return -ENOMEM; 699 return -ENOMEM;
692 700
693 parse_data.option_independent = parse_data.option; 701 parse_data.option_independent = parse_data.option;
694 parse_data.dev = dev; 702 parse_data.dev = dev;
695 status = acpi_walk_resources(handle, METHOD_NAME__PRS, 703 status = acpi_walk_resources(handle, METHOD_NAME__PRS,
696 pnpacpi_option_resource, &parse_data); 704 pnpacpi_option_resource, &parse_data);
697 705
698 if (ACPI_FAILURE(status)) { 706 if (ACPI_FAILURE(status)) {
699 if (status != AE_NOT_FOUND) 707 if (status != AE_NOT_FOUND)
700 dev_err(&dev->dev, "can't evaluate _PRS: %d", status); 708 dev_err(&dev->dev, "can't evaluate _PRS: %d", status);
701 return -EPERM; 709 return -EPERM;
702 } 710 }
703 return 0; 711 return 0;
704 } 712 }
705 713
706 static int pnpacpi_supported_resource(struct acpi_resource *res) 714 static int pnpacpi_supported_resource(struct acpi_resource *res)
707 { 715 {
708 switch (res->type) { 716 switch (res->type) {
709 case ACPI_RESOURCE_TYPE_IRQ: 717 case ACPI_RESOURCE_TYPE_IRQ:
710 case ACPI_RESOURCE_TYPE_DMA: 718 case ACPI_RESOURCE_TYPE_DMA:
711 case ACPI_RESOURCE_TYPE_IO: 719 case ACPI_RESOURCE_TYPE_IO:
712 case ACPI_RESOURCE_TYPE_FIXED_IO: 720 case ACPI_RESOURCE_TYPE_FIXED_IO:
713 case ACPI_RESOURCE_TYPE_MEMORY24: 721 case ACPI_RESOURCE_TYPE_MEMORY24:
714 case ACPI_RESOURCE_TYPE_MEMORY32: 722 case ACPI_RESOURCE_TYPE_MEMORY32:
715 case ACPI_RESOURCE_TYPE_FIXED_MEMORY32: 723 case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
716 case ACPI_RESOURCE_TYPE_ADDRESS16: 724 case ACPI_RESOURCE_TYPE_ADDRESS16:
717 case ACPI_RESOURCE_TYPE_ADDRESS32: 725 case ACPI_RESOURCE_TYPE_ADDRESS32:
718 case ACPI_RESOURCE_TYPE_ADDRESS64: 726 case ACPI_RESOURCE_TYPE_ADDRESS64:
719 case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: 727 case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
720 return 1; 728 return 1;
721 } 729 }
722 return 0; 730 return 0;
723 } 731 }
724 732
725 /* 733 /*
726 * Set resource 734 * Set resource
727 */ 735 */
728 static acpi_status pnpacpi_count_resources(struct acpi_resource *res, 736 static acpi_status pnpacpi_count_resources(struct acpi_resource *res,
729 void *data) 737 void *data)
730 { 738 {
731 int *res_cnt = data; 739 int *res_cnt = data;
732 740
733 if (pnpacpi_supported_resource(res)) 741 if (pnpacpi_supported_resource(res))
734 (*res_cnt)++; 742 (*res_cnt)++;
735 return AE_OK; 743 return AE_OK;
736 } 744 }
737 745
738 static acpi_status pnpacpi_type_resources(struct acpi_resource *res, void *data) 746 static acpi_status pnpacpi_type_resources(struct acpi_resource *res, void *data)
739 { 747 {
740 struct acpi_resource **resource = data; 748 struct acpi_resource **resource = data;
741 749
742 if (pnpacpi_supported_resource(res)) { 750 if (pnpacpi_supported_resource(res)) {
743 (*resource)->type = res->type; 751 (*resource)->type = res->type;
744 (*resource)->length = sizeof(struct acpi_resource); 752 (*resource)->length = sizeof(struct acpi_resource);
745 (*resource)++; 753 (*resource)++;
746 } 754 }
747 755
748 return AE_OK; 756 return AE_OK;
749 } 757 }
750 758
751 int pnpacpi_build_resource_template(struct pnp_dev *dev, 759 int pnpacpi_build_resource_template(struct pnp_dev *dev,
752 struct acpi_buffer *buffer) 760 struct acpi_buffer *buffer)
753 { 761 {
754 acpi_handle handle = dev->data; 762 acpi_handle handle = dev->data;
755 struct acpi_resource *resource; 763 struct acpi_resource *resource;
756 int res_cnt = 0; 764 int res_cnt = 0;
757 acpi_status status; 765 acpi_status status;
758 766
759 status = acpi_walk_resources(handle, METHOD_NAME__CRS, 767 status = acpi_walk_resources(handle, METHOD_NAME__CRS,
760 pnpacpi_count_resources, &res_cnt); 768 pnpacpi_count_resources, &res_cnt);
761 if (ACPI_FAILURE(status)) { 769 if (ACPI_FAILURE(status)) {
762 dev_err(&dev->dev, "can't evaluate _CRS: %d\n", status); 770 dev_err(&dev->dev, "can't evaluate _CRS: %d\n", status);
763 return -EINVAL; 771 return -EINVAL;
764 } 772 }
765 if (!res_cnt) 773 if (!res_cnt)
766 return -EINVAL; 774 return -EINVAL;
767 buffer->length = sizeof(struct acpi_resource) * (res_cnt + 1) + 1; 775 buffer->length = sizeof(struct acpi_resource) * (res_cnt + 1) + 1;
768 buffer->pointer = kzalloc(buffer->length - 1, GFP_KERNEL); 776 buffer->pointer = kzalloc(buffer->length - 1, GFP_KERNEL);
769 if (!buffer->pointer) 777 if (!buffer->pointer)
770 return -ENOMEM; 778 return -ENOMEM;
771 779
772 resource = (struct acpi_resource *)buffer->pointer; 780 resource = (struct acpi_resource *)buffer->pointer;
773 status = acpi_walk_resources(handle, METHOD_NAME__CRS, 781 status = acpi_walk_resources(handle, METHOD_NAME__CRS,
774 pnpacpi_type_resources, &resource); 782 pnpacpi_type_resources, &resource);
775 if (ACPI_FAILURE(status)) { 783 if (ACPI_FAILURE(status)) {
776 kfree(buffer->pointer); 784 kfree(buffer->pointer);
777 dev_err(&dev->dev, "can't evaluate _CRS: %d\n", status); 785 dev_err(&dev->dev, "can't evaluate _CRS: %d\n", status);
778 return -EINVAL; 786 return -EINVAL;
779 } 787 }
780 /* resource will pointer the end resource now */ 788 /* resource will pointer the end resource now */
781 resource->type = ACPI_RESOURCE_TYPE_END_TAG; 789 resource->type = ACPI_RESOURCE_TYPE_END_TAG;
782 790
783 return 0; 791 return 0;
784 } 792 }
785 793
786 static void pnpacpi_encode_irq(struct pnp_dev *dev, 794 static void pnpacpi_encode_irq(struct pnp_dev *dev,
787 struct acpi_resource *resource, 795 struct acpi_resource *resource,
788 struct resource *p) 796 struct resource *p)
789 { 797 {
790 struct acpi_resource_irq *irq = &resource->data.irq; 798 struct acpi_resource_irq *irq = &resource->data.irq;
791 int triggering, polarity; 799 int triggering, polarity;
792 800
793 decode_irq_flags(p->flags & IORESOURCE_BITS, &triggering, &polarity); 801 decode_irq_flags(dev, p->flags, &triggering, &polarity);
794 irq->triggering = triggering; 802 irq->triggering = triggering;
795 irq->polarity = polarity; 803 irq->polarity = polarity;
796 if (triggering == ACPI_EDGE_SENSITIVE) 804 if (triggering == ACPI_EDGE_SENSITIVE)
797 irq->sharable = ACPI_EXCLUSIVE; 805 irq->sharable = ACPI_EXCLUSIVE;
798 else 806 else
799 irq->sharable = ACPI_SHARED; 807 irq->sharable = ACPI_SHARED;
800 irq->interrupt_count = 1; 808 irq->interrupt_count = 1;
801 irq->interrupts[0] = p->start; 809 irq->interrupts[0] = p->start;
802 810
803 dev_dbg(&dev->dev, " encode irq %d %s %s %s\n", (int) p->start, 811 dev_dbg(&dev->dev, " encode irq %d %s %s %s\n", (int) p->start,
804 triggering == ACPI_LEVEL_SENSITIVE ? "level" : "edge", 812 triggering == ACPI_LEVEL_SENSITIVE ? "level" : "edge",
805 polarity == ACPI_ACTIVE_LOW ? "low" : "high", 813 polarity == ACPI_ACTIVE_LOW ? "low" : "high",
806 irq->sharable == ACPI_SHARED ? "shared" : "exclusive"); 814 irq->sharable == ACPI_SHARED ? "shared" : "exclusive");
807 } 815 }
808 816
809 static void pnpacpi_encode_ext_irq(struct pnp_dev *dev, 817 static void pnpacpi_encode_ext_irq(struct pnp_dev *dev,
810 struct acpi_resource *resource, 818 struct acpi_resource *resource,
811 struct resource *p) 819 struct resource *p)
812 { 820 {
813 struct acpi_resource_extended_irq *extended_irq = &resource->data.extended_irq; 821 struct acpi_resource_extended_irq *extended_irq = &resource->data.extended_irq;
814 int triggering, polarity; 822 int triggering, polarity;
815 823
816 decode_irq_flags(p->flags & IORESOURCE_BITS, &triggering, &polarity); 824 decode_irq_flags(dev, p->flags, &triggering, &polarity);
817 extended_irq->producer_consumer = ACPI_CONSUMER; 825 extended_irq->producer_consumer = ACPI_CONSUMER;
818 extended_irq->triggering = triggering; 826 extended_irq->triggering = triggering;
819 extended_irq->polarity = polarity; 827 extended_irq->polarity = polarity;
820 if (triggering == ACPI_EDGE_SENSITIVE) 828 if (triggering == ACPI_EDGE_SENSITIVE)
821 extended_irq->sharable = ACPI_EXCLUSIVE; 829 extended_irq->sharable = ACPI_EXCLUSIVE;
822 else 830 else
823 extended_irq->sharable = ACPI_SHARED; 831 extended_irq->sharable = ACPI_SHARED;
824 extended_irq->interrupt_count = 1; 832 extended_irq->interrupt_count = 1;
825 extended_irq->interrupts[0] = p->start; 833 extended_irq->interrupts[0] = p->start;
826 834
827 dev_dbg(&dev->dev, " encode irq %d %s %s %s\n", (int) p->start, 835 dev_dbg(&dev->dev, " encode irq %d %s %s %s\n", (int) p->start,
828 triggering == ACPI_LEVEL_SENSITIVE ? "level" : "edge", 836 triggering == ACPI_LEVEL_SENSITIVE ? "level" : "edge",
829 polarity == ACPI_ACTIVE_LOW ? "low" : "high", 837 polarity == ACPI_ACTIVE_LOW ? "low" : "high",
830 extended_irq->sharable == ACPI_SHARED ? "shared" : "exclusive"); 838 extended_irq->sharable == ACPI_SHARED ? "shared" : "exclusive");
831 } 839 }
832 840
833 static void pnpacpi_encode_dma(struct pnp_dev *dev, 841 static void pnpacpi_encode_dma(struct pnp_dev *dev,
834 struct acpi_resource *resource, 842 struct acpi_resource *resource,
835 struct resource *p) 843 struct resource *p)
836 { 844 {
837 struct acpi_resource_dma *dma = &resource->data.dma; 845 struct acpi_resource_dma *dma = &resource->data.dma;
838 846
839 /* Note: pnp_assign_dma will copy pnp_dma->flags into p->flags */ 847 /* Note: pnp_assign_dma will copy pnp_dma->flags into p->flags */
840 switch (p->flags & IORESOURCE_DMA_SPEED_MASK) { 848 switch (p->flags & IORESOURCE_DMA_SPEED_MASK) {
841 case IORESOURCE_DMA_TYPEA: 849 case IORESOURCE_DMA_TYPEA:
842 dma->type = ACPI_TYPE_A; 850 dma->type = ACPI_TYPE_A;
843 break; 851 break;
844 case IORESOURCE_DMA_TYPEB: 852 case IORESOURCE_DMA_TYPEB:
845 dma->type = ACPI_TYPE_B; 853 dma->type = ACPI_TYPE_B;
846 break; 854 break;
847 case IORESOURCE_DMA_TYPEF: 855 case IORESOURCE_DMA_TYPEF:
848 dma->type = ACPI_TYPE_F; 856 dma->type = ACPI_TYPE_F;
849 break; 857 break;
850 default: 858 default:
851 dma->type = ACPI_COMPATIBILITY; 859 dma->type = ACPI_COMPATIBILITY;
852 } 860 }
853 861
854 switch (p->flags & IORESOURCE_DMA_TYPE_MASK) { 862 switch (p->flags & IORESOURCE_DMA_TYPE_MASK) {
855 case IORESOURCE_DMA_8BIT: 863 case IORESOURCE_DMA_8BIT:
856 dma->transfer = ACPI_TRANSFER_8; 864 dma->transfer = ACPI_TRANSFER_8;
857 break; 865 break;
858 case IORESOURCE_DMA_8AND16BIT: 866 case IORESOURCE_DMA_8AND16BIT:
859 dma->transfer = ACPI_TRANSFER_8_16; 867 dma->transfer = ACPI_TRANSFER_8_16;
860 break; 868 break;
861 default: 869 default:
862 dma->transfer = ACPI_TRANSFER_16; 870 dma->transfer = ACPI_TRANSFER_16;
863 } 871 }
864 872
865 dma->bus_master = !!(p->flags & IORESOURCE_DMA_MASTER); 873 dma->bus_master = !!(p->flags & IORESOURCE_DMA_MASTER);
866 dma->channel_count = 1; 874 dma->channel_count = 1;
867 dma->channels[0] = p->start; 875 dma->channels[0] = p->start;
868 876
869 dev_dbg(&dev->dev, " encode dma %d " 877 dev_dbg(&dev->dev, " encode dma %d "
870 "type %#x transfer %#x master %d\n", 878 "type %#x transfer %#x master %d\n",
871 (int) p->start, dma->type, dma->transfer, dma->bus_master); 879 (int) p->start, dma->type, dma->transfer, dma->bus_master);
872 } 880 }
873 881
874 static void pnpacpi_encode_io(struct pnp_dev *dev, 882 static void pnpacpi_encode_io(struct pnp_dev *dev,
875 struct acpi_resource *resource, 883 struct acpi_resource *resource,
876 struct resource *p) 884 struct resource *p)
877 { 885 {
878 struct acpi_resource_io *io = &resource->data.io; 886 struct acpi_resource_io *io = &resource->data.io;
879 887
880 /* Note: pnp_assign_port will copy pnp_port->flags into p->flags */ 888 /* Note: pnp_assign_port will copy pnp_port->flags into p->flags */
881 io->io_decode = (p->flags & PNP_PORT_FLAG_16BITADDR) ? 889 io->io_decode = (p->flags & PNP_PORT_FLAG_16BITADDR) ?
882 ACPI_DECODE_16 : ACPI_DECODE_10; 890 ACPI_DECODE_16 : ACPI_DECODE_10;
883 io->minimum = p->start; 891 io->minimum = p->start;
884 io->maximum = p->end; 892 io->maximum = p->end;
885 io->alignment = 0; /* Correct? */ 893 io->alignment = 0; /* Correct? */
886 io->address_length = p->end - p->start + 1; 894 io->address_length = p->end - p->start + 1;
887 895
888 dev_dbg(&dev->dev, " encode io %#llx-%#llx decode %#x\n", 896 dev_dbg(&dev->dev, " encode io %#llx-%#llx decode %#x\n",
889 (unsigned long long) p->start, (unsigned long long) p->end, 897 (unsigned long long) p->start, (unsigned long long) p->end,
890 io->io_decode); 898 io->io_decode);
891 } 899 }
892 900
893 static void pnpacpi_encode_fixed_io(struct pnp_dev *dev, 901 static void pnpacpi_encode_fixed_io(struct pnp_dev *dev,
894 struct acpi_resource *resource, 902 struct acpi_resource *resource,
895 struct resource *p) 903 struct resource *p)
896 { 904 {
897 struct acpi_resource_fixed_io *fixed_io = &resource->data.fixed_io; 905 struct acpi_resource_fixed_io *fixed_io = &resource->data.fixed_io;
898 906
899 fixed_io->address = p->start; 907 fixed_io->address = p->start;
900 fixed_io->address_length = p->end - p->start + 1; 908 fixed_io->address_length = p->end - p->start + 1;
901 909
902 dev_dbg(&dev->dev, " encode fixed_io %#llx-%#llx\n", 910 dev_dbg(&dev->dev, " encode fixed_io %#llx-%#llx\n",
903 (unsigned long long) p->start, (unsigned long long) p->end); 911 (unsigned long long) p->start, (unsigned long long) p->end);
904 } 912 }
905 913
906 static void pnpacpi_encode_mem24(struct pnp_dev *dev, 914 static void pnpacpi_encode_mem24(struct pnp_dev *dev,
907 struct acpi_resource *resource, 915 struct acpi_resource *resource,
908 struct resource *p) 916 struct resource *p)
909 { 917 {
910 struct acpi_resource_memory24 *memory24 = &resource->data.memory24; 918 struct acpi_resource_memory24 *memory24 = &resource->data.memory24;
911 919
912 /* Note: pnp_assign_mem will copy pnp_mem->flags into p->flags */ 920 /* Note: pnp_assign_mem will copy pnp_mem->flags into p->flags */
913 memory24->write_protect = 921 memory24->write_protect =
914 (p->flags & IORESOURCE_MEM_WRITEABLE) ? 922 (p->flags & IORESOURCE_MEM_WRITEABLE) ?
915 ACPI_READ_WRITE_MEMORY : ACPI_READ_ONLY_MEMORY; 923 ACPI_READ_WRITE_MEMORY : ACPI_READ_ONLY_MEMORY;
916 memory24->minimum = p->start; 924 memory24->minimum = p->start;
917 memory24->maximum = p->end; 925 memory24->maximum = p->end;
918 memory24->alignment = 0; 926 memory24->alignment = 0;
919 memory24->address_length = p->end - p->start + 1; 927 memory24->address_length = p->end - p->start + 1;
920 928
921 dev_dbg(&dev->dev, " encode mem24 %#llx-%#llx write_protect %#x\n", 929 dev_dbg(&dev->dev, " encode mem24 %#llx-%#llx write_protect %#x\n",
922 (unsigned long long) p->start, (unsigned long long) p->end, 930 (unsigned long long) p->start, (unsigned long long) p->end,
923 memory24->write_protect); 931 memory24->write_protect);
924 } 932 }
925 933
926 static void pnpacpi_encode_mem32(struct pnp_dev *dev, 934 static void pnpacpi_encode_mem32(struct pnp_dev *dev,
927 struct acpi_resource *resource, 935 struct acpi_resource *resource,
928 struct resource *p) 936 struct resource *p)
929 { 937 {
930 struct acpi_resource_memory32 *memory32 = &resource->data.memory32; 938 struct acpi_resource_memory32 *memory32 = &resource->data.memory32;
931 939
932 memory32->write_protect = 940 memory32->write_protect =
933 (p->flags & IORESOURCE_MEM_WRITEABLE) ? 941 (p->flags & IORESOURCE_MEM_WRITEABLE) ?
934 ACPI_READ_WRITE_MEMORY : ACPI_READ_ONLY_MEMORY; 942 ACPI_READ_WRITE_MEMORY : ACPI_READ_ONLY_MEMORY;
935 memory32->minimum = p->start; 943 memory32->minimum = p->start;
936 memory32->maximum = p->end; 944 memory32->maximum = p->end;
937 memory32->alignment = 0; 945 memory32->alignment = 0;
938 memory32->address_length = p->end - p->start + 1; 946 memory32->address_length = p->end - p->start + 1;
939 947
940 dev_dbg(&dev->dev, " encode mem32 %#llx-%#llx write_protect %#x\n", 948 dev_dbg(&dev->dev, " encode mem32 %#llx-%#llx write_protect %#x\n",
941 (unsigned long long) p->start, (unsigned long long) p->end, 949 (unsigned long long) p->start, (unsigned long long) p->end,
942 memory32->write_protect); 950 memory32->write_protect);
943 } 951 }
944 952
945 static void pnpacpi_encode_fixed_mem32(struct pnp_dev *dev, 953 static void pnpacpi_encode_fixed_mem32(struct pnp_dev *dev,
946 struct acpi_resource *resource, 954 struct acpi_resource *resource,
947 struct resource *p) 955 struct resource *p)
948 { 956 {
949 struct acpi_resource_fixed_memory32 *fixed_memory32 = &resource->data.fixed_memory32; 957 struct acpi_resource_fixed_memory32 *fixed_memory32 = &resource->data.fixed_memory32;
950 958
951 fixed_memory32->write_protect = 959 fixed_memory32->write_protect =
952 (p->flags & IORESOURCE_MEM_WRITEABLE) ? 960 (p->flags & IORESOURCE_MEM_WRITEABLE) ?
953 ACPI_READ_WRITE_MEMORY : ACPI_READ_ONLY_MEMORY; 961 ACPI_READ_WRITE_MEMORY : ACPI_READ_ONLY_MEMORY;
954 fixed_memory32->address = p->start; 962 fixed_memory32->address = p->start;
955 fixed_memory32->address_length = p->end - p->start + 1; 963 fixed_memory32->address_length = p->end - p->start + 1;
956 964
957 dev_dbg(&dev->dev, " encode fixed_mem32 %#llx-%#llx " 965 dev_dbg(&dev->dev, " encode fixed_mem32 %#llx-%#llx "
958 "write_protect %#x\n", 966 "write_protect %#x\n",
959 (unsigned long long) p->start, (unsigned long long) p->end, 967 (unsigned long long) p->start, (unsigned long long) p->end,
960 fixed_memory32->write_protect); 968 fixed_memory32->write_protect);
961 } 969 }
962 970
963 int pnpacpi_encode_resources(struct pnp_dev *dev, struct acpi_buffer *buffer) 971 int pnpacpi_encode_resources(struct pnp_dev *dev, struct acpi_buffer *buffer)
964 { 972 {
965 int i = 0; 973 int i = 0;
966 /* pnpacpi_build_resource_template allocates extra mem */ 974 /* pnpacpi_build_resource_template allocates extra mem */
967 int res_cnt = (buffer->length - 1) / sizeof(struct acpi_resource) - 1; 975 int res_cnt = (buffer->length - 1) / sizeof(struct acpi_resource) - 1;
968 struct acpi_resource *resource = buffer->pointer; 976 struct acpi_resource *resource = buffer->pointer;
969 int port = 0, irq = 0, dma = 0, mem = 0; 977 int port = 0, irq = 0, dma = 0, mem = 0;
970 978
971 dev_dbg(&dev->dev, "encode %d resources\n", res_cnt); 979 dev_dbg(&dev->dev, "encode %d resources\n", res_cnt);
972 while (i < res_cnt) { 980 while (i < res_cnt) {
973 switch (resource->type) { 981 switch (resource->type) {
974 case ACPI_RESOURCE_TYPE_IRQ: 982 case ACPI_RESOURCE_TYPE_IRQ:
975 pnpacpi_encode_irq(dev, resource, 983 pnpacpi_encode_irq(dev, resource,
976 pnp_get_resource(dev, IORESOURCE_IRQ, irq)); 984 pnp_get_resource(dev, IORESOURCE_IRQ, irq));
977 irq++; 985 irq++;
978 break; 986 break;
979 987
980 case ACPI_RESOURCE_TYPE_DMA: 988 case ACPI_RESOURCE_TYPE_DMA:
981 pnpacpi_encode_dma(dev, resource, 989 pnpacpi_encode_dma(dev, resource,
982 pnp_get_resource(dev, IORESOURCE_DMA, dma)); 990 pnp_get_resource(dev, IORESOURCE_DMA, dma));
983 dma++; 991 dma++;
984 break; 992 break;
985 case ACPI_RESOURCE_TYPE_IO: 993 case ACPI_RESOURCE_TYPE_IO:
986 pnpacpi_encode_io(dev, resource, 994 pnpacpi_encode_io(dev, resource,
987 pnp_get_resource(dev, IORESOURCE_IO, port)); 995 pnp_get_resource(dev, IORESOURCE_IO, port));
988 port++; 996 port++;
989 break; 997 break;
990 case ACPI_RESOURCE_TYPE_FIXED_IO: 998 case ACPI_RESOURCE_TYPE_FIXED_IO:
991 pnpacpi_encode_fixed_io(dev, resource, 999 pnpacpi_encode_fixed_io(dev, resource,
992 pnp_get_resource(dev, IORESOURCE_IO, port)); 1000 pnp_get_resource(dev, IORESOURCE_IO, port));
993 port++; 1001 port++;
994 break; 1002 break;
995 case ACPI_RESOURCE_TYPE_MEMORY24: 1003 case ACPI_RESOURCE_TYPE_MEMORY24:
996 pnpacpi_encode_mem24(dev, resource, 1004 pnpacpi_encode_mem24(dev, resource,
997 pnp_get_resource(dev, IORESOURCE_MEM, mem)); 1005 pnp_get_resource(dev, IORESOURCE_MEM, mem));
998 mem++; 1006 mem++;
999 break; 1007 break;
1000 case ACPI_RESOURCE_TYPE_MEMORY32: 1008 case ACPI_RESOURCE_TYPE_MEMORY32:
1001 pnpacpi_encode_mem32(dev, resource, 1009 pnpacpi_encode_mem32(dev, resource,
1002 pnp_get_resource(dev, IORESOURCE_MEM, mem)); 1010 pnp_get_resource(dev, IORESOURCE_MEM, mem));
1003 mem++; 1011 mem++;
1004 break; 1012 break;
1005 case ACPI_RESOURCE_TYPE_FIXED_MEMORY32: 1013 case ACPI_RESOURCE_TYPE_FIXED_MEMORY32:
1006 pnpacpi_encode_fixed_mem32(dev, resource, 1014 pnpacpi_encode_fixed_mem32(dev, resource,
1007 pnp_get_resource(dev, IORESOURCE_MEM, mem)); 1015 pnp_get_resource(dev, IORESOURCE_MEM, mem));
1008 mem++; 1016 mem++;
1009 break; 1017 break;
1010 case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: 1018 case ACPI_RESOURCE_TYPE_EXTENDED_IRQ:
1011 pnpacpi_encode_ext_irq(dev, resource, 1019 pnpacpi_encode_ext_irq(dev, resource,
1012 pnp_get_resource(dev, IORESOURCE_IRQ, irq)); 1020 pnp_get_resource(dev, IORESOURCE_IRQ, irq));
1013 irq++; 1021 irq++;
1014 break; 1022 break;
1015 case ACPI_RESOURCE_TYPE_START_DEPENDENT: 1023 case ACPI_RESOURCE_TYPE_START_DEPENDENT:
1016 case ACPI_RESOURCE_TYPE_END_DEPENDENT: 1024 case ACPI_RESOURCE_TYPE_END_DEPENDENT:
1017 case ACPI_RESOURCE_TYPE_VENDOR: 1025 case ACPI_RESOURCE_TYPE_VENDOR:
1018 case ACPI_RESOURCE_TYPE_END_TAG: 1026 case ACPI_RESOURCE_TYPE_END_TAG:
1019 case ACPI_RESOURCE_TYPE_ADDRESS16: 1027 case ACPI_RESOURCE_TYPE_ADDRESS16:
1020 case ACPI_RESOURCE_TYPE_ADDRESS32: 1028 case ACPI_RESOURCE_TYPE_ADDRESS32:
1021 case ACPI_RESOURCE_TYPE_ADDRESS64: 1029 case ACPI_RESOURCE_TYPE_ADDRESS64:
1022 case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64: 1030 case ACPI_RESOURCE_TYPE_EXTENDED_ADDRESS64:
1023 case ACPI_RESOURCE_TYPE_GENERIC_REGISTER: 1031 case ACPI_RESOURCE_TYPE_GENERIC_REGISTER:
1024 default: /* other type */ 1032 default: /* other type */
1025 dev_warn(&dev->dev, "can't encode unknown resource " 1033 dev_warn(&dev->dev, "can't encode unknown resource "
1026 "type %d\n", resource->type); 1034 "type %d\n", resource->type);
1027 return -EINVAL; 1035 return -EINVAL;
1028 } 1036 }
1029 resource++; 1037 resource++;
1030 i++; 1038 i++;
1031 } 1039 }
1032 return 0; 1040 return 0;
1033 } 1041 }
1034 1042
include/linux/ioport.h
Diff comments   View file @ e9fe9e1
1 /* 1 /*
2 * ioport.h Definitions of routines for detecting, reserving and 2 * ioport.h Definitions of routines for detecting, reserving and
3 * allocating system resources. 3 * allocating system resources.
4 * 4 *
5 * Authors: Linus Torvalds 5 * Authors: Linus Torvalds
6 */ 6 */
7 7
8 #ifndef _LINUX_IOPORT_H 8 #ifndef _LINUX_IOPORT_H
9 #define _LINUX_IOPORT_H 9 #define _LINUX_IOPORT_H
10 10
11 #ifndef __ASSEMBLY__ 11 #ifndef __ASSEMBLY__
12 #include <linux/compiler.h> 12 #include <linux/compiler.h>
13 #include <linux/types.h> 13 #include <linux/types.h>
14 /* 14 /*
15 * Resources are tree-like, allowing 15 * Resources are tree-like, allowing
16 * nesting etc.. 16 * nesting etc..
17 */ 17 */
18 struct resource { 18 struct resource {
19 resource_size_t start; 19 resource_size_t start;
20 resource_size_t end; 20 resource_size_t end;
21 const char *name; 21 const char *name;
22 unsigned long flags; 22 unsigned long flags;
23 struct resource *parent, *sibling, *child; 23 struct resource *parent, *sibling, *child;
24 }; 24 };
25 25
26 struct resource_list { 26 struct resource_list {
27 struct resource_list *next; 27 struct resource_list *next;
28 struct resource *res; 28 struct resource *res;
29 struct pci_dev *dev; 29 struct pci_dev *dev;
30 }; 30 };
31 31
32 /* 32 /*
33 * IO resources have these defined flags. 33 * IO resources have these defined flags.
34 */ 34 */
35 #define IORESOURCE_BITS 0x000000ff /* Bus-specific bits */ 35 #define IORESOURCE_BITS 0x000000ff /* Bus-specific bits */
36 36
37 #define IORESOURCE_IO 0x00000100 /* Resource type */ 37 #define IORESOURCE_IO 0x00000100 /* Resource type */
38 #define IORESOURCE_MEM 0x00000200 38 #define IORESOURCE_MEM 0x00000200
39 #define IORESOURCE_IRQ 0x00000400 39 #define IORESOURCE_IRQ 0x00000400
40 #define IORESOURCE_DMA 0x00000800 40 #define IORESOURCE_DMA 0x00000800
41 41
42 #define IORESOURCE_PREFETCH 0x00001000 /* No side effects */ 42 #define IORESOURCE_PREFETCH 0x00001000 /* No side effects */
43 #define IORESOURCE_READONLY 0x00002000 43 #define IORESOURCE_READONLY 0x00002000
44 #define IORESOURCE_CACHEABLE 0x00004000 44 #define IORESOURCE_CACHEABLE 0x00004000
45 #define IORESOURCE_RANGELENGTH 0x00008000 45 #define IORESOURCE_RANGELENGTH 0x00008000
46 #define IORESOURCE_SHADOWABLE 0x00010000 46 #define IORESOURCE_SHADOWABLE 0x00010000
47 47
48 #define IORESOURCE_SIZEALIGN 0x00020000 /* size indicates alignment */ 48 #define IORESOURCE_SIZEALIGN 0x00020000 /* size indicates alignment */
49 #define IORESOURCE_STARTALIGN 0x00040000 /* start field is alignment */ 49 #define IORESOURCE_STARTALIGN 0x00040000 /* start field is alignment */
50 50
51 #define IORESOURCE_DISABLED 0x10000000 51 #define IORESOURCE_DISABLED 0x10000000
52 #define IORESOURCE_UNSET 0x20000000 52 #define IORESOURCE_UNSET 0x20000000
53 #define IORESOURCE_AUTO 0x40000000 53 #define IORESOURCE_AUTO 0x40000000
54 #define IORESOURCE_BUSY 0x80000000 /* Driver has marked this resource busy */ 54 #define IORESOURCE_BUSY 0x80000000 /* Driver has marked this resource busy */
55 55
56 /* ISA PnP IRQ specific bits (IORESOURCE_BITS) */ 56 /* PnP IRQ specific bits (IORESOURCE_BITS) */
57 #define IORESOURCE_IRQ_HIGHEDGE (1<<0) 57 #define IORESOURCE_IRQ_HIGHEDGE (1<<0)
58 #define IORESOURCE_IRQ_LOWEDGE (1<<1) 58 #define IORESOURCE_IRQ_LOWEDGE (1<<1)
59 #define IORESOURCE_IRQ_HIGHLEVEL (1<<2) 59 #define IORESOURCE_IRQ_HIGHLEVEL (1<<2)
60 #define IORESOURCE_IRQ_LOWLEVEL (1<<3) 60 #define IORESOURCE_IRQ_LOWLEVEL (1<<3)
61 #define IORESOURCE_IRQ_SHAREABLE (1<<4) 61 #define IORESOURCE_IRQ_SHAREABLE (1<<4)
62 62
63 /* ISA PnP DMA specific bits (IORESOURCE_BITS) */ 63 /* PnP DMA specific bits (IORESOURCE_BITS) */
64 #define IORESOURCE_DMA_TYPE_MASK (3<<0) 64 #define IORESOURCE_DMA_TYPE_MASK (3<<0)
65 #define IORESOURCE_DMA_8BIT (0<<0) 65 #define IORESOURCE_DMA_8BIT (0<<0)
66 #define IORESOURCE_DMA_8AND16BIT (1<<0) 66 #define IORESOURCE_DMA_8AND16BIT (1<<0)
67 #define IORESOURCE_DMA_16BIT (2<<0) 67 #define IORESOURCE_DMA_16BIT (2<<0)
68 68
69 #define IORESOURCE_DMA_MASTER (1<<2) 69 #define IORESOURCE_DMA_MASTER (1<<2)
70 #define IORESOURCE_DMA_BYTE (1<<3) 70 #define IORESOURCE_DMA_BYTE (1<<3)
71 #define IORESOURCE_DMA_WORD (1<<4) 71 #define IORESOURCE_DMA_WORD (1<<4)
72 72
73 #define IORESOURCE_DMA_SPEED_MASK (3<<6) 73 #define IORESOURCE_DMA_SPEED_MASK (3<<6)
74 #define IORESOURCE_DMA_COMPATIBLE (0<<6) 74 #define IORESOURCE_DMA_COMPATIBLE (0<<6)
75 #define IORESOURCE_DMA_TYPEA (1<<6) 75 #define IORESOURCE_DMA_TYPEA (1<<6)
76 #define IORESOURCE_DMA_TYPEB (2<<6) 76 #define IORESOURCE_DMA_TYPEB (2<<6)
77 #define IORESOURCE_DMA_TYPEF (3<<6) 77 #define IORESOURCE_DMA_TYPEF (3<<6)
78 78
79 /* ISA PnP memory I/O specific bits (IORESOURCE_BITS) */ 79 /* PnP memory I/O specific bits (IORESOURCE_BITS) */
80 #define IORESOURCE_MEM_WRITEABLE (1<<0) /* dup: IORESOURCE_READONLY */ 80 #define IORESOURCE_MEM_WRITEABLE (1<<0) /* dup: IORESOURCE_READONLY */
81 #define IORESOURCE_MEM_CACHEABLE (1<<1) /* dup: IORESOURCE_CACHEABLE */ 81 #define IORESOURCE_MEM_CACHEABLE (1<<1) /* dup: IORESOURCE_CACHEABLE */
82 #define IORESOURCE_MEM_RANGELENGTH (1<<2) /* dup: IORESOURCE_RANGELENGTH */ 82 #define IORESOURCE_MEM_RANGELENGTH (1<<2) /* dup: IORESOURCE_RANGELENGTH */
83 #define IORESOURCE_MEM_TYPE_MASK (3<<3) 83 #define IORESOURCE_MEM_TYPE_MASK (3<<3)
84 #define IORESOURCE_MEM_8BIT (0<<3) 84 #define IORESOURCE_MEM_8BIT (0<<3)
85 #define IORESOURCE_MEM_16BIT (1<<3) 85 #define IORESOURCE_MEM_16BIT (1<<3)
86 #define IORESOURCE_MEM_8AND16BIT (2<<3) 86 #define IORESOURCE_MEM_8AND16BIT (2<<3)
87 #define IORESOURCE_MEM_32BIT (3<<3) 87 #define IORESOURCE_MEM_32BIT (3<<3)
88 #define IORESOURCE_MEM_SHADOWABLE (1<<5) /* dup: IORESOURCE_SHADOWABLE */ 88 #define IORESOURCE_MEM_SHADOWABLE (1<<5) /* dup: IORESOURCE_SHADOWABLE */
89 #define IORESOURCE_MEM_EXPANSIONROM (1<<6) 89 #define IORESOURCE_MEM_EXPANSIONROM (1<<6)
90 90
91 /* PCI ROM control bits (IORESOURCE_BITS) */ 91 /* PCI ROM control bits (IORESOURCE_BITS) */
92 #define IORESOURCE_ROM_ENABLE (1<<0) /* ROM is enabled, same as PCI_ROM_ADDRESS_ENABLE */ 92 #define IORESOURCE_ROM_ENABLE (1<<0) /* ROM is enabled, same as PCI_ROM_ADDRESS_ENABLE */
93 #define IORESOURCE_ROM_SHADOW (1<<1) /* ROM is copy at C000:0 */ 93 #define IORESOURCE_ROM_SHADOW (1<<1) /* ROM is copy at C000:0 */
94 #define IORESOURCE_ROM_COPY (1<<2) /* ROM is alloc'd copy, resource field overlaid */ 94 #define IORESOURCE_ROM_COPY (1<<2) /* ROM is alloc'd copy, resource field overlaid */
95 #define IORESOURCE_ROM_BIOS_COPY (1<<3) /* ROM is BIOS copy, resource field overlaid */ 95 #define IORESOURCE_ROM_BIOS_COPY (1<<3) /* ROM is BIOS copy, resource field overlaid */
96 96
97 /* PCI control bits. Shares IORESOURCE_BITS with above PCI ROM. */ 97 /* PCI control bits. Shares IORESOURCE_BITS with above PCI ROM. */
98 #define IORESOURCE_PCI_FIXED (1<<4) /* Do not move resource */ 98 #define IORESOURCE_PCI_FIXED (1<<4) /* Do not move resource */
99 99
100 /* PC/ISA/whatever - the normal PC address spaces: IO and memory */ 100 /* PC/ISA/whatever - the normal PC address spaces: IO and memory */
101 extern struct resource ioport_resource; 101 extern struct resource ioport_resource;
102 extern struct resource iomem_resource; 102 extern struct resource iomem_resource;
103 103
104 extern int request_resource(struct resource *root, struct resource *new); 104 extern int request_resource(struct resource *root, struct resource *new);
105 extern int release_resource(struct resource *new); 105 extern int release_resource(struct resource *new);
106 extern int insert_resource(struct resource *parent, struct resource *new); 106 extern int insert_resource(struct resource *parent, struct resource *new);
107 extern int allocate_resource(struct resource *root, struct resource *new, 107 extern int allocate_resource(struct resource *root, struct resource *new,
108 resource_size_t size, resource_size_t min, 108 resource_size_t size, resource_size_t min,
109 resource_size_t max, resource_size_t align, 109 resource_size_t max, resource_size_t align,
110 void (*alignf)(void *, struct resource *, 110 void (*alignf)(void *, struct resource *,
111 resource_size_t, resource_size_t), 111 resource_size_t, resource_size_t),
112 void *alignf_data); 112 void *alignf_data);
113 int adjust_resource(struct resource *res, resource_size_t start, 113 int adjust_resource(struct resource *res, resource_size_t start,
114 resource_size_t size); 114 resource_size_t size);
115 resource_size_t resource_alignment(struct resource *res); 115 resource_size_t resource_alignment(struct resource *res);
116 116
117 /* Convenience shorthand with allocation */ 117 /* Convenience shorthand with allocation */
118 #define request_region(start,n,name) __request_region(&ioport_resource, (start), (n), (name)) 118 #define request_region(start,n,name) __request_region(&ioport_resource, (start), (n), (name))
119 #define request_mem_region(start,n,name) __request_region(&iomem_resource, (start), (n), (name)) 119 #define request_mem_region(start,n,name) __request_region(&iomem_resource, (start), (n), (name))
120 #define rename_region(region, newname) do { (region)->name = (newname); } while (0) 120 #define rename_region(region, newname) do { (region)->name = (newname); } while (0)
121 121
122 extern struct resource * __request_region(struct resource *, 122 extern struct resource * __request_region(struct resource *,
123 resource_size_t start, 123 resource_size_t start,
124 resource_size_t n, const char *name); 124 resource_size_t n, const char *name);
125 125
126 /* Compatibility cruft */ 126 /* Compatibility cruft */
127 #define release_region(start,n) __release_region(&ioport_resource, (start), (n)) 127 #define release_region(start,n) __release_region(&ioport_resource, (start), (n))
128 #define check_mem_region(start,n) __check_region(&iomem_resource, (start), (n)) 128 #define check_mem_region(start,n) __check_region(&iomem_resource, (start), (n))
129 #define release_mem_region(start,n) __release_region(&iomem_resource, (start), (n)) 129 #define release_mem_region(start,n) __release_region(&iomem_resource, (start), (n))
130 130
131 extern int __check_region(struct resource *, resource_size_t, resource_size_t); 131 extern int __check_region(struct resource *, resource_size_t, resource_size_t);
132 extern void __release_region(struct resource *, resource_size_t, 132 extern void __release_region(struct resource *, resource_size_t,
133 resource_size_t); 133 resource_size_t);
134 134
135 static inline int __deprecated check_region(resource_size_t s, 135 static inline int __deprecated check_region(resource_size_t s,
136 resource_size_t n) 136 resource_size_t n)
137 { 137 {
138 return __check_region(&ioport_resource, s, n); 138 return __check_region(&ioport_resource, s, n);
139 } 139 }
140 140
141 /* Wrappers for managed devices */ 141 /* Wrappers for managed devices */
142 struct device; 142 struct device;
143 #define devm_request_region(dev,start,n,name) \ 143 #define devm_request_region(dev,start,n,name) \
144 __devm_request_region(dev, &ioport_resource, (start), (n), (name)) 144 __devm_request_region(dev, &ioport_resource, (start), (n), (name))
145 #define devm_request_mem_region(dev,start,n,name) \ 145 #define devm_request_mem_region(dev,start,n,name) \
146 __devm_request_region(dev, &iomem_resource, (start), (n), (name)) 146 __devm_request_region(dev, &iomem_resource, (start), (n), (name))
147 147
148 extern struct resource * __devm_request_region(struct device *dev, 148 extern struct resource * __devm_request_region(struct device *dev,
149 struct resource *parent, resource_size_t start, 149 struct resource *parent, resource_size_t start,
150 resource_size_t n, const char *name); 150 resource_size_t n, const char *name);
151 151
152 #define devm_release_region(start,n) \ 152 #define devm_release_region(start,n) \
153 __devm_release_region(dev, &ioport_resource, (start), (n)) 153 __devm_release_region(dev, &ioport_resource, (start), (n))
154 #define devm_release_mem_region(start,n) \ 154 #define devm_release_mem_region(start,n) \
155 __devm_release_region(dev, &iomem_resource, (start), (n)) 155 __devm_release_region(dev, &iomem_resource, (start), (n))
156 156
157 extern void __devm_release_region(struct device *dev, struct resource *parent, 157 extern void __devm_release_region(struct device *dev, struct resource *parent,
158 resource_size_t start, resource_size_t n); 158 resource_size_t start, resource_size_t n);
159 159
160 #endif /* __ASSEMBLY__ */ 160 #endif /* __ASSEMBLY__ */
161 #endif /* _LINUX_IOPORT_H */ 161 #endif /* _LINUX_IOPORT_H */
162 162