From patchwork Wed Jun 8 00:15:27 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 9162899 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 7760660467 for ; Wed, 8 Jun 2016 00:18:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 66EB828373 for ; Wed, 8 Jun 2016 00:18:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5A25B28379; Wed, 8 Jun 2016 00:18: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.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, 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 C737A28373 for ; Wed, 8 Jun 2016 00:18: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 1bAR9g-0002b4-Ge; Wed, 08 Jun 2016 00:15:32 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bAR9e-0002ay-VT for xen-devel@lists.xen.org; Wed, 08 Jun 2016 00:15:31 +0000 Received: from [85.158.137.68] by server-6.bemta-3.messagelabs.com id AA/A7-15969-2A367575; Wed, 08 Jun 2016 00:15:30 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmphkeJIrShJLcpLzFFi42Lxqg1y0V2YHB5 usLBTw2LJx8UsDoweR3f/ZgpgjGLNzEvKr0hgzdg7+wRTwUuNinN/+1kbGBukuhg5OYQEJjFK PL4e1cXIxcEicIlFYs3XNcwgCQmBdywSfS1CEHaMxPb9bewQdrnEg95uVohmdYnT73awgTQLC cxgknh36hYTSIJNwERi758HYLaIgLTEtc+XGUFsZoFkif2vjwAN4uAQBhp653ISSJhFQFXi8f nHLCA2r4C7xLljh8BKJATkJBZcSJ/AyLeAkWEVo3pxalFZapGuuV5SUWZ6RkluYmaOrqGBsV5 uanFxYnpqTmJSsV5yfu4mRmCIMADBDsbG706HGCU5mJREeRXdw8OF+JLyUyozEosz4otKc1KL DzHKcHAoSfAqJAHlBItS01Mr0jJzgMEKk5bg4FES4Z0IkuYtLkjMLc5Mh0idYtTl2DL13lomI Za8/LxUKXFeeZAiAZCijNI8uBGwyLnEKCslzMsIdJQQT0FqUW5mCar8K0ZxDkYlYV49kCk8mX klcJteAR3BBHQEy9cwkCNKEhFSUg2Mhiybi03X3tlm9K7olYd3kZDXPJeNU4PfnWBRvbbjD4/ mU4fnPDNDKvWF1KI4u1axNJty37zdL897x13sYfSkD2sdvm/64/+m7KN+14PFos8/HbrU/ul4 +IVQ7bbTTnfnRy0R+sjCVPGffVZqIsvqQ4nfLW57fugL23T7c+Bxu9THcgHMy69cV2Ipzkg01 GIuKk4EAFmtzTSXAgAA X-Env-Sender: edgar.iglesias@gmail.com X-Msg-Ref: server-9.tower-31.messagelabs.com!1465344929!7575238!1 X-Originating-IP: [74.125.82.68] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 27382 invoked from network); 8 Jun 2016 00:15:29 -0000 Received: from mail-wm0-f68.google.com (HELO mail-wm0-f68.google.com) (74.125.82.68) by server-9.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 8 Jun 2016 00:15:29 -0000 Received: by mail-wm0-f68.google.com with SMTP id n184so27962762wmn.1 for ; Tue, 07 Jun 2016 17:15:29 -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; bh=OnDFKdcibA/Axjq36B0yf9zylBgOLnPt+mvb7JjT12A=; b=lCaxHTH2i255rYx/KmRjGrwt70fb0RCXifrY11J6/OtaOqmRZwgd0Oi6LZ80Ff6mMN 6b3/7tLGkk+67ZF1b82oP3IL57Z13ryOhclxuv2HTxOIwSXCIM8zBMS5BNpyucly4fwL g9UuXfl8fuVn+kHvHG4Zgj3wZz3eRWKhN+LEWQcxKyoaFCI5sfp2N7hG0B8S7grmzeaN zTTiOwqnyNMYPJkGweNOsSCnTwpCyMtEsw5dxmVYkmHtRFWLOkUhIF62lXZyuWhOaK/+ xf6vlx20IT47Amg3xp7Ucs9FoGIzbxfGmrvkrsPlk0X9iYm4f3Xy5hlFc/xjtBlUyHAH tn9Q== 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; bh=OnDFKdcibA/Axjq36B0yf9zylBgOLnPt+mvb7JjT12A=; b=CR4Psgr2axDO7GVWzNxc+ZRz9poXgBLlPDkqnaeX+4D76P7dqDrCIrMYiHs6vDdwNc C5biseK7vVJgBsdyateBxBTG4pU0mqoaQCRnwMaF3Mmv5AHl7e1L4Nrd76ssOLrrEcCL lh5GmUpHxFzsBSWuMBCcG8PDLuzW9g4c0bOWYljt3G3FYsLTdtWnNZqDgRa6hFSA2r4l aJAAewz+fPiLO3tpLOcw2+zv5DZuYNoDxOUcjgm7/ovYXpQkgix3MpBCg6OVKNBHgGod 9/7Stwd10CQ4bJzp8F9G7YMzm3DKAHAuMiEgl2qpbMJhoVAskFuJpHWQMr9IuvwsWYZQ 3V7A== X-Gm-Message-State: ALyK8tJVjBy3rq6XtvbIeHlCQiTmAsraEHnX3aprhkC96wk5j3Uqs1vE0SYCD9aJ7jPlsQ== X-Received: by 10.28.31.68 with SMTP id f65mr1764193wmf.45.1465344929174; Tue, 07 Jun 2016 17:15:29 -0700 (PDT) Received: from localhost (81-231-233-234-no56.tbcn.telia.com. [81.231.233.234]) by smtp.gmail.com with ESMTPSA id r19sm16897467wmd.3.2016.06.07.17.15.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 07 Jun 2016 17:15:28 -0700 (PDT) From: "Edgar E. Iglesias" To: xen-devel@lists.xen.org Date: Wed, 8 Jun 2016 02:15:27 +0200 Message-Id: <1465344927-3557-1-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.5.0 Cc: edgar.iglesias@xilinx.com, julien.grall@arm.com, sstabellini@kernel.org, wei.liu2@citrix.com Subject: [Xen-devel] [PATCH for-4.7 1/1] xen/arm: Rename map_regions_rw_cache and use p2m.default_access 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 From: "Edgar E. Iglesias" Rename map_regions_rw_cache to map_regions_cache and make it use p2m.default_access. Suggested-by: Julien Grall Signed-off-by: Edgar E. Iglesias --- xen/arch/arm/domain_build.c | 16 ++++++++-------- xen/arch/arm/p2m.c | 20 ++++++++++---------- xen/include/asm-arm/p2m.h | 18 +++++++++--------- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 00dc07a..b9ffaca 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1570,10 +1570,10 @@ static void acpi_map_other_tables(struct domain *d) { addr = acpi_gbl_root_table_list.tables[i].address; size = acpi_gbl_root_table_list.tables[i].length; - res = map_regions_rw_cache(d, - paddr_to_pfn(addr & PAGE_MASK), - DIV_ROUND_UP(size, PAGE_SIZE), - paddr_to_pfn(addr & PAGE_MASK)); + res = map_regions_cache(d, + paddr_to_pfn(addr & PAGE_MASK), + DIV_ROUND_UP(size, PAGE_SIZE), + paddr_to_pfn(addr & PAGE_MASK)); if ( res ) { panic(XENLOG_ERR "Unable to map ACPI region 0x%"PRIx64 @@ -1926,10 +1926,10 @@ static int prepare_acpi(struct domain *d, struct kernel_info *kinfo) acpi_create_efi_mmap_table(d, &kinfo->mem, tbl_add); /* Map the EFI and ACPI tables to Dom0 */ - rc = map_regions_rw_cache(d, - paddr_to_pfn(d->arch.efi_acpi_gpa), - PFN_UP(d->arch.efi_acpi_len), - paddr_to_pfn(virt_to_maddr(d->arch.efi_acpi_table))); + rc = map_regions_cache(d, + paddr_to_pfn(d->arch.efi_acpi_gpa), + PFN_UP(d->arch.efi_acpi_len), + paddr_to_pfn(virt_to_maddr(d->arch.efi_acpi_table))); if ( rc != 0 ) { printk(XENLOG_ERR "Unable to map EFI/ACPI table 0x%"PRIx64 diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 838d004..3d3fd16 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -1216,30 +1216,30 @@ int p2m_populate_ram(struct domain *d, d->arch.p2m.default_access); } -int map_regions_rw_cache(struct domain *d, - unsigned long start_gfn, - unsigned long nr, - unsigned long mfn) +int map_regions_cache(struct domain *d, + unsigned long start_gfn, + unsigned long nr, + unsigned long mfn) { return apply_p2m_changes(d, INSERT, pfn_to_paddr(start_gfn), pfn_to_paddr(start_gfn + nr), pfn_to_paddr(mfn), MATTR_MEM, 0, p2m_mmio_direct, - p2m_access_rw); + d->arch.p2m.default_access); } -int unmap_regions_rw_cache(struct domain *d, - unsigned long start_gfn, - unsigned long nr, - unsigned long mfn) +int unmap_regions_cache(struct domain *d, + unsigned long start_gfn, + unsigned long nr, + unsigned long mfn) { return apply_p2m_changes(d, REMOVE, pfn_to_paddr(start_gfn), pfn_to_paddr(start_gfn + nr), pfn_to_paddr(mfn), MATTR_MEM, 0, p2m_invalid, - p2m_access_rw); + d->arch.p2m.default_access); } int map_mmio_regions(struct domain *d, diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index d240d1e..a2d1bbe 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -144,15 +144,15 @@ int p2m_cache_flush(struct domain *d, xen_pfn_t start_mfn, xen_pfn_t end_mfn); /* Setup p2m RAM mapping for domain d from start-end. */ int p2m_populate_ram(struct domain *d, paddr_t start, paddr_t end); -int map_regions_rw_cache(struct domain *d, - unsigned long start_gfn, - unsigned long nr_mfns, - unsigned long mfn); - -int unmap_regions_rw_cache(struct domain *d, - unsigned long start_gfn, - unsigned long nr_mfns, - unsigned long mfn); +int map_regions_cache(struct domain *d, + unsigned long start_gfn, + unsigned long nr_mfns, + unsigned long mfn); + +int unmap_regions_cache(struct domain *d, + unsigned long start_gfn, + unsigned long nr_mfns, + unsigned long mfn); int map_dev_mmio_region(struct domain *d, unsigned long start_gfn,