From patchwork Mon Sep 12 20:18:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Kiper X-Patchwork-Id: 9327997 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 F0CC46089F for ; Mon, 12 Sep 2016 20:23:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E17FB28EAB for ; Mon, 12 Sep 2016 20:23:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D613E28EAC; Mon, 12 Sep 2016 20:23:53 +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, UNPARSEABLE_RELAY 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 8B9D528EAF for ; Mon, 12 Sep 2016 20:23:53 +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 1bjXjm-0006Qh-Kl; Mon, 12 Sep 2016 20:21:54 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bjXjl-0006PX-4P for xen-devel@lists.xenproject.org; Mon, 12 Sep 2016 20:21:53 +0000 Received: from [193.109.254.147] by server-7.bemta-6.messagelabs.com id 99/8B-15404-06E07D75; Mon, 12 Sep 2016 20:21:52 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNLMWRWlGSWpSXmKPExsXSO6nOVTeB73q 4wbRgi+9bJjM5MHoc/nCFJYAxijUzLym/IoE149jRz+wF1zgrPk29wdTA2MbexcjJISQwmUni 1VGZLkYuIPsbo8SVrauZIJyNjBITv89jhXAmMErsnfENrIVNQEfi4peHYLaIgJLEvVWTwTqYB eYwSVzt3cUEkhAWcJU4t2U/mM0ioCqx9vQFsAZeAQ+Jlyuus4HYEgKKEt3PJoDZnEDx510TmC Fucpc4svowE0SNsUT724tsExj5FjAyrGJUL04tKkst0jXWSyrKTM8oyU3MzNE1NDDTy00tLk5 MT81JTCrWS87P3cQIDBQGINjB2PHP6RCjJAeTkihvkuC1cCG+pPyUyozE4oz4otKc1OJDjDIc HEoSvD0818OFBItS01Mr0jJzgCELk5bg4FES4T0JkuYtLkjMLc5Mh0idYlSUEuetAUkIgCQyS vPg2mBxcolRVkqYlxHoECGegtSi3MwSVPlXjOIcjErCvMy8QFN4MvNK4Ka/AlrMBLT46dbLII tLEhFSUg2MrREHdz8SNYjeGbFILJFb/uTNOWo/Csvv6Zx2yPb45vzCQMKtdMP/oxbJUiFtu8V FVNrnzGrWnjz7p5L5bO73rgtnnIx03B5csUvIKVa1RvqMQNhK0SMcqqovUjNY9L3Uu2b8eDlB 992X7GqxlKn+6Zu2T7U8Z3uA4aZ4ri4Hp2T5xomtTLuUWIozEg21mIuKEwH1r1/OjgIAAA== X-Env-Sender: daniel.kiper@oracle.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1473711710!58611981!1 X-Originating-IP: [141.146.126.69] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTQxLjE0Ni4xMjYuNjkgPT4gMjc3MjE4\n X-StarScan-Received: X-StarScan-Version: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 47747 invoked from network); 12 Sep 2016 20:21:51 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-16.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 12 Sep 2016 20:21:51 -0000 Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u8CKLcXR019974 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 12 Sep 2016 20:21:39 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id u8CKLck1030942 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Mon, 12 Sep 2016 20:21:38 GMT Received: from abhmp0008.oracle.com (abhmp0008.oracle.com [141.146.116.14]) by aserv0121.oracle.com (8.13.8/8.13.8) with ESMTP id u8CKLboi019479; Mon, 12 Sep 2016 20:21:38 GMT Received: from olila.local.net-space.pl (/10.175.172.57) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 12 Sep 2016 13:21:37 -0700 From: Daniel Kiper To: xen-devel@lists.xenproject.org Date: Mon, 12 Sep 2016 22:18:27 +0200 Message-Id: <1473711511-11931-13-git-send-email-daniel.kiper@oracle.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1473711511-11931-1-git-send-email-daniel.kiper@oracle.com> References: <1473711511-11931-1-git-send-email-daniel.kiper@oracle.com> X-Source-IP: aserv0022.oracle.com [141.146.126.234] Cc: jgross@suse.com, sstabellini@kernel.org, andrew.cooper3@citrix.com, cardoe@cardoe.com, pgnet.dev@gmail.com, ning.sun@intel.com, david.vrabel@citrix.com, jbeulich@suse.com, qiaowei.ren@intel.com, gang.wei@intel.com, fu.wei@linaro.org Subject: [Xen-devel] [PATCH v6 12/15] x86/setup: use XEN_IMG_OFFSET instead of... 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 ..calculating its value during runtime. Signed-off-by: Daniel Kiper Acked-by: Jan Beulich --- xen/arch/x86/setup.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index f19af6e..ca1a97a 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -901,7 +901,6 @@ void __init noreturn __start_xen(unsigned long mbi_p) l4_pgentry_t *pl4e; l3_pgentry_t *pl3e; l2_pgentry_t *pl2e; - uint64_t load_start; int i, j, k; /* Select relocation address. */ @@ -915,9 +914,8 @@ void __init noreturn __start_xen(unsigned long mbi_p) * with a barrier(). After this we must *not* modify static/global * data until after we have switched to the relocated pagetables! */ - load_start = (unsigned long)_start - XEN_VIRT_START; barrier(); - move_memory(e + load_start, load_start, _end - _start, 1); + move_memory(e + XEN_IMG_OFFSET, XEN_IMG_OFFSET, _end - _start, 1); /* Walk initial pagetables, relocating page directory entries. */ pl4e = __va(__pa(idle_pg_table));