From patchwork Wed Nov 30 13:04:16 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Kiper X-Patchwork-Id: 9454313 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 D3F456071E for ; Wed, 30 Nov 2016 13:08:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA85B28409 for ; Wed, 30 Nov 2016 13:08:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BF51028417; Wed, 30 Nov 2016 13:08:13 +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 42DF128409 for ; Wed, 30 Nov 2016 13:08:12 +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 1cC4a7-0003dI-VJ; Wed, 30 Nov 2016 13:05:51 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cC4a6-0003cK-Pa for xen-devel@lists.xenproject.org; Wed, 30 Nov 2016 13:05:50 +0000 Received: from [85.158.137.68] by server-5.bemta-3.messagelabs.com id 00/4D-15840-DAECE385; Wed, 30 Nov 2016 13:05:49 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrHLMWRWlGSWpSXmKPExsXSO6nOVXftObs Ig7czFS2+b5nM5MDocfjDFZYAxijWzLyk/IoE1ow/G5czFzRwVWyedIexgXENexcjF4eQwEQm iekNj1ghnN+MEt+3LGCEcDYySjx4MxnKmcgoMW//ZiCHk4NNQEfi4peH7CC2iICSxL1Vk5lAi pgFZjJJnL5zkgUkISzgJnH31m5WEJtFQFXiwfMPYA28Ah4SK66/ZwKxJQQUJbqfTWADsTmB4k 8n3AWrERJwl/i29BIzRI2hxOmH2xgnMPItYGRYxahRnFpUllqka2Skl1SUmZ5RkpuYmaNraGC sl5taXJyYnpqTmFSsl5yfu4kRGC71DAyMOxinnvA7xCjJwaQkysvXaRchxJeUn1KZkVicEV9U mpNafIhRhoNDSYI34yxQTrAoNT21Ii0zBxi4MGkJDh4lEd4CkDRvcUFibnFmOkTqFKOilDhEQ gAkkVGaB9cGi5ZLjLJSwryMDAwMQjwFqUW5mSWo8q8YxTkYlYR5A0Cm8GTmlcBNfwW0mAlo8d vX1iCLSxIRUlINjNP6jh5fuq8tJ/v48s9LPIq9Yn0iosvOPvm6oGCV9I6KY+cMN6dxq026Lm6 800prvoPlcv+9PuYdc6++eVX78NjyD34nT2R+8XE+Lsdk/e7WBM2V9tdkvK+ofX14Ovqa8opM 6bx7eWxPDz+4u8/Cto4hRvxQlpjh1uqNUdbsrRJnGJ/fdfCKlVRiKc5INNRiLipOBABUdByHk QIAAA== X-Env-Sender: daniel.kiper@oracle.com X-Msg-Ref: server-10.tower-31.messagelabs.com!1480511148!73034230!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 23174 invoked from network); 30 Nov 2016 13:05:49 -0000 Received: from aserp1040.oracle.com (HELO aserp1040.oracle.com) (141.146.126.69) by server-10.tower-31.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 30 Nov 2016 13:05:49 -0000 Received: from userv0021.oracle.com (userv0021.oracle.com [156.151.31.71]) by aserp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id uAUD5X8F022279 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 30 Nov 2016 13:05:33 GMT Received: from userv0122.oracle.com (userv0122.oracle.com [156.151.31.75]) by userv0021.oracle.com (8.14.4/8.14.4) with ESMTP id uAUD5X1T027973 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 30 Nov 2016 13:05:33 GMT Received: from abhmp0008.oracle.com (abhmp0008.oracle.com [141.146.116.14]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id uAUD5WL6009859; Wed, 30 Nov 2016 13:05:32 GMT Received: from olila.local.net-space.pl (/10.175.217.205) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 30 Nov 2016 05:05:32 -0800 From: Daniel Kiper To: xen-devel@lists.xenproject.org Date: Wed, 30 Nov 2016 14:04:16 +0100 Message-Id: <1480511059-14062-11-git-send-email-daniel.kiper@oracle.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1480511059-14062-1-git-send-email-daniel.kiper@oracle.com> References: <1480511059-14062-1-git-send-email-daniel.kiper@oracle.com> X-Source-IP: userv0021.oracle.com [156.151.31.71] 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 v10 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));