From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:49502) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMD4I-0005Cs-4j for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMD4H-0002rH-5O for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34020) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMD4G-0002qr-Vz for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:13 -0400 From: Igor Mammedov Date: Thu, 2 May 2019 16:51:54 +0200 Message-Id: <1556808723-226478-7-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 06/15] tests: acpi: skip FACS table if board uses hw reduced ACPI profile 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 If FADT has HW_REDUCED_ACPI flag set, do not attempt to fetch FACS as it's not provided by the board. Signed-off-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Wei Yang --- tests/bios-tables-test.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index d165a1b..e2fc341 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -147,9 +147,13 @@ static void test_acpi_fadt_table(test_data *data) g_assert(compare_signature(&table, "FACP")); =20 /* Since DSDT/FACS isn't in RSDT, add them to ASL test list manually= */ - acpi_fetch_table(data->qts, &table.aml, &table.aml_len, - fadt_aml + 36 /* FIRMWARE_CTRL */, 4, "FACS", false= ); - g_array_append_val(data->tables, table); + memcpy(&val, fadt_aml + 112 /* Flags */, 4); + val =3D le32_to_cpu(val); + if (!(val & 1UL << 20 /* HW_REDUCED_ACPI */)) { + acpi_fetch_table(data->qts, &table.aml, &table.aml_len, + fadt_aml + 36 /* FIRMWARE_CTRL */, 4, "FACS", f= alse); + g_array_append_val(data->tables, table); + } =20 memcpy(&val, fadt_aml + dsdt_offset, 4); val =3D le32_to_cpu(val); --=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,URIBL_BLOCKED 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 E2C14C43219 for ; Thu, 2 May 2019 14:58:08 +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 AD8F02075E for ; Thu, 2 May 2019 14:58:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AD8F02075E 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]:52572 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMD9z-0001Ag-TM for qemu-devel@archiver.kernel.org; Thu, 02 May 2019 10:58:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49502) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMD4I-0005Cs-4j for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMD4H-0002rH-5O for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34020) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hMD4G-0002qr-Vz for qemu-devel@nongnu.org; Thu, 02 May 2019 10:52:13 -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 33152883CA; Thu, 2 May 2019 14:52:12 +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 BB0FF7DA23; Thu, 2 May 2019 14:52:09 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Thu, 2 May 2019 16:51:54 +0200 Message-Id: <1556808723-226478-7-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:12 +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 06/15] tests: acpi: skip FACS table if board uses hw reduced ACPI profile 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: <20190502145154.GrrpzunTwwTVE4GzqgjEFYPeIRy0UUJaYlUdt_5fC_w@z> If FADT has HW_REDUCED_ACPI flag set, do not attempt to fetch FACS as it's not provided by the board. Signed-off-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Wei Yang --- tests/bios-tables-test.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index d165a1b..e2fc341 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -147,9 +147,13 @@ static void test_acpi_fadt_table(test_data *data) g_assert(compare_signature(&table, "FACP")); =20 /* Since DSDT/FACS isn't in RSDT, add them to ASL test list manually= */ - acpi_fetch_table(data->qts, &table.aml, &table.aml_len, - fadt_aml + 36 /* FIRMWARE_CTRL */, 4, "FACS", false= ); - g_array_append_val(data->tables, table); + memcpy(&val, fadt_aml + 112 /* Flags */, 4); + val =3D le32_to_cpu(val); + if (!(val & 1UL << 20 /* HW_REDUCED_ACPI */)) { + acpi_fetch_table(data->qts, &table.aml, &table.aml_len, + fadt_aml + 36 /* FIRMWARE_CTRL */, 4, "FACS", f= alse); + g_array_append_val(data->tables, table); + } =20 memcpy(&val, fadt_aml + dsdt_offset, 4); val =3D le32_to_cpu(val); --=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 D63D3C04AAF for ; Thu, 16 May 2019 12:37:50 +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 ABDB420815 for ; Thu, 16 May 2019 12:37:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ABDB420815 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]:54103 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hRFdu-0007zM-0E for qemu-devel@archiver.kernel.org; Thu, 16 May 2019 08:37:50 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49155) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hRFNM-0001dW-Dm for qemu-devel@nongnu.org; Thu, 16 May 2019 08:20:47 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hRFNJ-0002mq-Ct for qemu-devel@nongnu.org; Thu, 16 May 2019 08:20:44 -0400 Received: from mail-qt1-f196.google.com ([209.85.160.196]:33319) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hRFNJ-0002mY-9w for qemu-devel@nongnu.org; Thu, 16 May 2019 08:20:41 -0400 Received: by mail-qt1-f196.google.com with SMTP id m32so3618442qtf.0 for ; Thu, 16 May 2019 05:20:41 -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:content-transfer-encoding :in-reply-to; bh=RTRIxsVKqqdz/HWRVEdKM6QUXrcO4t5UGM0Rdb91dxE=; b=DwcQ9hwemOVQ6EiNDi/UHImVwAZqfmF5IGZAmnXFHOubcIwjavLGCyOrB230PbdoLE 5HfS1CNG3sqBkNuPkgfR2xu8AH6PBD2slVNr762fdPuNVpiuFmhBX4fu7eeLbjAb6hZE vLKAQykL6HyF1lSKKpuUuj4LBvFgDR3vWOWRnqMYZlY4AxtKRIyYGuTt7mWUQ/3+4Mn0 Bu1WHhihXop6TXKxy68RQQ4oPERz5GnpoYzuDBO7Qn024g2Z+FkrkEDi2r5Bil3CT0+f va7gu5CsKanvY0s2HlbJM0VXuqO2rUJzy9e4D7v7jIVFIU4n4GrDPtp1eaKW3HhAhgXt 8vcQ== X-Gm-Message-State: APjAAAWb/sHIyq6XxoKlGRxgeYiohdj6aExTPFwsutggpBU6mpuv8+n8 jV+YHwIGpZG/3q4rHF7yyFnZmNk0kRs= X-Google-Smtp-Source: APXvYqwQeqEj7MLEu9Ulm6/kIEb3bFUMDWBZSbWMTCnBKZ9X9iBAXOuSDLQqhOXSkzeAe/CZWONXwQ== X-Received: by 2002:ac8:2fa8:: with SMTP id l37mr41089622qta.52.1558009240527; Thu, 16 May 2019 05:20:40 -0700 (PDT) Received: from redhat.com ([185.54.206.10]) by smtp.gmail.com with ESMTPSA id t2sm2402127qkm.11.2019.05.16.05.20.37 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Thu, 16 May 2019 05:20:39 -0700 (PDT) Date: Thu, 16 May 2019 08:20:35 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1556808723-226478-7-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 Content-Transfer-Encoding: 8bit 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.196 Subject: [Qemu-devel] [PULL 28/37] tests: acpi: skip FACS table if board uses hw reduced ACPI profile 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 , Paolo Bonzini , Igor Mammedov , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190516122035.aMzMZ-eHviHXjzNqYoczQZWzmVIlnox7izMfVgIrQzU@z> From: Igor Mammedov If FADT has HW_REDUCED_ACPI flag set, do not attempt to fetch FACS as it's not provided by the board. Signed-off-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Wei Yang Message-Id: <1556808723-226478-7-git-send-email-imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/bios-tables-test.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index d165a1bd62..e2fc34143d 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -147,9 +147,13 @@ static void test_acpi_fadt_table(test_data *data) g_assert(compare_signature(&table, "FACP")); /* Since DSDT/FACS isn't in RSDT, add them to ASL test list manually */ - acpi_fetch_table(data->qts, &table.aml, &table.aml_len, - fadt_aml + 36 /* FIRMWARE_CTRL */, 4, "FACS", false); - g_array_append_val(data->tables, table); + memcpy(&val, fadt_aml + 112 /* Flags */, 4); + val = le32_to_cpu(val); + if (!(val & 1UL << 20 /* HW_REDUCED_ACPI */)) { + acpi_fetch_table(data->qts, &table.aml, &table.aml_len, + 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); -- 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, 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 DE4D9C04AAC for ; Mon, 20 May 2019 23:45:01 +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 B008F21479 for ; Mon, 20 May 2019 23:45:01 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B008F21479 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]:43810 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hSrxk-00019X-Qh for qemu-devel@archiver.kernel.org; Mon, 20 May 2019 19:45:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45191) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hSrRE-0007nK-JM for qemu-devel@nongnu.org; Mon, 20 May 2019 19:11:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hSrRD-0008JU-Og for qemu-devel@nongnu.org; Mon, 20 May 2019 19:11:24 -0400 Received: from mail-qt1-f195.google.com ([209.85.160.195]:44765) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hSrRD-0008JO-Ku for qemu-devel@nongnu.org; Mon, 20 May 2019 19:11:23 -0400 Received: by mail-qt1-f195.google.com with SMTP id f24so18319260qtk.11 for ; Mon, 20 May 2019 16:11:23 -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:content-transfer-encoding :in-reply-to; bh=RTRIxsVKqqdz/HWRVEdKM6QUXrcO4t5UGM0Rdb91dxE=; b=jyu+FkF7i05I8Vu46anedF9on3MUFNm7oWG4BVzKORcEq3IiSl43MnkayT9Ru4KGxK 2ameI2w2qZyFQcaDE4Sgr6KPV8vvlnW5y6PiqW+BiNsstKHFazvYgiNHMZg24MYkpzue a/E0YY9mrBOJ40Koz7bj0BEktkEv/7yAeExb+FE6Luw1vLb1RQv4Ci4VltaDBX0iX3WE UjYgcO9nTF9q23H1hB9URYhp8AGSqLwt+Yn54zS0pRkrAz3GoVAJ4h2aEKLtzucpMGa8 2IBWXUEUEpNg02TQogwJbOajvrPs5ekGNmu3vcCwvMUU0O9PBX2N5VHcYfGuyyB2HC3S /6mA== X-Gm-Message-State: APjAAAXWmNfC5hQ60LHaVixib9CfqtRLzQ/lKcQswJrAqttZ7XGBzSK8 t9X4kUCEHc53t0HExWPCGquh9vDj1Rs= X-Google-Smtp-Source: APXvYqyPW3rvgR0EDfQOLmJ26yF4BMuEdOZmnKHL4DStmURZIzO1J3b5kJh20iF9OICPghykgGaeqQ== X-Received: by 2002:a0c:9ac8:: with SMTP id k8mr62251227qvf.132.1558393882954; Mon, 20 May 2019 16:11:22 -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 t187sm1528417qkh.10.2019.05.20.16.11.21 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 20 May 2019 16:11:22 -0700 (PDT) Date: Mon, 20 May 2019 19:11:21 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Message-ID: <1556808723-226478-7-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 Content-Transfer-Encoding: 8bit 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.195 Subject: [Qemu-devel] [PULL v2 27/36] tests: acpi: skip FACS table if board uses hw reduced ACPI profile 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 , Paolo Bonzini , Igor Mammedov , Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190520231121.8RDRw8W72NiZuu7R-lW5KDvnBVtvZ7oX5yARBUENK8c@z> From: Igor Mammedov If FADT has HW_REDUCED_ACPI flag set, do not attempt to fetch FACS as it's not provided by the board. Signed-off-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Wei Yang Message-Id: <1556808723-226478-7-git-send-email-imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- tests/bios-tables-test.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/bios-tables-test.c b/tests/bios-tables-test.c index d165a1bd62..e2fc34143d 100644 --- a/tests/bios-tables-test.c +++ b/tests/bios-tables-test.c @@ -147,9 +147,13 @@ static void test_acpi_fadt_table(test_data *data) g_assert(compare_signature(&table, "FACP")); /* Since DSDT/FACS isn't in RSDT, add them to ASL test list manually */ - acpi_fetch_table(data->qts, &table.aml, &table.aml_len, - fadt_aml + 36 /* FIRMWARE_CTRL */, 4, "FACS", false); - g_array_append_val(data->tables, table); + memcpy(&val, fadt_aml + 112 /* Flags */, 4); + val = le32_to_cpu(val); + if (!(val & 1UL << 20 /* HW_REDUCED_ACPI */)) { + acpi_fetch_table(data->qts, &table.aml, &table.aml_len, + 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); -- MST