From patchwork Mon Dec 5 22:25:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Kiper X-Patchwork-Id: 9461669 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 084AE6022E for ; Mon, 5 Dec 2016 22:28:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F006B28285 for ; Mon, 5 Dec 2016 22:28:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E4900282E2; Mon, 5 Dec 2016 22:28:26 +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 9CEB528285 for ; Mon, 5 Dec 2016 22:28:26 +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 1cE1iI-0003LV-43; Mon, 05 Dec 2016 22:26:22 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cE1iH-0003Js-C1 for xen-devel@lists.xenproject.org; Mon, 05 Dec 2016 22:26:21 +0000 Received: from [85.158.143.35] by server-1.bemta-6.messagelabs.com id 4D/CA-22836-C89E5485; Mon, 05 Dec 2016 22:26:20 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrDLMWRWlGSWpSXmKPExsXSO6nOVbf7pWu Ewe2tFhbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8afjcuZCxq4KjZPusPYwLiGvYuRi0NIYBKT RM+2P8wQzi9Gics7t7F0MXICORsYJU4dLoJI9DNKtD96wAaSYBPQkbj45SE7iC0ioCRxb9VkJ pAiZoGZTBKn75wE6ubgEBZwk5g5zQCkhkVAVeJg4z5GEJtXwENi0bNVzCC2hICiRPezCWAzOY HiKw62sUMsdpdYfe86C0SNsUT724tsExj5FjAyrGLUKE4tKkst0jUy1EsqykzPKMlNzMzRNTQ w08tNLS5OTE/NSUwq1kvOz93ECAwVBiDYwfhnWcAhRkkOJiVR3oUPXCOE+JLyUyozEosz4otK c1KLDzHKcHAoSfA6vQDKCRalpqdWpGXmAIMWJi3BwaMkwusHkuYtLkjMLc5Mh0idYlSUEufd9 RwoIQCSyCjNg2uDRcolRlkpYV5GoEOEeApSi3IzS1DlXzGKczAqCfMGgoznycwrgZv+CmgxE9 DiE8edQRaXJCKkpBoY7R79PtQ+L3T16dudKvfa53oxv2TMPPKjeVbTYoamJ1MPmmyb6Hx2/l2 x/KiZFfdqf5TuOvTW/Vz354CccGtztbOntB8/XjCd0aj/c1bIjDAWfma5pywqfExO61gNQ4JX XzTXl1kUdS94RoTD/+/b108sVFZM2ld8+WSt3jrTnzomafMmHHsopsRSnJFoqMVcVJwIACN5H 2uPAgAA X-Env-Sender: daniel.kiper@oracle.com X-Msg-Ref: server-4.tower-21.messagelabs.com!1480976778!40624946!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: 9.0.16; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27246 invoked from network); 5 Dec 2016 22:26:19 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-4.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 5 Dec 2016 22:26:19 -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 uB5MQ7hH021202 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 5 Dec 2016 22:26:08 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id uB5MQ7pP011888 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 5 Dec 2016 22:26:07 GMT Received: from abhmp0004.oracle.com (abhmp0004.oracle.com [141.146.116.10]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id uB5MQ6DT013465; Mon, 5 Dec 2016 22:26:06 GMT Received: from olila.local.net-space.pl (/10.175.220.3) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 05 Dec 2016 14:26:06 -0800 From: Daniel Kiper To: xen-devel@lists.xenproject.org Date: Mon, 5 Dec 2016 23:25:15 +0100 Message-Id: <1480976718-12198-11-git-send-email-daniel.kiper@oracle.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1480976718-12198-1-git-send-email-daniel.kiper@oracle.com> References: <1480976718-12198-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, julien.grall@arm.com, jbeulich@suse.com, qiaowei.ren@intel.com, gang.wei@intel.com, fu.wei@linaro.org Subject: [Xen-devel] [PATCH v11 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 fa808ef..5d0830e 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -943,7 +943,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. */ @@ -957,9 +956,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));