From patchwork Wed Sep 28 22:51:29 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Kiper X-Patchwork-Id: 9355107 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 8F84D60756 for ; Wed, 28 Sep 2016 22:54:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8276829529 for ; Wed, 28 Sep 2016 22:54:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 774202964E; Wed, 28 Sep 2016 22:54:28 +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 19E8529529 for ; Wed, 28 Sep 2016 22:54:28 +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 1bpNiP-0004aa-JT; Wed, 28 Sep 2016 22:52:37 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bpNiO-0004Zi-Jl for xen-devel@lists.xenproject.org; Wed, 28 Sep 2016 22:52:36 +0000 Received: from [85.158.143.35] by server-1.bemta-6.messagelabs.com id 9A/36-01767-3B94CE75; Wed, 28 Sep 2016 22:52:35 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrLLMWRWlGSWpSXmKPExsUyZ7p8oO5mzzf hBvduSVt83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBlzN89gLWjgqrjbOZm1gXENexcjF4eQwEQm iUtnvrNBOL8ZJa5PegWV2cgo8fvyFRYIZwKjxKO9e4DKODnYBHQkLn55yA5iiwgoSdxbNZkJp IhZYBeTxKnLGxlBEsICrhI/Np0EKuLgYBFQlTjbpgUS5hXwkNhz5DJYr4SAokT3swlgMzmB4j 8efgBrFRJwl7i96DsjRI2hxOeNS5knMPItYGRYxahRnFpUllqka2Sql1SUmZ5RkpuYmaNraGC ml5taXJyYnpqTmFSsl5yfu4kRGCwMQLCDcdWCwEOMkhxMSqK8U43fhAvxJeWnVGYkFmfEF5Xm pBYfYpTh4FCS4L3sAZQTLEpNT61Iy8wBhi1MWoKDR0mEdw5Imre4IDG3ODMdInWKUVFKnHcBS EIAJJFRmgfXBouVS4yyUsK8jECHCPEUpBblZpagyr9iFOdgVBKGGM+TmVcCN/0V0GImoMVLT7 wAWVySiJCSamDsPWnJduXZdGXWvPWfVs2+pdOn9mRyR/tS5v+7Ls46I/8m2MB9h1uOyHdfL1a pg+3fz04U0uJpmiYzUeSKXKH5iX8hZ+ON3czKsovXX3U+qfciZsEimToutdgp1VH1lx+K7N3w 9+WWvfISgTnbFQLj43rz//9TsLfbfk3Qz//th1szj8943LVViaU4I9FQi7moOBEAUKgDMJACA AA= X-Env-Sender: daniel.kiper@oracle.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1475103153!31055500!1 X-Originating-IP: [156.151.31.81] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogMTU2LjE1MS4zMS44MSA9PiAyODgzMzk=\n X-StarScan-Received: X-StarScan-Version: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 10608 invoked from network); 28 Sep 2016 22:52:35 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-16.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 28 Sep 2016 22:52:35 -0000 Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id u8SMqLLY012230 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 28 Sep 2016 22:52:21 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0022.oracle.com (8.14.4/8.13.8) with ESMTP id u8SMqKmR003741 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 28 Sep 2016 22:52:21 GMT Received: from abhmp0018.oracle.com (abhmp0018.oracle.com [141.146.116.24]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id u8SMqKnp030412; Wed, 28 Sep 2016 22:52:20 GMT Received: from olila.local.net-space.pl (/10.175.227.27) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 28 Sep 2016 15:52:19 -0700 From: Daniel Kiper To: xen-devel@lists.xenproject.org Date: Thu, 29 Sep 2016 00:51:29 +0200 Message-Id: <1475103092-27893-11-git-send-email-daniel.kiper@oracle.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1475103092-27893-1-git-send-email-daniel.kiper@oracle.com> References: <1475103092-27893-1-git-send-email-daniel.kiper@oracle.com> X-Source-IP: userv0022.oracle.com [156.151.31.74] Cc: jgross@suse.com, sstabellini@kernel.org, andrew.cooper3@citrix.com, cardoe@cardoe.com, pgnet.dev@gmail.com, ning.sun@intel.com, julien.grall@arm.com, david.vrabel@citrix.com, jbeulich@suse.com, qiaowei.ren@intel.com, gang.wei@intel.com, fu.wei@linaro.org Subject: [Xen-devel] [PATCH v8 10/13] 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));