From patchwork Tue Sep 12 10:03:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 9948885 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 41981603FB for ; Tue, 12 Sep 2017 10:06:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 31AD828EC7 for ; Tue, 12 Sep 2017 10:06:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 26AC428ED0; Tue, 12 Sep 2017 10:06:03 +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 7414528EC7 for ; Tue, 12 Sep 2017 10:06:01 +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 1dri2v-00031z-8j; Tue, 12 Sep 2017 10:03:57 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dri2u-0002ym-6l for xen-devel@lists.xen.org; Tue, 12 Sep 2017 10:03:56 +0000 Received: from [85.158.139.211] by server-11.bemta-5.messagelabs.com id 4C/BC-01760-B01B7B95; Tue, 12 Sep 2017 10:03:55 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrBLMWRWlGSWpSXmKPExsVysyfVTZd74/Z Ig7fz2SyWfFzM4sDocXT3b6YAxijWzLyk/IoE1ox/O5YyF3zjq1h+YB9bA2MbTxcjF4eQwGZG iV1dL5ggnNOMEi9enGTuYuTkYBPQlLjz+RMTiC0iIC1x7fNlRhCbWSBS4vCHH+wgtrBAhsTF4 +fZuhg5OFgEVCUezpIDCfMKWErM+H6MBcSWEJCX2NV2kRXE5gSKr/j4iw3EFhKwkPj+8gfjBE buBYwMqxg1ilOLylKLdA2N9JKKMtMzSnITM3N0DQ1M9XJTi4sT01NzEpOK9ZLzczcxAv3LAAQ 7GPtmOR9ilORgUhLlPbJ+e6QQX1J+SmVGYnFGfFFpTmrxIUYZDg4lCV72DUA5waLU9NSKtMwc YKDBpCU4eJREeIVA0rzFBYm5xZnpEKlTjMYc7yZd+cPE0XHz7h8mIZa8/LxUKXHeNyBbBEBKM 0rz4AbBIuASo6yUMC8j0GlCPAWpRbmZJajyrxjFORiVhHnlQBbyZOaVwO17BXQKE9ApPJe2gJ xSkoiQkmpgrF65aXuisMn6uGSPpf/faV96Hsk9vZO/OEIhqU+pPvLxAqV1jQX9W4PEGM6cFVk StddOwEzv6jG/ifWrD+gx/E88cCZ0W1zJPT0vyUl9t8xqG1ab/ok36haclvl9jc6KAKlPTOv7 2ywPbN6Yx6e0Sr7gvcXCz4dceOYvfx+36mrfVIFf08MClFiKMxINtZiLihMBB/cPjHsCAAA= X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1505210634!111086269!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 63417 invoked from network); 12 Sep 2017 10:03:54 -0000 Received: from usa-sjc-mx-foss1.foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-4.tower-206.messagelabs.com with SMTP; 12 Sep 2017 10:03:54 -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 48F681529; Tue, 12 Sep 2017 03:03:54 -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 5AD0A3F578; Tue, 12 Sep 2017 03:03:53 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Tue, 12 Sep 2017 11:03:18 +0100 Message-Id: <20170912100330.2168-13-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170912100330.2168-1-julien.grall@arm.com> References: <20170912100330.2168-1-julien.grall@arm.com> Cc: andre.przywara@arm.com, Julien Grall , sstabellini@kernel.org Subject: [Xen-devel] [PATCH v2 12/24] 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 Reviewed-by: Stefano Stabellini --- Changes in v2: - Add Andre's reviewed-by --- 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__);