From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:49478) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMD4F-00058b-E3 for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMD4E-0002od-E3 for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33982) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMD4E-0002oJ-8Y for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:10 -0400 From: Igor Mammedov Date: Thu, 2 May 2019 16:51:53 +0200 Message-Id: <1556808723-226478-6-git-send-email-imammedo@redhat.com> In-Reply-To: <1556808723-226478-1-git-send-email-imammedo@redhat.com> References: <1556808723-226478-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 v4 05/15] 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 , xuwei5@hisilicon.com, xuwei5@huawei.com, linuxarm@huawei.com 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 --- v4: * dropping Reviewed-bys due to acpi_fetch_table() change introduced by earlier patch: "tests: acpi: make acpi_fetch_table() take size of fetched table point= er" 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 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index a164d27..d165a1b 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -140,6 +140,9 @@ 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 */; + int dsdt_entry_size =3D 4; =20 g_assert(compare_signature(&table, "FACP")); =20 @@ -148,8 +151,14 @@ static void test_acpi_fadt_table(test_data *data) fadt_aml + 36 /* FIRMWARE_CTRL */, 4, "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 */; + dsdt_entry_size =3D 8; + } acpi_fetch_table(data->qts, &table.aml, &table.aml_len, - fadt_aml + 40 /* DSDT */, 4, "DSDT", true); + fadt_aml + dsdt_offset, dsdt_entry_size, "DSDT", tr= ue); 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 1D376C43219 for ; Thu, 2 May 2019 15:13:19 +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 E713B20675 for ; Thu, 2 May 2019 15:13:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E713B20675 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]:52853 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMDOg-0006SG-58 for qemu-devel@archiver.kernel.org; Thu, 02 May 2019 11:13:18 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49478) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMD4F-00058b-E3 for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMD4E-0002od-E3 for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33982) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMD4E-0002oJ-8Y for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:10 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 746D7883B8; Thu, 2 May 2019 14:52:09 +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 0304971C80; Thu, 2 May 2019 14:52:06 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 2 May 2019 16:51:53 +0200 Message-Id: <1556808723-226478-6-git-send-email-imammedo@redhat.com> In-Reply-To: <1556808723-226478-1-git-send-email-imammedo@redhat.com> References: <1556808723-226478-1-git-send-email-imammedo@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Thu, 02 May 2019 14:52:09 +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 v4 05/15] 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 , linuxarm@huawei.com, Shameer Kolothum , Shannon Zhao , Gonglei , Wei Yang , xuwei5@huawei.com, xuwei5@hisilicon.com, =?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: <20190502145153.4TyGZGJRUwFYS_semFEGiDlKKJ0LR-SlLN6kL8dK6co@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 --- v4: * dropping Reviewed-bys due to acpi_fetch_table() change introduced by earlier patch: "tests: acpi: make acpi_fetch_table() take size of fetched table point= er" 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 | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index a164d27..d165a1b 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -140,6 +140,9 @@ 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 */; + int dsdt_entry_size =3D 4; =20 g_assert(compare_signature(&table, "FACP")); =20 @@ -148,8 +151,14 @@ static void test_acpi_fadt_table(test_data *data) fadt_aml + 36 /* FIRMWARE_CTRL */, 4, "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 */; + dsdt_entry_size =3D 8; + } acpi_fetch_table(data->qts, &table.aml, &table.aml_len, - fadt_aml + 40 /* DSDT */, 4, "DSDT", true); + fadt_aml + dsdt_offset, dsdt_entry_size, "DSDT", tr= ue); 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=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT 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 AE7ACC04AAF for ; Thu, 16 May 2019 12:26:59 +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 8125D20848 for ; Thu, 16 May 2019 12:26:59 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8125D20848 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]:53845 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hRFTO-0006vz-P9 for qemu-devel@archiver.kernel.org; Thu, 16 May 2019 08:26:58 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49129) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hRFNH-0001YN-2Q for qemu-devel@nongnu.org; Thu, 16 May 2019 08:20:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hRFNE-0002jI-1X for qemu-devel@nongnu.org; Thu, 16 May 2019 08:20:39 -0400 Received: from mail-qt1-f179.google.com ([209.85.160.179]:44593) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hRFND-0002iy-V8 for qemu-devel@nongnu.org; Thu, 16 May 2019 08:20:35 -0400 Received: by mail-qt1-f179.google.com with SMTP id f24so3517244qtk.11 for ; Thu, 16 May 2019 05:20:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=lNTYO0MId4gzUO1w6UtHVs4DCqDNXlBKY0mc09csDo8=; b=nniG5hUvSznMei+aALFod497O1VvrJhXcnzsJTfiIWTQv59I5rBiOy9pKKs0tpfCU7 YkBiiTlsJKYlQXdvwscqWidTAYWho3ScqYiYmzmeE6/JLhtc6g0yJLedzyrgo6OTcAtI fMN9/LDjszV84pkTsNLkl1btX3PDWZMTj9cFUcjBsMA9xnCw2J25Z9K4Gi+FduBGPW/2 hj7IQAbr1G5pg+LRKZZeldlIQI2/W6yUKmliDa/9PEe44uKw+uYwAErtHLLOrrzt2035 ke9glEH/tEounUhDiP3k+92ryGfeFHR2wKn5CYl/hOgl9bNySNJrwZGe/qIruxrbX31J NsPg== X-Gm-Message-State: APjAAAWyz0mUDt8BWIpRSbzWComPo0/oOivZik2jwJZRBZfWT+tHmJZ/ YNBvgCTXbqyKILLU3CKX0pZhu08UYLM= X-Google-Smtp-Source: APXvYqz2LXsEZK4YjfZjvVhkDO8rWKfQ5mOr+YQMTpYObNQoik/w3nyvEsAG4v/WCV1By0WLt72PLQ== X-Received: by 2002:a0c:872c:: with SMTP id 41mr39897703qvh.213.1558009235122; Thu, 16 May 2019 05:20:35 -0700 (PDT) Received: from redhat.com ([185.54.206.10]) by smtp.gmail.com with ESMTPSA id a64sm2587930qkd.73.2019.05.16.05.20.33 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 16 May 2019 05:20:34 -0700 (PDT) Date: Thu, 16 May 2019 08:20:32 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1556808723-226478-6-git-send-email-imammedo@redhat.com> References: <20190515121146.7248-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline In-Reply-To: <20190515121146.7248-1-mst@redhat.com> X-Mailer: git-send-email 2.17.1.1206.gb667731e2e.dirty X-Mutt-Fcc: =sent X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.160.179 Subject: [Qemu-devel] [PULL 27/37] 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: Laurent Vivier , Peter Maydell , Thomas Huth , Wei Yang , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190516122032.y_bwZlpjrzj7xc9tvnIibT6a6Eob_Rcg2aAIPfy6xDw@z> From: Igor Mammedov 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 Message-Id: <1556808723-226478-6-git-send-email-imammedo@redhat.com> Reviewed-by: Wei Yang Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/bios-tables-test.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index a164d274a2..d165a1bd62 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -140,6 +140,9 @@ static void test_acpi_fadt_table(test_data *data) AcpiSdtTable table = g_array_index(data->tables, typeof(table), 0); uint8_t *fadt_aml = table.aml; uint32_t fadt_len = table.aml_len; + uint32_t val; + int dsdt_offset = 40 /* DSDT */; + int dsdt_entry_size = 4; g_assert(compare_signature(&table, "FACP")); @@ -148,8 +151,14 @@ static void test_acpi_fadt_table(test_data *data) fadt_aml + 36 /* FIRMWARE_CTRL */, 4, "FACS", false); g_array_append_val(data->tables, table); + memcpy(&val, fadt_aml + dsdt_offset, 4); + val = le32_to_cpu(val); + if (!val) { + dsdt_offset = 140 /* X_DSDT */; + dsdt_entry_size = 8; + } acpi_fetch_table(data->qts, &table.aml, &table.aml_len, - fadt_aml + 40 /* DSDT */, 4, "DSDT", true); + fadt_aml + dsdt_offset, dsdt_entry_size, "DSDT", true); g_array_append_val(data->tables, table); memset(fadt_aml + 36, 0, 4); /* sanitize FIRMWARE_CTRL ptr */ -- MST 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=-9.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT 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 09DC1C04AAC for ; Mon, 20 May 2019 23:24:57 +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 D021B20862 for ; Mon, 20 May 2019 23:24:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D021B20862 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]:43508 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hSreK-0001tA-2V for qemu-devel@archiver.kernel.org; Mon, 20 May 2019 19:24:56 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45180) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hSrRD-0007mE-DB for qemu-devel@nongnu.org; Mon, 20 May 2019 19:11:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hSrRC-0008Ii-Ej for qemu-devel@nongnu.org; Mon, 20 May 2019 19:11:23 -0400 Received: from mail-qt1-f180.google.com ([209.85.160.180]:34845) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hSrRB-0008I9-Pk for qemu-devel@nongnu.org; Mon, 20 May 2019 19:11:21 -0400 Received: by mail-qt1-f180.google.com with SMTP id a39so18398526qtk.2 for ; Mon, 20 May 2019 16:11:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=lNTYO0MId4gzUO1w6UtHVs4DCqDNXlBKY0mc09csDo8=; b=j5uvziY3sT9YuRE84klb7pIx5QFslVEtrjhmqh8MH5rym2Ab3pVRSWaR4/DwW3FMra eR6QxCqtrgJV39UUlPM7TjPWSUailIoiL0DihMZT29ah74lEcQLIi0OShJk3itw1I60R Zd66+DUXNY4XmN7PQPKOzwS2QIeGY7Foz6s1pE+mjf+uSKp6ti2BFmactl8DPcYDmuqZ gfSQtzEw6haPQ1JBhAx2CrX2UMCWNp1RDYn6vFqNXC7tkF58qHgM8zXTddNPjOi8+PPV 16MKwzk3N7AA7bfM3+L7uuBTurUYXO30Vj1MDs6RuWqVuuaAbVJC8cwlBnTBKJE9mscx FIpw== X-Gm-Message-State: APjAAAXuEgMry5eKa6th+mcO575OEQi5RRBPCGC4XYcYP4+1tqFw84OT gGqbRb5vqd35ttW0a1pUN385RBly/38= X-Google-Smtp-Source: APXvYqzUxLyXf5SRpIKnr+lSmq3PPOp522ROXuffdunxsNT35HwMFXkf67Ssf6F4EiJrwNqll3Z7Aw== X-Received: by 2002:ac8:1c51:: with SMTP id j17mr64276477qtk.7.1558393880965; Mon, 20 May 2019 16:11:20 -0700 (PDT) Received: from redhat.com (pool-173-76-105-71.bstnma.fios.verizon.net. [173.76.105.71]) by smtp.gmail.com with ESMTPSA id t58sm10680212qtj.4.2019.05.20.16.11.19 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 20 May 2019 16:11:20 -0700 (PDT) Date: Mon, 20 May 2019 19:11:19 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1556808723-226478-6-git-send-email-imammedo@redhat.com> References: <20190520231008.20140-1-mst@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline In-Reply-To: <20190520231008.20140-1-mst@redhat.com> X-Mailer: git-send-email 2.17.1.1206.gb667731e2e.dirty X-Mutt-Fcc: =sent X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.160.180 Subject: [Qemu-devel] [PULL v2 26/36] 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: Laurent Vivier , Peter Maydell , Thomas Huth , Wei Yang , Igor Mammedov , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190520231119.U5dbsJzfpdRO_LU-qcwcNG2pzM5Yc7-3Qh3uc6i91ns@z> From: Igor Mammedov 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 Message-Id: <1556808723-226478-6-git-send-email-imammedo@redhat.com> Reviewed-by: Wei Yang Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/bios-tables-test.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index a164d274a2..d165a1bd62 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -140,6 +140,9 @@ static void test_acpi_fadt_table(test_data *data) AcpiSdtTable table = g_array_index(data->tables, typeof(table), 0); uint8_t *fadt_aml = table.aml; uint32_t fadt_len = table.aml_len; + uint32_t val; + int dsdt_offset = 40 /* DSDT */; + int dsdt_entry_size = 4; g_assert(compare_signature(&table, "FACP")); @@ -148,8 +151,14 @@ static void test_acpi_fadt_table(test_data *data) fadt_aml + 36 /* FIRMWARE_CTRL */, 4, "FACS", false); g_array_append_val(data->tables, table); + memcpy(&val, fadt_aml + dsdt_offset, 4); + val = le32_to_cpu(val); + if (!val) { + dsdt_offset = 140 /* X_DSDT */; + dsdt_entry_size = 8; + } acpi_fetch_table(data->qts, &table.aml, &table.aml_len, - fadt_aml + 40 /* DSDT */, 4, "DSDT", true); + fadt_aml + dsdt_offset, dsdt_entry_size, "DSDT", true); g_array_append_val(data->tables, table); memset(fadt_aml + 36, 0, 4); /* sanitize FIRMWARE_CTRL ptr */ -- MST