From patchwork Thu May 12 02:01:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Fan X-Patchwork-Id: 9076431 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 1A3739F30C for ; Thu, 12 May 2016 02:04:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 421FD201CE for ; Thu, 12 May 2016 02:04:36 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 1547C200C1 for ; Thu, 12 May 2016 02:04:35 +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 1b0fx8-0000EU-DJ; Thu, 12 May 2016 02:02:14 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b0fx7-0000EL-9M for xen-devel@lists.xen.org; Thu, 12 May 2016 02:02:13 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id FD/A2-02978-324E3375; Thu, 12 May 2016 02:02:11 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrMIsWRWlGSWpSXmKPExsVyMfSOi67SE+N wg6u7rC2WfFzM4sDocXT3b6YAxijWzLyk/IoE1oyvx1IKlvBXHHu4j7GB8Q5PFyMXh5BAP6PE oasLWLsYOTlYBF6ySFzp8ABJSAj0s0r83LycsYuRA8iJkXh+uQCkRkKgQqL38TQmEFtIQEVi7 qYeRohBPUwSr/7cYAZJsAmoSRx5P5MRxBYR8JbY+aEbLM4sICkx9fhXsGZhATeJ1QcmQy1Wlb gwewYbiM0r4Crx5fdGZohlchJT7reD1XMC1W/4MRFqsavEnw09LBMYBRYwMqxiVC9OLSpLLdI 110sqykzPKMlNzMzRNTQw1stNLS5OTE/NSUwq1kvOz93ECAwqBiDYwdj43ekQoyQHk5IoL/9j 43AhvqT8lMqMxOKM+KLSnNTiQ4wyHBxKErxGIDnBotT01Iq0zBxgeMOkJTh4lER4vz0CSvMWF yTmFmemQ6ROMRpzbPl9bS0Tx7ap99YyCbHk5eelSonzuoBMEgApzSjNgxsEi7tLjLJSwryMQK cJ8RSkFuVmlqDKv2IU52BUEuYtBpnCk5lXArfvFdApTECnVF83AjmlJBEhJdXAKPvwzNp84QC BxPgk582sH80ks5R5FIzTt2326maosZ/YkhWUlbp/sUpGmOkVpX9RkTxPp1V37Cg9r1psvHiC CI/8ZRaeL89zlotFzlLiPtvycEEd4/F9c1Zo3uM6cY7f4drEzibneRsYHydEBh6a/0QupujpB cmm+VX7Fr2aX9KTV/n5mPYRJZbijERDLeai4kQA+U+4rLYCAAA= X-Env-Sender: van.freenix@gmail.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1463018529!39686198!1 X-Originating-IP: [209.85.220.68] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.34; banners=-,-,- X-VirusChecked: Checked Received: (qmail 3682 invoked from network); 12 May 2016 02:02:10 -0000 Received: from mail-pa0-f68.google.com (HELO mail-pa0-f68.google.com) (209.85.220.68) by server-3.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 12 May 2016 02:02:10 -0000 Received: by mail-pa0-f68.google.com with SMTP id i5so4791470pag.3 for ; Wed, 11 May 2016 19:02:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KfVVGgnM3kmL4RCVNYskDj2SH+GO1cyc6N4yEFfxO5U=; b=yDICnX+Ys20HA4cBxxI7/dJoSdBpataYcUxF7tcXAm1mK0ASiYcT10oeB8sYqQ+jnz ZEaJ1IINgqpVwmlQrJyEysAC0+qQ6A/z5HVk8Tiy4/UCCsnjCvenbSxZBPDk3A1kfq1X qjzYL5Xe2/wdtK8BAlN2UUxEPAXWmOKMwywk2nRT6qlcqtFtXtX7c7zaweaOioRS7Wjx wVIMDPCJYGZODEWlq8oTBHdOp156sEVT5DAEjeiZOwzDmUbzjDhw/Ddbk7xFNQ0ZegL5 ydIE3IBTcdMd96SLepnfSG2gMHiDL3dv97vG59siwx0Cjljh/u7SsJmnbtjcMKnQABjs Jqag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KfVVGgnM3kmL4RCVNYskDj2SH+GO1cyc6N4yEFfxO5U=; b=VlLSWegkLBO3YUF973XkSDMPXh7hjGh9TBirJSZytdDOlDX3YydorjfH/j7wnnkXNf q92qUC8HghAJdRrGlcxtKlzOmM9tLrUA3V2VyqDy4NcpxbMZ6LjcgvzYJ5uoiyJZffuV ZxCqZmJ7U+yyMARb+blVGTtfaqUzAsmgVRf5jqUHzjVkHOAVJT77Mmrj2pc410xf2twV NngpuC2LH+dDJM6bL/grW2Chq4svecNHyrj6khMEbfNc6P6pFS3PDpB4w3kSP6oLubyd ukYrhtp3NLZhWDMxl/Dfv/DifjXkcvK0HPfG3I4EvnAbSgUH5PaN2ht3GUFlaKtaYyrj tbqg== X-Gm-Message-State: AOPr4FX0STt4eIIidoo/GTljkzTMevDYnw/M/Yw+442OJxPT+v/jrDFqUAZn5H3DZMPV6g== X-Received: by 10.66.199.66 with SMTP id ji2mr9875681pac.34.1463018529186; Wed, 11 May 2016 19:02:09 -0700 (PDT) Received: from linux-7smt.suse (gate-zmy3.freescale.com. [192.88.167.1]) by smtp.gmail.com with ESMTPSA id m190sm15210062pfm.29.2016.05.11.19.02.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 11 May 2016 19:02:08 -0700 (PDT) From: Peng Fan To: xen-devel@lists.xen.org, julien.grall@arm.com, sstabellini@kernel.org Date: Thu, 12 May 2016 10:01:44 +0800 Message-Id: <1463018504-26432-2-git-send-email-van.freenix@gmail.com> X-Mailer: git-send-email 2.6.2 In-Reply-To: <1463018504-26432-1-git-send-email-van.freenix@gmail.com> References: <1463018504-26432-1-git-send-email-van.freenix@gmail.com> Cc: van.freenix@gmail.com Subject: [Xen-devel] [PATCH V2 2/2] xen/arm: mm: clean up code in setup_pagetables 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-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In setup_pagetables, need to map BOOT_RELOC_VIRT_START in xen_second and boot_second, so we can merge the two pieces code into one code block. Also no need to use write_pte when map BOOT_RELOC_VIRT_START in xen_second, because CPU0 is using boot page tables now. Signed-off-by: Peng Fan Cc: Stefano Stabellini Cc: Julien Grall --- V2: Follow Julien's comments: split the V1 patch into two patches, this patch is the code movement part. xen/arch/arm/mm.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index addd699..0a4f845 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -443,11 +443,6 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) lpae_t pte, *p; int i; - /* Map the destination in the boot misc area. */ - dest_va = BOOT_RELOC_VIRT_START; - pte = mfn_to_xen_entry(xen_paddr >> PAGE_SHIFT, WRITEALLOC); - write_pte(xen_second + second_table_offset(dest_va), pte); - /* Calculate virt-to-phys offset for the new location */ phys_offset = xen_paddr - (unsigned long) _start; @@ -494,9 +489,12 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) pte = boot_second[second_table_offset(BOOT_FDT_VIRT_START)]; xen_second[second_table_offset(BOOT_FDT_VIRT_START)] = pte; - /* Map the destination in the boot misc area. */ + /* ... Boot Misc area for xen relocation */ dest_va = BOOT_RELOC_VIRT_START; pte = mfn_to_xen_entry(xen_paddr >> PAGE_SHIFT, WRITEALLOC); + /* Map the destination in xen_second. */ + xen_second[second_table_offset(dest_va)] = pte; + /* Map the destination in boot_second. */ write_pte(boot_second + second_table_offset(dest_va), pte); flush_xen_data_tlb_range_va_local(dest_va, SECOND_SIZE); #ifdef CONFIG_ARM_64