Print this page
update to acpica-unix2-20131115
acpica-unix2-20130823
PANKOVs restructure
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/uts/intel/sys/acpi/acresrc.h
+++ new/usr/src/common/acpica/include/acresrc.h
1 1 /******************************************************************************
2 2 *
3 3 * Name: acresrc.h - Resource Manager function prototypes
4 4 *
5 5 *****************************************************************************/
6 6
7 7 /*
8 - * Copyright (C) 2000 - 2011, Intel Corp.
8 + * Copyright (C) 2000 - 2013, Intel Corp.
9 9 * All rights reserved.
10 10 *
11 11 * Redistribution and use in source and binary forms, with or without
12 12 * modification, are permitted provided that the following conditions
13 13 * are met:
14 14 * 1. Redistributions of source code must retain the above copyright
15 15 * notice, this list of conditions, and the following disclaimer,
16 16 * without modification.
17 17 * 2. Redistributions in binary form must reproduce at minimum a disclaimer
18 18 * substantially similar to the "NO WARRANTY" disclaimer below
19 19 * ("Disclaimer") and any redistribution must be conditioned upon
20 20 * including a substantially similar Disclaimer requirement for further
21 21 * binary redistribution.
22 22 * 3. Neither the names of the above-listed copyright holders nor the names
23 23 * of any contributors may be used to endorse or promote products derived
24 24 * from this software without specific prior written permission.
25 25 *
26 26 * Alternatively, this software may be distributed under the terms of the
27 27 * GNU General Public License ("GPL") version 2 as published by the Free
28 28 * Software Foundation.
29 29 *
30 30 * NO WARRANTY
31 31 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
32 32 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
33 33 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
34 34 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
35 35 * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
36 36 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
37 37 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
38 38 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
39 39 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
40 40 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
41 41 * POSSIBILITY OF SUCH DAMAGES.
42 42 */
43 43
44 44 #ifndef __ACRESRC_H__
45 45 #define __ACRESRC_H__
46 46
47 47 /* Need the AML resource descriptor structs */
48 48
49 49 #include "amlresrc.h"
50 50
51 51
52 52 /*
53 53 * If possible, pack the following structures to byte alignment, since we
54 54 * don't care about performance for debug output. Two cases where we cannot
55 55 * pack the structures:
56 56 *
57 57 * 1) Hardware does not support misaligned memory transfers
58 58 * 2) Compiler does not support pointers within packed structures
59 59 */
60 60 #if (!defined(ACPI_MISALIGNMENT_NOT_SUPPORTED) && !defined(ACPI_PACKED_POINTERS_NOT_SUPPORTED))
61 61 #pragma pack(1)
62 62 #endif
63 63
64 64 /*
65 65 * Individual entry for the resource conversion tables
66 66 */
67 67 typedef const struct acpi_rsconvert_info
|
↓ open down ↓ |
49 lines elided |
↑ open up ↑ |
68 68 {
69 69 UINT8 Opcode;
70 70 UINT8 ResourceOffset;
71 71 UINT8 AmlOffset;
72 72 UINT8 Value;
73 73
74 74 } ACPI_RSCONVERT_INFO;
75 75
76 76 /* Resource conversion opcodes */
77 77
78 -#define ACPI_RSC_INITGET 0
79 -#define ACPI_RSC_INITSET 1
80 -#define ACPI_RSC_FLAGINIT 2
81 -#define ACPI_RSC_1BITFLAG 3
82 -#define ACPI_RSC_2BITFLAG 4
83 -#define ACPI_RSC_COUNT 5
84 -#define ACPI_RSC_COUNT16 6
85 -#define ACPI_RSC_LENGTH 7
86 -#define ACPI_RSC_MOVE8 8
87 -#define ACPI_RSC_MOVE16 9
88 -#define ACPI_RSC_MOVE32 10
89 -#define ACPI_RSC_MOVE64 11
90 -#define ACPI_RSC_SET8 12
91 -#define ACPI_RSC_DATA8 13
92 -#define ACPI_RSC_ADDRESS 14
93 -#define ACPI_RSC_SOURCE 15
94 -#define ACPI_RSC_SOURCEX 16
95 -#define ACPI_RSC_BITMASK 17
96 -#define ACPI_RSC_BITMASK16 18
97 -#define ACPI_RSC_EXIT_NE 19
98 -#define ACPI_RSC_EXIT_LE 20
99 -#define ACPI_RSC_EXIT_EQ 21
78 +typedef enum
79 +{
80 + ACPI_RSC_INITGET = 0,
81 + ACPI_RSC_INITSET,
82 + ACPI_RSC_FLAGINIT,
83 + ACPI_RSC_1BITFLAG,
84 + ACPI_RSC_2BITFLAG,
85 + ACPI_RSC_3BITFLAG,
86 + ACPI_RSC_ADDRESS,
87 + ACPI_RSC_BITMASK,
88 + ACPI_RSC_BITMASK16,
89 + ACPI_RSC_COUNT,
90 + ACPI_RSC_COUNT16,
91 + ACPI_RSC_COUNT_GPIO_PIN,
92 + ACPI_RSC_COUNT_GPIO_RES,
93 + ACPI_RSC_COUNT_GPIO_VEN,
94 + ACPI_RSC_COUNT_SERIAL_RES,
95 + ACPI_RSC_COUNT_SERIAL_VEN,
96 + ACPI_RSC_DATA8,
97 + ACPI_RSC_EXIT_EQ,
98 + ACPI_RSC_EXIT_LE,
99 + ACPI_RSC_EXIT_NE,
100 + ACPI_RSC_LENGTH,
101 + ACPI_RSC_MOVE_GPIO_PIN,
102 + ACPI_RSC_MOVE_GPIO_RES,
103 + ACPI_RSC_MOVE_SERIAL_RES,
104 + ACPI_RSC_MOVE_SERIAL_VEN,
105 + ACPI_RSC_MOVE8,
106 + ACPI_RSC_MOVE16,
107 + ACPI_RSC_MOVE32,
108 + ACPI_RSC_MOVE64,
109 + ACPI_RSC_SET8,
110 + ACPI_RSC_SOURCE,
111 + ACPI_RSC_SOURCEX
100 112
113 +} ACPI_RSCONVERT_OPCODES;
114 +
101 115 /* Resource Conversion sub-opcodes */
102 116
103 117 #define ACPI_RSC_COMPARE_AML_LENGTH 0
104 118 #define ACPI_RSC_COMPARE_VALUE 1
105 119
106 120 #define ACPI_RSC_TABLE_SIZE(d) (sizeof (d) / sizeof (ACPI_RSCONVERT_INFO))
107 121
108 122 #define ACPI_RS_OFFSET(f) (UINT8) ACPI_OFFSET (ACPI_RESOURCE,f)
109 123 #define AML_OFFSET(f) (UINT8) ACPI_OFFSET (AML_RESOURCE,f)
110 124
111 125
126 +/*
127 + * Individual entry for the resource dump tables
128 + */
112 129 typedef const struct acpi_rsdump_info
113 130 {
114 131 UINT8 Opcode;
115 132 UINT8 Offset;
116 133 char *Name;
117 134 const char **Pointer;
118 135
119 136 } ACPI_RSDUMP_INFO;
120 137
121 138 /* Values for the Opcode field above */
122 139
123 -#define ACPI_RSD_TITLE 0
124 -#define ACPI_RSD_LITERAL 1
125 -#define ACPI_RSD_STRING 2
126 -#define ACPI_RSD_UINT8 3
127 -#define ACPI_RSD_UINT16 4
128 -#define ACPI_RSD_UINT32 5
129 -#define ACPI_RSD_UINT64 6
130 -#define ACPI_RSD_1BITFLAG 7
131 -#define ACPI_RSD_2BITFLAG 8
132 -#define ACPI_RSD_SHORTLIST 9
133 -#define ACPI_RSD_LONGLIST 10
134 -#define ACPI_RSD_DWORDLIST 11
135 -#define ACPI_RSD_ADDRESS 12
136 -#define ACPI_RSD_SOURCE 13
140 +typedef enum
141 +{
142 + ACPI_RSD_TITLE = 0,
143 + ACPI_RSD_1BITFLAG,
144 + ACPI_RSD_2BITFLAG,
145 + ACPI_RSD_3BITFLAG,
146 + ACPI_RSD_ADDRESS,
147 + ACPI_RSD_DWORDLIST,
148 + ACPI_RSD_LITERAL,
149 + ACPI_RSD_LONGLIST,
150 + ACPI_RSD_SHORTLIST,
151 + ACPI_RSD_SHORTLISTX,
152 + ACPI_RSD_SOURCE,
153 + ACPI_RSD_STRING,
154 + ACPI_RSD_UINT8,
155 + ACPI_RSD_UINT16,
156 + ACPI_RSD_UINT32,
157 + ACPI_RSD_UINT64,
158 + ACPI_RSD_WORDLIST
137 159
160 +} ACPI_RSDUMP_OPCODES;
161 +
138 162 /* restore default alignment */
139 163
140 164 #pragma pack()
141 165
142 166
143 167 /* Resource tables indexed by internal resource type */
144 168
145 169 extern const UINT8 AcpiGbl_AmlResourceSizes[];
170 +extern const UINT8 AcpiGbl_AmlResourceSerialBusSizes[];
146 171 extern ACPI_RSCONVERT_INFO *AcpiGbl_SetResourceDispatch[];
147 172
148 173 /* Resource tables indexed by raw AML resource descriptor type */
149 174
150 175 extern const UINT8 AcpiGbl_ResourceStructSizes[];
176 +extern const UINT8 AcpiGbl_ResourceStructSerialBusSizes[];
151 177 extern ACPI_RSCONVERT_INFO *AcpiGbl_GetResourceDispatch[];
152 178
179 +extern ACPI_RSCONVERT_INFO *AcpiGbl_ConvertResourceSerialBusDispatch[];
153 180
154 181 typedef struct acpi_vendor_walk_info
155 182 {
156 183 ACPI_VENDOR_UUID *Uuid;
157 184 ACPI_BUFFER *Buffer;
158 185 ACPI_STATUS Status;
159 186
160 187 } ACPI_VENDOR_WALK_INFO;
161 188
162 189
163 190 /*
164 191 * rscreate
165 192 */
166 193 ACPI_STATUS
167 194 AcpiRsCreateResourceList (
168 195 ACPI_OPERAND_OBJECT *AmlBuffer,
169 196 ACPI_BUFFER *OutputBuffer);
170 197
171 198 ACPI_STATUS
172 199 AcpiRsCreateAmlResources (
173 - ACPI_RESOURCE *LinkedListBuffer,
200 + ACPI_BUFFER *ResourceList,
174 201 ACPI_BUFFER *OutputBuffer);
175 202
176 203 ACPI_STATUS
177 204 AcpiRsCreatePciRoutingTable (
178 205 ACPI_OPERAND_OBJECT *PackageObject,
179 206 ACPI_BUFFER *OutputBuffer);
180 207
181 208
182 209 /*
183 210 * rsutils
184 211 */
185 212 ACPI_STATUS
186 213 AcpiRsGetPrtMethodData (
187 214 ACPI_NAMESPACE_NODE *Node,
188 215 ACPI_BUFFER *RetBuffer);
189 216
190 217 ACPI_STATUS
191 218 AcpiRsGetCrsMethodData (
192 219 ACPI_NAMESPACE_NODE *Node,
193 220 ACPI_BUFFER *RetBuffer);
194 221
195 222 ACPI_STATUS
196 223 AcpiRsGetPrsMethodData (
197 224 ACPI_NAMESPACE_NODE *Node,
198 225 ACPI_BUFFER *RetBuffer);
199 226
200 227 ACPI_STATUS
|
↓ open down ↓ |
17 lines elided |
↑ open up ↑ |
201 228 AcpiRsGetMethodData (
202 229 ACPI_HANDLE Handle,
203 230 char *Path,
204 231 ACPI_BUFFER *RetBuffer);
205 232
206 233 ACPI_STATUS
207 234 AcpiRsSetSrsMethodData (
208 235 ACPI_NAMESPACE_NODE *Node,
209 236 ACPI_BUFFER *RetBuffer);
210 237
238 +ACPI_STATUS
239 +AcpiRsGetAeiMethodData (
240 + ACPI_NAMESPACE_NODE *Node,
241 + ACPI_BUFFER *RetBuffer);
211 242
212 243 /*
213 244 * rscalc
214 245 */
215 246 ACPI_STATUS
216 247 AcpiRsGetListLength (
217 248 UINT8 *AmlBuffer,
218 249 UINT32 AmlBufferLength,
219 250 ACPI_SIZE *SizeNeeded);
220 251
221 252 ACPI_STATUS
222 253 AcpiRsGetAmlLength (
223 - ACPI_RESOURCE *LinkedListBuffer,
254 + ACPI_RESOURCE *ResourceList,
255 + ACPI_SIZE ResourceListSize,
224 256 ACPI_SIZE *SizeNeeded);
225 257
226 258 ACPI_STATUS
227 259 AcpiRsGetPciRoutingTableLength (
228 260 ACPI_OPERAND_OBJECT *PackageObject,
229 261 ACPI_SIZE *BufferSizeNeeded);
230 262
231 263 ACPI_STATUS
232 264 AcpiRsConvertAmlToResources (
233 265 UINT8 *Aml,
234 266 UINT32 Length,
235 267 UINT32 Offset,
236 268 UINT8 ResourceIndex,
237 - void *Context);
269 + void **Context);
238 270
239 271 ACPI_STATUS
240 272 AcpiRsConvertResourcesToAml (
241 273 ACPI_RESOURCE *Resource,
242 274 ACPI_SIZE AmlSizeNeeded,
243 275 UINT8 *OutputBuffer);
244 276
245 277
246 278 /*
247 279 * rsaddr
248 280 */
249 281 void
250 282 AcpiRsSetAddressCommon (
251 283 AML_RESOURCE *Aml,
252 284 ACPI_RESOURCE *Resource);
253 285
254 286 BOOLEAN
255 287 AcpiRsGetAddressCommon (
256 288 ACPI_RESOURCE *Resource,
257 289 AML_RESOURCE *Aml);
258 290
259 291
260 292 /*
261 293 * rsmisc
262 294 */
263 295 ACPI_STATUS
264 296 AcpiRsConvertAmlToResource (
265 297 ACPI_RESOURCE *Resource,
266 298 AML_RESOURCE *Aml,
267 299 ACPI_RSCONVERT_INFO *Info);
268 300
269 301 ACPI_STATUS
270 302 AcpiRsConvertResourceToAml (
271 303 ACPI_RESOURCE *Resource,
272 304 AML_RESOURCE *Aml,
273 305 ACPI_RSCONVERT_INFO *Info);
274 306
275 307
276 308 /*
277 309 * rsutils
278 310 */
279 311 void
280 312 AcpiRsMoveData (
281 313 void *Destination,
282 314 void *Source,
283 315 UINT16 ItemCount,
284 316 UINT8 MoveType);
285 317
286 318 UINT8
287 319 AcpiRsDecodeBitmask (
288 320 UINT16 Mask,
289 321 UINT8 *List);
290 322
291 323 UINT16
292 324 AcpiRsEncodeBitmask (
293 325 UINT8 *List,
294 326 UINT8 Count);
295 327
296 328 ACPI_RS_LENGTH
297 329 AcpiRsGetResourceSource (
298 330 ACPI_RS_LENGTH ResourceLength,
299 331 ACPI_RS_LENGTH MinimumLength,
300 332 ACPI_RESOURCE_SOURCE *ResourceSource,
301 333 AML_RESOURCE *Aml,
302 334 char *StringPtr);
303 335
304 336 ACPI_RSDESC_SIZE
305 337 AcpiRsSetResourceSource (
306 338 AML_RESOURCE *Aml,
307 339 ACPI_RS_LENGTH MinimumLength,
308 340 ACPI_RESOURCE_SOURCE *ResourceSource);
309 341
310 342 void
311 343 AcpiRsSetResourceHeader (
312 344 UINT8 DescriptorType,
313 345 ACPI_RSDESC_SIZE TotalLength,
314 346 AML_RESOURCE *Aml);
315 347
316 348 void
317 349 AcpiRsSetResourceLength (
318 350 ACPI_RSDESC_SIZE TotalLength,
319 351 AML_RESOURCE *Aml);
320 352
321 353
322 354 /*
323 355 * rsdump
324 356 */
325 357 void
326 358 AcpiRsDumpResourceList (
327 359 ACPI_RESOURCE *Resource);
328 360
329 361 void
330 362 AcpiRsDumpIrqList (
331 363 UINT8 *RouteTable);
332 364
333 365
334 366 /*
335 367 * Resource conversion tables
336 368 */
337 369 extern ACPI_RSCONVERT_INFO AcpiRsConvertDma[];
338 370 extern ACPI_RSCONVERT_INFO AcpiRsConvertEndDpf[];
339 371 extern ACPI_RSCONVERT_INFO AcpiRsConvertIo[];
340 372 extern ACPI_RSCONVERT_INFO AcpiRsConvertFixedIo[];
|
↓ open down ↓ |
93 lines elided |
↑ open up ↑ |
341 373 extern ACPI_RSCONVERT_INFO AcpiRsConvertEndTag[];
342 374 extern ACPI_RSCONVERT_INFO AcpiRsConvertMemory24[];
343 375 extern ACPI_RSCONVERT_INFO AcpiRsConvertGenericReg[];
344 376 extern ACPI_RSCONVERT_INFO AcpiRsConvertMemory32[];
345 377 extern ACPI_RSCONVERT_INFO AcpiRsConvertFixedMemory32[];
346 378 extern ACPI_RSCONVERT_INFO AcpiRsConvertAddress32[];
347 379 extern ACPI_RSCONVERT_INFO AcpiRsConvertAddress16[];
348 380 extern ACPI_RSCONVERT_INFO AcpiRsConvertExtIrq[];
349 381 extern ACPI_RSCONVERT_INFO AcpiRsConvertAddress64[];
350 382 extern ACPI_RSCONVERT_INFO AcpiRsConvertExtAddress64[];
383 +extern ACPI_RSCONVERT_INFO AcpiRsConvertGpio[];
384 +extern ACPI_RSCONVERT_INFO AcpiRsConvertFixedDma[];
385 +extern ACPI_RSCONVERT_INFO AcpiRsConvertI2cSerialBus[];
386 +extern ACPI_RSCONVERT_INFO AcpiRsConvertSpiSerialBus[];
387 +extern ACPI_RSCONVERT_INFO AcpiRsConvertUartSerialBus[];
351 388
352 389 /* These resources require separate get/set tables */
353 390
354 391 extern ACPI_RSCONVERT_INFO AcpiRsGetIrq[];
355 392 extern ACPI_RSCONVERT_INFO AcpiRsGetStartDpf[];
356 393 extern ACPI_RSCONVERT_INFO AcpiRsGetVendorSmall[];
357 394 extern ACPI_RSCONVERT_INFO AcpiRsGetVendorLarge[];
358 395
359 396 extern ACPI_RSCONVERT_INFO AcpiRsSetIrq[];
360 397 extern ACPI_RSCONVERT_INFO AcpiRsSetStartDpf[];
361 398 extern ACPI_RSCONVERT_INFO AcpiRsSetVendor[];
362 399
363 400
364 401 #if defined(ACPI_DEBUG_OUTPUT) || defined(ACPI_DEBUGGER)
365 402 /*
366 403 * rsinfo
367 404 */
368 405 extern ACPI_RSDUMP_INFO *AcpiGbl_DumpResourceDispatch[];
406 +extern ACPI_RSDUMP_INFO *AcpiGbl_DumpSerialBusDispatch[];
369 407
370 408 /*
371 - * rsdump
409 + * rsdumpinfo
372 410 */
373 411 extern ACPI_RSDUMP_INFO AcpiRsDumpIrq[];
412 +extern ACPI_RSDUMP_INFO AcpiRsDumpPrt[];
374 413 extern ACPI_RSDUMP_INFO AcpiRsDumpDma[];
375 414 extern ACPI_RSDUMP_INFO AcpiRsDumpStartDpf[];
376 415 extern ACPI_RSDUMP_INFO AcpiRsDumpEndDpf[];
377 416 extern ACPI_RSDUMP_INFO AcpiRsDumpIo[];
417 +extern ACPI_RSDUMP_INFO AcpiRsDumpIoFlags[];
378 418 extern ACPI_RSDUMP_INFO AcpiRsDumpFixedIo[];
379 419 extern ACPI_RSDUMP_INFO AcpiRsDumpVendor[];
380 420 extern ACPI_RSDUMP_INFO AcpiRsDumpEndTag[];
381 421 extern ACPI_RSDUMP_INFO AcpiRsDumpMemory24[];
382 422 extern ACPI_RSDUMP_INFO AcpiRsDumpMemory32[];
423 +extern ACPI_RSDUMP_INFO AcpiRsDumpMemoryFlags[];
383 424 extern ACPI_RSDUMP_INFO AcpiRsDumpFixedMemory32[];
384 425 extern ACPI_RSDUMP_INFO AcpiRsDumpAddress16[];
385 426 extern ACPI_RSDUMP_INFO AcpiRsDumpAddress32[];
386 427 extern ACPI_RSDUMP_INFO AcpiRsDumpAddress64[];
387 428 extern ACPI_RSDUMP_INFO AcpiRsDumpExtAddress64[];
388 429 extern ACPI_RSDUMP_INFO AcpiRsDumpExtIrq[];
389 430 extern ACPI_RSDUMP_INFO AcpiRsDumpGenericReg[];
431 +extern ACPI_RSDUMP_INFO AcpiRsDumpGpio[];
432 +extern ACPI_RSDUMP_INFO AcpiRsDumpFixedDma[];
433 +extern ACPI_RSDUMP_INFO AcpiRsDumpCommonSerialBus[];
434 +extern ACPI_RSDUMP_INFO AcpiRsDumpI2cSerialBus[];
435 +extern ACPI_RSDUMP_INFO AcpiRsDumpSpiSerialBus[];
436 +extern ACPI_RSDUMP_INFO AcpiRsDumpUartSerialBus[];
437 +extern ACPI_RSDUMP_INFO AcpiRsDumpGeneralFlags[];
390 438 #endif
391 439
392 440 #endif /* __ACRESRC_H__ */
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX