From patchwork Tue Jun 15 03:51:16 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Isaku Yamahata X-Patchwork-Id: 55604 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6CFA21007D2 for ; Tue, 15 Jun 2010 13:57:44 +1000 (EST) Received: from localhost ([127.0.0.1]:58064 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OONHR-0002EQ-W2 for incoming@patchwork.ozlabs.org; Mon, 14 Jun 2010 23:57:42 -0400 Received: from [140.186.70.92] (port=39603 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OONEm-0000Uh-7P for qemu-devel@nongnu.org; Mon, 14 Jun 2010 23:54:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OONEk-0006mR-TZ for qemu-devel@nongnu.org; Mon, 14 Jun 2010 23:54:56 -0400 Received: from mail.valinux.co.jp ([210.128.90.3]:49060) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OONEk-0006mH-ID for qemu-devel@nongnu.org; Mon, 14 Jun 2010 23:54:54 -0400 Received: from ps.local.valinux.co.jp (vagw.valinux.co.jp [210.128.90.14]) by mail.valinux.co.jp (Postfix) with SMTP id 9F629187C1; Tue, 15 Jun 2010 12:54:53 +0900 (JST) Received: (nullmailer pid 5931 invoked by uid 1000); Tue, 15 Jun 2010 03:51:16 -0000 Date: Tue, 15 Jun 2010 12:51:16 +0900 From: Isaku Yamahata To: seabios Message-ID: <20100615035116.GW23473@valinux.co.jp> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) X-Virus-Scanned: clamav-milter 0.95.2 at va-mail.local.valinux.co.jp X-Virus-Status: Clean X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH] seabios: acpi: allow qemu to load dsdt as external acpi table. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org allow qemu to load dsdt as external acpi table. Signed-off-by: Isaku Yamahata --- src/acpi.c | 27 +++++++++++++++++++++++++-- 1 files changed, 25 insertions(+), 2 deletions(-) diff --git a/src/acpi.c b/src/acpi.c index 0559443..254e43b 100644 --- a/src/acpi.c +++ b/src/acpi.c @@ -126,6 +126,11 @@ struct fadt_descriptor_rev1 } PACKED; /* + * Differentiated System Descrition Table (DSDT) + */ +#define DSDT_SIGNATURE 0x54445344 // DSDT + +/* * MADT values and structures */ @@ -280,6 +285,11 @@ static inline u32 cpu_to_le32(u32 x) return x; } +static inline u32 le32_to_cpu(u32 x) +{ + return x; +} + static void build_header(struct acpi_table_header *h, u32 sig, int len, u8 rev) { @@ -634,7 +644,8 @@ acpi_bios_init(void) } while(0) // Add tables - ACPI_INIT_TABLE(build_fadt(bdf)); + struct fadt_descriptor_rev1 *fadt = build_fadt(bdf); + ACPI_INIT_TABLE(fadt); ACPI_INIT_TABLE(build_ssdt()); ACPI_INIT_TABLE(build_madt()); ACPI_INIT_TABLE(build_hpet()); @@ -649,7 +660,19 @@ acpi_bios_init(void) warn_noalloc(); continue; } - ACPI_INIT_TABLE(qemu_cfg_next_acpi_table_load(addr, len)); + struct acpi_table_header *header = + qemu_cfg_next_acpi_table_load(addr, len); + if (header->signature == DSDT_SIGNATURE) { + if (fadt) { + free((void*)le32_to_cpu(fadt->dsdt)); + fadt->dsdt = cpu_to_le32((u32)addr); + fadt->checksum -= checksum(fadt, sizeof(*fadt)); + header->checksum -= checksum(header, len); + dprintf(1, "ACPI DSDT=%p\n", addr); + } + } else { + ACPI_INIT_TABLE(header); + } if (tbl_idx == MAX_ACPI_TABLES) { warn_noalloc(); break;