From patchwork Fri Jun 3 13:29:07 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: 9153057 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 527E56072B for ; Fri, 3 Jun 2016 13:31:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4313A282E8 for ; Fri, 3 Jun 2016 13:31:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 37F2828304; Fri, 3 Jun 2016 13:31:34 +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 3C182282E8 for ; Fri, 3 Jun 2016 13:31:33 +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 1b8pAM-0005jU-IJ; Fri, 03 Jun 2016 13:29:34 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1b8pAK-0005j5-Rm for xen-devel@lists.xen.org; Fri, 03 Jun 2016 13:29:32 +0000 Received: from [193.109.254.147] by server-6.bemta-14.messagelabs.com id D5/CB-31829-C3681575; Fri, 03 Jun 2016 13:29:32 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprPIsWRWlGSWpSXmKPExsXiVRvkqGvdFhh uMH26ksWSj4tZHBg9ju7+zRTAGMWamZeUX5HAmrGiaSlrwQPtinWnNrI3MJ6V7mLk4hASmMAo cf3gdhYQh0XgJYvEzFu7GEEcCYF+Vom1h1YDOZxATozExmWf2CDscon2WRPBbCEBdYnT73awQ YyawSTRte0QWAObgInE3j8PmEBsEQFpiWufL4PFmQV8JW7uPA4WFxYIkfi3+hALiM0ioCqx6+ 1NsKG8Au4SjzZvB6rnAFomJ7HgQjpImFPAQ+L5qZdsIGEhoJJn99QmMAosYGRYxahRnFpUllq ka2igl1SUmZ5RkpuYmaNraGiil5taXJyYnpqTmFSsl5yfu4kRGFgMQLCD8dwy50OMkhxMSqK8 588GhAvxJeWnVGYkFmfEF5XmpBYfYpTh4FCS4D3SEhguJFiUmp5akZaZAwxxmLQEB4+SCG8uS Jq3uCAxtzgzHSJ1ilGXY8vUe2uZhFjy8vNSpcR5t4IUCYAUZZTmwY2AxdslRlkpYV5GoKOEeA pSi3IzS1DlXzGKczAqCfNuA5nCk5lXArfpFdARTEBHFDzyBzmiJBEhJdXA6P5QIci2R1tp5bn yE7/M4kq5Ygyv/7b9Xmv6JovhrUtl8vJtXlcuPZ6jJDY3fLd3/ZaIpG8icxbOTfjfezp0+Xx+ t2mlm7+rmGcHTuT99zgiUkVsou6yVYli21p36k+5LfQkbULOv8LOh+uvO3+QjMqLEYpQyHme4 /txS460zf+AeW4LxaK2KbEUZyQaajEXFScCACKgvK6yAgAA X-Env-Sender: edgar.iglesias@gmail.com X-Msg-Ref: server-16.tower-27.messagelabs.com!1464960571!45592732!1 X-Originating-IP: [74.125.82.65] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.46; banners=-,-,- X-VirusChecked: Checked Received: (qmail 52040 invoked from network); 3 Jun 2016 13:29:31 -0000 Received: from mail-wm0-f65.google.com (HELO mail-wm0-f65.google.com) (74.125.82.65) by server-16.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 3 Jun 2016 13:29:31 -0000 Received: by mail-wm0-f65.google.com with SMTP id e3so23574705wme.2 for ; Fri, 03 Jun 2016 06:29:31 -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=NBB3VNd0PwlPBqYKKCKVX3/9aZ9vXxC2A9aNIQwF3O0=; b=zqyUFiFMKCzm+bw9kciviofs+bqO8egl5Zbpt3Nrks8XhBO2IxEZX6mR3RaEZ+9DFr xsbl3LeYXwNom1/2JLs5nN7V644issmgnMcABvftosBGMzApF14FiB0TSmBNoFKZI+43 wAbRYAVabuz+l7qxLh5YD9qN1hKlfG+gUN0T4WJ0jdAvThvF08DapWFd0Nnvp9Y7yyPs uNtvwKwN8WeF4KgfxNY2LpvGnpPAgQvof0wH9AmCm9wSLeRQkEQi5M7K/YK7OC9GV3Tr IYL+M7gufZQcA/TCLXdH3kYGWzl3e3yGhTn8wb8mILHzHdvgRC1OfRUQDjexvM9k2G20 hmQw== 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=NBB3VNd0PwlPBqYKKCKVX3/9aZ9vXxC2A9aNIQwF3O0=; b=R6hlBLrs+B42m3ESO0TkAlgCXgTy70wd5vG/tZqwEm9M8frJcGoqa9sLWMqIqGDCUJ XfsjxyWFN9wzsMn4Ghpu90cK1L2JsJrPCI24MaQ4PA9QljRxAbBEgGxoMwG/jZqOai2n uiUPBP5PP3rRzp+cUbU4LRR9RTAXU86NvyQVJWwX3eTJMRKDeTWbEXKKrwESR2WUqdXz h9D6IjQtNKbLY2ksC3miirZfRLdNOcDEssX1iach7V38CoMhL/u3DYMLanEncecPgjOO OVEIhtvAWfg0cc+STuOl5xuNQvUIthni1c1bB/DVlox0eNLb5yA7q/SuxGvgnFiZX7vG 3Bgg== X-Gm-Message-State: ALyK8tJsok4M7UuD0Qzlj+NGV1FX4x03Vcyq9n/bKS06Rhyp0r/5SvHtJ6ZZ59PZmqF4SQ== X-Received: by 10.28.128.67 with SMTP id b64mr4279982wmd.2.1464960570786; Fri, 03 Jun 2016 06:29:30 -0700 (PDT) Received: from localhost (81-231-233-234-no56.tbcn.telia.com. [81.231.233.234]) by smtp.gmail.com with ESMTPSA id lf7sm5764550wjb.23.2016.06.03.06.29.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Jun 2016 06:29:27 -0700 (PDT) From: "Edgar E. Iglesias" To: xen-devel@lists.xen.org Date: Fri, 3 Jun 2016 15:29:07 +0200 Message-Id: <1464960552-6645-3-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1464960552-6645-1-git-send-email-edgar.iglesias@gmail.com> References: <1464960552-6645-1-git-send-email-edgar.iglesias@gmail.com> Cc: edgar.iglesias@xilinx.com, julien.grall@arm.com, sstabellini@kernel.org Subject: [Xen-devel] [RFC for-4.8 v2 2/7] xen/arm: Rename and generalize un/map_regions_rw_cache 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 and generalize un/map_regions_rw_cache into un/map_regions. The new functions take the mapping attributes and access permissions as arguments. No functional change. Signed-off-by: Edgar E. Iglesias --- xen/arch/arm/domain_build.c | 18 ++++++++++-------- xen/arch/arm/p2m.c | 28 ++++++++++++++++------------ xen/include/asm-arm/p2m.h | 22 +++++++++++++--------- 3 files changed, 39 insertions(+), 29 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 00dc07a..e4fed4b 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1570,10 +1570,11 @@ 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(d, + paddr_to_pfn(addr & PAGE_MASK), + DIV_ROUND_UP(size, PAGE_SIZE), + paddr_to_pfn(addr & PAGE_MASK), + MATTR_MEM, p2m_access_rw); if ( res ) { panic(XENLOG_ERR "Unable to map ACPI region 0x%"PRIx64 @@ -1926,10 +1927,11 @@ 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(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)), + MATTR_MEM, p2m_access_rw); 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 0f1e1b1..a8538e5 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -1217,30 +1217,34 @@ 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(struct domain *d, + unsigned long start_gfn, + unsigned long nr, + unsigned long mfn, + unsigned int mattr, + p2m_access_t access) { 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); + mattr, 0, p2m_mmio_direct, + access); } -int unmap_regions_rw_cache(struct domain *d, - unsigned long start_gfn, - unsigned long nr, - unsigned long mfn) +int unmap_regions(struct domain *d, + unsigned long start_gfn, + unsigned long nr, + unsigned long mfn, + unsigned int mattr, + p2m_access_t access) { 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); + mattr, 0, p2m_invalid, + 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..92c425e 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -144,15 +144,19 @@ 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(struct domain *d, + unsigned long start_gfn, + unsigned long nr, + unsigned long mfn, + unsigned int mattr, + p2m_access_t perms); + +int unmap_regions(struct domain *d, + unsigned long start_gfn, + unsigned long nr, + unsigned long mfn, + unsigned int mattr, + p2m_access_t perms); int map_dev_mmio_region(struct domain *d, unsigned long start_gfn,