Commit ecafe6fa authored by Bob Moore's avatar Bob Moore Committed by Len Brown

ACPICA: Update for larger ACPI 5 FADT size

FADT is now larger than 256 bytes, so all FADT offsets must be
changed from 8 bits to 16 bits.
Signed-off-by: default avatarBob Moore <robert.moore@intel.com>
Signed-off-by: default avatarLin Ming <ming.m.lin@intel.com>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 240c320c
...@@ -63,14 +63,15 @@ static void acpi_tb_setup_fadt_registers(void); ...@@ -63,14 +63,15 @@ static void acpi_tb_setup_fadt_registers(void);
typedef struct acpi_fadt_info { typedef struct acpi_fadt_info {
char *name; char *name;
u8 address64; u16 address64;
u8 address32; u16 address32;
u8 length; u16 length;
u8 default_length; u8 default_length;
u8 type; u8 type;
} acpi_fadt_info; } acpi_fadt_info;
#define ACPI_FADT_OPTIONAL 0
#define ACPI_FADT_REQUIRED 1 #define ACPI_FADT_REQUIRED 1
#define ACPI_FADT_SEPARATE_LENGTH 2 #define ACPI_FADT_SEPARATE_LENGTH 2
...@@ -87,7 +88,7 @@ static struct acpi_fadt_info fadt_info_table[] = { ...@@ -87,7 +88,7 @@ static struct acpi_fadt_info fadt_info_table[] = {
ACPI_FADT_OFFSET(pm1b_event_block), ACPI_FADT_OFFSET(pm1b_event_block),
ACPI_FADT_OFFSET(pm1_event_length), ACPI_FADT_OFFSET(pm1_event_length),
ACPI_PM1_REGISTER_WIDTH * 2, /* Enable + Status register */ ACPI_PM1_REGISTER_WIDTH * 2, /* Enable + Status register */
0}, ACPI_FADT_OPTIONAL},
{"Pm1aControlBlock", {"Pm1aControlBlock",
ACPI_FADT_OFFSET(xpm1a_control_block), ACPI_FADT_OFFSET(xpm1a_control_block),
...@@ -101,7 +102,7 @@ static struct acpi_fadt_info fadt_info_table[] = { ...@@ -101,7 +102,7 @@ static struct acpi_fadt_info fadt_info_table[] = {
ACPI_FADT_OFFSET(pm1b_control_block), ACPI_FADT_OFFSET(pm1b_control_block),
ACPI_FADT_OFFSET(pm1_control_length), ACPI_FADT_OFFSET(pm1_control_length),
ACPI_PM1_REGISTER_WIDTH, ACPI_PM1_REGISTER_WIDTH,
0}, ACPI_FADT_OPTIONAL},
{"Pm2ControlBlock", {"Pm2ControlBlock",
ACPI_FADT_OFFSET(xpm2_control_block), ACPI_FADT_OFFSET(xpm2_control_block),
...@@ -139,7 +140,7 @@ static struct acpi_fadt_info fadt_info_table[] = { ...@@ -139,7 +140,7 @@ static struct acpi_fadt_info fadt_info_table[] = {
typedef struct acpi_fadt_pm_info { typedef struct acpi_fadt_pm_info {
struct acpi_generic_address *target; struct acpi_generic_address *target;
u8 source; u16 source;
u8 register_num; u8 register_num;
} acpi_fadt_pm_info; } acpi_fadt_pm_info;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment