From patchwork Thu Jan 26 13:16:01 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: 9539245 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 9FE99604A0 for ; Thu, 26 Jan 2017 13:18:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A3C2128174 for ; Thu, 26 Jan 2017 13:18:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 98AB0282ED; Thu, 26 Jan 2017 13:18:14 +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 38EC028174 for ; Thu, 26 Jan 2017 13:18:14 +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-0007KT-62; Thu, 26 Jan 2017 13:16:13 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cWjuO-0007Jd-Bg for xen-devel@lists.xen.org; Thu, 26 Jan 2017 13:16:12 +0000 Received: from [193.109.254.147] by server-10.bemta-6.messagelabs.com id 8E/5F-13192-B96F9885; Thu, 26 Jan 2017 13:16:11 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrLIsWRWlGSWpSXmKPExsVyMfS6o+6sb50 RBhMfmVss+biYxYHR4+ju30wBjFGsmXlJ+RUJrBlPP19kKvjHX/Fm/zrGBsZlPF2MXBxCAhMZ Ja4fOMIG4rAIvGSRWLJtISuIIyHQzyqxcPN15i5GTiAnRuJw03UWCLtSYvvxWewgtpCAusTpd zvYIEZNY5J4+OcFK0iCTcBEYu+fB0wgtoiAtMS1z5cZQWxmAV+JmzuPg8WFBQIldl87AbaARU BVYvrN+WBxXgF3iXvvjrJDLJOTuHmuE6yGU8BD4suKKUwQi90lHrw4wjqBUWABI8MqRo3i1KK y1CJdYwO9pKLM9IyS3MTMHF1DAzO93NTi4sT01JzEpGK95PzcTYzA4GIAgh2Mf9cGHmKU5GBS EuW9qd0ZIcSXlJ9SmZFYnBFfVJqTWnyIUYaDQ0mCN/IrUE6wKDU9tSItMwcY5jBpCQ4eJRHeb JA0b3FBYm5xZjpE6hSjJUdP1+mXTBynboDIPbsuv2QSYsnLz0uVEuedAtIgANKQUZoHNw4Wi5 cYZaWEeRmBDhTiKUgtys0sQZV/xSjOwagkzLsKZApPZl4J3NZXQAcxAR10gbkd5KCSRISUVAN jkR3frz9RNhuPu02fpPuL847jxRqTbP9C9ZMtZXLBzHNuPiqV9yx1DVOttwjg3yFr1vk15p7Z Q7fFhV1MW9YZWR7uDjJ/80Tq/6ErKwO3PMo18p19WnCudPW7Sz4sT45o1HR3q6UebHt47MCrP b/P3j+7foOYSl15qELt9IwWVZNY6zPTLkgpsRRnJBpqMRcVJwIAY9rg58ACAAA= X-Env-Sender: edgar.iglesias@gmail.com X-Msg-Ref: server-6.tower-27.messagelabs.com!1485436569!84045403!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 33083 invoked from network); 26 Jan 2017 13:16:10 -0000 Received: from mail-lf0-f65.google.com (HELO mail-lf0-f65.google.com) (209.85.215.65) by server-6.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 26 Jan 2017 13:16:10 -0000 Received: by mail-lf0-f65.google.com with SMTP id q89so23673501lfi.1 for ; Thu, 26 Jan 2017 05:16:10 -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=PrTulB9FSD5Zz5Sry1B9/kE1VaCx370homKmnOtKvM8=; b=aRIZpE5JkbNA19+KJv5xzcUR//nZWHtdkNmBkdCF3IuVEjrWWc6HY+2QHZVRuZXwCu 1QRC89RZmsCXi8jrp4Ar1REfgVr07vETd2+tF8R6ArPPN28g4etuM58fLsaHlal3jNeX W+EW5dlLM8bp+Hjn2n72N9YIe4yWVlycXzkU0dkkTLqn7JT3jR8GjaKjoiLfzvsii2Py Oy4p6gckigs+2Tdqy0pS/5yoTPkxsbFedTqQTxg/IQyX+AwXUY7UkEcvRj4m6FhJq+Ub vAXEoDH/2lBHUlR9dbvaGW56ci1ALKf/X0okXXb55m4aNOxvFtlZYA2wReaR2LHb0cG2 HMfw== 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=PrTulB9FSD5Zz5Sry1B9/kE1VaCx370homKmnOtKvM8=; b=KTbveUeCtgcYNyL0hZwrGB8WVSGS455jAwMB7C+FaHn9NhykcsHYs2sdAypAjQnMHI l3LfmV/bRIYx1tqf8DzIaUnoUcy7NbcNtDwBNMYXqu2Ak4SnaugmQR6duGh/Hj6MBJfi ZkGHqRe+tlSz1BfiNS6hComUZcWdQz9wmLqg1Bb2Sl37P24XKKhs6aa1+MEqerU33VSm R5LhQyF2Fb4bRxjc50FLdzMS/QkIKDm9AgkuvKgNZCqM6bs+elZ39XeoFlW0Nb+cgE1U Kk601BCi2jqWGbwvbOO4+8dwn7lpODSo7JGKkEme/exmBNtBNs1CAyIxekcjt2gVKVA4 5LgA== X-Gm-Message-State: AIkVDXLYJnnB+SM9GwtZewRC8Rb8R9e+6pSSPZtkIYULr8vDKwTSxVgf7S3R9ZaAJi3WNA== X-Received: by 10.25.72.209 with SMTP id v200mr1018129lfa.74.1485436569277; Thu, 26 Jan 2017 05:16:09 -0800 (PST) Received: from localhost (81-231-233-234-no56.tbcn.telia.com. [81.231.233.234]) by smtp.gmail.com with ESMTPSA id n8sm472405lfi.30.2017.01.26.05.16.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Jan 2017 05:16:08 -0800 (PST) From: "Edgar E. Iglesias" To: xen-devel@lists.xen.org Date: Thu, 26 Jan 2017 14:16:01 +0100 Message-Id: <1485436562-7312-3-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 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. --- 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;