From patchwork Thu Feb 25 14:56:08 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 8424321 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 98D50C0553 for ; Thu, 25 Feb 2016 15:06:06 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C1AA42035E for ; Thu, 25 Feb 2016 15:06:05 +0000 (UTC) Received: from lists.xen.org (unknown [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 074C52034C for ; Thu, 25 Feb 2016 15:06:05 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1aYxRZ-0003a5-8e; Thu, 25 Feb 2016 15:03:05 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.84) (envelope-from ) id 1aYxRY-0003ZB-5T for xen-devel@lists.xen.org; Thu, 25 Feb 2016 15:03:04 +0000 Received: from [85.158.139.211] by server-17.bemta-5.messagelabs.com id CC/9A-03800-7A71FC65; Thu, 25 Feb 2016 15:03:03 +0000 X-Env-Sender: prvs=85652c963=anthony.perard@citrix.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1456412581!24709258!1 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 31175 invoked from network); 25 Feb 2016 15:03:02 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-6.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 25 Feb 2016 15:03:02 -0000 X-IronPort-AV: E=Sophos;i="5.22,498,1449532800"; d="scan'208";a="341083261" From: Anthony PERARD To: Date: Thu, 25 Feb 2016 14:56:08 +0000 Message-ID: <1456412174-20162-11-git-send-email-anthony.perard@citrix.com> X-Mailer: git-send-email 2.7.1 In-Reply-To: <1456412174-20162-1-git-send-email-anthony.perard@citrix.com> References: <1456412174-20162-1-git-send-email-anthony.perard@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Keir Fraser , Stefano Stabellini , Andrew Cooper , Ian Jackson , Jan Beulich , Anthony PERARD , Wei Liu Subject: [Xen-devel] [PATCH v3 10/16] hvmloader: Load SeaBIOS from hvm_start_info modules X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Spam-Status: No, score=-1.1 required=5.0 tests=BAYES_00,RDNS_NONE, UNPARSEABLE_RELAY autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP ... and do not include the SeaBIOS ROM into hvmloader anymore. This also fix the dependency on roms.inc, hvmloader.o does not include it. Signed-off-by: Anthony PERARD --- Change in V3: - change makefile to not include seabios roms into roms.inc. - update the struct bios_config with the location of the bios blob. --- tools/firmware/hvmloader/Makefile | 15 +-------------- tools/firmware/hvmloader/seabios.c | 24 ++++++++++++++---------- 2 files changed, 15 insertions(+), 24 deletions(-) diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index f2f4791..ed0bfad 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -45,7 +45,6 @@ CIRRUSVGA_DEBUG ?= n OVMF_DIR := ../ovmf-dir ROMBIOS_DIR := ../rombios -SEABIOS_DIR := ../seabios-dir ifeq ($(CONFIG_ROMBIOS),y) STDVGA_ROM := ../vgabios/VGABIOS-lgpl-latest.bin @@ -80,19 +79,13 @@ endif ifeq ($(CONFIG_SEABIOS),y) OBJS += seabios.o CFLAGS += -DENABLE_SEABIOS -ifeq ($(SEABIOS_PATH),) - SEABIOS_ROM := $(SEABIOS_DIR)/out/bios.bin -else - SEABIOS_ROM := $(SEABIOS_PATH) -endif -ROMS += $(SEABIOS_ROM) endif .PHONY: all all: subdirs-all $(MAKE) hvmloader -ovmf.o rombios.o seabios.o hvmloader.o: roms.inc +ovmf.o rombios.o: roms.inc smbios.o: CFLAGS += -D__SMBIOS_DATE__="\"$(SMBIOS_REL_DATE)\"" hvmloader: $(OBJS) acpi/acpi.a @@ -109,12 +102,6 @@ ifneq ($(ROMBIOS_ROM),) echo "#endif" >> $@.new endif -ifneq ($(SEABIOS_ROM),) - echo "#ifdef ROM_INCLUDE_SEABIOS" >> $@.new - sh ./mkhex seabios $(SEABIOS_ROM) >> $@.new - echo "#endif" >> $@.new -endif - ifneq ($(OVMF_ROM),) echo "#ifdef ROM_INCLUDE_OVMF" >> $@.new sh ./mkhex ovmf $(OVMF_ROM) >> $@.new diff --git a/tools/firmware/hvmloader/seabios.c b/tools/firmware/hvmloader/seabios.c index c6b3d9f..5d896e3 100644 --- a/tools/firmware/hvmloader/seabios.c +++ b/tools/firmware/hvmloader/seabios.c @@ -27,9 +27,6 @@ #include "smbios_types.h" #include "acpi/acpi2_0.h" -#define ROM_INCLUDE_SEABIOS -#include "roms.inc" - extern unsigned char dsdt_anycpu_qemu_xen[]; extern int dsdt_anycpu_qemu_xen_len; @@ -127,22 +124,29 @@ static void seabios_setup_e820(void) struct e820entry *e820 = scratch_alloc(sizeof(struct e820entry)*16, 0); info->e820 = (uint32_t)e820; + BUG_ON(seabios_config.bios_address == 0); /* SeaBIOS reserves memory in e820 as necessary so no low reservation. */ - info->e820_nr = build_e820_table(e820, 0, 0x100000-sizeof(seabios)); + info->e820_nr = build_e820_table(e820, 0, seabios_config.bios_address); dump_e820_table(e820, info->e820_nr); } -struct bios_config seabios_config = { - .name = "SeaBIOS", +static void seabios_load(const struct bios_config *bios, + void *bios_addr, uint32_t bios_length) +{ + unsigned int bios_dest = 0x100000 - bios_length; - .image = seabios, - .image_size = sizeof(seabios), + BUG_ON(bios_dest + bios_length > HVMLOADER_PHYSICAL_ADDRESS); + memcpy((void *)bios_dest, bios_addr, bios_length); + seabios_config.bios_address = bios_dest; + seabios_config.image_size = bios_length; +} - .bios_address = 0x100000 - sizeof(seabios), +struct bios_config seabios_config = { + .name = "SeaBIOS", .load_roms = NULL, - .bios_load = NULL, + .bios_load = seabios_load, .bios_info_setup = seabios_setup_bios_info, .bios_info_finish = seabios_finish_bios_info,