From patchwork Mon Aug 14 14:24:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 9899029 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 9CCE5602CA for ; Mon, 14 Aug 2017 14:27:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8FEFB2842E for ; Mon, 14 Aug 2017 14:27:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 84C53284D1; Mon, 14 Aug 2017 14:27:22 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED 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 F2A052867E for ; Mon, 14 Aug 2017 14:27:18 +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 1dhGIY-0000dV-1X; Mon, 14 Aug 2017 14:24:54 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dhGIX-0000WJ-Fc for xen-devel@lists.xen.org; Mon, 14 Aug 2017 14:24:53 +0000 Received: from [85.158.143.35] by server-11.bemta-6.messagelabs.com id 55/0B-03612-4B2B1995; Mon, 14 Aug 2017 14:24:52 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrJLMWRWlGSWpSXmKPExsVysyfVTXfLpom RBpu/C1ks+biYxYHR4+ju30wBjFGsmXlJ+RUJrBnLz59mLGjjq/j/YCpLA+MG7i5GLg4hgc2M Eh9X72eGcE4zSry6/QHI4eRgE9CUuPP5ExOILSIgLXHt82VGEJtZIFLi8Icf7CC2sECqxP5Jp 8BsFgFVib4fC8BqeAWsJO6cXAFmSwjIS+xqu8gKYnMCxTvv7mQBsYUELCVOrJ7NNoGRewEjwy pGjeLUorLUIl0jY72kosz0jJLcxMwcXUMDM73c1OLixPTUnMSkYr3k/NxNjEAPMwDBDsY/8wM PMUpyMCmJ8ib49EYK8SXlp1RmJBZnxBeV5qQWH2KU4eBQkuC9sXFipJBgUWp6akVaZg4w1GDS Ehw8SiK8s0DSvMUFibnFmekQqVOMxhyX+jZ8YeJ4NeH/NyYhlrz8vFQpcd5ykFIBkNKM0jy4Q bAYuMQoKyXMywh0mhBPQWpRbmYJqvwrRnEORiVh3k8gU3gy80rg9r0COoUJ6JQ+kC94i0sSEV JSDYyJ9yvc69bZ7tw8Vfvpq0cCX6OSqhlsv2zquXSUXU4g0PTkmeAbjm9nlT248J+/xeRj59N zy68FLfobxJVfkfGrfq7aiq2qQbxHHAIFqnxdXnOav2t2OPj01YUVi6WT5Vw3L7K8E/bQW0Xn kML0ixGBXJofujL8ODTnLua5d/rNedmPYjMCjqspsRRnJBpqMRcVJwIAG4A+PHwCAAA= X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-11.tower-21.messagelabs.com!1502720691!74726637!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 44148 invoked from network); 14 Aug 2017 14:24:52 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-11.tower-21.messagelabs.com with SMTP; 14 Aug 2017 14:24:52 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 948371713; Mon, 14 Aug 2017 07:24:51 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.206.53]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A8DC83F483; Mon, 14 Aug 2017 07:24:50 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Mon, 14 Aug 2017 15:24:06 +0100 Message-Id: <20170814142418.13267-16-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170814142418.13267-1-julien.grall@arm.com> References: <20170814142418.13267-1-julien.grall@arm.com> Cc: andre.przywara@arm.com, Julien Grall , sstabellini@kernel.org Subject: [Xen-devel] [PATCH 15/27] xen/arm: Replace ioremap_attr(PAGE_HYPERVISOR_NOCACHE) call by ioremap_nocache 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 ioremap_cache is a wrapper of ioremap_attr(...). Signed-off-by: Julien Grall Reviewed-by: Andre Przywara --- xen/arch/arm/platforms/exynos5.c | 2 +- xen/arch/arm/platforms/omap5.c | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/xen/arch/arm/platforms/exynos5.c b/xen/arch/arm/platforms/exynos5.c index 2ae5fa66e0..95d6581d33 100644 --- a/xen/arch/arm/platforms/exynos5.c +++ b/xen/arch/arm/platforms/exynos5.c @@ -62,7 +62,7 @@ static int exynos5_init_time(void) dprintk(XENLOG_INFO, "mct_base_addr: %016llx size: %016llx\n", mct_base_addr, size); - mct = ioremap_attr(mct_base_addr, size, PAGE_HYPERVISOR_NOCACHE); + mct = ioremap_nocache(mct_base_addr, size); if ( !mct ) { dprintk(XENLOG_ERR, "Unable to map MCT\n"); diff --git a/xen/arch/arm/platforms/omap5.c b/xen/arch/arm/platforms/omap5.c index 1e1f9fa970..7dbba95756 100644 --- a/xen/arch/arm/platforms/omap5.c +++ b/xen/arch/arm/platforms/omap5.c @@ -51,8 +51,7 @@ static int omap5_init_time(void) unsigned int sys_clksel; unsigned int num, den, frac1, frac2; - ckgen_prm_base = ioremap_attr(OMAP5_CKGEN_PRM_BASE, - 0x20, PAGE_HYPERVISOR_NOCACHE); + ckgen_prm_base = ioremap_nocache(OMAP5_CKGEN_PRM_BASE, 0x20); if ( !ckgen_prm_base ) { dprintk(XENLOG_ERR, "%s: PRM_BASE ioremap failed\n", __func__); @@ -64,8 +63,7 @@ static int omap5_init_time(void) iounmap(ckgen_prm_base); - rt_ct_base = ioremap_attr(REALTIME_COUNTER_BASE, - 0x20, PAGE_HYPERVISOR_NOCACHE); + rt_ct_base = ioremap_nocache(REALTIME_COUNTER_BASE, 0x20); if ( !rt_ct_base ) { dprintk(XENLOG_ERR, "%s: REALTIME_COUNTER_BASE ioremap failed\n", __func__);