From patchwork Wed Jan 25 22:11:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Kiper X-Patchwork-Id: 9538013 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 D0CAC6042B for ; Wed, 25 Jan 2017 22:15:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BD9B120700 for ; Wed, 25 Jan 2017 22:15:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B25A626E75; Wed, 25 Jan 2017 22:15:30 +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 8EEE020700 for ; Wed, 25 Jan 2017 22:15:29 +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 1cWVnr-0002qK-Kw; Wed, 25 Jan 2017 22:12:31 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cWVnp-0002nJ-SH for xen-devel@lists.xenproject.org; Wed, 25 Jan 2017 22:12:29 +0000 Received: from [193.109.254.147] by server-10.bemta-6.messagelabs.com id D6/4D-13192-DC229885; Wed, 25 Jan 2017 22:12:29 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJLMWRWlGSWpSXmKPExsUyZ7p8oO4Zpc4 Ig/3z1S2+b5nM5MDocfjDFZYAxijWzLyk/IoE1oye3RfYCjZwVTxbU9zAeIO9i5GLQ0hgMpPE /8eXmCGc34wSt76/Zexi5ARyNjBK7LhpAWFPYJS4tqwCxGYT0JG4+OUhO4gtIqAkcW/VZCaQZ maBmUwSp++cZAFJCAu4SJz81QaU4OBgEVCVmLiWAyTMK+AucXhDO1iJhICiRPezCWwgNqeAh0 T3wi42iF3uEhteXmSGqDGWaH97kW0CI98CRoZVjOrFqUVlqUW6ZnpJRZnpGSW5iZk5uoYGZnq 5qcXFiempOYlJxXrJ+bmbGIFBwgAEOxjnnfA/xCjJwaQkynvqVEeEEF9SfkplRmJxRnxRaU5q 8SFGGQ4OJQnebMXOCCHBotT01Iq0zBxguMKkJTh4lER4n4GkeYsLEnOLM9MhUqcYFaXEeQ+CJ ARAEhmleXBtsBi5xCgrJczLCHSIEE9BalFuZgmq/CtGcQ5GJWHeGpApPJl5JXDTXwEtZgJafI G5HWRxSSJCSqqBMfw716TPOUzJPxKy9rYV3w0rfWPxSfdv2TLpfZpznj2b2Bf+ZWfZmjTV68X mjJdEExesZtY3e5BXo3aqrs1IXWYnR4vhMcVL50T+KehNquUvWdrfPj/g4eePPg9l3j9onlrh 9P/dqeQX0Utvc9SLPrReta2wYoPllpPrEt3Nfkekzj4SuOrHNiWW4oxEQy3mouJEAKEIWK6MA gAA X-Env-Sender: daniel.kiper@oracle.com X-Msg-Ref: server-2.tower-27.messagelabs.com!1485382347!31307120!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: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 15873 invoked from network); 25 Jan 2017 22:12:28 -0000 Received: from userp1040.oracle.com (HELO userp1040.oracle.com) (156.151.31.81) by server-2.tower-27.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 25 Jan 2017 22:12:28 -0000 Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id v0PMCEAF031548 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 25 Jan 2017 22:12:15 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 v0PMCEq9020332 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 25 Jan 2017 22:12:14 GMT Received: from abhmp0003.oracle.com (abhmp0003.oracle.com [141.146.116.9]) by userv0122.oracle.com (8.14.4/8.14.4) with ESMTP id v0PMCDtk023431; Wed, 25 Jan 2017 22:12:13 GMT Received: from olila.local.net-space.pl (/10.175.228.37) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 25 Jan 2017 14:12:13 -0800 From: Daniel Kiper To: xen-devel@lists.xenproject.org Date: Wed, 25 Jan 2017 23:11:30 +0100 Message-Id: <1485382293-13800-7-git-send-email-daniel.kiper@oracle.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1485382293-13800-1-git-send-email-daniel.kiper@oracle.com> References: <1485382293-13800-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 v13 6/9] 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 Reviewed-by: Doug Goldstein --- 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 e6f6ef1..24b4b23 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));