From patchwork Tue Mar 26 13:09:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Igor Mammedov X-Patchwork-Id: 1065588 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44TBqk3kFdz9sSX for ; Wed, 27 Mar 2019 00:31:46 +1100 (AEDT) Received: from localhost ([127.0.0.1]:60015 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8mB6-0007K5-3A for incoming@patchwork.ozlabs.org; Tue, 26 Mar 2019 09:31:44 -0400 Received: from eggs.gnu.org ([209.51.188.92]:42524) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8lyl-0005TR-JH for qemu-devel@nongnu.org; Tue, 26 Mar 2019 09:19:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h8lqZ-0000Tu-LC for qemu-devel@nongnu.org; Tue, 26 Mar 2019 09:10:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45840) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h8lqZ-0000RR-DJ for qemu-devel@nongnu.org; Tue, 26 Mar 2019 09:10:31 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A485C58E4E; Tue, 26 Mar 2019 13:10:25 +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 D3B7583186; Tue, 26 Mar 2019 13:10:23 +0000 (UTC) From: Igor Mammedov To: qemu-devel@nongnu.org Date: Tue, 26 Mar 2019 14:09:50 +0100 Message-Id: <1553605799-168605-5-git-send-email-imammedo@redhat.com> In-Reply-To: <1553605799-168605-1-git-send-email-imammedo@redhat.com> References: <1553605799-168605-1-git-send-email-imammedo@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 26 Mar 2019 13:10:25 +0000 (UTC) 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 for 4.1 v2 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 , "Michael S. Tsirkin" , Laszlo Ersek , Shameer Kolothum , Shannon Zhao , Gonglei , Wei Yang , =?utf-8?q?Philippe_Mathieu-?= =?utf-8?b?RGF1ZMOp?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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é --- v2: add 'val = 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é ) --- 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 = 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 */; g_assert(compare_signature(&table, "FACP")); @@ -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); + memcpy(&val, fadt_aml + dsdt_offset, 4); + val = le32_to_cpu(val); + if (!val) { + dsdt_offset = 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); memset(fadt_aml + 36, 0, 4); /* sanitize FIRMWARE_CTRL ptr */