From patchwork Thu Jul 19 18:53:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 172047 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4240A2C00B0 for ; Fri, 20 Jul 2012 05:53:51 +1000 (EST) Received: from localhost ([::1]:34245 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrvsU-0001ZI-JL for incoming@patchwork.ozlabs.org; Thu, 19 Jul 2012 14:55:10 -0400 Received: from eggs.gnu.org ([208.118.235.92]:43799) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Srvrk-0007mR-Bn for qemu-devel@nongnu.org; Thu, 19 Jul 2012 14:54:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Srvrh-0008Cz-Pq for qemu-devel@nongnu.org; Thu, 19 Jul 2012 14:54:24 -0400 Received: from vms173003pub.verizon.net ([206.46.173.3]:25847) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Srvrh-0008Cm-Kk for qemu-devel@nongnu.org; Thu, 19 Jul 2012 14:54:21 -0400 Received: from wf-rch.minyard.home ([unknown] [173.57.151.210]) by vms173003.mailsrvcs.net (Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16 2009)) with ESMTPA id <0M7F000QO8HHO0GB@vms173003.mailsrvcs.net> for qemu-devel@nongnu.org; Thu, 19 Jul 2012 13:53:45 -0500 (CDT) Received: from i.minyard.home (i2.minyard.home [192.168.27.116]) by wf-rch.minyard.home (Postfix) with ESMTP id 6BD631F950; Thu, 19 Jul 2012 13:53:36 -0500 (CDT) Received: by i.minyard.home (Postfix, from userid 1000) id 93E9E7FF45; Thu, 19 Jul 2012 13:53:35 -0500 (CDT) From: minyard@acm.org To: qemu-devel@nongnu.org Date: Thu, 19 Jul 2012 13:53:17 -0500 Message-id: <1342724013-1633-3-git-send-email-minyard@acm.org> X-Mailer: git-send-email 1.7.4.1 In-reply-to: <1342724013-1633-1-git-send-email-minyard@acm.org> References: <1342724013-1633-1-git-send-email-minyard@acm.org> X-detected-operating-system: by eggs.gnu.org: Solaris 10 (1203?) X-Received-From: 206.46.173.3 Cc: Corey Minyard Subject: [Qemu-devel] [PATCH 02/18] pc: move SMBIOS setup to after device init 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 From: Corey Minyard Setting up the firmware interface for the SMBIOS table needs to be done later in the process, after device initialization, so that devices can add entries to the table. Signed-off-by: Corey Minyard --- hw/pc.c | 24 ++++++++++++++---------- hw/pc.h | 11 ++++++----- hw/pc_piix.c | 12 ++++++++---- 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/hw/pc.c b/hw/pc.c index fb1ad5b..bedd5be 100644 --- a/hw/pc.c +++ b/hw/pc.c @@ -970,21 +970,13 @@ void pc_cpus_init(const char *cpu_model) } } -void *pc_memory_init(MemoryRegion *system_memory, - const char *kernel_filename, - const char *kernel_cmdline, - const char *initrd_filename, +void pc_memory_init(MemoryRegion *system_memory, ram_addr_t below_4g_mem_size, ram_addr_t above_4g_mem_size, - MemoryRegion *rom_memory, MemoryRegion **ram_memory) { - int linux_boot, i; - MemoryRegion *ram, *option_rom_mr; + MemoryRegion *ram; MemoryRegion *ram_below_4g, *ram_above_4g; - void *fw_cfg; - - linux_boot = (kernel_filename != NULL); /* Allocate RAM. We allocate it as a single memory region and use * aliases to address portions of it, mostly for backwards compatibility @@ -1006,7 +998,17 @@ void *pc_memory_init(MemoryRegion *system_memory, memory_region_add_subregion(system_memory, 0x100000000ULL, ram_above_4g); } +} +void *pc_bios_init(const char *kernel_filename, + const char *kernel_cmdline, + const char *initrd_filename, + ram_addr_t below_4g_mem_size, + MemoryRegion *rom_memory) +{ + MemoryRegion *option_rom_mr; + void *fw_cfg; + int linux_boot, i; /* Initialize PC system firmware */ pc_system_firmware_init(rom_memory); @@ -1019,6 +1021,8 @@ void *pc_memory_init(MemoryRegion *system_memory, option_rom_mr, 1); + linux_boot = (kernel_filename != NULL); + fw_cfg = bochs_bios_init(); rom_set_fw(fw_cfg); diff --git a/hw/pc.h b/hw/pc.h index a662090..28c938e 100644 --- a/hw/pc.h +++ b/hw/pc.h @@ -106,14 +106,15 @@ void pc_register_ferr_irq(qemu_irq irq); void pc_acpi_smi_interrupt(void *opaque, int irq, int level); void pc_cpus_init(const char *cpu_model); -void *pc_memory_init(MemoryRegion *system_memory, - const char *kernel_filename, - const char *kernel_cmdline, - const char *initrd_filename, +void pc_memory_init(MemoryRegion *system_memory, ram_addr_t below_4g_mem_size, ram_addr_t above_4g_mem_size, - MemoryRegion *rom_memory, MemoryRegion **ram_memory); +void *pc_bios_init(const char *kernel_filename, + const char *kernel_cmdline, + const char *initrd_filename, + ram_addr_t below_4g_mem_size, + MemoryRegion *rom_memory); qemu_irq *pc_allocate_cpu_irq(void); DeviceState *pc_vga_init(ISABus *isa_bus, PCIBus *pci_bus); void pc_basic_device_init(ISABus *isa_bus, qemu_irq *gsi, diff --git a/hw/pc_piix.c b/hw/pc_piix.c index 98a06fa..4b4ee3d 100644 --- a/hw/pc_piix.c +++ b/hw/pc_piix.c @@ -178,10 +178,8 @@ static void pc_init1(MemoryRegion *system_memory, /* allocate ram and load rom/bios */ if (!xen_enabled()) { - fw_cfg = pc_memory_init(system_memory, - kernel_filename, kernel_cmdline, initrd_filename, - below_4g_mem_size, above_4g_mem_size, - pci_enabled ? rom_memory : system_memory, &ram_memory); + pc_memory_init(system_memory, below_4g_mem_size, + above_4g_mem_size, &ram_memory); } gsi_state = g_malloc0(sizeof(*gsi_state)); @@ -275,6 +273,12 @@ static void pc_init1(MemoryRegion *system_memory, pci_create_simple(pci_bus, piix3_devfn + 2, "piix3-usb-uhci"); } + if (!xen_enabled()) { + fw_cfg = pc_bios_init(kernel_filename, kernel_cmdline, + initrd_filename, below_4g_mem_size, + pci_enabled ? rom_memory : system_memory); + } + if (pci_enabled && acpi_enabled) { i2c_bus *smbus;