From patchwork Tue Jun 8 19:50:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Hung X-Patchwork-Id: 1489613 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=) 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 4G017v1yBDz9sWk for ; Wed, 9 Jun 2021 05:51:07 +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 1lqhke-0006wd-SI; Tue, 08 Jun 2021 19:51:04 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lqhkV-0006ui-F4 for fwts-devel@lists.ubuntu.com; Tue, 08 Jun 2021 19:50:55 +0000 Received: from d75-158-101-9.abhsia.telus.net ([75.158.101.9] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lqhkU-0003kB-TC; Tue, 08 Jun 2021 19:50:55 +0000 From: Alex Hung To: fwts-devel@lists.ubuntu.com Subject: [PATCH 2/2] live-image: create a separate menu for arm64/aarch64 Date: Tue, 8 Jun 2021 13:50:49 -0600 Message-Id: <20210608195049.562002-2-alex.hung@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210608195049.562002-1-alex.hung@canonical.com> References: <20210608195049.562002-1-alex.hung@canonical.com> 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" Also add the EBBR test to arm64/aarch64. Signed-off-by: Alex Hung Acked-by: Colin Ian King Acked-by: Ivan Hu --- live-image/fwts-frontend-text | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/live-image/fwts-frontend-text b/live-image/fwts-frontend-text index 430ea271..5ac327dd 100755 --- a/live-image/fwts-frontend-text +++ b/live-image/fwts-frontend-text @@ -373,13 +373,14 @@ do "Abort" "Abort Testing" off \ 2> $OPTIONS ;; - *) + aarch64) dialog --help-button --backtitle "$FWTS" --title "Select Tests" --radiolist \ "This will run a suite of firmware tests that will check the BIOS and ACPI tables. It can also find issues that can cause Linux problems.\n\nThe default below is to run just all the Batch Tests, but you can select more tests below if required.\n\nPlease select below (using cursor up/down and space) and press enter to continue."\ 24 70 8 \ "All" "All Batch Tests" on \ "ACPI" "ACPI Tests" off \ "UEFI" "UEFI Tests" off \ + "EBBR" "ARM EBBR Tests" off \ "SBBR" "ARM SBBR Tests" off \ "Recommended" "Recommended Tests" off \ "Recommended for IFV" "Recommended Tests for F/W Vendors" off \ @@ -388,6 +389,20 @@ do "Abort" "Abort Testing" off \ 2> $OPTIONS ;; + *) + dialog --help-button --backtitle "$FWTS" --title "Select Tests" --radiolist \ + "This will run a suite of firmware tests that will check the BIOS and ACPI tables. It can also find issues that can cause Linux problems.\n\nThe default below is to run just all the Batch Tests, but you can select more tests below if required.\n\nPlease select below (using cursor up/down and space) and press enter to continue."\ + 24 70 8 \ + "All" "All Batch Tests" on \ + "ACPI" "ACPI Tests" off \ + "UEFI" "UEFI Tests" off \ + "Recommended" "Recommended Tests" off \ + "Recommended for IFV" "Recommended Tests for F/W Vendors" off \ + "Selected" "Select Individual Tests" off \ + "Automated" "Create Auto-Tests" off \ + "Abort" "Abort Testing" off \ + 2> $OPTIONS + ;; esac @@ -415,6 +430,10 @@ do do_test "--uefitests" 'Running UEFI Tests' done_tests_finish ;; + 'EBBR') + do_test "--ebbr" 'Embedded Base Boot Requirements (EBBR) Tests' + done_tests_finish + ;; 'SBBR') do_test "--sbbr" 'Server Base Boot Requirements (SBBR) Tests' done_tests_finish @@ -424,6 +443,9 @@ do ppc*) FWTS_OPTIONS="--batch" ;; + aarch64) + FWTS_OPTIONS="version cpufreq aspm dmicheck klog oops --acpitests --uefitests --log-level=medium" + ;; *) FWTS_OPTIONS="version cpufreq maxfreq msr mtrr nx virt aspm dmicheck apicedge klog oops --acpitests --uefitests --log-level=medium" ;; @@ -433,7 +455,15 @@ do done_tests_finish ;; 'Recommended for IFV') - FWTS_OPTIONS="version cpufreq maxfreq msr mtrr nx virt aspm dmicheck apicedge klog oops --acpitests --uefitests --ifv" + case "${UNAME_PLATFORM}" in + aarch64) + FWTS_OPTIONS="version cpufreq aspm dmicheck klog oops --acpitests --uefitests --ifv" + ;; + *) + FWTS_OPTIONS="version cpufreq maxfreq msr mtrr nx virt aspm dmicheck apicedge klog oops --acpitests --uefitests --ifv" + ;; + esac + do_test "${FWTS_OPTIONS}" 'Running Recommended Tests for F/W Vendors' done_tests_finish ;;