From patchwork Sat Jan 23 02:12:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Hung X-Patchwork-Id: 1430625 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 4DN05X4d8Mz9sVF for ; Sat, 23 Jan 2021 13:12:47 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1l38Pq-00063i-3y; Sat, 23 Jan 2021 02:12:42 +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 1l38Po-00063W-1Z for fwts-devel@lists.ubuntu.com; Sat, 23 Jan 2021 02:12:40 +0000 Received: from 2.general.alexhung.us.vpn ([10.172.65.255] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1l38Pn-0007hX-6J; Sat, 23 Jan 2021 02:12:39 +0000 From: Alex Hung To: fwts-devel@lists.ubuntu.com Subject: [PATCH 2/7] acpi: method: merge _PCT & _PTC method tests Date: Fri, 22 Jan 2021 19:12:26 -0700 Message-Id: <20210123021231.54136-2-alex.hung@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210123021231.54136-1-alex.hung@canonical.com> References: <20210123021231.54136-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" Both methods have the same definition. Signed-off-by: Alex Hung Acked-by: Ivan Hu Acked-by: Colin Ian King --- src/acpi/method/method.c | 87 +++++++++++++++------------------------- 1 file changed, 33 insertions(+), 54 deletions(-) diff --git a/src/acpi/method/method.c b/src/acpi/method/method.c index 8ee03b1e..2f59ac41 100644 --- a/src/acpi/method/method.c +++ b/src/acpi/method/method.c @@ -2100,13 +2100,18 @@ static int method_test_CST(fwts_framework *fw) "_CST", NULL, 0, method_test_CST_return, NULL); } -static void method_test_PCT_return( +static void method_test_PCT_PTC_return( fwts_framework *fw, char *name, ACPI_BUFFER *buf, ACPI_OBJECT *obj, void *private) { + uint32_t i; + bool failed = false; + char *objname = (char*) private; + char tmp[128]; + static const fwts_package_element elements[] = { { ACPI_TYPE_BUFFER, "ControlRegister" }, { ACPI_TYPE_BUFFER, "StatusRegister" }, @@ -2120,13 +2125,36 @@ static void method_test_PCT_return( if (fwts_method_package_elements_type(fw, name, obj, elements) != FWTS_OK) return; - fwts_method_passed_sane(fw, name, "package"); + snprintf(tmp, sizeof(tmp), "Method%sBadElement", objname); + for (i = 0; i < obj->Package.Count; i++) { + ACPI_RESOURCE *resource = NULL; + ACPI_STATUS status; + ACPI_OBJECT *element_buf = &obj->Package.Elements[i]; + + status = AcpiBufferToResource(element_buf->Buffer.Pointer, element_buf->Buffer.Length, &resource); + if (ACPI_FAILURE(status) || !resource) { + failed = true; + fwts_failed(fw, LOG_LEVEL_HIGH, tmp, + "%s should contain only Resource Descriptors", name); + continue; + } + + if (resource->Type != ACPI_RESOURCE_TYPE_GENERIC_REGISTER) { + failed = true; + fwts_failed(fw, LOG_LEVEL_HIGH, tmp, + "%s should contain only Resource Type 16, got %" PRIu32 "\n", + name, resource->Type); + } + } + + if (!failed) + fwts_method_passed_sane(fw, name, "package"); } static int method_test_PCT(fwts_framework *fw) { - return method_evaluate_method(fw, METHOD_OPTIONAL, "_PCT", NULL, - 0, method_test_PCT_return, NULL); + return method_evaluate_method(fw, METHOD_OPTIONAL, + "_PCT", NULL, 0, method_test_PCT_PTC_return, "_PCT"); } static void method_test_PSS_return( @@ -2303,59 +2331,10 @@ static int method_test_PDL(fwts_framework *fw) "_PDL", NULL, 0, fwts_method_test_integer_return, NULL); } - -static void method_test_PTC_return( - fwts_framework *fw, - char *name, - ACPI_BUFFER *buf, - ACPI_OBJECT *obj, - void *private) -{ - uint32_t i; - bool failed = false; - - FWTS_UNUSED(private); - - if (fwts_method_check_type(fw, name, buf, ACPI_TYPE_PACKAGE) != FWTS_OK) - return; - - if (fwts_method_package_elements_all_type(fw, name, obj, ACPI_TYPE_BUFFER) != FWTS_OK) - return; - - if (fwts_method_package_count_equal(fw, name, obj, 2) != FWTS_OK) - return; - - for (i = 0; i < obj->Package.Count; i++) { - ACPI_RESOURCE *resource = NULL; - ACPI_STATUS status; - ACPI_OBJECT *element_buf = &obj->Package.Elements[i]; - - status = AcpiBufferToResource(element_buf->Buffer.Pointer, element_buf->Buffer.Length, &resource); - if (ACPI_FAILURE(status) || !resource) { - failed = true; - fwts_failed(fw, LOG_LEVEL_HIGH, - "Method_PTCBadElement", - "%s should contain only Resource Descriptors", name); - continue; - } - - if (resource->Type != ACPI_RESOURCE_TYPE_GENERIC_REGISTER) { - failed = true; - fwts_failed(fw, LOG_LEVEL_HIGH, - "Method_PTCBadElement", - "%s should contain only Resource Type 16, got %" PRIu32 "\n", - name, resource->Type); - } - } - - if (!failed) - fwts_method_passed_sane(fw, name, "package"); -} - static int method_test_PTC(fwts_framework *fw) { return method_evaluate_method(fw, METHOD_OPTIONAL, - "_PTC", NULL, 0, method_test_PTC_return, NULL); + "_PTC", NULL, 0, method_test_PCT_PTC_return, "_PTC"); } static int method_test_TDL(fwts_framework *fw)