From patchwork Wed Aug 31 17:52:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deb McLemore X-Patchwork-Id: 664637 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3sPXyv5NJxz9s8x; Thu, 1 Sep 2016 03:52:23 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1bf9gT-00039f-55; Wed, 31 Aug 2016 17:52:21 +0000 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1bf9gK-00039C-MW for fwts-devel@lists.ubuntu.com; Wed, 31 Aug 2016 17:52:12 +0000 Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u7VHh6Ys108557 for ; Wed, 31 Aug 2016 13:52:11 -0400 Received: from e34.co.us.ibm.com (e34.co.us.ibm.com [32.97.110.152]) by mx0a-001b2d01.pphosted.com with ESMTP id 255hfkfab5-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Wed, 31 Aug 2016 13:52:11 -0400 Received: from localhost by e34.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 31 Aug 2016 11:52:10 -0600 Received: from d03dlp01.boulder.ibm.com (9.17.202.177) by e34.co.us.ibm.com (192.168.1.134) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Wed, 31 Aug 2016 11:52:09 -0600 X-IBM-Helo: d03dlp01.boulder.ibm.com X-IBM-MailFrom: debmc@linux.vnet.ibm.com Received: from b03cxnp07028.gho.boulder.ibm.com (b03cxnp07028.gho.boulder.ibm.com [9.17.130.15]) by d03dlp01.boulder.ibm.com (Postfix) with ESMTP id ACB921FF004B for ; Wed, 31 Aug 2016 11:51:50 -0600 (MDT) Received: from b03ledav005.gho.boulder.ibm.com (b03ledav005.gho.boulder.ibm.com [9.17.130.236]) by b03cxnp07028.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u7VHq8qe13500874; Wed, 31 Aug 2016 10:52:08 -0700 Received: from b03ledav005.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C2008BE04C; Wed, 31 Aug 2016 11:52:08 -0600 (MDT) Received: from oc6714664003.ibm.com (unknown [9.80.221.58]) by b03ledav005.gho.boulder.ibm.com (Postfix) with ESMTP id 86B87BE04A; Wed, 31 Aug 2016 11:52:08 -0600 (MDT) Received: by oc6714664003.ibm.com (Postfix, from userid 1000) id EF0711C1319; Wed, 31 Aug 2016 12:52:05 -0500 (CDT) From: Deb McLemore To: fwts-devel@lists.ubuntu.com Subject: [PATCH] acpi: ACPI Platform check updates Date: Wed, 31 Aug 2016 12:52:03 -0500 X-Mailer: git-send-email 1.8.3.1 X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16083117-0016-0000-0000-0000048CB9B2 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00005687; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000184; SDB=6.00752185; UDB=6.00355607; IPR=6.00524996; BA=6.00004683; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00012536; XFM=3.00000011; UTC=2016-08-31 17:52:09 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16083117-0017-0000-0000-00003281B9B5 Message-Id: <1472665923-15759-1-git-send-email-debmc@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-08-31_04:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1608310216 Cc: Deb McLemore X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: fwts-devel-bounces@lists.ubuntu.com Set the ACPI platform check to undefine the PPC64 to properly conditionally build the tests on the respective platforms. Cleanup messages to properly identify per platform the FW feature flag being checked. Signed-off-by: Deb McLemore Acked-by: Colin Ian King Acked-by: Alex Hung --- src/acpi/wakealarm/wakealarm.c | 4 ++++ src/bios/hdaaudio/hdaaudio.c | 4 ++++ src/kernel/version/version.c | 4 ++++ src/lib/include/fwts.h | 4 ++-- src/lib/src/fwts_framework.c | 13 ++++++++++--- src/opal/prd_info.c | 5 +++-- 6 files changed, 27 insertions(+), 7 deletions(-) diff --git a/src/acpi/wakealarm/wakealarm.c b/src/acpi/wakealarm/wakealarm.c index 32bf3c4..0251079 100644 --- a/src/acpi/wakealarm/wakealarm.c +++ b/src/acpi/wakealarm/wakealarm.c @@ -18,6 +18,8 @@ */ #include "fwts.h" +#if defined(FWTS_HAS_ACPI) + #include #include #include @@ -171,3 +173,5 @@ static fwts_framework_ops wakealarm_ops = { }; FWTS_REGISTER("wakealarm", &wakealarm_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV) + +#endif diff --git a/src/bios/hdaaudio/hdaaudio.c b/src/bios/hdaaudio/hdaaudio.c index 8aa5ce9..cd943ee 100644 --- a/src/bios/hdaaudio/hdaaudio.c +++ b/src/bios/hdaaudio/hdaaudio.c @@ -21,6 +21,8 @@ #include "fwts.h" +#ifdef FWTS_ARCH_INTEL + typedef struct { uint16_t pin; uint32_t setting; @@ -189,3 +191,5 @@ static fwts_framework_ops hda_audio_ops = { }; FWTS_REGISTER("hda_audio", &hda_audio_ops, FWTS_TEST_ANYTIME, FWTS_FLAG_BATCH) + +#endif diff --git a/src/kernel/version/version.c b/src/kernel/version/version.c index 2615998..5432f60 100644 --- a/src/kernel/version/version.c +++ b/src/kernel/version/version.c @@ -85,6 +85,7 @@ static int version_test3(fwts_framework *fw) return FWTS_OK; } +#if defined(FWTS_HAS_ACPI) static int version_test4(fwts_framework *fw) { char *str; @@ -104,12 +105,15 @@ static int version_test4(fwts_framework *fw) return FWTS_OK; } +#endif static fwts_framework_minor_test version_tests[] = { { version_test1, "Gather kernel signature." }, { version_test2, "Gather kernel system information." }, { version_test3, "Gather kernel boot command line." }, +#if defined(FWTS_HAS_ACPI) { version_test4, "Gather ACPI driver version." }, +#endif { NULL, NULL }, }; diff --git a/src/lib/include/fwts.h b/src/lib/include/fwts.h index 780c308..42f454e 100644 --- a/src/lib/include/fwts.h +++ b/src/lib/include/fwts.h @@ -40,8 +40,8 @@ #endif #if defined(__PPC64__) -#define FWTS_HAS_ACPI 0 -#define FWTS_HAS_UEFI 0 +#undef FWTS_HAS_ACPI +#undef FWTS_HAS_UEFI #endif #define FWTS_UNUSED(var) (void)var diff --git a/src/lib/src/fwts_framework.c b/src/lib/src/fwts_framework.c index 9c2d3df..a296f93 100644 --- a/src/lib/src/fwts_framework.c +++ b/src/lib/src/fwts_framework.c @@ -600,18 +600,25 @@ static int fwts_framework_run_test(fwts_framework *fw, fwts_framework_test *test fw->total.aborted += test->ops->total_tests; if (fw->show_progress) { fwts_framework_minor_test_progress_clear_line(); - fprintf(stderr, " Test aborted.\n"); + fprintf(stderr, " Test aborted\n"); } goto done; } if (!fwts_firmware_has_features(test->fw_features)) { int missing = test->fw_features & ~fwts_firmware_features(); + char *msg = NULL; fwts_log_info(fw, "Test skipped, missing features: %s", fwts_firmware_feature_string(missing)); fw->current_major_test->results.skipped += test->ops->total_tests; fw->total.skipped += test->ops->total_tests; + msg = "Test skipped, missing features"; + if (fw->show_progress) { + fwts_framework_minor_test_progress_clear_line(); + fprintf(stderr, " %s: %s\n", + msg, fwts_firmware_feature_string(missing)); + } goto done; } @@ -623,12 +630,12 @@ static int fwts_framework_run_test(fwts_framework *fw, fwts_framework_test *test if (ret == FWTS_SKIP) { fw->current_major_test->results.skipped += test->ops->total_tests; fw->total.skipped += test->ops->total_tests; - msg = "Test skipped."; + msg = "Test skipped"; } else { fwts_log_error(fw, "Aborted test, initialisation failed."); fw->current_major_test->results.aborted += test->ops->total_tests; fw->total.aborted += test->ops->total_tests; - msg = "Test aborted."; + msg = "Test aborted"; } if (fw->show_progress) { fwts_framework_minor_test_progress_clear_line(); diff --git a/src/opal/prd_info.c b/src/opal/prd_info.c index bdbfb9d..d529504 100644 --- a/src/opal/prd_info.c +++ b/src/opal/prd_info.c @@ -227,5 +227,6 @@ static fwts_framework_ops prd_info_ops = { .minor_tests = prd_info_tests }; -FWTS_REGISTER("prd_info", &prd_info_ops, FWTS_TEST_EARLY, - FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV) +FWTS_REGISTER_FEATURES("prd_info", &prd_info_ops, FWTS_TEST_EARLY, + FWTS_FLAG_BATCH | FWTS_FLAG_ROOT_PRIV, + FWTS_FW_FEATURE_DEVICETREE)