| Message ID | 20181011084822.29362-1-alex.hung@canonical.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | acpi: button: check fixed hardware & control method power buttons | expand |
On 11/10/18 09:48, Alex Hung wrote: > Accordingly to ACPI spec, fixed hardware power button and control method > power button should be mutually exclusive. > > Signed-off-by: Alex Hung <alex.hung@canonical.com> > --- > src/acpi/devices/buttons/power_button.c | 27 +++++++++++++++++++++++++ > 1 file changed, 27 insertions(+) > > diff --git a/src/acpi/devices/buttons/power_button.c b/src/acpi/devices/buttons/power_button.c > index 4df65ea7..feea5bb4 100644 > --- a/src/acpi/devices/buttons/power_button.c > +++ b/src/acpi/devices/buttons/power_button.c > @@ -137,6 +137,31 @@ static int method_test_UID(fwts_framework *fw) > return fwts_method_test_UID(fw, &device); > } > > +static int facp_test_pwrbutton(fwts_framework *fw) > +{ > + fwts_acpi_table_fadt *fadt; > + fwts_acpi_table_info *table; > + > + if (fwts_acpi_find_table(fw, "FACP", 0, &table) != FWTS_OK) > + return FWTS_SKIP; > + > + if (table == NULL) > + return FWTS_SKIP; > + > + fadt = (fwts_acpi_table_fadt *)table->data; > + > + /* check PWR_BUTTON as in Table 4-13 Power Button Support */ > + if (fadt->flags & 0x10) > + fwts_passed(fw, "Fixed hardware power button does not exist."); > + else > + fwts_failed(fw, LOG_LEVEL_HIGH, > + "PWRBFixedHardwareError", > + "PWR_Button field in FACP should not be zero " > + "with ACPI PNP0C0C device."); > + > + return FWTS_OK; > +} > + > static fwts_framework_minor_test power_button_tests[] = { > /* Device Specific Objects */ > { method_test_HID, "Test _HID (Hardware ID)." }, > @@ -152,6 +177,8 @@ static fwts_framework_minor_test power_button_tests[] = { > { method_test_SUN, "Test _SUN (Slot User Number)." }, > { method_test_STR, "Test _STR (String)." }, > { method_test_UID, "Test _UID (Unique ID)." }, > + /* Check against fixed hardware in FACP */ > + { facp_test_pwrbutton, "Test FACP PWR_BUTTON." }, > { NULL, NULL } > }; > > Seems a good idea to me. Thanks. Acked-by: Colin Ian King <colin.king@canonical.com>
On 10/11/2018 04:48 PM, Alex Hung wrote: > Accordingly to ACPI spec, fixed hardware power button and control method > power button should be mutually exclusive. > > Signed-off-by: Alex Hung <alex.hung@canonical.com> > --- > src/acpi/devices/buttons/power_button.c | 27 +++++++++++++++++++++++++ > 1 file changed, 27 insertions(+) > > diff --git a/src/acpi/devices/buttons/power_button.c b/src/acpi/devices/buttons/power_button.c > index 4df65ea7..feea5bb4 100644 > --- a/src/acpi/devices/buttons/power_button.c > +++ b/src/acpi/devices/buttons/power_button.c > @@ -137,6 +137,31 @@ static int method_test_UID(fwts_framework *fw) > return fwts_method_test_UID(fw, &device); > } > > +static int facp_test_pwrbutton(fwts_framework *fw) > +{ > + fwts_acpi_table_fadt *fadt; > + fwts_acpi_table_info *table; > + > + if (fwts_acpi_find_table(fw, "FACP", 0, &table) != FWTS_OK) > + return FWTS_SKIP; > + > + if (table == NULL) > + return FWTS_SKIP; > + > + fadt = (fwts_acpi_table_fadt *)table->data; > + > + /* check PWR_BUTTON as in Table 4-13 Power Button Support */ > + if (fadt->flags & 0x10) > + fwts_passed(fw, "Fixed hardware power button does not exist."); > + else > + fwts_failed(fw, LOG_LEVEL_HIGH, > + "PWRBFixedHardwareError", > + "PWR_Button field in FACP should not be zero " > + "with ACPI PNP0C0C device."); > + > + return FWTS_OK; > +} > + > static fwts_framework_minor_test power_button_tests[] = { > /* Device Specific Objects */ > { method_test_HID, "Test _HID (Hardware ID)." }, > @@ -152,6 +177,8 @@ static fwts_framework_minor_test power_button_tests[] = { > { method_test_SUN, "Test _SUN (Slot User Number)." }, > { method_test_STR, "Test _STR (String)." }, > { method_test_UID, "Test _UID (Unique ID)." }, > + /* Check against fixed hardware in FACP */ > + { facp_test_pwrbutton, "Test FACP PWR_BUTTON." }, > { NULL, NULL } > }; > Acked-by: Ivan Hu <ivan.hu@canonical.com>
diff --git a/src/acpi/devices/buttons/power_button.c b/src/acpi/devices/buttons/power_button.c index 4df65ea7..feea5bb4 100644 --- a/src/acpi/devices/buttons/power_button.c +++ b/src/acpi/devices/buttons/power_button.c @@ -137,6 +137,31 @@ static int method_test_UID(fwts_framework *fw) return fwts_method_test_UID(fw, &device); } +static int facp_test_pwrbutton(fwts_framework *fw) +{ + fwts_acpi_table_fadt *fadt; + fwts_acpi_table_info *table; + + if (fwts_acpi_find_table(fw, "FACP", 0, &table) != FWTS_OK) + return FWTS_SKIP; + + if (table == NULL) + return FWTS_SKIP; + + fadt = (fwts_acpi_table_fadt *)table->data; + + /* check PWR_BUTTON as in Table 4-13 Power Button Support */ + if (fadt->flags & 0x10) + fwts_passed(fw, "Fixed hardware power button does not exist."); + else + fwts_failed(fw, LOG_LEVEL_HIGH, + "PWRBFixedHardwareError", + "PWR_Button field in FACP should not be zero " + "with ACPI PNP0C0C device."); + + return FWTS_OK; +} + static fwts_framework_minor_test power_button_tests[] = { /* Device Specific Objects */ { method_test_HID, "Test _HID (Hardware ID)." }, @@ -152,6 +177,8 @@ static fwts_framework_minor_test power_button_tests[] = { { method_test_SUN, "Test _SUN (Slot User Number)." }, { method_test_STR, "Test _STR (String)." }, { method_test_UID, "Test _UID (Unique ID)." }, + /* Check against fixed hardware in FACP */ + { facp_test_pwrbutton, "Test FACP PWR_BUTTON." }, { NULL, NULL } };
Accordingly to ACPI spec, fixed hardware power button and control method power button should be mutually exclusive. Signed-off-by: Alex Hung <alex.hung@canonical.com> --- src/acpi/devices/buttons/power_button.c | 27 +++++++++++++++++++++++++ 1 file changed, 27 insertions(+)