From patchwork Wed Jan 9 10:58:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 210690 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 103342C00E1 for ; Wed, 9 Jan 2013 21:58:39 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TstMj-0006Zl-Fu; Wed, 09 Jan 2013 10:58:37 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TstMi-0006Zg-0m for fwts-devel@lists.ubuntu.com; Wed, 09 Jan 2013 10:58:36 +0000 Received: from cpc3-craw6-2-0-cust180.croy.cable.virginmedia.com ([77.100.248.181] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1TstMh-0003p7-Sn for fwts-devel@lists.ubuntu.com; Wed, 09 Jan 2013 10:58:35 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH] acpi: method: Add _HPP (Hot Plug Parameters) sanity check Date: Wed, 9 Jan 2013 10:58:35 +0000 Message-Id: <1357729115-10404-1-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 1.8.0 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: fwts-devel-bounces@lists.ubuntu.com Errors-To: fwts-devel-bounces@lists.ubuntu.com From: Colin Ian King Test return type from _HPP object Signed-off-by: Colin Ian King Acked-by: Keng-Yu Lin Acked-by: Alex Hung --- src/acpi/method/method.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c index fd7aac0..7b35f62 100644 --- a/src/acpi/method/method.c +++ b/src/acpi/method/method.c @@ -115,7 +115,7 @@ * _GWS 9.18.5 Y * _HID 6.1.5 Y * _HOT 11.4.6 Y - * _HPP 6.2.7 N + * _HPP 6.2.7 Y * _HPX 6.2.8 N * _HRV 6.1.6 Y * _IFT 19.5 N @@ -1717,6 +1717,54 @@ static int method_test_GSB(fwts_framework *fw) "_GSB", NULL, 0, method_test_integer_return, NULL); } +static void method_test_HPP_return( + fwts_framework *fw, + char *name, + ACPI_BUFFER *buf, + ACPI_OBJECT *obj, + void *private) +{ + uint32_t i; + bool failed = false; + + FWTS_UNUSED(private); + + if (method_check_type(fw, name, buf, ACPI_TYPE_PACKAGE) != FWTS_OK) + return; + + /* Must be 4 elements in the package */ + if (obj->Package.Count != 4) { + fwts_failed(fw, LOG_LEVEL_MEDIUM, + "Method_HPPElementCount", + "%s should return a package of 4 elements, " + "instead got %" PRIu32 " elements.", + name, obj->Package.Count); + fwts_tag_failed(fw, FWTS_TAG_ACPI_METHOD_RETURN); + return; + } + + /* All 4 elements in the package must be integers */ + for (i = 0; i < obj->Package.Count; i++) { + if (obj->Package.Elements[i].Type != ACPI_TYPE_INTEGER) { + fwts_failed(fw, LOG_LEVEL_MEDIUM, + "Method_HPPElementType", + "%s package element %" PRIu32 " was not an integer.", + name, i); + fwts_tag_failed(fw, FWTS_TAG_ACPI_METHOD_RETURN); + failed = true; + } + } + + if (!failed) + method_passed_sane(fw, name, "package"); +} + +static int method_test_HPP(fwts_framework *fw) +{ + return method_evaluate_method(fw, METHOD_OPTIONAL, + "_HPP", NULL, 0, method_test_HPP_return, NULL); +} + static int method_test_PXM(fwts_framework *fw) { return method_evaluate_method(fw, METHOD_OPTIONAL, @@ -4806,7 +4854,7 @@ static fwts_framework_minor_test method_tests[] = { { method_test_DMA, "Check _DMA (Direct Memory Access)." }, { method_test_FIX, "Check _FIX (Fixed Register Resource Provider)." }, { method_test_GSB, "Check _GSB (Global System Interrupt Base)." }, - /* { method_test_HPP, "Check _HPP (Hot Plug Parameters)." }, */ + { method_test_HPP, "Check _HPP (Hot Plug Parameters)." }, /* { method_test_HPX, "Check _HPX (Hot Plug Extensions)." }, */ /* { method_test_MAT, "Check _MAT (Multiple APIC Table Entry)." }, */ /* { method_test_PRS, "Check _PRS (Possible Resource Settings)." }, */