From patchwork Tue Oct 7 06:43:27 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Hung X-Patchwork-Id: 397120 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 501281400B5; Tue, 7 Oct 2014 17:44:05 +1100 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XbOVA-00077N-61; Tue, 07 Oct 2014 06:44:04 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XbOUz-00076d-No for fwts-devel@lists.ubuntu.com; Tue, 07 Oct 2014 06:43:53 +0000 Received: from [175.182.192.254] (helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1XbOUz-0007sE-6H; Tue, 07 Oct 2014 06:43:53 +0000 From: Alex Hung To: fwts-devel@lists.ubuntu.com Subject: [PATCH] acpi: method: add check for _MLS Date: Tue, 7 Oct 2014 14:43:27 +0800 Message-Id: <1412664207-32297-5-git-send-email-alex.hung@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1412664207-32297-1-git-send-email-alex.hung@canonical.com> References: <1412664207-32297-1-git-send-email-alex.hung@canonical.com> 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 Signed-off-by: Alex Hung Acked-by: Colin Ian King Acked-by: Keng-Yu Lin --- src/acpi/method/method.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 2 deletions(-) diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c index f53a9ca..eae1276 100644 --- a/src/acpi/method/method.c +++ b/src/acpi/method/method.c @@ -126,7 +126,7 @@ * _LID 9.4.1 Y * _MAT 6.2.9 N * _MBM 9.12.2.1 Y - * _MLS 6.1.7 N + * _MLS 6.1.7 Y * _MSG 9.1.2 Y * _MSM 9.12.2.2 N * _NTT 11.4.7 Y @@ -1216,6 +1216,66 @@ static int method_test_CID(fwts_framework *fw) "_CID", NULL, 0, method_test_CID_return, NULL); } +static void method_test_MLS_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; + + if (method_package_elements_all_type(fw, name, "_MLS", obj, ACPI_TYPE_PACKAGE) != FWTS_OK) + return; + + /* Could be one or more packages */ + for (i = 0; i < obj->Package.Count; i++) { + ACPI_OBJECT *pkg = &obj->Package.Elements[i]; + + if (pkg->Package.Count != 2) { + fwts_failed(fw, LOG_LEVEL_MEDIUM, + "Method_MLSSubPackageElementCount", + "%s sub-package %" PRIu32 " was expected to " + "have 2 elements, got %" PRIu32 " elements instead.", + name, i, pkg->Package.Count); + failed = true; + continue; + } + + if (pkg->Package.Elements[0].Type != ACPI_TYPE_STRING) { + fwts_failed(fw, LOG_LEVEL_MEDIUM, + "Method_MLSBadSubPackageReturnType", + "%s sub-package %" PRIu32 + " element 0 is not a string.", + name, i); + failed = true; + } + + if (pkg->Package.Elements[1].Type != ACPI_TYPE_BUFFER) { + fwts_failed(fw, LOG_LEVEL_MEDIUM, + "Method_MLSBadSubPackageReturnType", + "%s sub-package %" PRIu32 + " element 1 is not a buffer.", + name, i); + failed = true; + } + } + + if (!failed) + method_passed_sane(fw, name, "package"); +} + +static int method_test_MLS(fwts_framework *fw) +{ + return method_evaluate_method(fw, METHOD_OPTIONAL, + "_MLS", NULL, 0, method_test_MLS_return, NULL); +} static int method_test_HRV(fwts_framework *fw) { return method_evaluate_method(fw, METHOD_OPTIONAL, @@ -5882,7 +5942,7 @@ static fwts_framework_minor_test method_tests[] = { { method_test_DDN, "Test _DDN (DOS Device Name)." }, { method_test_HID, "Test _HID (Hardware ID)." }, { method_test_HRV, "Test _HRV (Hardware Revision Number)." }, - /* { method_test_MLS, "Test _MLS (Multiple Language String)." }, */ + { method_test_MLS, "Test _MLS (Multiple Language String)." }, { method_test_PLD, "Test _PLD (Physical Device Location)." }, { method_test_SUB, "Test _SUB (Subsystem ID)." }, { method_test_SUN, "Test _SUN (Slot User Number)." },