ACPICA: Update for larger ACPI 5 FADT size
authorBob Moore <robert.moore@intel.com>
Fri, 22 Feb 2013 10:47:25 +0000 (11:47 +0100)
committerJan Beulich <jbeulich@suse.com>
Fri, 22 Feb 2013 10:47:25 +0000 (11:47 +0100)
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: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
xen/drivers/acpi/tables/tbfadt.c

index 2ab4588f0bb48123414955a5671ca8345b931118..0afea1e45bd906d549b187352a241698e2047c07 100644 (file)
@@ -62,13 +62,14 @@ static void acpi_tb_validate_fadt(void);
 
 typedef struct acpi_fadt_info {
        char *name;
-       u8 target;
-       u8 source;
-       u8 length;
+       u16 target;
+       u16 source;
+       u16 length;
        u8 type;
 
 } acpi_fadt_info;
 
+#define ACPI_FADT_OPTIONAL          0
 #define ACPI_FADT_REQUIRED          1
 #define ACPI_FADT_SEPARATE_LENGTH   2
 
@@ -79,7 +80,7 @@ static struct acpi_fadt_info __initdata fadt_info_table[] = {
 
        {"Pm1bEventBlock", ACPI_FADT_OFFSET(xpm1b_event_block),
         ACPI_FADT_OFFSET(pm1b_event_block),
-        ACPI_FADT_OFFSET(pm1_event_length), 0},
+        ACPI_FADT_OFFSET(pm1_event_length), ACPI_FADT_OPTIONAL},
 
        {"Pm1aControlBlock", ACPI_FADT_OFFSET(xpm1a_control_block),
         ACPI_FADT_OFFSET(pm1a_control_block),
@@ -87,7 +88,7 @@ static struct acpi_fadt_info __initdata fadt_info_table[] = {
 
        {"Pm1bControlBlock", ACPI_FADT_OFFSET(xpm1b_control_block),
         ACPI_FADT_OFFSET(pm1b_control_block),
-        ACPI_FADT_OFFSET(pm1_control_length), 0},
+        ACPI_FADT_OFFSET(pm1_control_length), ACPI_FADT_OPTIONAL},
 
        {"Pm2ControlBlock", ACPI_FADT_OFFSET(xpm2_control_block),
         ACPI_FADT_OFFSET(pm2_control_block),