From patchwork Wed Jun 22 17:15:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 9193415 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 9330360890 for ; Wed, 22 Jun 2016 17:48:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 88E4E28408 for ; Wed, 22 Jun 2016 17:48:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 79F8728418; Wed, 22 Jun 2016 17:48:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E64BC28413 for ; Wed, 22 Jun 2016 17:48:21 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bFmEJ-0007uW-Dr; Wed, 22 Jun 2016 17:46:23 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bFmEH-0007u1-NX for xen-devel@lists.xen.org; Wed, 22 Jun 2016 17:46:21 +0000 Received: from [85.158.137.68] by server-15.bemta-3.messagelabs.com id 58/7D-30131-CEECA675; Wed, 22 Jun 2016 17:46:20 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprAIsWRWlGSWpSXmKPExsXitHSDve6bc1n hBgtWClos+biYxYHR4+ju30wBjFGsmXlJ+RUJrBlT/zxhLJglW7H0XVUD40WJLkZODgkBf4kf j08zgdhsAgYSK6ZfZQSxRQRkJVZ3zWHvYuTiYBY4wihx6+ZPsISwgK/EomU7WbsYOThYBFQl7 uyvAQnzCthJ3Hg2lw1ippxEw/n7zCA2J1B82asesLiQgK3E7QULGCFsNYkbC5exQPQKSpyc+Q TMZhaQkDj44gUzxBxuidunpzJPYOSbhaRsFpKyBYxMqxg1ilOLylKLdA1N9ZKKMtMzSnITM3N 0DQ2M9XJTi4sT01NzEpOK9ZLzczcxAkOKAQh2MK7Z7nmIUZKDSUmUl3FbVrgQX1J+SmVGYnFG fFFpTmrxIUYZDg4lCd5rZ4FygkWp6akVaZk5wOCGSUtw8CiJ8IoBA1yIt7ggMbc4Mx0idYpRU Uqc9xtInwBIIqM0D64NFlGXGGWlhHkZgQ4R4ilILcrNLEGVf8UozsGoJMz7GGQKT2ZeCdz0V0 CLmYAWL+tPB1lckoiQkmpgVFv5+bO9bm7m3c3Oi1hYihdac07MD71wQVH38ttpfjMqvz968eB Ek8qmcg9f359vWP7Ls9dxsPzzt4lUK31h9v/XUbsvk7iP1F/nFD59U27vxuTpTUYPj1f7Nc7r rFHflJ1RtmXzhVsTLz6avCPMwWnj766g5Sliscsv25/kdN43wXADV5/+ViWW4oxEQy3mouJEA BXfU+ujAgAA X-Env-Sender: prvs=9742ee4c2=anthony.perard@citrix.com X-Msg-Ref: server-5.tower-31.messagelabs.com!1466617578!43535765!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: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 589 invoked from network); 22 Jun 2016 17:46:19 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-5.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 22 Jun 2016 17:46:19 -0000 X-IronPort-AV: E=Sophos;i="5.26,509,1459814400"; d="scan'208";a="369024777" From: Anthony PERARD To: Date: Wed, 22 Jun 2016 18:15:41 +0100 Message-ID: <20160622171545.5304-11-anthony.perard@citrix.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160622171545.5304-1-anthony.perard@citrix.com> References: <20160622171545.5304-1-anthony.perard@citrix.com> MIME-Version: 1.0 X-DLP: MIA2 Cc: Anthony PERARD , Andrew Cooper , Ian Jackson , Wei Liu , Jan Beulich Subject: [Xen-devel] [PATCH v5 10/14] 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-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 Acked-by: Jan Beulich --- Change in V5: - update BUG_ON in seabios_setup_e820(). Change in V4: - check that seabios_config.bios_address have a probably good value instead of checking only if it's set. 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 | 25 +++++++++++++++---------- 2 files changed, 16 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..c5d2b34 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,30 @@ static void seabios_setup_e820(void) struct e820entry *e820 = scratch_alloc(sizeof(struct e820entry)*16, 0); info->e820 = (uint32_t)e820; + /* Upper boundary already checked by seabios_load(). */ + BUG_ON(seabios_config.bios_address < 0x000c0000); /* 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,