| Message ID | 20210126203227.6291-2-alex.hung@canonical.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [01/16] acpi: update ACPI version to 6.4 | expand |
On 26/01/2021 20:32, Alex Hung wrote: > Signed-off-by: Alex Hung <alex.hung@canonical.com> > --- > src/acpi/madt/madt.c | 6 +++--- > src/lib/include/fwts_acpi.h | 1 + > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/src/acpi/madt/madt.c b/src/acpi/madt/madt.c > index 2c858792..2a18a62e 100644 > --- a/src/acpi/madt/madt.c > +++ b/src/acpi/madt/madt.c > @@ -116,9 +116,9 @@ > * > */ > > -#define FADT_MAX_MAJOR_REVISION ((uint8_t)6) > -#define FADT_MAX_MINOR_REVISION ((uint8_t)2) > -#define MADT_MAX_REVISION ((uint8_t)4) > +#define FADT_MAX_MAJOR_REVISION ((uint8_t)((FWTS_ACPI_VERSION_NOW & 0xF00) >> 8)) > +#define FADT_MAX_MINOR_REVISION ((uint8_t)(FWTS_ACPI_VERSION_NOW & 0xF0) >> 4) > +#define MADT_MAX_REVISION ((uint8_t)5) > > #define SUBTABLE_UNDEFINED 0x00 > #define SUBTABLE_VARIABLE 0xff > diff --git a/src/lib/include/fwts_acpi.h b/src/lib/include/fwts_acpi.h > index 9a075c2f..614fd881 100644 > --- a/src/lib/include/fwts_acpi.h > +++ b/src/lib/include/fwts_acpi.h > @@ -89,6 +89,7 @@ > #define FWTS_GAS_ADDR_SPACE_ID_PCC (0x0a) > #define FWTS_GAS_ADDR_SPACE_ID_FFH (0x7f) > > +#define FWTS_ACPI_VERSION_NOW (FWTS_ACPI_VERSION_64) Perhaps _CURRENT instead of _NOW, but _NOW is less to type, so I'm OK with that :-) > #define FWTS_ACPI_VERSION_NEXT (0x650) > #define FWTS_ACPI_VERSION_64 (0x640) > #define FWTS_ACPI_VERSION_63 (0x630) > Acked-by: Colin Ian King <colin.king@canonical.com>
On 1/27/21 4:32 AM, Alex Hung wrote: > Signed-off-by: Alex Hung <alex.hung@canonical.com> > --- > src/acpi/madt/madt.c | 6 +++--- > src/lib/include/fwts_acpi.h | 1 + > 2 files changed, 4 insertions(+), 3 deletions(-) > > diff --git a/src/acpi/madt/madt.c b/src/acpi/madt/madt.c > index 2c858792..2a18a62e 100644 > --- a/src/acpi/madt/madt.c > +++ b/src/acpi/madt/madt.c > @@ -116,9 +116,9 @@ > * > */ > > -#define FADT_MAX_MAJOR_REVISION ((uint8_t)6) > -#define FADT_MAX_MINOR_REVISION ((uint8_t)2) > -#define MADT_MAX_REVISION ((uint8_t)4) > +#define FADT_MAX_MAJOR_REVISION ((uint8_t)((FWTS_ACPI_VERSION_NOW & 0xF00) >> 8)) > +#define FADT_MAX_MINOR_REVISION ((uint8_t)(FWTS_ACPI_VERSION_NOW & 0xF0) >> 4) > +#define MADT_MAX_REVISION ((uint8_t)5) > > #define SUBTABLE_UNDEFINED 0x00 > #define SUBTABLE_VARIABLE 0xff > diff --git a/src/lib/include/fwts_acpi.h b/src/lib/include/fwts_acpi.h > index 9a075c2f..614fd881 100644 > --- a/src/lib/include/fwts_acpi.h > +++ b/src/lib/include/fwts_acpi.h > @@ -89,6 +89,7 @@ > #define FWTS_GAS_ADDR_SPACE_ID_PCC (0x0a) > #define FWTS_GAS_ADDR_SPACE_ID_FFH (0x7f) > > +#define FWTS_ACPI_VERSION_NOW (FWTS_ACPI_VERSION_64) > #define FWTS_ACPI_VERSION_NEXT (0x650) > #define FWTS_ACPI_VERSION_64 (0x640) > #define FWTS_ACPI_VERSION_63 (0x630) > Acked-by: Ivan Hu <ivan.hu@canonical.com>
diff --git a/src/acpi/madt/madt.c b/src/acpi/madt/madt.c index 2c858792..2a18a62e 100644 --- a/src/acpi/madt/madt.c +++ b/src/acpi/madt/madt.c @@ -116,9 +116,9 @@ * */ -#define FADT_MAX_MAJOR_REVISION ((uint8_t)6) -#define FADT_MAX_MINOR_REVISION ((uint8_t)2) -#define MADT_MAX_REVISION ((uint8_t)4) +#define FADT_MAX_MAJOR_REVISION ((uint8_t)((FWTS_ACPI_VERSION_NOW & 0xF00) >> 8)) +#define FADT_MAX_MINOR_REVISION ((uint8_t)(FWTS_ACPI_VERSION_NOW & 0xF0) >> 4) +#define MADT_MAX_REVISION ((uint8_t)5) #define SUBTABLE_UNDEFINED 0x00 #define SUBTABLE_VARIABLE 0xff diff --git a/src/lib/include/fwts_acpi.h b/src/lib/include/fwts_acpi.h index 9a075c2f..614fd881 100644 --- a/src/lib/include/fwts_acpi.h +++ b/src/lib/include/fwts_acpi.h @@ -89,6 +89,7 @@ #define FWTS_GAS_ADDR_SPACE_ID_PCC (0x0a) #define FWTS_GAS_ADDR_SPACE_ID_FFH (0x7f) +#define FWTS_ACPI_VERSION_NOW (FWTS_ACPI_VERSION_64) #define FWTS_ACPI_VERSION_NEXT (0x650) #define FWTS_ACPI_VERSION_64 (0x640) #define FWTS_ACPI_VERSION_63 (0x630)
Signed-off-by: Alex Hung <alex.hung@canonical.com> --- src/acpi/madt/madt.c | 6 +++--- src/lib/include/fwts_acpi.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-)