From patchwork Fri Sep 23 18:53:16 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: 9348597 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 5E847607D0 for ; Fri, 23 Sep 2016 18:55:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4AE3C2AD53 for ; Fri, 23 Sep 2016 18:55:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3AC2B2AD6A; Fri, 23 Sep 2016 18:55:45 +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=-3.6 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM, 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 D899C2AD53 for ; Fri, 23 Sep 2016 18:55:44 +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 1bnVbE-0005Yl-LF; Fri, 23 Sep 2016 18:53: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 1bnVbD-0005YK-A4 for xen-devel@lists.xen.org; Fri, 23 Sep 2016 18:53:27 +0000 Received: from [193.109.254.147] by server-7.bemta-6.messagelabs.com id A2/B0-15404-62A75E75; Fri, 23 Sep 2016 18:53:26 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrAIsWRWlGSWpSXmKPExsXiVRvkrKtW9TT cYOELRoslHxezODB6HN39mymAMYo1My8pvyKBNePsusPsBQcFK97f38vcwPiWt4uRi0NIYAKj xO91W9lBHBaBlywSV45fYwFxJAT6WSX6+44AZTiBnBiJ7nV/WSDsaonlzZeYQWwhAXWJ0+92s EGMmsEk8ebeX0aQBJuAicTePw+YQGwRAWmJa58vg8WZBXwlbu48DhYXFgiT2DXpBVAzB9BqVY mZf+pAwrwCHhIv936H2iUncfNcJ9guTgFPiY39G5gg9npI/Nj3j30Co8ACRoZVjBrFqUVlqUW 6xoZ6SUWZ6RkluYmZObqGBmZ6uanFxYnpqTmJScV6yfm5mxiBocUABDsYmxYFHmKU5GBSEuVV cnsaLsSXlJ9SmZFYnBFfVJqTWnyIUYaDQ0mC18EAKCdYlJqeWpGWmQMMcpi0BAePkgjvvAqgN G9xQWJucWY6ROoUoy7Hlqn31jIJseTl56VKifPOAikSACnKKM2DGwGLuEuMslLCvIxARwnxFK QW5WaWoMq/YhTnYFQS5r0EMoUnM68EbtMroCOYgI74ducJyBEliQgpqQbGcws7df7tj9cRCt8 2oW8eG6PY41QNLg7jOu6AT3szZzbubsgSXtS6KopXL8N4o7X5Q4YT8Y75HCZiZyR0P01xLWy6 16Gqv3hKrZPdFs6jfisrNl48FnhWb8HbDI538pl+p1v1WKefvsm/uuVzZMmUJMmjj3SfH/y51 7/02taAHxdmrPU5eaJHiaU4I9FQi7moOBEAiLYbirMCAAA= X-Env-Sender: edgar.iglesias@gmail.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1474656805!61142799!1 X-Originating-IP: [74.125.82.67] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 8.84; banners=-,-,- X-VirusChecked: Checked Received: (qmail 6407 invoked from network); 23 Sep 2016 18:53:25 -0000 Received: from mail-wm0-f67.google.com (HELO mail-wm0-f67.google.com) (74.125.82.67) by server-6.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 23 Sep 2016 18:53:25 -0000 Received: by mail-wm0-f67.google.com with SMTP id 133so4123286wmq.2 for ; Fri, 23 Sep 2016 11:53:25 -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=3yvZ48E9BeZ/FrXXn8MsMK4AM3dhf7n5WXcg9PMe7DI=; b=Gf9SO3YM0EjfzgVKma4Pzyjd2qYXKYhyBN+mirY5mNkZGzV5XXFvicMpX1gxVwAXUd 8RPI4cq9z5Q9TPnbNwJEAixj2dYYOM5FVy5Z1CxJf+jGQbRPtLWmozh5uCL/f9cmr5rr xAxgfy9nASGlsQ9DCYbeU/dAB8FUHaeYVhPy1HTAINesLKkCur9UmDgfvfIePYWgQxhk dYYUjsjm6eyAP2xLVxyRlbw4ypWKfS6PHNKbsN08F/Hm6n4ZDLfjgQXabwCG+EBg1/On y+5UFjCAKh4MCwJMj4BDgkUmCSl2gIEos3tOJYGEIV3kZ2h62VW5fHz9xIPaW3KNTJt+ +4Rg== 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=3yvZ48E9BeZ/FrXXn8MsMK4AM3dhf7n5WXcg9PMe7DI=; b=HKUT5afpu5PGKochVv116Na4iqdSwljcMqXu9RuvqiNNQM2MG8LkWh9szdO4hNqW6O 8SsX2gDIakwF54rmV6sG/wWTDd/HEhaaF0odiLCfPCRhs5fcD7JXAe/BQHFITlgpI0bm OWy47jcJgoRwu9dhZbX+TL3Ketyuk4pkburDefe1xJZq6+WjrGKJmIBctmWb0R6+gYOd TikmG9G+EfixRPh9aUmf5gityvnpfuEvyElU+/he3UXyKMUDS0ITrnMo4E0Ca3B0ug/7 YNifs1ekt+7X7HxjHreTjkTd+MjMp6Rg7YkbW6P9wSKHRJ1iMAg9oNva/4d0SqOPYD1A ZqNw== X-Gm-Message-State: AA6/9Rl8sZdTMkh4lDJW4Mpn5U1cKXq/gbzNEFHRhcBedIsE5FZBKhngjDyDR6fEalR84A== X-Received: by 10.28.221.213 with SMTP id u204mr4575830wmg.117.1474656805378; Fri, 23 Sep 2016 11:53:25 -0700 (PDT) Received: from localhost (81-231-233-234-no56.tbcn.telia.com. [81.231.233.234]) by smtp.gmail.com with ESMTPSA id gf4sm8506173wjb.47.2016.09.23.11.53.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 23 Sep 2016 11:53:24 -0700 (PDT) From: "Edgar E. Iglesias" To: xen-devel@lists.xen.org Date: Fri, 23 Sep 2016 20:53:16 +0200 Message-Id: <1474656802-24081-2-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1474656802-24081-1-git-send-email-edgar.iglesias@gmail.com> References: <1474656802-24081-1-git-send-email-edgar.iglesias@gmail.com> Cc: edgar.iglesias@xilinx.com, julien.grall@arm.com, sstabellini@kernel.org Subject: [Xen-devel] [PATCH v4 1/7] xen/arm: p2m: Rename p2m_mmio_direct_nc -> p2m_mmio_direct_dev 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 p2m_mmio_direct_nc to p2m_mmio_direct_dev to better express that we are mapping device memory. This will allow us to use p2m_mmio_direct_nc for Normal Non-Cached mappings. No functional change. Signed-off-by: Edgar E. Iglesias Reviewed-by: Julien Grall --- xen/arch/arm/p2m.c | 6 +++--- xen/include/asm-arm/p2m.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 5c5049f..c3b1233 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -295,7 +295,7 @@ static void p2m_set_permission(lpae_t *e, p2m_type_t t, p2m_access_t a) case p2m_iommu_map_rw: case p2m_map_foreign: case p2m_grant_map_rw: - case p2m_mmio_direct_nc: + case p2m_mmio_direct_dev: case p2m_mmio_direct_c: e->p2m.xn = 1; e->p2m.write = 1; @@ -366,7 +366,7 @@ static lpae_t mfn_to_p2m_entry(mfn_t mfn, p2m_type_t t, p2m_access_t a) switch ( t ) { - case p2m_mmio_direct_nc: + case p2m_mmio_direct_dev: e.p2m.mattr = MATTR_DEV; e.p2m.sh = LPAE_SH_OUTER; break; @@ -1237,7 +1237,7 @@ int map_mmio_regions(struct domain *d, unsigned long nr, mfn_t mfn) { - return p2m_insert_mapping(d, start_gfn, nr, mfn, p2m_mmio_direct_nc); + return p2m_insert_mapping(d, start_gfn, nr, mfn, p2m_mmio_direct_dev); } int unmap_mmio_regions(struct domain *d, diff --git a/xen/include/asm-arm/p2m.h b/xen/include/asm-arm/p2m.h index 6251b37..b342122 100644 --- a/xen/include/asm-arm/p2m.h +++ b/xen/include/asm-arm/p2m.h @@ -91,7 +91,7 @@ typedef enum { p2m_invalid = 0, /* Nothing mapped here */ p2m_ram_rw, /* Normal read/write guest RAM */ p2m_ram_ro, /* Read-only; writes are silently dropped */ - p2m_mmio_direct_nc, /* Read/write mapping of genuine MMIO area non-cacheable */ + p2m_mmio_direct_dev,/* Read/write mapping of genuine Device MMIO area */ p2m_mmio_direct_c, /* Read/write mapping of genuine MMIO area cacheable */ p2m_map_foreign, /* Ram pages from foreign domain */ p2m_grant_map_rw, /* Read/write grant mapping */