From patchwork Tue Nov 22 15:09:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 9441339 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 58BF2600BA for ; Tue, 22 Nov 2016 15:11:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 48890284C2 for ; Tue, 22 Nov 2016 15:11:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3D39D2859B; Tue, 22 Nov 2016 15:11:21 +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 609D7284C2 for ; Tue, 22 Nov 2016 15:11:20 +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 1c9Cgf-0005FR-Jq; Tue, 22 Nov 2016 15:08:45 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1c9Cgf-0005FK-67 for xen-devel@lists.xenproject.org; Tue, 22 Nov 2016 15:08:45 +0000 Received: from [85.158.139.211] by server-5.bemta-5.messagelabs.com id 42/9E-02084-C7F54385; Tue, 22 Nov 2016 15:08:44 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrKLMWRWlGSWpSXmKPExsVysyfVTbcq3iT C4PocTYvvWyYzOTB6HP5whSWAMYo1My8pvyKBNePea8+ClZoVlx5fZ25g3KfUxcjFISSwmVFi wcqN7BDOckaJvVs+ADmcHGwCuhI7br5mBrFFBNQlenZ9YQEpYhaYxyRx6k47C0hCWMBG4t3ro 2A2i4CqxN+Pi1m7GDk4eAWsJW4dkAAJSwjISTScvw82hxOofN+kJ2DlQkAl6x58ZZvAyL2AkW EVo3pxalFZapGupV5SUWZ6RkluYmaOrqGBqV5uanFxYnpqTmJSsV5yfu4mRqB3GYBgB+PaVud DjJIcTEqivIeXGkUI8SXlp1RmJBZnxBeV5qQWH2KU4eBQkuC9F2sSISRYlJqeWpGWmQMMM5i0 BAePkgjvMpA0b3FBYm5xZjpE6hSjopQ4b1AcUEIAJJFRmgfXBgvtS4yyUsK8jECHCPEUpBblZ pagyr9iFOdgVBLmjQeZwpOZVwI3/RXQYiagxZLfjEEWlyQipKQaGOPfHC4OKOWQcg09upnXrl V4kaoLc+LCMyIHZa1t+Ba4MTlPuGfHXeyWEPV1rmf6l8+OtT9lHzd4XxH2rducny6u5ihl/fb a6y+R+15cehf8dGZa0sFCoWX8hmzzU5M/7P2Zkq0x51GLdESHq3Azw9GlB1mqVSZ4Tz/B+/L3 4aapXJbVfetllViKMxINtZiLihMB6YBuSGgCAAA= X-Env-Sender: andre.przywara@arm.com X-Msg-Ref: server-13.tower-206.messagelabs.com!1479827318!56058325!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 9.0.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15802 invoked from network); 22 Nov 2016 15:08:38 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-13.tower-206.messagelabs.com with SMTP; 22 Nov 2016 15:08:38 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id AF8AC1515; Tue, 22 Nov 2016 07:08:41 -0800 (PST) Received: from e104803-lin.lan (unknown [10.1.207.46]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4911B3F24D; Tue, 22 Nov 2016 07:08:40 -0800 (PST) From: Andre Przywara To: Mark Rutland Date: Tue, 22 Nov 2016 15:09:14 +0000 Message-Id: <20161122150917.16524-2-andre.przywara@arm.com> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20161122150917.16524-1-andre.przywara@arm.com> References: <20161122150917.16524-1-andre.przywara@arm.com> Cc: Stefano Stabellini , Catalin Marinas , Julien Grall , linux-arm-kernel@lists.infradead.org, Ian Campbell , xen-devel@lists.xenproject.org, Christoffer Dall Subject: [Xen-devel] [PATCH v2 1/4] Support for building in a Xen binary 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: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Christoffer Dall Add support for building a Xen binary which includes a Dom0 image and the Dom0 command-line. If the user specifies --with-xen=, where Xen is an appropriate AArch64 Xen binary, the build system will generate a xen-system.axf instead of a linux-system.axf. Original patch from Ian Campbell, but I modified most of it so all bugs are probably mine. [Andre: adapt to newest boot-wrapper branch, increase load address, fixup Xen image file test] Cc: Ian Campbell Signed-off-by: Christoffer Dall Signed-off-by: Andre Przywara Tested-by: Konrad Rzeszutek Wilk Reviewed-by: Konrad Rzeszutek Wilk Reviewed-by: Julien Grall --- .gitignore | 1 + Makefile.am | 10 +++++++--- boot_common.c | 4 ++-- configure.ac | 17 +++++++++++++++++ model.lds.S | 14 ++++++++++++++ 5 files changed, 41 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 8653852..80770c0 100644 --- a/.gitignore +++ b/.gitignore @@ -14,6 +14,7 @@ configure dtc fdt.dtb Image +Xen install-sh Makefile Makefile.in diff --git a/Makefile.am b/Makefile.am index 692d2cc..f8b9ec9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -85,7 +85,6 @@ TEXT_LIMIT := 0x80080000 endif LD_SCRIPT := model.lds.S -IMAGE := linux-system.axf FS_OFFSET := 0x10000000 FILESYSTEM_START:= $(shell echo $$(($(PHYS_OFFSET) + $(FS_OFFSET)))) @@ -94,6 +93,11 @@ FILESYSTEM_END := $(shell echo $$(($(FILESYSTEM_START) + $(FILESYSTEM_SIZE)))) FDT_OFFSET := 0x08000000 +if XEN +XEN := -DXEN=$(XEN_IMAGE) +XEN_OFFSET := 0x08200000 +endif + if INITRD INITRD_FLAGS := -DUSE_INITRD CHOSEN_NODE := chosen { \ @@ -121,7 +125,7 @@ all: $(IMAGE) CLEANFILES = $(IMAGE) $(OFILES) model.lds fdt.dtb -$(IMAGE): $(OFILES) model.lds fdt.dtb $(KERNEL_IMAGE) $(FILESYSTEM) +$(IMAGE): $(OFILES) model.lds fdt.dtb $(KERNEL_IMAGE) $(FILESYSTEM) $(XEN_IMAGE) $(LD) $(LDFLAGS) $(OFILES) -o $@ --script=model.lds %.o: %.S Makefile @@ -131,7 +135,7 @@ $(IMAGE): $(OFILES) model.lds fdt.dtb $(KERNEL_IMAGE) $(FILESYSTEM) $(CC) $(CPPFLAGS) $(CFLAGS) $(DEFINES) -c -o $@ $< model.lds: $(LD_SCRIPT) Makefile - $(CPP) $(CPPFLAGS) -ansi -DPHYS_OFFSET=$(PHYS_OFFSET) -DMBOX_OFFSET=$(MBOX_OFFSET) -DKERNEL_OFFSET=$(KERNEL_OFFSET) -DFDT_OFFSET=$(FDT_OFFSET) -DFS_OFFSET=$(FS_OFFSET) -DKERNEL=$(KERNEL_IMAGE) -DFILESYSTEM=$(FILESYSTEM) -DTEXT_LIMIT=$(TEXT_LIMIT) -P -C -o $@ $< + $(CPP) $(CPPFLAGS) -ansi -DPHYS_OFFSET=$(PHYS_OFFSET) -DMBOX_OFFSET=$(MBOX_OFFSET) -DKERNEL_OFFSET=$(KERNEL_OFFSET) -DFDT_OFFSET=$(FDT_OFFSET) -DFS_OFFSET=$(FS_OFFSET) $(XEN) -DXEN_OFFSET=$(XEN_OFFSET) -DKERNEL=$(KERNEL_IMAGE) -DFILESYSTEM=$(FILESYSTEM) -DTEXT_LIMIT=$(TEXT_LIMIT) -P -C -o $@ $< fdt.dtb: $(KERNEL_DTB) Makefile gen-cpu-nodes.sh ( $(DTC) -O dts -I dtb $(KERNEL_DTB) ; echo "/ { $(CHOSEN_NODE) $(PSCI_NODE) $(CPUS_NODE) };" ) | $(DTC) -O dtb -o $@ - diff --git a/boot_common.c b/boot_common.c index 4947fe3..e7b8e1d 100644 --- a/boot_common.c +++ b/boot_common.c @@ -9,7 +9,7 @@ #include #include -extern unsigned long kernel; +extern unsigned long entrypoint; extern unsigned long dtb; void init_platform(void); @@ -67,7 +67,7 @@ void __noreturn first_spin(unsigned int cpu, unsigned long *mbox, if (cpu == 0) { init_platform(); - *mbox = (unsigned long)&kernel; + *mbox = (unsigned long)&entrypoint; sevl(); spin(mbox, invalid, 1); } else { diff --git a/configure.ac b/configure.ac index ab8f5b3..f7e24c7 100644 --- a/configure.ac +++ b/configure.ac @@ -40,6 +40,18 @@ AC_ARG_WITH([dtb], AS_HELP_STRING([--with-dtb], [Specify a particular DTB to use]), [KERN_DTB="$withval"]) +AC_ARG_WITH([xen], + AS_HELP_STRING([--with-xen], [Compile for Xen, and Specify a particular Xen to use]), + X_IMAGE=$withval) + +AS_IF([test "x$X_IMAGE" == "x"], [], + [AS_IF([test ! -f "$X_IMAGE"], + [AC_MSG_ERROR([Could not find Xen hypervisor binary: $X_IMAGE])] + )] +) +AC_SUBST([XEN_IMAGE], [$X_IMAGE]) +AM_CONDITIONAL([XEN], [test "x$X_IMAGE" != "x"]) + # Ensure that the user has provided us with a sane kernel dir. m4_define([CHECKFILES], [KERN_DIR, KERN_DTB, @@ -50,6 +62,10 @@ m4_foreach([checkfile], [CHECKFILES], AC_SUBST([KERNEL_IMAGE], [$KERN_IMAGE]) AC_SUBST([KERNEL_DTB], [$KERN_DTB]) +AS_IF([test "x$X_IMAGE" != "x"], + [AC_SUBST([IMAGE], ["xen-system.axf"])], + [AC_SUBST([IMAGE], ["linux-system.axf"])] +) # Allow a user to pass --enable-psci AC_ARG_ENABLE([psci], @@ -119,4 +135,5 @@ echo " CPU IDs: ${CPU_IDS}" echo " Use GICv3? ${USE_GICV3}" echo " Boot-wrapper execution state: AArch${BOOTWRAPPER_ES}" echo " Kernel execution state: AArch${KERNEL_ES}" +echo " Xen image ${XEN_IMAGE:-NONE}" echo "" diff --git a/model.lds.S b/model.lds.S index 51c5684..511f552 100644 --- a/model.lds.S +++ b/model.lds.S @@ -16,6 +16,9 @@ OUTPUT_ARCH(aarch64) #endif TARGET(binary) +#ifdef XEN +INPUT(XEN) +#endif INPUT(KERNEL) INPUT(./fdt.dtb) @@ -36,6 +39,17 @@ SECTIONS KERNEL } +#ifdef XEN + .xen (PHYS_OFFSET + XEN_OFFSET): { + xen = .; + XEN + } + + entrypoint = xen; +#else + entrypoint = kernel; +#endif + .dtb (PHYS_OFFSET + FDT_OFFSET): { dtb = .; ./fdt.dtb