diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/acpi/acpi_bus.h | 2 | ||||
-rw-r--r-- | include/acpi/acpi_drivers.h | 3 | ||||
-rw-r--r-- | include/acpi/acpi_hest.h | 12 | ||||
-rw-r--r-- | include/acpi/apei.h | 34 | ||||
-rw-r--r-- | include/acpi/atomicio.h | 10 | ||||
-rw-r--r-- | include/acpi/hed.h | 18 | ||||
-rw-r--r-- | include/acpi/processor.h | 13 | ||||
-rw-r--r-- | include/acpi/video.h | 16 | ||||
-rw-r--r-- | include/linux/acpi.h | 1 | ||||
-rw-r--r-- | include/linux/cper.h | 314 | ||||
-rw-r--r-- | include/linux/debugfs.h | 2 | ||||
-rw-r--r-- | include/linux/pci.h | 3 | ||||
-rw-r--r-- | include/linux/uuid.h | 70 |
13 files changed, 468 insertions, 30 deletions
diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h index 7bf83ddf82e0..baacd98e7cc6 100644 --- a/include/acpi/acpi_bus.h +++ b/include/acpi/acpi_bus.h | |||
@@ -373,7 +373,7 @@ struct acpi_pci_root { | |||
373 | struct acpi_pci_id id; | 373 | struct acpi_pci_id id; |
374 | struct pci_bus *bus; | 374 | struct pci_bus *bus; |
375 | u16 segment; | 375 | u16 segment; |
376 | u8 bus_nr; | 376 | struct resource secondary; /* downstream bus range */ |
377 | 377 | ||
378 | u32 osc_support_set; /* _OSC state of support bits */ | 378 | u32 osc_support_set; /* _OSC state of support bits */ |
379 | u32 osc_control_set; /* _OSC state of control bits */ | 379 | u32 osc_control_set; /* _OSC state of control bits */ |
diff --git a/include/acpi/acpi_drivers.h b/include/acpi/acpi_drivers.h index 4f7b44866b76..23d78b4d088b 100644 --- a/include/acpi/acpi_drivers.h +++ b/include/acpi/acpi_drivers.h | |||
@@ -104,8 +104,7 @@ int acpi_pci_bind_root(struct acpi_device *device); | |||
104 | 104 | ||
105 | /* Arch-defined function to add a bus to the system */ | 105 | /* Arch-defined function to add a bus to the system */ |
106 | 106 | ||
107 | struct pci_bus *pci_acpi_scan_root(struct acpi_device *device, int domain, | 107 | struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root); |
108 | int bus); | ||
109 | void pci_acpi_crs_quirks(void); | 108 | void pci_acpi_crs_quirks(void); |
110 | 109 | ||
111 | /* -------------------------------------------------------------------------- | 110 | /* -------------------------------------------------------------------------- |
diff --git a/include/acpi/acpi_hest.h b/include/acpi/acpi_hest.h deleted file mode 100644 index 63194d03cb2d..000000000000 --- a/include/acpi/acpi_hest.h +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | #ifndef __ACPI_HEST_H | ||
2 | #define __ACPI_HEST_H | ||
3 | |||
4 | #include <linux/pci.h> | ||
5 | |||
6 | #ifdef CONFIG_ACPI | ||
7 | extern int acpi_hest_firmware_first_pci(struct pci_dev *pci); | ||
8 | #else | ||
9 | static inline int acpi_hest_firmware_first_pci(struct pci_dev *pci) { return 0; } | ||
10 | #endif | ||
11 | |||
12 | #endif | ||
diff --git a/include/acpi/apei.h b/include/acpi/apei.h new file mode 100644 index 000000000000..b3365025ff8d --- /dev/null +++ b/include/acpi/apei.h | |||
@@ -0,0 +1,34 @@ | |||
1 | /* | ||
2 | * apei.h - ACPI Platform Error Interface | ||
3 | */ | ||
4 | |||
5 | #ifndef ACPI_APEI_H | ||
6 | #define ACPI_APEI_H | ||
7 | |||
8 | #include <linux/acpi.h> | ||
9 | #include <linux/cper.h> | ||
10 | #include <asm/ioctls.h> | ||
11 | |||
12 | #define APEI_ERST_INVALID_RECORD_ID 0xffffffffffffffffULL | ||
13 | |||
14 | #define APEI_ERST_CLEAR_RECORD _IOW('E', 1, u64) | ||
15 | #define APEI_ERST_GET_RECORD_COUNT _IOR('E', 2, u32) | ||
16 | |||
17 | #ifdef __KERNEL__ | ||
18 | |||
19 | extern int hest_disable; | ||
20 | extern int erst_disable; | ||
21 | |||
22 | typedef int (*apei_hest_func_t)(struct acpi_hest_header *hest_hdr, void *data); | ||
23 | int apei_hest_parse(apei_hest_func_t func, void *data); | ||
24 | |||
25 | int erst_write(const struct cper_record_header *record); | ||
26 | ssize_t erst_get_record_count(void); | ||
27 | int erst_get_next_record_id(u64 *record_id); | ||
28 | ssize_t erst_read(u64 record_id, struct cper_record_header *record, | ||
29 | size_t buflen); | ||
30 | ssize_t erst_read_next(struct cper_record_header *record, size_t buflen); | ||
31 | int erst_clear(u64 record_id); | ||
32 | |||
33 | #endif | ||
34 | #endif | ||
diff --git a/include/acpi/atomicio.h b/include/acpi/atomicio.h new file mode 100644 index 000000000000..8b9fb4b0b9ce --- /dev/null +++ b/include/acpi/atomicio.h | |||
@@ -0,0 +1,10 @@ | |||
1 | #ifndef ACPI_ATOMIC_IO_H | ||
2 | #define ACPI_ATOMIC_IO_H | ||
3 | |||
4 | int acpi_pre_map_gar(struct acpi_generic_address *reg); | ||
5 | int acpi_post_unmap_gar(struct acpi_generic_address *reg); | ||
6 | |||
7 | int acpi_atomic_read(u64 *val, struct acpi_generic_address *reg); | ||
8 | int acpi_atomic_write(u64 val, struct acpi_generic_address *reg); | ||
9 | |||
10 | #endif | ||
diff --git a/include/acpi/hed.h b/include/acpi/hed.h new file mode 100644 index 000000000000..46e1249b70cc --- /dev/null +++ b/include/acpi/hed.h | |||
@@ -0,0 +1,18 @@ | |||
1 | /* | ||
2 | * hed.h - ACPI Hardware Error Device | ||
3 | * | ||
4 | * Copyright (C) 2009, Intel Corp. | ||
5 | * Author: Huang Ying <ying.huang@intel.com> | ||
6 | * | ||
7 | * This file is released under the GPLv2. | ||
8 | */ | ||
9 | |||
10 | #ifndef ACPI_HED_H | ||
11 | #define ACPI_HED_H | ||
12 | |||
13 | #include <linux/notifier.h> | ||
14 | |||
15 | int register_acpi_hed_notifier(struct notifier_block *nb); | ||
16 | void unregister_acpi_hed_notifier(struct notifier_block *nb); | ||
17 | |||
18 | #endif | ||
diff --git a/include/acpi/processor.h b/include/acpi/processor.h index 86825ddbe14e..da565a48240e 100644 --- a/include/acpi/processor.h +++ b/include/acpi/processor.h | |||
@@ -52,17 +52,6 @@ struct acpi_power_register { | |||
52 | u64 address; | 52 | u64 address; |
53 | } __attribute__ ((packed)); | 53 | } __attribute__ ((packed)); |
54 | 54 | ||
55 | struct acpi_processor_cx_policy { | ||
56 | u32 count; | ||
57 | struct acpi_processor_cx *state; | ||
58 | struct { | ||
59 | u32 time; | ||
60 | u32 ticks; | ||
61 | u32 count; | ||
62 | u32 bm; | ||
63 | } threshold; | ||
64 | }; | ||
65 | |||
66 | struct acpi_processor_cx { | 55 | struct acpi_processor_cx { |
67 | u8 valid; | 56 | u8 valid; |
68 | u8 type; | 57 | u8 type; |
@@ -74,8 +63,6 @@ struct acpi_processor_cx { | |||
74 | u32 power; | 63 | u32 power; |
75 | u32 usage; | 64 | u32 usage; |
76 | u64 time; | 65 | u64 time; |
77 | struct acpi_processor_cx_policy promotion; | ||
78 | struct acpi_processor_cx_policy demotion; | ||
79 | char desc[ACPI_CX_DESC_LEN]; | 66 | char desc[ACPI_CX_DESC_LEN]; |
80 | }; | 67 | }; |
81 | 68 | ||
diff --git a/include/acpi/video.h b/include/acpi/video.h index cf7be3dd157b..551793c9b6e8 100644 --- a/include/acpi/video.h +++ b/include/acpi/video.h | |||
@@ -1,12 +1,28 @@ | |||
1 | #ifndef __ACPI_VIDEO_H | 1 | #ifndef __ACPI_VIDEO_H |
2 | #define __ACPI_VIDEO_H | 2 | #define __ACPI_VIDEO_H |
3 | 3 | ||
4 | #define ACPI_VIDEO_DISPLAY_CRT 1 | ||
5 | #define ACPI_VIDEO_DISPLAY_TV 2 | ||
6 | #define ACPI_VIDEO_DISPLAY_DVI 3 | ||
7 | #define ACPI_VIDEO_DISPLAY_LCD 4 | ||
8 | |||
9 | #define ACPI_VIDEO_DISPLAY_LEGACY_MONITOR 0x0100 | ||
10 | #define ACPI_VIDEO_DISPLAY_LEGACY_PANEL 0x0110 | ||
11 | #define ACPI_VIDEO_DISPLAY_LEGACY_TV 0x0200 | ||
12 | |||
4 | #if (defined CONFIG_ACPI_VIDEO || defined CONFIG_ACPI_VIDEO_MODULE) | 13 | #if (defined CONFIG_ACPI_VIDEO || defined CONFIG_ACPI_VIDEO_MODULE) |
5 | extern int acpi_video_register(void); | 14 | extern int acpi_video_register(void); |
6 | extern void acpi_video_unregister(void); | 15 | extern void acpi_video_unregister(void); |
16 | extern int acpi_video_get_edid(struct acpi_device *device, int type, | ||
17 | int device_id, void **edid); | ||
7 | #else | 18 | #else |
8 | static inline int acpi_video_register(void) { return 0; } | 19 | static inline int acpi_video_register(void) { return 0; } |
9 | static inline void acpi_video_unregister(void) { return; } | 20 | static inline void acpi_video_unregister(void) { return; } |
21 | static inline int acpi_video_get_edid(struct acpi_device *device, int type, | ||
22 | int device_id, void **edid) | ||
23 | { | ||
24 | return -ENODEV; | ||
25 | } | ||
10 | #endif | 26 | #endif |
11 | 27 | ||
12 | #endif | 28 | #endif |
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 2c60f1f70b38..224a38c960d4 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h | |||
@@ -254,7 +254,6 @@ int acpi_resources_are_enforced(void); | |||
254 | void __init acpi_no_s4_hw_signature(void); | 254 | void __init acpi_no_s4_hw_signature(void); |
255 | void __init acpi_old_suspend_ordering(void); | 255 | void __init acpi_old_suspend_ordering(void); |
256 | void __init acpi_s4_no_nvs(void); | 256 | void __init acpi_s4_no_nvs(void); |
257 | void __init acpi_set_sci_en_on_resume(void); | ||
258 | #endif /* CONFIG_PM_SLEEP */ | 257 | #endif /* CONFIG_PM_SLEEP */ |
259 | 258 | ||
260 | struct acpi_osc_context { | 259 | struct acpi_osc_context { |
diff --git a/include/linux/cper.h b/include/linux/cper.h new file mode 100644 index 000000000000..4b38f905b705 --- /dev/null +++ b/include/linux/cper.h | |||
@@ -0,0 +1,314 @@ | |||
1 | /* | ||
2 | * UEFI Common Platform Error Record | ||
3 | * | ||
4 | * Copyright (C) 2010, Intel Corp. | ||
5 | * Author: Huang Ying <ying.huang@intel.com> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or | ||
8 | * modify it under the terms of the GNU General Public License version | ||
9 | * 2 as published by the Free Software Foundation. | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License | ||
17 | * along with this program; if not, write to the Free Software | ||
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
19 | */ | ||
20 | |||
21 | #ifndef LINUX_CPER_H | ||
22 | #define LINUX_CPER_H | ||
23 | |||
24 | #include <linux/uuid.h> | ||
25 | |||
26 | /* CPER record signature and the size */ | ||
27 | #define CPER_SIG_RECORD "CPER" | ||
28 | #define CPER_SIG_SIZE 4 | ||
29 | /* Used in signature_end field in struct cper_record_header */ | ||
30 | #define CPER_SIG_END 0xffffffff | ||
31 | |||
32 | /* | ||
33 | * CPER record header revision, used in revision field in struct | ||
34 | * cper_record_header | ||
35 | */ | ||
36 | #define CPER_RECORD_REV 0x0100 | ||
37 | |||
38 | /* | ||
39 | * Severity difinition for error_severity in struct cper_record_header | ||
40 | * and section_severity in struct cper_section_descriptor | ||
41 | */ | ||
42 | #define CPER_SER_RECOVERABLE 0x0 | ||
43 | #define CPER_SER_FATAL 0x1 | ||
44 | #define CPER_SER_CORRECTED 0x2 | ||
45 | #define CPER_SER_INFORMATIONAL 0x3 | ||
46 | |||
47 | /* | ||
48 | * Validation bits difinition for validation_bits in struct | ||
49 | * cper_record_header. If set, corresponding fields in struct | ||
50 | * cper_record_header contain valid information. | ||
51 | * | ||
52 | * corresponds platform_id | ||
53 | */ | ||
54 | #define CPER_VALID_PLATFORM_ID 0x0001 | ||
55 | /* corresponds timestamp */ | ||
56 | #define CPER_VALID_TIMESTAMP 0x0002 | ||
57 | /* corresponds partition_id */ | ||
58 | #define CPER_VALID_PARTITION_ID 0x0004 | ||
59 | |||
60 | /* | ||
61 | * Notification type used to generate error record, used in | ||
62 | * notification_type in struct cper_record_header | ||
63 | * | ||
64 | * Corrected Machine Check | ||
65 | */ | ||
66 | #define CPER_NOTIFY_CMC \ | ||
67 | UUID_LE(0x2DCE8BB1, 0xBDD7, 0x450e, 0xB9, 0xAD, 0x9C, 0xF4, \ | ||
68 | 0xEB, 0xD4, 0xF8, 0x90) | ||
69 | /* Corrected Platform Error */ | ||
70 | #define CPER_NOTIFY_CPE \ | ||
71 | UUID_LE(0x4E292F96, 0xD843, 0x4a55, 0xA8, 0xC2, 0xD4, 0x81, \ | ||
72 | 0xF2, 0x7E, 0xBE, 0xEE) | ||
73 | /* Machine Check Exception */ | ||
74 | #define CPER_NOTIFY_MCE \ | ||
75 | UUID_LE(0xE8F56FFE, 0x919C, 0x4cc5, 0xBA, 0x88, 0x65, 0xAB, \ | ||
76 | 0xE1, 0x49, 0x13, 0xBB) | ||
77 | /* PCI Express Error */ | ||
78 | #define CPER_NOTIFY_PCIE \ | ||
79 | UUID_LE(0xCF93C01F, 0x1A16, 0x4dfc, 0xB8, 0xBC, 0x9C, 0x4D, \ | ||
80 | 0xAF, 0x67, 0xC1, 0x04) | ||
81 | /* INIT Record (for IPF) */ | ||
82 | #define CPER_NOTIFY_INIT \ | ||
83 | UUID_LE(0xCC5263E8, 0x9308, 0x454a, 0x89, 0xD0, 0x34, 0x0B, \ | ||
84 | 0xD3, 0x9B, 0xC9, 0x8E) | ||
85 | /* Non-Maskable Interrupt */ | ||
86 | #define CPER_NOTIFY_NMI \ | ||
87 | UUID_LE(0x5BAD89FF, 0xB7E6, 0x42c9, 0x81, 0x4A, 0xCF, 0x24, \ | ||
88 | 0x85, 0xD6, 0xE9, 0x8A) | ||
89 | /* BOOT Error Record */ | ||
90 | #define CPER_NOTIFY_BOOT \ | ||
91 | UUID_LE(0x3D61A466, 0xAB40, 0x409a, 0xA6, 0x98, 0xF3, 0x62, \ | ||
92 | 0xD4, 0x64, 0xB3, 0x8F) | ||
93 | /* DMA Remapping Error */ | ||
94 | #define CPER_NOTIFY_DMAR \ | ||
95 | UUID_LE(0x667DD791, 0xC6B3, 0x4c27, 0x8A, 0x6B, 0x0F, 0x8E, \ | ||
96 | 0x72, 0x2D, 0xEB, 0x41) | ||
97 | |||
98 | /* | ||
99 | * Flags bits definitions for flags in struct cper_record_header | ||
100 | * If set, the error has been recovered | ||
101 | */ | ||
102 | #define CPER_HW_ERROR_FLAGS_RECOVERED 0x1 | ||
103 | /* If set, the error is for previous boot */ | ||
104 | #define CPER_HW_ERROR_FLAGS_PREVERR 0x2 | ||
105 | /* If set, the error is injected for testing */ | ||
106 | #define CPER_HW_ERROR_FLAGS_SIMULATED 0x4 | ||
107 | |||
108 | /* | ||
109 | * CPER section header revision, used in revision field in struct | ||
110 | * cper_section_descriptor | ||
111 | */ | ||
112 | #define CPER_SEC_REV 0x0100 | ||
113 | |||
114 | /* | ||
115 | * Validation bits difinition for validation_bits in struct | ||
116 | * cper_section_descriptor. If set, corresponding fields in struct | ||
117 | * cper_section_descriptor contain valid information. | ||
118 | * | ||
119 | * corresponds fru_id | ||
120 | */ | ||
121 | #define CPER_SEC_VALID_FRU_ID 0x1 | ||
122 | /* corresponds fru_text */ | ||
123 | #define CPER_SEC_VALID_FRU_TEXT 0x2 | ||
124 | |||
125 | /* | ||
126 | * Flags bits definitions for flags in struct cper_section_descriptor | ||
127 | * | ||
128 | * If set, the section is associated with the error condition | ||
129 | * directly, and should be focused on | ||
130 | */ | ||
131 | #define CPER_SEC_PRIMARY 0x0001 | ||
132 | /* | ||
133 | * If set, the error was not contained within the processor or memory | ||
134 | * hierarchy and the error may have propagated to persistent storage | ||
135 | * or network | ||
136 | */ | ||
137 | #define CPER_SEC_CONTAINMENT_WARNING 0x0002 | ||
138 | /* If set, the component must be re-initialized or re-enabled prior to use */ | ||
139 | #define CPER_SEC_RESET 0x0004 | ||
140 | /* If set, Linux may choose to discontinue use of the resource */ | ||
141 | #define CPER_SEC_ERROR_THRESHOLD_EXCEEDED 0x0008 | ||
142 | /* | ||
143 | * If set, resource could not be queried for error information due to | ||
144 | * conflicts with other system software or resources. Some fields of | ||
145 | * the section will be invalid | ||
146 | */ | ||
147 | #define CPER_SEC_RESOURCE_NOT_ACCESSIBLE 0x0010 | ||
148 | /* | ||
149 | * If set, action has been taken to ensure error containment (such as | ||
150 | * poisoning data), but the error has not been fully corrected and the | ||
151 | * data has not been consumed. Linux may choose to take further | ||
152 | * corrective action before the data is consumed | ||
153 | */ | ||
154 | #define CPER_SEC_LATENT_ERROR 0x0020 | ||
155 | |||
156 | /* | ||
157 | * Section type definitions, used in section_type field in struct | ||
158 | * cper_section_descriptor | ||
159 | * | ||
160 | * Processor Generic | ||
161 | */ | ||
162 | #define CPER_SEC_PROC_GENERIC \ | ||
163 | UUID_LE(0x9876CCAD, 0x47B4, 0x4bdb, 0xB6, 0x5E, 0x16, 0xF1, \ | ||
164 | 0x93, 0xC4, 0xF3, 0xDB) | ||
165 | /* Processor Specific: X86/X86_64 */ | ||
166 | #define CPER_SEC_PROC_IA \ | ||
167 | UUID_LE(0xDC3EA0B0, 0xA144, 0x4797, 0xB9, 0x5B, 0x53, 0xFA, \ | ||
168 | 0x24, 0x2B, 0x6E, 0x1D) | ||
169 | /* Processor Specific: IA64 */ | ||
170 | #define CPER_SEC_PROC_IPF \ | ||
171 | UUID_LE(0xE429FAF1, 0x3CB7, 0x11D4, 0x0B, 0xCA, 0x07, 0x00, \ | ||
172 | 0x80, 0xC7, 0x3C, 0x88, 0x81) | ||
173 | /* Platform Memory */ | ||
174 | #define CPER_SEC_PLATFORM_MEM \ | ||
175 | UUID_LE(0xA5BC1114, 0x6F64, 0x4EDE, 0xB8, 0x63, 0x3E, 0x83, \ | ||
176 | 0xED, 0x7C, 0x83, 0xB1) | ||
177 | #define CPER_SEC_PCIE \ | ||
178 | UUID_LE(0xD995E954, 0xBBC1, 0x430F, 0xAD, 0x91, 0xB4, 0x4D, \ | ||
179 | 0xCB, 0x3C, 0x6F, 0x35) | ||
180 | /* Firmware Error Record Reference */ | ||
181 | #define CPER_SEC_FW_ERR_REC_REF \ | ||
182 | UUID_LE(0x81212A96, 0x09ED, 0x4996, 0x94, 0x71, 0x8D, 0x72, \ | ||
183 | 0x9C, 0x8E, 0x69, 0xED) | ||
184 | /* PCI/PCI-X Bus */ | ||
185 | #define CPER_SEC_PCI_X_BUS \ | ||
186 | UUID_LE(0xC5753963, 0x3B84, 0x4095, 0xBF, 0x78, 0xED, 0xDA, \ | ||
187 | 0xD3, 0xF9, 0xC9, 0xDD) | ||
188 | /* PCI Component/Device */ | ||
189 | #define CPER_SEC_PCI_DEV \ | ||
190 | UUID_LE(0xEB5E4685, 0xCA66, 0x4769, 0xB6, 0xA2, 0x26, 0x06, \ | ||
191 | 0x8B, 0x00, 0x13, 0x26) | ||
192 | #define CPER_SEC_DMAR_GENERIC \ | ||
193 | UUID_LE(0x5B51FEF7, 0xC79D, 0x4434, 0x8F, 0x1B, 0xAA, 0x62, \ | ||
194 | 0xDE, 0x3E, 0x2C, 0x64) | ||
195 | /* Intel VT for Directed I/O specific DMAr */ | ||
196 | #define CPER_SEC_DMAR_VT \ | ||
197 | UUID_LE(0x71761D37, 0x32B2, 0x45cd, 0xA7, 0xD0, 0xB0, 0xFE, \ | ||
198 | 0xDD, 0x93, 0xE8, 0xCF) | ||
199 | /* IOMMU specific DMAr */ | ||
200 | #define CPER_SEC_DMAR_IOMMU \ | ||
201 | UUID_LE(0x036F84E1, 0x7F37, 0x428c, 0xA7, 0x9E, 0x57, 0x5F, \ | ||
202 | 0xDF, 0xAA, 0x84, 0xEC) | ||
203 | |||
204 | /* | ||
205 | * All tables and structs must be byte-packed to match CPER | ||
206 | * specification, since the tables are provided by the system BIOS | ||
207 | */ | ||
208 | #pragma pack(1) | ||
209 | |||
210 | struct cper_record_header { | ||
211 | char signature[CPER_SIG_SIZE]; /* must be CPER_SIG_RECORD */ | ||
212 | __u16 revision; /* must be CPER_RECORD_REV */ | ||
213 | __u32 signature_end; /* must be CPER_SIG_END */ | ||
214 | __u16 section_count; | ||
215 | __u32 error_severity; | ||
216 | __u32 validation_bits; | ||
217 | __u32 record_length; | ||
218 | __u64 timestamp; | ||
219 | uuid_le platform_id; | ||
220 | uuid_le partition_id; | ||
221 | uuid_le creator_id; | ||
222 | uuid_le notification_type; | ||
223 | __u64 record_id; | ||
224 | __u32 flags; | ||
225 | __u64 persistence_information; | ||
226 | __u8 reserved[12]; /* must be zero */ | ||
227 | }; | ||
228 | |||
229 | struct cper_section_descriptor { | ||
230 | __u32 section_offset; /* Offset in bytes of the | ||
231 | * section body from the base | ||
232 | * of the record header */ | ||
233 | __u32 section_length; | ||
234 | __u16 revision; /* must be CPER_RECORD_REV */ | ||
235 | __u8 validation_bits; | ||
236 | __u8 reserved; /* must be zero */ | ||
237 | __u32 flags; | ||
238 | uuid_le section_type; | ||
239 | uuid_le fru_id; | ||
240 | __u32 section_severity; | ||
241 | __u8 fru_text[20]; | ||
242 | }; | ||
243 | |||
244 | /* Generic Processor Error Section */ | ||
245 | struct cper_sec_proc_generic { | ||
246 | __u64 validation_bits; | ||
247 | __u8 proc_type; | ||
248 | __u8 proc_isa; | ||
249 | __u8 proc_error_type; | ||
250 | __u8 operation; | ||
251 | __u8 flags; | ||
252 | __u8 level; | ||
253 | __u16 reserved; | ||
254 | __u64 cpu_version; | ||
255 | char cpu_brand[128]; | ||
256 | __u64 proc_id; | ||
257 | __u64 target_addr; | ||
258 | __u64 requestor_id; | ||
259 | __u64 responder_id; | ||
260 | __u64 ip; | ||
261 | }; | ||
262 | |||
263 | /* IA32/X64 Processor Error Section */ | ||
264 | struct cper_sec_proc_ia { | ||
265 | __u64 validation_bits; | ||
266 | __u8 lapic_id; | ||
267 | __u8 cpuid[48]; | ||
268 | }; | ||
269 | |||
270 | /* IA32/X64 Processor Error Infomation Structure */ | ||
271 | struct cper_ia_err_info { | ||
272 | uuid_le err_type; | ||
273 | __u64 validation_bits; | ||
274 | __u64 check_info; | ||
275 | __u64 target_id; | ||
276 | __u64 requestor_id; | ||
277 | __u64 responder_id; | ||
278 | __u64 ip; | ||
279 | }; | ||
280 | |||
281 | /* IA32/X64 Processor Context Information Structure */ | ||
282 | struct cper_ia_proc_ctx { | ||
283 | __u16 reg_ctx_type; | ||
284 | __u16 reg_arr_size; | ||
285 | __u32 msr_addr; | ||
286 | __u64 mm_reg_addr; | ||
287 | }; | ||
288 | |||
289 | /* Memory Error Section */ | ||
290 | struct cper_sec_mem_err { | ||
291 | __u64 validation_bits; | ||
292 | __u64 error_status; | ||
293 | __u64 physical_addr; | ||
294 | __u64 physical_addr_mask; | ||
295 | __u16 node; | ||
296 | __u16 card; | ||
297 | __u16 module; | ||
298 | __u16 bank; | ||
299 | __u16 device; | ||
300 | __u16 row; | ||
301 | __u16 column; | ||
302 | __u16 bit_pos; | ||
303 | __u64 requestor_id; | ||
304 | __u64 responder_id; | ||
305 | __u64 target_id; | ||
306 | __u8 error_type; | ||
307 | }; | ||
308 | |||
309 | /* Reset to default packing */ | ||
310 | #pragma pack() | ||
311 | |||
312 | u64 cper_next_record_id(void); | ||
313 | |||
314 | #endif | ||
diff --git a/include/linux/debugfs.h b/include/linux/debugfs.h index fc1b930f246c..e7d9b20ddc5b 100644 --- a/include/linux/debugfs.h +++ b/include/linux/debugfs.h | |||
@@ -63,6 +63,8 @@ struct dentry *debugfs_create_x16(const char *name, mode_t mode, | |||
63 | struct dentry *parent, u16 *value); | 63 | struct dentry *parent, u16 *value); |
64 | struct dentry *debugfs_create_x32(const char *name, mode_t mode, | 64 | struct dentry *debugfs_create_x32(const char *name, mode_t mode, |
65 | struct dentry *parent, u32 *value); | 65 | struct dentry *parent, u32 *value); |
66 | struct dentry *debugfs_create_x64(const char *name, mode_t mode, | ||
67 | struct dentry *parent, u64 *value); | ||
66 | struct dentry *debugfs_create_size_t(const char *name, mode_t mode, | 68 | struct dentry *debugfs_create_size_t(const char *name, mode_t mode, |
67 | struct dentry *parent, size_t *value); | 69 | struct dentry *parent, size_t *value); |
68 | struct dentry *debugfs_create_bool(const char *name, mode_t mode, | 70 | struct dentry *debugfs_create_bool(const char *name, mode_t mode, |
diff --git a/include/linux/pci.h b/include/linux/pci.h index a327322a33ab..6a471aba3b07 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -311,7 +311,8 @@ struct pci_dev { | |||
311 | unsigned int is_virtfn:1; | 311 | unsigned int is_virtfn:1; |
312 | unsigned int reset_fn:1; | 312 | unsigned int reset_fn:1; |
313 | unsigned int is_hotplug_bridge:1; | 313 | unsigned int is_hotplug_bridge:1; |
314 | unsigned int aer_firmware_first:1; | 314 | unsigned int __aer_firmware_first_valid:1; |
315 | unsigned int __aer_firmware_first:1; | ||
315 | pci_dev_flags_t dev_flags; | 316 | pci_dev_flags_t dev_flags; |
316 | atomic_t enable_cnt; /* pci_enable_device has been called */ | 317 | atomic_t enable_cnt; /* pci_enable_device has been called */ |
317 | 318 | ||
diff --git a/include/linux/uuid.h b/include/linux/uuid.h new file mode 100644 index 000000000000..5b7efbfcee4e --- /dev/null +++ b/include/linux/uuid.h | |||
@@ -0,0 +1,70 @@ | |||
1 | /* | ||
2 | * UUID/GUID definition | ||
3 | * | ||
4 | * Copyright (C) 2010, Intel Corp. | ||
5 | * Huang Ying <ying.huang@intel.com> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or | ||
8 | * modify it under the terms of the GNU General Public License version | ||
9 | * 2 as published by the Free Software Foundation; | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License | ||
17 | * along with this program; if not, write to the Free Software | ||
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
19 | */ | ||
20 | |||
21 | #ifndef _LINUX_UUID_H_ | ||
22 | #define _LINUX_UUID_H_ | ||
23 | |||
24 | #include <linux/types.h> | ||
25 | #include <linux/string.h> | ||
26 | |||
27 | typedef struct { | ||
28 | __u8 b[16]; | ||
29 | } uuid_le; | ||
30 | |||
31 | typedef struct { | ||
32 | __u8 b[16]; | ||
33 | } uuid_be; | ||
34 | |||
35 | #define UUID_LE(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \ | ||
36 | ((uuid_le) \ | ||
37 | {{ (a) & 0xff, ((a) >> 8) & 0xff, ((a) >> 16) & 0xff, ((a) >> 24) & 0xff, \ | ||
38 | (b) & 0xff, ((b) >> 8) & 0xff, \ | ||
39 | (c) & 0xff, ((c) >> 8) & 0xff, \ | ||
40 | (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }}) | ||
41 | |||
42 | #define UUID_BE(a, b, c, d0, d1, d2, d3, d4, d5, d6, d7) \ | ||
43 | ((uuid_be) \ | ||
44 | {{ ((a) >> 24) & 0xff, ((a) >> 16) & 0xff, ((a) >> 8) & 0xff, (a) & 0xff, \ | ||
45 | ((b) >> 8) & 0xff, (b) & 0xff, \ | ||
46 | ((c) >> 8) & 0xff, (c) & 0xff, \ | ||
47 | (d0), (d1), (d2), (d3), (d4), (d5), (d6), (d7) }}) | ||
48 | |||
49 | #define NULL_UUID_LE \ | ||
50 | UUID_LE(0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, \ | ||
51 | 0x00, 0x00, 0x00, 0x00) | ||
52 | |||
53 | #define NULL_UUID_BE \ | ||
54 | UUID_BE(0x00000000, 0x0000, 0x0000, 0x00, 0x00, 0x00, 0x00, \ | ||
55 | 0x00, 0x00, 0x00, 0x00) | ||
56 | |||
57 | static inline int uuid_le_cmp(const uuid_le u1, const uuid_le u2) | ||
58 | { | ||
59 | return memcmp(&u1, &u2, sizeof(uuid_le)); | ||
60 | } | ||
61 | |||
62 | static inline int uuid_be_cmp(const uuid_be u1, const uuid_be u2) | ||
63 | { | ||
64 | return memcmp(&u1, &u2, sizeof(uuid_be)); | ||
65 | } | ||
66 | |||
67 | extern void uuid_le_gen(uuid_le *u); | ||
68 | extern void uuid_be_gen(uuid_be *u); | ||
69 | |||
70 | #endif | ||