Skip to content

Commit

Permalink
ACPICA: Update for larger ACPI 5 FADT size
Browse files Browse the repository at this point in the history
FADT is now larger than 256 bytes, so all FADT offsets must be
changed from 8 bits to 16 bits.

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>
  • Loading branch information
Bob Moore authored and Len Brown committed Jan 17, 2012
1 parent 240c320 commit ecafe6f
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions drivers/acpi/acpica/tbfadt.c
Original file line number Diff line number Diff line change
Expand Up @@ -63,14 +63,15 @@ static void acpi_tb_setup_fadt_registers(void);

typedef struct acpi_fadt_info {
char *name;
u8 address64;
u8 address32;
u8 length;
u16 address64;
u16 address32;
u16 length;
u8 default_length;
u8 type;

} acpi_fadt_info;

#define ACPI_FADT_OPTIONAL 0
#define ACPI_FADT_REQUIRED 1
#define ACPI_FADT_SEPARATE_LENGTH 2

Expand All @@ -87,7 +88,7 @@ static struct acpi_fadt_info fadt_info_table[] = {
ACPI_FADT_OFFSET(pm1b_event_block),
ACPI_FADT_OFFSET(pm1_event_length),
ACPI_PM1_REGISTER_WIDTH * 2, /* Enable + Status register */
0},
ACPI_FADT_OPTIONAL},

{"Pm1aControlBlock",
ACPI_FADT_OFFSET(xpm1a_control_block),
Expand All @@ -101,7 +102,7 @@ static struct acpi_fadt_info fadt_info_table[] = {
ACPI_FADT_OFFSET(pm1b_control_block),
ACPI_FADT_OFFSET(pm1_control_length),
ACPI_PM1_REGISTER_WIDTH,
0},
ACPI_FADT_OPTIONAL},

{"Pm2ControlBlock",
ACPI_FADT_OFFSET(xpm2_control_block),
Expand Down Expand Up @@ -139,7 +140,7 @@ static struct acpi_fadt_info fadt_info_table[] = {

typedef struct acpi_fadt_pm_info {
struct acpi_generic_address *target;
u8 source;
u16 source;
u8 register_num;

} acpi_fadt_pm_info;
Expand Down

0 comments on commit ecafe6f

Please sign in to comment.