From patchwork Tue Jan 31 22:17:59 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: 9548741 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 DDCA1604DF 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 CE797283EB for ; Tue, 31 Jan 2017 22:20:27 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C382D283FE; 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 58E4B283F4 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 1cYgkZ-0003IG-Ke; Tue, 31 Jan 2017 22:18:07 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cYgkY-0003I3-Td for xen-devel@lists.xen.org; Tue, 31 Jan 2017 22:18:07 +0000 Received: from [85.158.143.35] by server-11.bemta-6.messagelabs.com id C0/11-25337-E1D01985; Tue, 31 Jan 2017 22:18:06 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrLIsWRWlGSWpSXmKPExsVyMfS6k64s78Q Ig4tzFCyWfFzM4sDocXT3b6YAxijWzLyk/IoE1oyr798yFuwVrDj9+TRbA+NJ3i5GLg4hgYmM Euumd7OCOCwCL1kkLmz7xAjiSAj0s0o8fT4ZyOEEcmIkVh07zgRhV0l0fXzHAmILCahLnH63g w1i1HQmidMLXoEl2ARMJPb+eQDWICIgLXHt82WwQcwCvhI3d0IMEhYIlLj5qIUZxGYRUJX4P+ 8uG4jNK+AusenfAqhlchI3z3WC1XAKeEjM/PyQFWKxu8T/V5/YJzAKLGBkWMWoUZxaVJZapGt kqZdUlJmeUZKbmJmja2hgppebWlycmJ6ak5hUrJecn7uJERhcDECwg/HAosBDjJIcTEqivOkd EyKE+JLyUyozEosz4otKc1KLDzHKcHAoSfBK8EyMEBIsSk1PrUjLzAGGOUxagoNHSYRXBiTNW 1yQmFucmQ6ROsVoydHTdfolE8epGyByz67LL5mEWPLy81KlxHmFQBoEQBoySvPgxsFi8RKjrJ QwLyPQgUI8BalFuZklqPKvGMU5GJWEeTVBpvBk5pXAbX0FdBAT0EHur/pADipJREhJNTD2Tz7 UlPeK3c+5+8nXvVMO1utNdno35cn+H8XPy564dji6rdy9O+3yX+emhZqv5B2WKGat2r18Wcib ddN+/k71eLlrWuzrA9JzHjO8zfgn2Jnbr6ny7KeS4snzV/Sfzs848OHMlF7Rp3NuNO861l54z nNPTcRMy8wrcW67FvvI/vD4u2vzgtWr3iqxFGckGmoxFxUnAgB538HbwAIAAA== X-Env-Sender: edgar.iglesias@gmail.com X-Msg-Ref: server-13.tower-21.messagelabs.com!1485901085!49581734!1 X-Originating-IP: [209.85.215.66] 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 54176 invoked from network); 31 Jan 2017 22:18:05 -0000 Received: from mail-lf0-f66.google.com (HELO mail-lf0-f66.google.com) (209.85.215.66) by server-13.tower-21.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 31 Jan 2017 22:18:05 -0000 Received: by mail-lf0-f66.google.com with SMTP id q89so35044684lfi.1 for ; Tue, 31 Jan 2017 14:18:05 -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=/5iQ8isEW6ewGhXUmjZEcl5DLrzCHC/vWOp6EAbwXzo=; b=KIlTvEN0aIM3sxlX2sOJHv7dDir8yTI2FRhoLrjsux4KTekV0MGyfMOm1JbbLLv94d Yo1BSrZvtKehnFTABnLKEVivABbfsY+ejP1D9HxlcOONOc8FOibKh3tBZFQdL5LtM7Zp tr5PwKOe5csw0fioaTAno3svj62m97QzR1MTEMOldPBAazuHcDgDPSrvfJ1+ZJ7H8mbw AL6mS1ZuS+XLg7ZD6SkAp8YYAQVuo8/N4HgZ+8K0HD6Rd/HgzXTOaF9bX7ttWF+xU4Hv ODgJCnxZ8ib/jTU712K0kT/8Xx66uug0j97LSNOEBVYSjQFXuOt9PXmUAL6uoVqV7ow9 e8YA== 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=/5iQ8isEW6ewGhXUmjZEcl5DLrzCHC/vWOp6EAbwXzo=; b=mFVq2Xm9ao/frGHfDr2aCMa887nUTWStPs/WJJpa4+eISa6lOFza8cKjJ4RCQpzRnf 93k+Z+TypFkIywC51Meq3hgSXuB6kp2xXj8vcmzqS7LyJnOVCU1U6S2aVHCpvBY7dvjM e2ocTFDSWllU9Pi1A81rQ2HIfHZiiMeHremFQILrubg+4I+9cX2+wAwbfPXCIX+aV7KC iuWONDDRRurTvae7ajRbTq+ACBbGbp6YTFAgIpjf0LFHbg8I2y73cDFujTOp5UlRK5RI azxtjNGIq9XsahzwY5uwwzixe5hfEf0jFxsvtzjy8lLzZ9bE4lvlkPjVS4QSaFeVqkxk yzEQ== X-Gm-Message-State: AIkVDXIo26u6/rD2RHsJ3FwwLC/BgWob5gRInaixkEhRodZDvdh8tiBtvPjZLZGFEXqu2g== X-Received: by 10.46.71.132 with SMTP id u126mr10512372lja.43.1485901084746; Tue, 31 Jan 2017 14:18:04 -0800 (PST) Received: from localhost (81-231-233-234-no56.tbcn.telia.com. [81.231.233.234]) by smtp.gmail.com with ESMTPSA id u18sm4833666ljd.4.2017.01.31.14.18.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 31 Jan 2017 14:18:04 -0800 (PST) From: "Edgar E. Iglesias" To: xen-devel@lists.xen.org Date: Tue, 31 Jan 2017 23:17:59 +0100 Message-Id: <1485901080-8802-3-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 2/3] Revert "xen/arm: Map mmio-sram nodes as un-cached memory" 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" This reverts commit 1e75ed8b64bc1a9b47e540e6f100f17ec6d97f1b. The default attribute mappings for MMIO have been relaxed, we now rely on the hardware domain to set correct memory attributes. Signed-off-by: Edgar E. Iglesias --- xen/arch/arm/domain_build.c | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 4fc467c..c97a1f5 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -48,20 +48,6 @@ struct map_range_data p2m_type_t p2mt; }; -static const struct dt_device_match dev_map_attrs[] __initconst = -{ - { - __DT_MATCH_COMPATIBLE("mmio-sram"), - __DT_MATCH_PROP("no-memory-wc"), - .data = (void *) (uintptr_t) p2m_mmio_direct_dev, - }, - { - __DT_MATCH_COMPATIBLE("mmio-sram"), - .data = (void *) (uintptr_t) p2m_mmio_direct_nc, - }, - { /* sentinel */ }, -}; - //#define DEBUG_11_ALLOCATION #ifdef DEBUG_11_ALLOCATION # define D11PRINT(fmt, args...) printk(XENLOG_DEBUG fmt, ##args) @@ -1170,21 +1156,6 @@ static int handle_device(struct domain *d, struct dt_device_node *dev, return 0; } -static p2m_type_t lookup_map_attr(struct dt_device_node *node, - p2m_type_t parent_p2mt) -{ - const struct dt_device_match *r; - - /* Search and if nothing matches, use the parent's attributes. */ - r = dt_match_node(dev_map_attrs, node); - - /* - * If this node does not dictate specific mapping attributes, - * it inherits its parent's attributes. - */ - return r ? (uintptr_t) r->data : parent_p2mt; -} - static int handle_node(struct domain *d, struct kernel_info *kinfo, struct dt_device_node *node, p2m_type_t p2mt) @@ -1275,7 +1246,6 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, "WARNING: Path %s is reserved, skip the node as we may re-use the path.\n", path); - p2mt = lookup_map_attr(node, p2mt); res = handle_device(d, node, p2mt); if ( res) return res;