From patchwork Mon Nov 10 11:34:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 40480 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C4B06218DE for ; Mon, 10 Nov 2014 11:36:30 +0000 (UTC) Received: by mail-wg0-f69.google.com with SMTP id l18sf3925240wgh.4 for ; Mon, 10 Nov 2014 03:36:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:message-id:from:to:date:in-reply-to :references:organization:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=1W+qr4UvrHzcKj5/Jvncf9XhtL4DL8v1cQdRqjC41Bc=; b=YLhrpQPTd4pdX2N9/0jBpEeFpiD750p7p1q+m21n3+XfAAPQ0nvWJgD2DpdmUvoUC4 /lsklp/QY4F8ZsOnc6SnB8b8lWUvdpg/1NJ1/iMlRqlMoUkYcpJ3IOU6QP9zpXlsKq+D 6lu+xsLbOSr9hLdlzy8fbauOlT9ZatF+wa/XgSzpu3EmXAUeIVgGFMYaxsWqn4Ljj4id dpbIa/tQXFVyhghw99rTH+vZksykMCA+RGOLt+Wuj3RKGdXBGyxj4pykNen8zlKyjsuy f4xwySt9sZxBIcNupvCYwCwJrINjHgu94P8kMbW3/LWCpB4+mk+8TDlYcCMTIaQGo0Sr HJ7g== X-Gm-Message-State: ALoCoQmQklFyZiLEWarKJx2sYNrOBhXHCo9SRcn/GMn2DhejYVNR7ad3g/MzpkuG4JX07EXcyLEE X-Received: by 10.180.76.168 with SMTP id l8mr800470wiw.1.1415619389711; Mon, 10 Nov 2014 03:36:29 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.6.169 with SMTP id c9ls400796laa.104.gmail; Mon, 10 Nov 2014 03:36:29 -0800 (PST) X-Received: by 10.112.125.106 with SMTP id mp10mr29348666lbb.50.1415619389375; Mon, 10 Nov 2014 03:36:29 -0800 (PST) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id ua7si26647192lac.103.2014.11.10.03.36.29 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Nov 2014 03:36:29 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by mail-la0-f51.google.com with SMTP id q1so7439374lam.24 for ; Mon, 10 Nov 2014 03:36:29 -0800 (PST) X-Received: by 10.112.14.69 with SMTP id n5mr28852184lbc.34.1415619388939; Mon, 10 Nov 2014 03:36:28 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.184.201 with SMTP id ew9csp73093lbc; Mon, 10 Nov 2014 03:36:28 -0800 (PST) X-Received: by 10.220.195.132 with SMTP id ec4mr20999450vcb.16.1415619387378; Mon, 10 Nov 2014 03:36:27 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id br5si10773352vcb.4.2014.11.10.03.36.26 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 10 Nov 2014 03:36:27 -0800 (PST) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnnEz-0008Ag-JO; Mon, 10 Nov 2014 11:34:37 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnnEy-0008Ab-0N for xen-devel@lists.xen.org; Mon, 10 Nov 2014 11:34:36 +0000 Received: from [85.158.143.35] by server-3.bemta-4.messagelabs.com id 47/C9-09936-BC2A0645; Mon, 10 Nov 2014 11:34:35 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-10.tower-21.messagelabs.com!1415619273!12699445!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: 6.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27404 invoked from network); 10 Nov 2014 11:34:34 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-10.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 10 Nov 2014 11:34:34 -0000 X-IronPort-AV: E=Sophos;i="5.07,352,1413244800"; d="scan'208";a="191146658" Message-ID: <1415619271.28370.6.camel@citrix.com> From: Ian Campbell To: Julien Grall Date: Mon, 10 Nov 2014 11:34:31 +0000 In-Reply-To: <545B6E2B.9030303@linaro.org> References: <545B6E2B.9030303@linaro.org> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.12.7-1 MIME-Version: 1.0 X-DLP: MIA1 Cc: Stefano Stabellini , Christoffer Dall , "xen-devel@lists.xen.org" Subject: Re: [Xen-devel] xen/arm: Bootwrapper update to support PSCI and GICv3 X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: On Thu, 2014-11-06 at 12:48 +0000, Julien Grall wrote: > Hello all, > > I've been working on updating our aarch64 bootwrapper > to support new feature such as PSCI and GICv3. > > Rather than porting the feature from the Linux bootwrapper [1]. > I've added support of Xen on top of the Linux repo. > > Below an example to configure bootwrapper with GICv3 and PSCI for > the foundation model: > > 42sh> ./configure --host=aarch64-linux-gnu \ > --with-kernel-dir=$HOME/linux-build/aarch64 \ > --with-dtb=$HOME/arm-trusted-firmware/fdts/fvp-foundation-gicv3-psci.dtb \ > --with-cmdline="console=hvc0 earlycon=pl011,0x1c090000 init=/root/init.sh root=/dev/vda" \ > --enable-psci --with-xen-cmdline="dtuart=serial0 console=dtuart no-bootscrub" \ > --with-xen="$HOME/xen" --enable-gicv3 > 42sh> make > > Make will produce a xen-system.axf which is the image used to boot > Xen on the model. > > The branch with the new version is: > git://xenbits.xen.org/people/julieng/boot-wrapper-aarch64.git branch xen > > Ian, can you update your repo with this new version? FWIW I've been happily using https://git.linaro.org/people/christoffer.dall/boot-wrapper-aarch64.git/shortlog/refs/heads/xen-psci-support at 7e702c7892d0965f459a61d36e4c8f1a9d6ee6df plus the following fixup (which I've been remiss in not sending out). Given that we are now in a state where the patches appear to be nicely in keeping with the wrapper's architecture and therefore potentially upstreamable I'd like to at least have that conversation with the maintainers (probably via a patch set submission) before we carry on with a fork. Ian. diff --git a/Makefile.am b/Makefile.am index 9b6c7e3..6c2786e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,8 +69,9 @@ XEN_OFFSET := 0xA00000 DOM0_OFFSET := $(shell echo $$(($(PHYS_OFFSET) + $(KERNEL_OFFSET)))) XEN_BOOTARGS := xen,xen-bootargs = \"$(BOOTARGS)\"; \ module@1 { \ + bootargs = \"$(CMDLINE)\"; \ compatible = \"xen,linux-zimage\", \"xen,multiboot-module\"; \ - reg = <$(DOM0_OFFSET) 0x800000>; \ + reg = <0 $(DOM0_OFFSET) 0 0x800000>; \ }; endif @@ -97,7 +98,10 @@ all: $(IMAGE) $(XIMAGE) CLEANFILES = $(IMAGE) boot.o cache.o $(GIC) mmu.o ns.o $(BOOTMETHOD) model.lds fdt.dtb -$(IMAGE): boot.o cache.o $(GIC) mmu.o ns.o $(BOOTMETHOD) model.lds fdt.dtb $(KERNEL_IMAGE) $(FILESYSTEM) $(XEN_IMAGE) +if XEN +XEN_IMAGE_DEP = $(XEN_IMAGE) +endif +$(IMAGE): boot.o cache.o $(GIC) mmu.o ns.o $(BOOTMETHOD) model.lds fdt.dtb $(KERNEL_IMAGE) $(FILESYSTEM) $(XEN_IMAGE_DEP) $(LD) -o $@ --script=model.lds %.o: %.S Makefile diff --git a/configure.ac b/configure.ac index 2f31fab..44b3bf0 100644 --- a/configure.ac +++ b/configure.ac @@ -75,13 +75,14 @@ AC_ARG_WITH([initrd], AC_SUBST([FILESYSTEM], [$USE_INITRD]) AM_CONDITIONAL([INITRD], [test "x$USE_INITRD" != "x"]) -C_CMDLINE="console=ttyAMA0 earlyprintk=pl011,0x1c090000" +AS_IF([test "x$XEN_IMAGE" = "no"],[C_CONSOLE="ttyAMA0"],[C_CONSOLE="hvc0"]) +C_CMDLINE="console=$C_CONSOLE earlyprintk=pl011,0x1c090000" AC_ARG_WITH([cmdline], AS_HELP_STRING([--with-cmdline], [set a command line for the kernel]), [C_CMDLINE=$withval]) AC_SUBST([CMDLINE], [$C_CMDLINE]) -X_BOOTARGS="console=dtuart dtuart=serial0" +X_BOOTARGS="console=dtuart dtuart=serial0 no-bootscrub" AC_ARG_WITH([xen-bootargs], AS_HELP_STRING([--with-xen-bootargs], [set Xen bootargs]), [X_BOOTARGS=$withval])