diff options
author | Bob Moore <robert.moore@intel.com> | 2008-12-30 14:06:06 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-12-31 01:17:09 -0500 |
commit | 06f5541960d02d5e0ddd8fd5c9a1554d85d94fa9 (patch) | |
tree | 2a86b61dd4e63d6a74450198c13f8c7430be9e69 /include/acpi | |
parent | 1685bd404dc2ecce2fdae6410e85ded2f2c0136d (diff) |
ACPICA: FADT parsing changes and fixes
1) Update the register lengths for the PM1 event blocks. The
length must be divided by two in order to use these to access
the status registers.
2) Add run-time option to use default register lengths to override a
faulty FADT.
3) Add warning message if any of the X64 address structures contain a length
that does not match the legacy length earlier in the FADT.
4) Move all FADT warning messages into the ValidateFadt function.
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include/acpi')
-rw-r--r-- | include/acpi/acglobal.h | 6 | ||||
-rw-r--r-- | include/acpi/actypes.h | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/include/acpi/acglobal.h b/include/acpi/acglobal.h index 78f3c149f7ba..55eb5d618764 100644 --- a/include/acpi/acglobal.h +++ b/include/acpi/acglobal.h | |||
@@ -102,6 +102,12 @@ ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_create_osi_method, TRUE); | |||
102 | */ | 102 | */ |
103 | ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_leave_wake_gpes_disabled, TRUE); | 103 | ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_leave_wake_gpes_disabled, TRUE); |
104 | 104 | ||
105 | /* | ||
106 | * Optionally use default values for the ACPI register widths. Set this to | ||
107 | * TRUE to use the defaults, if an FADT contains incorrect widths/lengths. | ||
108 | */ | ||
109 | ACPI_EXTERN u8 ACPI_INIT_GLOBAL(acpi_gbl_use_default_register_widths, FALSE); | ||
110 | |||
105 | /***************************************************************************** | 111 | /***************************************************************************** |
106 | * | 112 | * |
107 | * Debug support | 113 | * Debug support |
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index 24b2cef5a13f..03744d28dcf6 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h | |||
@@ -309,10 +309,16 @@ typedef u32 acpi_physical_address; | |||
309 | * | 309 | * |
310 | *****************************************************************************/ | 310 | *****************************************************************************/ |
311 | 311 | ||
312 | /* Number of distinct GPE register blocks and register width */ | 312 | /* Number of distinct FADT-based GPE register blocks (GPE0 and GPE1) */ |
313 | 313 | ||
314 | #define ACPI_MAX_GPE_BLOCKS 2 | 314 | #define ACPI_MAX_GPE_BLOCKS 2 |
315 | |||
316 | /* Default ACPI register widths */ | ||
317 | |||
315 | #define ACPI_GPE_REGISTER_WIDTH 8 | 318 | #define ACPI_GPE_REGISTER_WIDTH 8 |
319 | #define ACPI_PM1_REGISTER_WIDTH 16 | ||
320 | #define ACPI_PM2_REGISTER_WIDTH 8 | ||
321 | #define ACPI_PM_TIMER_WIDTH 32 | ||
316 | 322 | ||
317 | /* Names within the namespace are 4 bytes long */ | 323 | /* Names within the namespace are 4 bytes long */ |
318 | 324 | ||