From patchwork Tue Jan 31 22:18:00 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: 9548739 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 C72EA60236 for ; Tue, 31 Jan 2017 22:20:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B9408283EC for ; Tue, 31 Jan 2017 22:20:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AE260283EF; Tue, 31 Jan 2017 22:20:27 +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 55579283EC for ; Tue, 31 Jan 2017 22:20:27 +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 1cYgka-0003IZ-S4; Tue, 31 Jan 2017 22:18:08 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYgkZ-0003IF-V5 for xen-devel@lists.xen.org; Tue, 31 Jan 2017 22:18:08 +0000 Received: from [85.158.143.35] by server-4.bemta-6.messagelabs.com id 42/99-25093-F1D01985; Tue, 31 Jan 2017 22:18:07 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrLIsWRWlGSWpSXmKPExsVyMfS6i64c78Q IgwV3DSyWfFzM4sDocXT3b6YAxijWzLyk/IoE1oz/V/6wFfQLVLQs6mJsYDzK3cXIxSEkMJFR YuPSb+wgDovASxaJhYsmsIE4EgL9rBJTtl9l7GLkBHJiJA5e6mGCsMslfs/cChYXElCXOP1uB xvEqBlMEldbDoAl2ARMJPb+eQDWICIgLXHt82WwOLOAr8TNncfB4sICcRJ9m1exg9gsAqoS9x 7MZQOxeQXcJZb/eM0OsUxO4ua5TmYQm1PAQ2Lm54esEIvdJf6/+sQ+gVFgASPDKkaN4tSistQ iXUMDvaSizPSMktzEzBwgz0wvN7W4ODE9NScxqVgvOT93EyMwuBiAYAfjvWUBhxglOZiURHnT OyZECPEl5adUZiQWZ8QXleakFh9ilOHgUJLgleCZGCEkWJSanlqRlpkDDHOYtAQHj5IIrwxIm re4IDG3ODMdInWK0ZKjp+v0SyaOUzdA5J5dl18yCbHk5eelSonzCoE0CIA0ZJTmwY2DxeIlRl kpYV5GoAOFeApSi3IzS1DlXzGKczAqCfNqgkzhycwrgdv6CuggJqCD3F/1gRxUkoiQkmpgNHq WwOt7hfGo2i6HpGuh53csMUjg5vBIfHLzp8Uaz8U3+NSLLBdWhDznibc+tG35ogf271X1tE4v dzFcKmmxk+/pK2ee8y+1jOyLOLpvvVdfx3xvU92kI90zO10fM25XfeRyd88K61k/qpT3J352j drcWZA75ZrYHBWVFXXPzq6ed98k2vT5GyWW4oxEQy3mouJEAIOq+5rAAgAA X-Env-Sender: edgar.iglesias@gmail.com X-Msg-Ref: server-16.tower-21.messagelabs.com!1485901086!50960992!1 X-Originating-IP: [209.85.215.68] 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 53796 invoked from network); 31 Jan 2017 22:18:06 -0000 Received: from mail-lf0-f68.google.com (HELO mail-lf0-f68.google.com) (209.85.215.68) by server-16.tower-21.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 31 Jan 2017 22:18:06 -0000 Received: by mail-lf0-f68.google.com with SMTP id h65so34911290lfi.3 for ; Tue, 31 Jan 2017 14:18:06 -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=F4hz5VkTEHxJYie0PvihWedLPmbJaOV9ajc8eCh4TTE=; b=nfxP/Mz5SMpcALXlrv0aw8KlzYPIKUJPHnGDZL6IsR8Rp5j+XrSf1Nz5eWhVb6OT5f vzkqUYT2W6qDnJD6R7dyY6VbapfHqrR4DmZD9yBCVmq+L2qsTfJwC9BBgy+7BPm3HXoF yaBFppqS8orAo1kg4qG6U9WULzmLIJ9+/51fXlNBaBFm+NWYTthUmD5mVpA1Lgx1R2Gk Z/bFe+fcDe9Nfg9KVw0Fm59K5PctI+1Ef88Xh9gOfcYxHg/nKILVdlFPtbHAkRhI8gg7 pg1SUlG9sGRrdYESE9cDjw0FEbzw+b1OkDDaY8Nz4D1C7JBklkOoRNAxsJqBXfvXfgqd kU7Q== 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=F4hz5VkTEHxJYie0PvihWedLPmbJaOV9ajc8eCh4TTE=; b=pANQVaFOV9i/a0IsEaHF45AoAk+Bh0kIPeNzGZXPvWp/LDQ3Rw+Q2nbp8oDbz2tvMT Vmf6i6drTVbkwG7TRSpf+RlkfHbg4/yTCW88bBkamt9vSoubONZiHcmlbN60LUvtmjWa 2y15bTy+N8Dye43Cb0tzzArBhY12EGdbYCWOu36aFIBW4VxENgZIT0Uxe+GkgkikJd1t mYrcWwfiwvsgHrziSrATBV78aCpp5zUKQi1xlZ6t6Sx0bM/GSAdjM4Svw7Axkx/Qwoch NRzOor2bfxtpcblRuFafchPPOtBc32HrejrVnala83jHn5NcLEZoysI41hlw0ZfX72px O8yA== X-Gm-Message-State: AIkVDXLH094KiVtUWUxi2l/Yjif6uE8wyr1uv9VJ44fS/4a4tlKbnPkfmyN6ik2tSTLBzg== X-Received: by 10.46.14.26 with SMTP id 26mr10437900ljo.59.1485901086012; Tue, 31 Jan 2017 14:18:06 -0800 (PST) Received: from localhost (81-231-233-234-no56.tbcn.telia.com. [81.231.233.234]) by smtp.gmail.com with ESMTPSA id f25sm5011246lji.26.2017.01.31.14.18.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Jan 2017 14:18:05 -0800 (PST) From: "Edgar E. Iglesias" To: xen-devel@lists.xen.org Date: Tue, 31 Jan 2017 23:18:00 +0100 Message-Id: <1485901080-8802-4-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1485901080-8802-1-git-send-email-edgar.iglesias@gmail.com> References: <1485901080-8802-1-git-send-email-edgar.iglesias@gmail.com> Cc: edgar.iglesias@xilinx.com, julien.grall@arm.com, sstabellini@kernel.org Subject: [Xen-devel] [PATCH v3 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. Acked-by: Julien Grall Signed-off-by: Edgar E. Iglesias --- 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. */ /* ` } */ /*