From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:47203) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJX3Q-0003hD-CI for qemu-devel@nongnu.org; Thu, 25 Apr 2019 01:36:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJX1v-0008J7-J5 for qemu-devel@nongnu.org; Thu, 25 Apr 2019 01:34:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49032) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hJX1v-0008IX-Da for qemu-devel@nongnu.org; Thu, 25 Apr 2019 01:34:43 -0400 From: Igor Mammedov Date: Thu, 25 Apr 2019 07:34:40 +0200 Message-Id: <1556170489-131927-5-git-send-email-imammedo@redhat.com> In-Reply-To: <1556170489-131927-1-git-send-email-imammedo@redhat.com> References: <1556170489-131927-1-git-send-email-imammedo@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH v3 04/13] tests: acpi: fetch X_DSDT if pointer to DSDT is 0 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Laszlo Ersek , "Michael S. Tsirkin" , Gonglei , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Shannon Zhao , Wei Yang , Andrew Jones , Shameer Kolothum , Ben Warren that way it would be possible to test a DSDT pointed by 64bit X_DSDT field in FADT. PS: it will allow to enable testing arm/virt board, which sets only newer X_DSDT field. Signed-off-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- v2: add 'val =3D le32_to_cpu(val)' even if it doesn't necessary it works as reminder that value copied from table is in little-endian format (Philippe Mathieu-Daud=C3=A9 ) --- tests/bios-tables-test.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index c29dcf4..ed62a17 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -140,6 +140,8 @@ static void test_acpi_fadt_table(test_data *data) AcpiSdtTable table =3D g_array_index(data->tables, typeof(table), 0)= ; uint8_t *fadt_aml =3D table.aml; uint32_t fadt_len =3D table.aml_len; + uint32_t val; + int dsdt_offset =3D 40 /* DSDT */; =20 g_assert(compare_signature(&table, "FACP")); =20 @@ -148,8 +150,13 @@ static void test_acpi_fadt_table(test_data *data) fadt_aml + 36 /* FIRMWARE_CTRL */, "FACS", false); g_array_append_val(data->tables, table); =20 + memcpy(&val, fadt_aml + dsdt_offset, 4); + val =3D le32_to_cpu(val); + if (!val) { + dsdt_offset =3D 140 /* X_DSDT */; + } acpi_fetch_table(data->qts, &table.aml, &table.aml_len, - fadt_aml + 40 /* DSDT */, "DSDT", true); + fadt_aml + dsdt_offset, "DSDT", true); g_array_append_val(data->tables, table); =20 memset(fadt_aml + 36, 0, 4); /* sanitize FIRMWARE_CTRL ptr */ --=20 2.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EC192C10F03 for ; Thu, 25 Apr 2019 05:42:58 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B5ADC214AE for ; Thu, 25 Apr 2019 05:42:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B5ADC214AE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:52100 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJX9t-0000s2-Vs for qemu-devel@archiver.kernel.org; Thu, 25 Apr 2019 01:42:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47203) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJX3Q-0003hD-CI for qemu-devel@nongnu.org; Thu, 25 Apr 2019 01:36:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJX1v-0008J7-J5 for qemu-devel@nongnu.org; Thu, 25 Apr 2019 01:34:44 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49032) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hJX1v-0008IX-Da for qemu-devel@nongnu.org; Thu, 25 Apr 2019 01:34:43 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A4C24C058CA4; Thu, 25 Apr 2019 05:34:42 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.37.153.18]) by smtp.corp.redhat.com (Postfix) with ESMTP id AD3BE19491; Thu, 25 Apr 2019 05:34:40 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 25 Apr 2019 07:34:40 +0200 Message-Id: <1556170489-131927-5-git-send-email-imammedo@redhat.com> In-Reply-To: <1556170489-131927-1-git-send-email-imammedo@redhat.com> References: <1556170489-131927-1-git-send-email-imammedo@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Thu, 25 Apr 2019 05:34:42 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 04/13] tests: acpi: fetch X_DSDT if pointer to DSDT is 0 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Andrew Jones , Ben Warren , "Michael S. Tsirkin" , Laszlo Ersek , Shameer Kolothum , Shannon Zhao , Gonglei , Wei Yang , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190425053440.UpX8tVk6-7zoanuKh7DnpVI5ubZl9cb8lxKaQDz4-KI@z> that way it would be possible to test a DSDT pointed by 64bit X_DSDT field in FADT. PS: it will allow to enable testing arm/virt board, which sets only newer X_DSDT field. Signed-off-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- v2: add 'val =3D le32_to_cpu(val)' even if it doesn't necessary it works as reminder that value copied from table is in little-endian format (Philippe Mathieu-Daud=C3=A9 ) --- tests/bios-tables-test.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index c29dcf4..ed62a17 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -140,6 +140,8 @@ static void test_acpi_fadt_table(test_data *data) AcpiSdtTable table =3D g_array_index(data->tables, typeof(table), 0)= ; uint8_t *fadt_aml =3D table.aml; uint32_t fadt_len =3D table.aml_len; + uint32_t val; + int dsdt_offset =3D 40 /* DSDT */; =20 g_assert(compare_signature(&table, "FACP")); =20 @@ -148,8 +150,13 @@ static void test_acpi_fadt_table(test_data *data) fadt_aml + 36 /* FIRMWARE_CTRL */, "FACS", false); g_array_append_val(data->tables, table); =20 + memcpy(&val, fadt_aml + dsdt_offset, 4); + val =3D le32_to_cpu(val); + if (!val) { + dsdt_offset =3D 140 /* X_DSDT */; + } acpi_fetch_table(data->qts, &table.aml, &table.aml_len, - fadt_aml + 40 /* DSDT */, "DSDT", true); + fadt_aml + dsdt_offset, "DSDT", true); g_array_append_val(data->tables, table); =20 memset(fadt_aml + 36, 0, 4); /* sanitize FIRMWARE_CTRL ptr */ --=20 2.7.4