From patchwork Thu Jul 28 10:50:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 9251111 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 3539860757 for ; Thu, 28 Jul 2016 11:19:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 26B5C26D17 for ; Thu, 28 Jul 2016 11:19:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1B2212723E; Thu, 28 Jul 2016 11:19:00 +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 ABDF826D17 for ; Thu, 28 Jul 2016 11:18:59 +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 1bSjIo-0001nJ-1X; Thu, 28 Jul 2016 11:16:34 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bSjIn-0001n7-FY for xen-devel@lists.xen.org; Thu, 28 Jul 2016 11:16:33 +0000 Received: from [85.158.137.68] by server-4.bemta-3.messagelabs.com id 85/8C-15788-099E9975; Thu, 28 Jul 2016 11:16:32 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprIIsWRWlGSWpSXmKPExsXitHRDpO6ElzP DDa5vErdY8nExiwOjx9Hdv5kCGKNYM/OS8isSWDN2fP3JXHBLsWLL91bmBsYfUl2MnBwSAv4S jd/fsILYbAIGEiumX2UEsUUEZCVWd81h72Lk4mAWOMIocevmT7CEsIC1xI7OFywgNouAqsTVL 7OYQWxeAXuJk0/3sUAMlZNoOH8fLM4JFF95+D47iC0kYCdxaONCZghbTeLGwmUsEL2CEidnPg GzmQUkJA6+eMEMMYdb4vbpqcwTGPlmISmbhaRsASPTKkb14tSistQiXVO9pKLM9IyS3MTMHF1 DA2O93NTi4sT01JzEpGK95PzcTYzAoKpnYGDcwXj5q9MhRkkOJiVR3rDQmeFCfEn5KZUZicUZ 8UWlOanFhxhlODiUJHgFXgDlBItS01Mr0jJzgOENk5bg4FES4X38HCjNW1yQmFucmQ6ROsWoK CXOKw/SJwCSyCjNg2uDxdQlRlkpYV5GBgYGIZ6C1KLczBJU+VeM4hyMSsK8mSBTeDLzSuCmvw JazAS0uDh2BsjikkSElFQD44rEvIYTq51rzqdbPHpfEC6xfu3j3aIW5vMY8r/HOLdYbp7Pl7u se/2k1fc/zF6voVry91/OpnihsuMuO4TsT+m2Kim9mizncrQkyW1615u16XXF0kUb/y1T3xbi 8LPgS9qKQv7lXHMP9jwLLk9Zv3p567NTDNe7LnHHmRaY159o0+zevzPslBJLcUaioRZzUXEiA EX4koakAgAA X-Env-Sender: prvs=0100a76d6=anthony.perard@citrix.com X-Msg-Ref: server-11.tower-31.messagelabs.com!1469704590!26604443!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 64365 invoked from network); 28 Jul 2016 11:16:32 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-11.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 28 Jul 2016 11:16:32 -0000 X-IronPort-AV: E=Sophos;i="5.28,433,1464652800"; d="scan'208";a="368933902" From: Anthony PERARD To: Date: Thu, 28 Jul 2016 11:50:09 +0100 Message-ID: <20160728105013.22310-12-anthony.perard@citrix.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20160728105013.22310-1-anthony.perard@citrix.com> References: <20160728105013.22310-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 v7 11/15] hvmloader: Load OVMF from 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 OVMF ROM into hvmloader anymore. Signed-off-by: Anthony PERARD Acked-by: Jan Beulich Reviewed-by: Andrew Cooper --- Change in V5: - define OVMF_END macro - fix some cast coding style Change in V4: - check if source and dest of ovmf binary does not overlaps Change in V3: - change makefile to not include ovmf rom into roms.inc. - update the struct bios_config with bios destination --- tools/firmware/hvmloader/Makefile | 15 +-------------- tools/firmware/hvmloader/ovmf.c | 31 ++++++++++++++----------------- 2 files changed, 15 insertions(+), 31 deletions(-) diff --git a/tools/firmware/hvmloader/Makefile b/tools/firmware/hvmloader/Makefile index ed0bfad..dee1c6b 100644 --- a/tools/firmware/hvmloader/Makefile +++ b/tools/firmware/hvmloader/Makefile @@ -43,7 +43,6 @@ endif CIRRUSVGA_DEBUG ?= n -OVMF_DIR := ../ovmf-dir ROMBIOS_DIR := ../rombios ifeq ($(CONFIG_ROMBIOS),y) @@ -61,12 +60,6 @@ ROMS := ifeq ($(CONFIG_OVMF),y) OBJS += ovmf.o CFLAGS += -DENABLE_OVMF -ifeq ($(OVMF_PATH),) - OVMF_ROM := $(OVMF_DIR)/ovmf.bin -else - OVMF_ROM := $(OVMF_PATH) -endif -ROMS += $(OVMF_ROM) endif ifeq ($(CONFIG_ROMBIOS),y) @@ -85,7 +78,7 @@ endif all: subdirs-all $(MAKE) hvmloader -ovmf.o rombios.o: roms.inc +rombios.o: roms.inc smbios.o: CFLAGS += -D__SMBIOS_DATE__="\"$(SMBIOS_REL_DATE)\"" hvmloader: $(OBJS) acpi/acpi.a @@ -102,12 +95,6 @@ ifneq ($(ROMBIOS_ROM),) echo "#endif" >> $@.new endif -ifneq ($(OVMF_ROM),) - echo "#ifdef ROM_INCLUDE_OVMF" >> $@.new - sh ./mkhex ovmf $(OVMF_ROM) >> $@.new - echo "#endif" >> $@.new -endif - ifneq ($(STDVGA_ROM),) echo "#ifdef ROM_INCLUDE_VGABIOS" >> $@.new sh ./mkhex vgabios_stdvga $(STDVGA_ROM) >> $@.new diff --git a/tools/firmware/hvmloader/ovmf.c b/tools/firmware/hvmloader/ovmf.c index 858a2d4..59d0e45 100644 --- a/tools/firmware/hvmloader/ovmf.c +++ b/tools/firmware/hvmloader/ovmf.c @@ -34,17 +34,11 @@ #include #include -#define ROM_INCLUDE_OVMF -#include "roms.inc" - -#define OVMF_SIZE (sizeof(ovmf)) #define OVMF_MAXOFFSET 0x000FFFFFULL -#define OVMF_BEGIN (0x100000000ULL - ((OVMF_SIZE + OVMF_MAXOFFSET) & ~OVMF_MAXOFFSET)) -#define OVMF_END (OVMF_BEGIN + OVMF_SIZE) +#define OVMF_END 0x100000000ULL #define LOWCHUNK_BEGIN 0x000F0000 #define LOWCHUNK_SIZE 0x00010000 #define LOWCHUNK_MAXOFFSET 0x0000FFFF -#define LOWCHUNK_END (OVMF_BEGIN + OVMF_SIZE) #define OVMF_INFO_PHYSICAL_ADDRESS 0x00001000 extern unsigned char dsdt_anycpu_qemu_xen[]; @@ -97,24 +91,31 @@ static void ovmf_load(const struct bios_config *config, void *bios_addr, uint32_t bios_length) { xen_pfn_t mfn; - uint64_t addr = OVMF_BEGIN; + uint64_t addr = OVMF_END + - ((bios_length + OVMF_MAXOFFSET) & ~OVMF_MAXOFFSET); + uint64_t ovmf_end = addr + bios_length; + + ovmf_config.bios_address = addr; + ovmf_config.image_size = bios_length; /* Copy low-reset vector portion. */ - memcpy((void *) LOWCHUNK_BEGIN, (uint8_t *) config->image - + OVMF_SIZE - - LOWCHUNK_SIZE, + memcpy((void *)LOWCHUNK_BEGIN, + (uint8_t *)bios_addr + bios_length - LOWCHUNK_SIZE, LOWCHUNK_SIZE); /* Ensure we have backing page prior to moving FD. */ - while ( (addr >> PAGE_SHIFT) != (OVMF_END >> PAGE_SHIFT) ) + while ( (addr >> PAGE_SHIFT) != (ovmf_end >> PAGE_SHIFT) ) { mfn = (uint32_t) (addr >> PAGE_SHIFT); addr += PAGE_SIZE; mem_hole_populate_ram(mfn, 1); } + /* Check that source and destination does not overlaps. */ + BUG_ON(addr + bios_length > (unsigned)bios_addr && + addr < (unsigned)bios_addr + bios_length); /* Copy FD. */ - memcpy((void *) OVMF_BEGIN, config->image, OVMF_SIZE); + memcpy((void *)ovmf_config.bios_address, bios_addr, bios_length); } static void ovmf_acpi_build_tables(void) @@ -151,10 +152,6 @@ static void ovmf_setup_e820(void) struct bios_config ovmf_config = { .name = "OVMF", - .image = ovmf, - .image_size = sizeof(ovmf), - - .bios_address = OVMF_BEGIN, .bios_load = ovmf_load, .load_roms = 0,