From patchwork Wed Apr 12 04:30:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 9676445 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 1B9B860382 for ; Wed, 12 Apr 2017 04:32:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 08EFD28562 for ; Wed, 12 Apr 2017 04:32:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F185A28569; Wed, 12 Apr 2017 04:32:47 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID 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 65C8B28562 for ; Wed, 12 Apr 2017 04:32:47 +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 1cy9vI-0003aG-8C; Wed, 12 Apr 2017 04:30:28 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cy9vH-0003aA-G8 for Xen-devel@lists.xensource.com; Wed, 12 Apr 2017 04:30:27 +0000 Received: from [85.158.143.35] by server-6.bemta-6.messagelabs.com id CC/29-03430-26DADE85; Wed, 12 Apr 2017 04:30:26 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrNLMWRWlGSWpSXmKPExsWSLjbBWTdx7ds Ig/bp1hb3prxnd2D02N63iz2AMYo1My8pvyKBNeP9Os+CfZIVi/pvsjUw9op1MXJxCAn0MElc 2raWGcRhEZjPInGy+RdjFyMnkKMq0TrjPwuIzSagK/Hv1XMmkCIRgUnMEm/+LWIDcZgF5jBKv J27gg2kSljAXeL8x0tMIDavgJnEq32n2SBsQYmTM5+ATWIW0JJ4+OsWlC0vsf3tHOYJjNyzkJ TNQlI2C0nZAkbmVYzqxalFZalFuqZ6SUWZ6RkluYmZObqGBmZ6uanFxYnpqTmJScV6yfm5mxi BgcIABDsYp1/2P8QoycGkJMp7WeFthBBfUn5KZUZicUZ8UWlOavEhRhkODiUJXqM1QDnBotT0 1Iq0zBxgyMKkJTh4lER4l4OkeYsLEnOLM9MhUqcYFaXEeUtAEgIgiYzSPLg2WJxcYpSVEuZlB DpEiKcgtSg3swRV/hWjOAejkjBvAcgUnsy8Erjpr4AWMwEtPrPrJcjikkSElFQDo01DQODSib k8PZ8v9lyRUNyWZHMxUUeBSzmfy6TNPt6Blf/0O6Wem/enB2yxsJbZKuEQElZ1+gGP4rS+LVr 7f2jMmGtroLxLcvHZB59dRGp/5SWuXsN5SH/7jxjJJhmPSjPxiKfh1j0Jkv+mPtsboqr3JXW/ Ixfn/w+/He7qa+YaCf+ufh6gxFKckWioxVxUnAgATUXeVI4CAAA= X-Env-Sender: sfr@canb.auug.org.au X-Msg-Ref: server-7.tower-21.messagelabs.com!1491971422!63374675!1 X-Originating-IP: [103.22.144.67] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.12; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3417 invoked from network); 12 Apr 2017 04:30:25 -0000 Received: from ozlabs.org (HELO ozlabs.org) (103.22.144.67) by server-7.tower-21.messagelabs.com with DHE-RSA-AES256-GCM-SHA384 encrypted SMTP; 12 Apr 2017 04:30:25 -0000 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 3w2rZ62336z9sN7; Wed, 12 Apr 2017 14:30:22 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201702; t=1491971422; bh=bFJQt7YFACh3NQbKWFgdpIZ8yyNrkijK4OCP3p6YmbA=; h=Date:From:To:Cc:Subject:From; b=nvbsvrdpETcr8WQJlM7yEOECuCIvRQN10AuSrlwhA0/YaPigkDgwV30M++QsaYygx eAyLnN2W28NgjpNarAvtbYCsxbAZ3sknGy64y3LT9K8WdkaMG8FuKDLyJ+YoNUop0q eSn1mb0h95PI+D5/l6UisN3sgi0jklN9KrJ5R4L2IcYyhVYSKTh3LzU58IlkpRGvb5 KOqLKmCGkGlTRA5bnBguUX1hSCfNFDEwkDu8aW1Lh6wRXs9AFsvC4y+BpBXnVC+9+n APdFIceio/AROGxYFweA/VK1ReDYIh0EzKHarvIWn/3/pviuJkw4wClAWQwhD8x00s FEeofJQFzHJJQ== Date: Wed, 12 Apr 2017 14:30:21 +1000 From: Stephen Rothwell To: Juergen Gross , Konrad Rzeszutek Wilk , Stefano Stabellini , Boris Ostrovsky , David Vrabel , Xen Devel , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra Message-ID: <20170412143021.2e3c6209@canb.auug.org.au> MIME-Version: 1.0 Cc: Vitaly Kuznetsov , Linux-Next Mailing List , Linux Kernel Mailing List Subject: [Xen-devel] linux-next: manual merge of the xen-tip tree with the tip tree 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: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Hi all, Today's linux-next merge of the xen-tip tree got a conflict in: arch/x86/xen/enlighten.c between commit: 687d77a5f7b2 ("x86/xen: Update e820 table handling to the new core x86 E820 code") from the tip tree and commit: ca7b75377014 ("x86/xen: split off enlighten_pvh.c") from the xen-tip tree. The latter moved the code changed by the former to another file, so I have applied the following merge fix patch. I fixed it up (see below) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. From: Stephen Rothwell Date: Wed, 12 Apr 2017 14:27:23 +1000 Subject: [PATCH] x86/xen: merge fix for arch/x86/xen/enlighten.c code movement Signed-off-by: Stephen Rothwell --- arch/x86/xen/enlighten_pvh.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/arch/x86/xen/enlighten_pvh.c b/arch/x86/xen/enlighten_pvh.c index 331d7696af45..a4272c8620ce 100644 --- a/arch/x86/xen/enlighten_pvh.c +++ b/arch/x86/xen/enlighten_pvh.c @@ -4,6 +4,7 @@ #include #include +#include #include #include @@ -38,34 +39,32 @@ static void __init init_pvh_bootparams(void) memset(&pvh_bootparams, 0, sizeof(pvh_bootparams)); - memmap.nr_entries = ARRAY_SIZE(pvh_bootparams.e820_map); - set_xen_guest_handle(memmap.buffer, pvh_bootparams.e820_map); + memmap.nr_entries = ARRAY_SIZE(pvh_bootparams.e820_table); + set_xen_guest_handle(memmap.buffer, pvh_bootparams.e820_table); rc = HYPERVISOR_memory_op(XENMEM_memory_map, &memmap); if (rc) { xen_raw_printk("XENMEM_memory_map failed (%d)\n", rc); BUG(); } - if (memmap.nr_entries < E820MAX - 1) { - pvh_bootparams.e820_map[memmap.nr_entries].addr = + if (memmap.nr_entries < E820_MAX_ENTRIES_ZEROPAGE - 1) { + pvh_bootparams.e820_table[memmap.nr_entries].addr = ISA_START_ADDRESS; - pvh_bootparams.e820_map[memmap.nr_entries].size = + pvh_bootparams.e820_table[memmap.nr_entries].size = ISA_END_ADDRESS - ISA_START_ADDRESS; - pvh_bootparams.e820_map[memmap.nr_entries].type = - E820_RESERVED; + pvh_bootparams.e820_table[memmap.nr_entries].type = + E820_TYPE_RESERVED; memmap.nr_entries++; } else xen_raw_printk("Warning: Can fit ISA range into e820\n"); - sanitize_e820_map(pvh_bootparams.e820_map, - ARRAY_SIZE(pvh_bootparams.e820_map), - &memmap.nr_entries); - pvh_bootparams.e820_entries = memmap.nr_entries; for (i = 0; i < pvh_bootparams.e820_entries; i++) - e820_add_region(pvh_bootparams.e820_map[i].addr, - pvh_bootparams.e820_map[i].size, - pvh_bootparams.e820_map[i].type); + e820__range_add(pvh_bootparams.e820_table[i].addr, + pvh_bootparams.e820_table[i].size, + pvh_bootparams.e820_table[i].type); + + e820__update_table(e820_table); pvh_bootparams.hdr.cmd_line_ptr = pvh_start_info.cmdline_paddr;