From patchwork Wed Aug 10 16:51:25 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Berger X-Patchwork-Id: 109416 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id ACC30B6F68 for ; Thu, 11 Aug 2011 03:43:23 +1000 (EST) Received: from localhost ([::1]:47003 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrC1V-00019p-4T for incoming@patchwork.ozlabs.org; Wed, 10 Aug 2011 12:52:53 -0400 Received: from eggs.gnu.org ([140.186.70.92]:53998) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrC0q-00087z-GX for qemu-devel@nongnu.org; Wed, 10 Aug 2011 12:52:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QrC0k-0004MX-As for qemu-devel@nongnu.org; Wed, 10 Aug 2011 12:52:12 -0400 Received: from e33.co.us.ibm.com ([32.97.110.151]:46563) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QrC0i-0004LQ-R2 for qemu-devel@nongnu.org; Wed, 10 Aug 2011 12:52:05 -0400 Received: from d03relay01.boulder.ibm.com (d03relay01.boulder.ibm.com [9.17.195.226]) by e33.co.us.ibm.com (8.14.4/8.13.1) with ESMTP id p7AGi9p4002164 for ; Wed, 10 Aug 2011 10:44:09 -0600 Received: from d03av02.boulder.ibm.com (d03av02.boulder.ibm.com [9.17.195.168]) by d03relay01.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p7AGplLX094638 for ; Wed, 10 Aug 2011 10:51:47 -0600 Received: from d03av02.boulder.ibm.com (loopback [127.0.0.1]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p7AApFUT026787 for ; Wed, 10 Aug 2011 04:51:18 -0600 Received: from localhost.localdomain (d941e-10.watson.ibm.com [9.59.241.154]) by d03av02.boulder.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id p7AApB83026447 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 10 Aug 2011 04:51:12 -0600 Received: from localhost.localdomain (d941e-10 [127.0.0.1]) by localhost.localdomain (8.14.4/8.14.3) with ESMTP id p7AGpcN5006027; Wed, 10 Aug 2011 12:51:38 -0400 Received: (from root@localhost) by localhost.localdomain (8.14.4/8.14.4/Submit) id p7AGpc4e006022; Wed, 10 Aug 2011 12:51:38 -0400 Message-Id: <20110810165138.181859246@linux.vnet.ibm.com> User-Agent: quilt/0.48-1 Date: Wed, 10 Aug 2011 12:51:25 -0400 From: Stefan Berger To: stefanb@linux.vnet.ibm.com, seabios@seabios.org References: <20110810165122.639452836@linux.vnet.ibm.com> Content-Disposition: inline; filename=acpi_get_rsdp.diff X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) X-Received-From: 32.97.110.151 Cc: qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH V6 3/9] Add public get_rsdp function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This patch adds a global get_rsdp() function call and refactors find_resume_vector() to call it. Signed-off-by: Stefan Berger --- src/acpi.c | 12 ++++++++++-- src/acpi.h | 1 + 2 files changed, 11 insertions(+), 2 deletions(-) Index: seabios/src/acpi.c =================================================================== --- seabios.orig/src/acpi.c +++ seabios/src/acpi.c @@ -719,11 +719,19 @@ acpi_bios_init(void) dprintf(1, "ACPI tables: RSDP=%p RSDT=%p\n", rsdp, rsdt); } -u32 -find_resume_vector(void) +struct rsdp_descriptor * +get_rsdp(void) { dprintf(4, "rsdp=%p\n", RsdpAddr); if (!RsdpAddr || RsdpAddr->signature != RSDP_SIGNATURE) + return 0; + return RsdpAddr; +} + +u32 +find_resume_vector(void) +{ + if (!get_rsdp()) return 0; struct rsdt_descriptor_rev1 *rsdt = (void*)RsdpAddr->rsdt_physical_address; dprintf(4, "rsdt=%p\n", rsdt); Index: seabios/src/acpi.h =================================================================== --- seabios.orig/src/acpi.h +++ seabios/src/acpi.h @@ -4,6 +4,7 @@ #include "types.h" // u32 void acpi_bios_init(void); +struct rsdp_descriptor *get_rsdp(); u32 find_resume_vector(void); #define RSDP_SIGNATURE 0x2052545020445352LL // "RSD PTR "