From patchwork Fri Jul 16 20:05:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Hung X-Patchwork-Id: 1506281 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=fwts-devel-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=lPS1d+tu; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GRMgq462fz9sWS for ; Sat, 17 Jul 2021 06:06:14 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1m4U64-0002V1-GO; Fri, 16 Jul 2021 20:06:08 +0000 Received: from smtp-relay-canonical-0.internal ([10.131.114.83] helo=smtp-relay-canonical-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1m4U62-0002Uv-I0 for fwts-devel@lists.ubuntu.com; Fri, 16 Jul 2021 20:06:06 +0000 Received: from canonical.com (d104-157-108-141.abhsia.telus.net [104.157.108.141]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPSA id DF68B408AB; Fri, 16 Jul 2021 20:06:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1626465966; bh=jMup8k/QgTDiLfq2tBTJ76a66ND64ixYGrf6h/UYErA=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=lPS1d+tu8gwQdnx88NkuP6+DuN2BNRpnKP3DnIFLzyqIYdjZ4j39BccJ0NdQ3FZBy 494l0mKkGzy2Ppnvuy3/L4fON5ICLUX77z67uHS4ZyN2n772+miRyGUaDTPFOUEekE K8cDHDJ3zDQv0L1k8jOGjTDnFPRLKtm02ulcINyKAdN7goXULW2KFQ7LfjOk2+jqf0 xWDlD8BX0taXwn+hhalWYrgymMNwr1xQF9aTBG9rUECz6ekpgtnw/SMe0XZ1y3rRTU u30atorK3zDBn+axC55YDmGUqf92Sz87SXJvfxz3STk68ibphzalgVeqRshd5WiYO6 +QNxwXZpUx7/A== From: Alex Hung To: fwts-devel@lists.ubuntu.com, Samer.El-Haj-Mahmoud@arm.com Subject: [PATCH] sbbr: remove pm_file test (not required in BBR 1.0) Date: Fri, 16 Jul 2021 14:05:59 -0600 Message-Id: <20210716200559.877429-1-alex.hung@canonical.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: "fwts-devel" BugLink: https://bugs.launchpad.net/bugs/1936650 Also remove test* from function names Signed-off-by: Alex Hung Acked-by: Ivan Hu Acked-by: Colin Ian King --- 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 } };