From patchwork Thu Jan 26 13:16:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 9539243 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 DC4E1604A0 for ; Thu, 26 Jan 2017 13:18:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DFD4328174 for ; Thu, 26 Jan 2017 13:18:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D4B99282ED; Thu, 26 Jan 2017 13: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=-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 28D4928174 for ; Thu, 26 Jan 2017 13: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 1cWjuP-0007Lc-DW; Thu, 26 Jan 2017 13:16:13 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cWjuO-0007Jb-Bw for xen-devel@lists.xen.org; Thu, 26 Jan 2017 13:16:12 +0000 Received: from [85.158.139.211] by server-1.bemta-5.messagelabs.com id D8/DB-12836-B96F9885; Thu, 26 Jan 2017 13:16:11 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrNIsWRWlGSWpSXmKPExsVyMfS6o+7sb50 RBq2dPBZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa8bRmwkFD/krml+/Y29gnM3dxcjFISQwkVHi 0Pdz7CAOi8BLFomm1z8ZQRwJgX5WiSfL1zJ3MXICOTESy25dZoGwyyVW95xnB7GFBNQlTr/bw QYxaiqTxL//kxhBEmwCJhJ7/zxgArFFBKQlrn2+DBZnFvCVuLnzOFCcg0NYIE7iYY8nSJhFQF Xi4/c9bCA2r4C7xNEvb6F2yUncPNcJdgOngIfElxVTmCD2uks8eHGEdQKjwAJGhlWMGsWpRWW pRbqGFnpJRZnpGSW5iZk5uoYGpnq5qcXFiempOYlJxXrJ+bmbGIGBxQAEOxibtnseYpTkYFIS 5b2p3RkhxJeUn1KZkVicEV9UmpNafIhRhoNDSYJ30VegnGBRanpqRVpmDjDEYdISHDxKIrzZI Gne4oLE3OLMdIjUKUZLjp6u0y+ZOE7dAJF7dl1+ySTEkpeflyolzjsFpEEApCGjNA9uHCwOLz HKSgnzMgIdKMRTkFqUm1mCKv+KUZyDUUmYdxXIFJ7MvBK4ra+ADmICOugCczvIQSWJCCmpBsa AqlKu11Esu/SdN5wts0wT/c7IvdwudM/DkuucC6L41vwPaG7ynHT87dNujYrnL5dbrEjcul8y zXJeSW6om4zMk9tP2vzXJSUeLm+Y2qJ7mK1Ui3GX/Fe5ps06ms83hZ7Y0GD1o+yuySYmwbbzv dJy8xlEmePqHh87VOUd9KJwM5+ge0CakhJLcUaioRZzUXEiAHy+K1i+AgAA X-Env-Sender: edgar.iglesias@gmail.com X-Msg-Ref: server-12.tower-206.messagelabs.com!1485436570!45596207!1 X-Originating-IP: [209.85.215.65] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14200 invoked from network); 26 Jan 2017 13:16:11 -0000 Received: from mail-lf0-f65.google.com (HELO mail-lf0-f65.google.com) (209.85.215.65) by server-12.tower-206.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 26 Jan 2017 13:16:11 -0000 Received: by mail-lf0-f65.google.com with SMTP id q89so23673531lfi.1 for ; Thu, 26 Jan 2017 05:16:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=exIqdrhqXRhu6gZXCMqqoG8NSE2cCqwEuGii60JR33s=; b=cLgdou9Ek9v1IPUiOPTGQDhJtiXuyPbrzbaoL2cWY9ZiCBLgYTTDxahhnH0/8aUX6m UTW+YRtmX10uqpT1sPs68oRngCY5wLp0N1K0BxA3lohLLvP/QGx1RVV0a/JXAnJgxK0M PGNZzaCDcmHtNJvda+uk99WidabFW5Xj2jmnk/P7WzGvSX/KENIsjy/sGLDlMIEvU3RB kKuSGR3u6wQs2Jsw0sKjVQAmdUutd5WtRlPof8O86WPZlS+Cvz5JFWWEDbzzCSTmGDWi 9TlFtIQAz1/NDgdZOeZ3k8F7wGwBcInTdn8GIjWXCIpyxcWhEC7IFkDEHU+uiupJLg+o QIoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=exIqdrhqXRhu6gZXCMqqoG8NSE2cCqwEuGii60JR33s=; b=I84zlS1x6yC8hMPVdtwh60XrP4P7wLgwofuwwX9xHEwBqri/Y515wh13jevSDLz/j+ ITS4mSxY7/WMoiogX2agff6cq3yD5bGK2tdqmuBt3nzQrMPdJ7PfjIbWp7yOtOKnjpgR ZVd06duSlNhe1diXcIPVfXGE9hnhhC60nTtxFtb5vUgTuZXeMAiIgxr/qnC+2GSiY1Pa RusLbXeYYpup8pucb5a8HWlOdyf/2G6YJ+WNFcrGRMAsF4OliEJiIrhBFGfjKuuwBopN LJDixaEv5v6B0hr2O/JXs5k11KoWKY5Y5LmdXg0VL/ZjSFIGC2TVOnpL/r5Xfhp1oRgc TtQw== X-Gm-Message-State: AIkVDXL8FfnNC0S2tyYkqJQTflmuPwdpPpLfFSXkSrsYqXqOk1Ej9qhdWe054CQnqnVDww== X-Received: by 10.25.23.162 with SMTP id 34mr856845lfx.174.1485436570415; Thu, 26 Jan 2017 05:16:10 -0800 (PST) Received: from localhost (81-231-233-234-no56.tbcn.telia.com. [81.231.233.234]) by smtp.gmail.com with ESMTPSA id c1sm474082lfg.9.2017.01.26.05.16.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jan 2017 05:16:09 -0800 (PST) From: "Edgar E. Iglesias" To: xen-devel@lists.xen.org Date: Thu, 26 Jan 2017 14:16:02 +0100 Message-Id: <1485436562-7312-4-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485436562-7312-1-git-send-email-edgar.iglesias@gmail.com> References: <1485436562-7312-1-git-send-email-edgar.iglesias@gmail.com> Cc: edgar.iglesias@xilinx.com, julien.grall@arm.com, sstabellini@kernel.org Subject: [Xen-devel] [PATCH v2 3/3] xen/arm: acpi: Relax hw domain mapping attributes to p2m_mmio_direct_c 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" Since the hardware domain is a trusted domain, we extend the trust to include making final decisions on what attributes to use when mapping memory regions. For ACPI configured hardware domains, this patch relaxes the hardware domains mapping attributes to p2m_mmio_direct_c. This will allow the hardware domain to control the attributes via its S1 mappings. Signed-off-by: Edgar E. Iglesias Acked-by: Julien Grall --- xen/arch/arm/p2m.c | 2 +- xen/include/public/memory.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 09ceb37..cb5a45d 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -1185,7 +1185,7 @@ int map_dev_mmio_region(struct domain *d, if ( !(nr && iomem_access_permitted(d, mfn_x(mfn), mfn_x(mfn) + nr - 1)) ) return 0; - res = map_mmio_regions(d, gfn, nr, mfn); + res = p2m_insert_mapping(d, gfn, nr, mfn, p2m_mmio_direct_c); if ( res < 0 ) { printk(XENLOG_G_ERR "Unable to map MFNs [%#"PRI_mfn" - %#"PRI_mfn" in Dom%d\n", diff --git a/xen/include/public/memory.h b/xen/include/public/memory.h index e633047..6eee0c8 100644 --- a/xen/include/public/memory.h +++ b/xen/include/public/memory.h @@ -222,9 +222,9 @@ DEFINE_XEN_GUEST_HANDLE(xen_machphys_mapping_t); * XENMEM_add_to_physmap_batch only. */ #define XENMAPSPACE_dev_mmio 5 /* device mmio region ARM only; the region is mapped in - Stage-2 using the memory attribute - "Device-nGnRE" (previously named - "Device" on ARMv7) */ + Stage-2 using the Normal Memory + Inner/Outer Write-Back Cacheable + memory attribute. */ /* ` } */ /*