| Message ID | 20210716200559.877429-1-alex.hung@canonical.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | sbbr: remove pm_file test (not required in BBR 1.0) | expand |
On 7/17/21 4:05 AM, Alex Hung wrote: > BugLink: https://bugs.launchpad.net/bugs/1936650 > > Also remove test* from function names > > Signed-off-by: Alex Hung <alex.hung@canonical.com> > --- > src/sbbr/fadt/fadt.c | 33 ++++++--------------------------- > 1 file changed, 6 insertions(+), 27 deletions(-) > > diff --git a/src/sbbr/fadt/fadt.c b/src/sbbr/fadt/fadt.c > index 47fa3bd7..a9b409ae 100644 > --- a/src/sbbr/fadt/fadt.c > +++ b/src/sbbr/fadt/fadt.c > @@ -61,7 +61,7 @@ static int fadt_sbbr_init(fwts_framework *fw) > > #define SBBR_VERSION(major, minor) ((((uint16_t)(major)) << 8) | (minor)) > > -static int fadt_sbbr_revision_test1(fwts_framework *fw) > +static int fadt_sbbr_revision(fwts_framework *fw) > { > const uint8_t SBBR_LATEST_MAJOR = 6; > const uint8_t SBBR_LATEST_MINOR = 0; > @@ -85,7 +85,7 @@ static int fadt_sbbr_revision_test1(fwts_framework *fw) > return FWTS_OK; > } > > -static int fadt_sbbr_reduced_hw_test2(fwts_framework *fw) > +static int fadt_sbbr_reduced_hw(fwts_framework *fw) > { > bool rhw; > bool passed; > @@ -370,27 +370,7 @@ static int fadt_sbbr_reduced_hw_test2(fwts_framework *fw) > return FWTS_OK; > } > > -static int fadt_sbbr_profile_test3(fwts_framework *fw) > -{ > - const uint8_t SBBR_ENT_SERVER = 4; > - const uint8_t SBBR_SOHO_SERVER = 5; > - const uint8_t SBBR_PERF_SERVER = 7; > - > - fwts_log_info(fw, "FADT Preferred PM Profile: %hhu (%s)", > - fadt->preferred_pm_profile, > - fwts_acpi_fadt_preferred_pm_profile(fadt->preferred_pm_profile)); > - > - if ((fadt->preferred_pm_profile == SBBR_ENT_SERVER) || > - (fadt->preferred_pm_profile == SBBR_SOHO_SERVER) || > - (fadt->preferred_pm_profile == SBBR_PERF_SERVER)) > - fwts_passed(fw, "FADT has a recommended server PM profile."); > - else > - fwts_failed(fw, LOG_LEVEL_MEDIUM, "fadt_profile:", "FADT preferred PM profile is not recommended."); > - > - return FWTS_OK; > -} > - > -static int fadt_sbbr_boot_arch_psci_compliant_test4(fwts_framework *fw) > +static int fadt_sbbr_boot_arch_psci_compliant(fwts_framework *fw) > { > /* ARM SBBR 4.2.1.3 FADT */ > if (fadt->arm_boot_flags & FWTS_FACP_ARM_BOOT_ARCH_PSCI_COMPLIANT) > @@ -404,10 +384,9 @@ static int fadt_sbbr_boot_arch_psci_compliant_test4(fwts_framework *fw) > } > > static fwts_framework_minor_test fadt_sbbr_tests[] = { > - { fadt_sbbr_revision_test1, "FADT Revision Test." }, > - { fadt_sbbr_reduced_hw_test2, "FADT Reduced HW Test." }, > - { fadt_sbbr_profile_test3, "FADT Server Profile Test." }, > - { fadt_sbbr_boot_arch_psci_compliant_test4, "FADT PSCI Compliant Test." }, > + { fadt_sbbr_revision, "FADT Revision Test." }, > + { fadt_sbbr_reduced_hw, "FADT Reduced HW Test." }, > + { fadt_sbbr_boot_arch_psci_compliant, "FADT PSCI Compliant Test." }, > { NULL, NULL } > }; > > Acked-by: Ivan Hu <ivan.hu@canonical.com>
On 16/07/2021 21:05, Alex Hung wrote: > BugLink: https://bugs.launchpad.net/bugs/1936650 > > Also remove test* from function names > > Signed-off-by: Alex Hung <alex.hung@canonical.com> > --- > src/sbbr/fadt/fadt.c | 33 ++++++--------------------------- > 1 file changed, 6 insertions(+), 27 deletions(-) > > diff --git a/src/sbbr/fadt/fadt.c b/src/sbbr/fadt/fadt.c > index 47fa3bd7..a9b409ae 100644 > --- a/src/sbbr/fadt/fadt.c > +++ b/src/sbbr/fadt/fadt.c > @@ -61,7 +61,7 @@ static int fadt_sbbr_init(fwts_framework *fw) > > #define SBBR_VERSION(major, minor) ((((uint16_t)(major)) << 8) | (minor)) > > -static int fadt_sbbr_revision_test1(fwts_framework *fw) > +static int fadt_sbbr_revision(fwts_framework *fw) > { > const uint8_t SBBR_LATEST_MAJOR = 6; > const uint8_t SBBR_LATEST_MINOR = 0; > @@ -85,7 +85,7 @@ static int fadt_sbbr_revision_test1(fwts_framework *fw) > return FWTS_OK; > } > > -static int fadt_sbbr_reduced_hw_test2(fwts_framework *fw) > +static int fadt_sbbr_reduced_hw(fwts_framework *fw) > { > bool rhw; > bool passed; > @@ -370,27 +370,7 @@ static int fadt_sbbr_reduced_hw_test2(fwts_framework *fw) > return FWTS_OK; > } > > -static int fadt_sbbr_profile_test3(fwts_framework *fw) > -{ > - const uint8_t SBBR_ENT_SERVER = 4; > - const uint8_t SBBR_SOHO_SERVER = 5; > - const uint8_t SBBR_PERF_SERVER = 7; > - > - fwts_log_info(fw, "FADT Preferred PM Profile: %hhu (%s)", > - fadt->preferred_pm_profile, > - fwts_acpi_fadt_preferred_pm_profile(fadt->preferred_pm_profile)); > - > - if ((fadt->preferred_pm_profile == SBBR_ENT_SERVER) || > - (fadt->preferred_pm_profile == SBBR_SOHO_SERVER) || > - (fadt->preferred_pm_profile == SBBR_PERF_SERVER)) > - fwts_passed(fw, "FADT has a recommended server PM profile."); > - else > - fwts_failed(fw, LOG_LEVEL_MEDIUM, "fadt_profile:", "FADT preferred PM profile is not recommended."); > - > - return FWTS_OK; > -} > - > -static int fadt_sbbr_boot_arch_psci_compliant_test4(fwts_framework *fw) > +static int fadt_sbbr_boot_arch_psci_compliant(fwts_framework *fw) > { > /* ARM SBBR 4.2.1.3 FADT */ > if (fadt->arm_boot_flags & FWTS_FACP_ARM_BOOT_ARCH_PSCI_COMPLIANT) > @@ -404,10 +384,9 @@ static int fadt_sbbr_boot_arch_psci_compliant_test4(fwts_framework *fw) > } > > static fwts_framework_minor_test fadt_sbbr_tests[] = { > - { fadt_sbbr_revision_test1, "FADT Revision Test." }, > - { fadt_sbbr_reduced_hw_test2, "FADT Reduced HW Test." }, > - { fadt_sbbr_profile_test3, "FADT Server Profile Test." }, > - { fadt_sbbr_boot_arch_psci_compliant_test4, "FADT PSCI Compliant Test." }, > + { fadt_sbbr_revision, "FADT Revision Test." }, > + { fadt_sbbr_reduced_hw, "FADT Reduced HW Test." }, > + { fadt_sbbr_boot_arch_psci_compliant, "FADT PSCI Compliant Test." }, > { NULL, NULL } > }; > > Acked-by: Colin Ian King <colin.king@canonical.com>
diff --git a/src/sbbr/fadt/fadt.c b/src/sbbr/fadt/fadt.c index 47fa3bd7..a9b409ae 100644 --- a/src/sbbr/fadt/fadt.c +++ b/src/sbbr/fadt/fadt.c @@ -61,7 +61,7 @@ static int fadt_sbbr_init(fwts_framework *fw) #define SBBR_VERSION(major, minor) ((((uint16_t)(major)) << 8) | (minor)) -static int fadt_sbbr_revision_test1(fwts_framework *fw) +static int fadt_sbbr_revision(fwts_framework *fw) { const uint8_t SBBR_LATEST_MAJOR = 6; const uint8_t SBBR_LATEST_MINOR = 0; @@ -85,7 +85,7 @@ static int fadt_sbbr_revision_test1(fwts_framework *fw) return FWTS_OK; } -static int fadt_sbbr_reduced_hw_test2(fwts_framework *fw) +static int fadt_sbbr_reduced_hw(fwts_framework *fw) { bool rhw; bool passed; @@ -370,27 +370,7 @@ static int fadt_sbbr_reduced_hw_test2(fwts_framework *fw) return FWTS_OK; } -static int fadt_sbbr_profile_test3(fwts_framework *fw) -{ - const uint8_t SBBR_ENT_SERVER = 4; - const uint8_t SBBR_SOHO_SERVER = 5; - const uint8_t SBBR_PERF_SERVER = 7; - - fwts_log_info(fw, "FADT Preferred PM Profile: %hhu (%s)", - fadt->preferred_pm_profile, - fwts_acpi_fadt_preferred_pm_profile(fadt->preferred_pm_profile)); - - if ((fadt->preferred_pm_profile == SBBR_ENT_SERVER) || - (fadt->preferred_pm_profile == SBBR_SOHO_SERVER) || - (fadt->preferred_pm_profile == SBBR_PERF_SERVER)) - fwts_passed(fw, "FADT has a recommended server PM profile."); - else - fwts_failed(fw, LOG_LEVEL_MEDIUM, "fadt_profile:", "FADT preferred PM profile is not recommended."); - - return FWTS_OK; -} - -static int fadt_sbbr_boot_arch_psci_compliant_test4(fwts_framework *fw) +static int fadt_sbbr_boot_arch_psci_compliant(fwts_framework *fw) { /* ARM SBBR 4.2.1.3 FADT */ if (fadt->arm_boot_flags & FWTS_FACP_ARM_BOOT_ARCH_PSCI_COMPLIANT) @@ -404,10 +384,9 @@ static int fadt_sbbr_boot_arch_psci_compliant_test4(fwts_framework *fw) } static fwts_framework_minor_test fadt_sbbr_tests[] = { - { fadt_sbbr_revision_test1, "FADT Revision Test." }, - { fadt_sbbr_reduced_hw_test2, "FADT Reduced HW Test." }, - { fadt_sbbr_profile_test3, "FADT Server Profile Test." }, - { fadt_sbbr_boot_arch_psci_compliant_test4, "FADT PSCI Compliant Test." }, + { fadt_sbbr_revision, "FADT Revision Test." }, + { fadt_sbbr_reduced_hw, "FADT Reduced HW Test." }, + { fadt_sbbr_boot_arch_psci_compliant, "FADT PSCI Compliant Test." }, { NULL, NULL } };
BugLink: https://bugs.launchpad.net/bugs/1936650 Also remove test* from function names Signed-off-by: Alex Hung <alex.hung@canonical.com> --- src/sbbr/fadt/fadt.c | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-)