From: Anthony PERARD <anthony.perard@citrix.com>
To: xen-devel@lists.xen.org
Cc: Anthony PERARD <anthony.perard@citrix.com>,
Andrew Cooper <andrew.cooper3@citrix.com>,
Ian Jackson <ian.jackson@eu.citrix.com>,
Wei Liu <wei.liu2@citrix.com>, Jan Beulich <jbeulich@suse.com>
Subject: [PATCH v7 11/15] hvmloader: Load OVMF from modules
Date: Thu, 28 Jul 2016 11:50:09 +0100 [thread overview]
Message-ID: <20160728105013.22310-12-anthony.perard@citrix.com> (raw)
In-Reply-To: <20160728105013.22310-1-anthony.perard@citrix.com>
... and do not include the OVMF ROM into hvmloader anymore.
Signed-off-by: Anthony PERARD <anthony.perard@citrix.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---
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 <xen/hvm/ioreq.h>
#include <xen/memory.h>
-#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,
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-07-28 10:50 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-28 10:49 [PATCH v7 00/15] Load BIOS via toolstack instead of been embedded in hvmloader Anthony PERARD
2016-07-28 10:49 ` [PATCH v7 01/15] libxc: Rework extra module initialisation Anthony PERARD
2016-07-28 10:50 ` [PATCH v7 02/15] libxc: Prepare a start info structure for hvmloader Anthony PERARD
2016-07-28 10:50 ` [PATCH v7 03/15] configure: #define SEABIOS_PATH and OVMF_PATH Anthony PERARD
2016-07-28 10:50 ` [PATCH v7 04/15] firmware/makefile: install BIOS blob Anthony PERARD
2016-07-28 10:50 ` [PATCH v7 05/15] libxl: Load guest BIOS from file Anthony PERARD
2016-08-15 9:04 ` Shannon Zhao
2016-08-15 9:09 ` Wei Liu
2016-08-15 9:14 ` Shannon Zhao
2016-08-15 9:17 ` Wei Liu
2016-07-28 10:50 ` [PATCH v7 06/15] xen: Move the hvm_start_info C representation to the public headers Anthony PERARD
2016-07-28 13:23 ` Andrew Cooper
2016-08-03 15:43 ` Jan Beulich
2016-07-28 10:50 ` [PATCH v7 07/15] hvmloader: Grab the hvm_start_info pointer Anthony PERARD
2016-07-28 14:09 ` Andrew Cooper
2016-07-28 10:50 ` [PATCH v7 08/15] hvmloader: Locate the BIOS blob Anthony PERARD
2016-07-28 13:44 ` Andrew Cooper
2016-08-02 18:14 ` Anthony PERARD
2016-07-28 10:50 ` [PATCH v7 09/15] hvmloader: Check modules whereabouts in perform_tests Anthony PERARD
2016-07-28 14:08 ` Andrew Cooper
2016-08-02 18:34 ` Anthony PERARD
2016-07-28 10:50 ` [PATCH v7 10/15] hvmloader: Load SeaBIOS from hvm_start_info modules Anthony PERARD
2016-07-28 14:09 ` Andrew Cooper
2016-07-28 10:50 ` Anthony PERARD [this message]
2016-07-28 14:11 ` [PATCH v7 11/15] hvmloader: Load OVMF from modules Andrew Cooper
2016-07-28 10:50 ` [PATCH v7 12/15] hvmloader: bios->bios_load() now needs to be defined Anthony PERARD
2016-07-28 10:50 ` [PATCH v7 13/15] hvmloader: Always build-in SeaBIOS and OVMF loader Anthony PERARD
2016-07-28 10:50 ` [PATCH v7 14/15] configure: do not depend on SEABIOS_PATH or OVMF_PATH Anthony PERARD
2016-07-28 10:50 ` [PATCH v7 15/15] docs/misc/hvmlite: Point to the canonical definition of hvm_start_info Anthony PERARD
2016-08-01 12:29 ` Jan Beulich
2016-07-29 5:28 ` [PATCH v7 00/15] Load BIOS via toolstack instead of been embedded in hvmloader Boris Ostrovsky
2016-07-29 8:29 ` Wei Liu
2016-07-29 14:36 ` Boris Ostrovsky
2016-07-29 14:50 ` Wei Liu
2016-07-29 14:57 ` Boris Ostrovsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160728105013.22310-12-anthony.perard@citrix.com \
--to=anthony.perard@citrix.com \
--cc=andrew.cooper3@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=jbeulich@suse.com \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.