From patchwork Tue Jul 12 14:42:47 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 9225549 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 D23036086B for ; Tue, 12 Jul 2016 14:49:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C37CC27D29 for ; Tue, 12 Jul 2016 14:49:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B847A27DCD; Tue, 12 Jul 2016 14:49:16 +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 32C6E27D29 for ; Tue, 12 Jul 2016 14:49:16 +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 1bMyxd-0004QV-In; Tue, 12 Jul 2016 14:46:57 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bMyxc-0004PU-Ff for xen-devel@lists.xen.org; Tue, 12 Jul 2016 14:46:56 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id E1/4B-30934-FD205875; Tue, 12 Jul 2016 14:46:55 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprAIsWRWlGSWpSXmKPExsXitHRDpO59ptZ wg43nBCyWfFzM4sDocXT3b6YAxijWzLyk/IoE1ox1jxcwFtyRrehtcWpgbJfsYuTkkBDwl7i9 7iMTiM0mYCCxYvpVRhBbREBWYnXXHPYuRi4OZoEjjBK3bv4ESwgL+EosO9jJDGKzCKhKNG+7B GbzCthK7O2bwAYxVE6i4fx9sDgnULyt9SmYLSRgI7F26SxWCFtN4sbCZSwQvYISJ2c+AbOZBS QkDr54AVTPATSHW+Jvt/0ERr5ZSKpmIalawMi0ilGjOLWoLLVI19BIL6koMz2jJDcxM0fX0NB ELze1uDgxPTUnMalYLzk/dxMjMKQYgGAH49lpzocYJTmYlER5m5lbwoX4kvJTKjMSizPii0pz UosPMcpwcChJ8J5kbA0XEixKTU+tSMvMAQY3TFqCg0dJhHczSJq3uCAxtzgzHSJ1ilFRSpz3O EhCACSRUZoH1waLqEuMslLCvIxAhwjxFKQW5WaWoMq/YhTnYFQS5p0OMoUnM68EbvoroMVMQI trHZpBFpckIqSkGhjVVb76WRT9uKiw79CTF63zJkYKSh5l7lV1rxDj5O8IFEnW7Jh8+OsVzV8 qSQ/f6UdnLOa7cn4fe+PuW3dyvZRTs8+VHTANeVz1O+dRV9DFyk9Mzn+qjxbfa7mYrLvmzWrH 5Rq/ns+ea6o0X3NxuKt6M6t/U8aEpTk2Bo3tpdv/WZWb2M3hX6fEUpyRaKjFXFScCACoIanGo wIAAA== X-Env-Sender: prvs=994f31c19=anthony.perard@citrix.com X-Msg-Ref: server-4.tower-27.messagelabs.com!1468334811!52459129!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 8.77; banners=-,-,- X-VirusChecked: Checked Received: (qmail 30930 invoked from network); 12 Jul 2016 14:46:55 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-4.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 12 Jul 2016 14:46:55 -0000 X-IronPort-AV: E=Sophos;i="5.28,352,1464652800"; d="scan'208";a="365726892" From: Anthony PERARD To: Date: Tue, 12 Jul 2016 15:42:47 +0100 Message-ID: <20160712144251.558-11-anthony.perard@citrix.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160712144251.558-1-anthony.perard@citrix.com> References: <20160712144251.558-1-anthony.perard@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Anthony PERARD , Andrew Cooper , Ian Jackson , Wei Liu , Jan Beulich Subject: [Xen-devel] [PATCH v6 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 V6: acked 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,