Message ID | 20170912100330.2168-13-julien.grall@arm.com |
---|---|
State | Accepted |
Commit | 64cf3181e4d469a8bd7e7dee8ff2d3bf5b45f4b0 |
Headers | show |
Series | xen/arm: Memory subsystem clean-up | expand |
On Tue, 12 Sep 2017, Julien Grall wrote: > ioremap_cache is a wrapper of ioremap_attr(...). > > Signed-off-by: Julien Grall <julien.grall@arm.com> > Reviewed-by: Andre Przywara <andre.przywara@arm.com> Reviewed-by: Stefano Stabellini <sstabellini@kernel.org> > --- > > 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__); > -- > 2.11.0 >
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__);