diff mbox

[Xen-devel,V5,13/15] add arm64 cache flushing code from linux v3.16

Message ID 1411080607-32365-14-git-send-email-roy.franz@linaro.org
State New
Headers show

Commit Message

Roy Franz Sept. 18, 2014, 10:50 p.m. UTC
__flush_dcache_all added from arch/arm64/mm/cache.S, with helper macros from
arch/arm64/include/asm/assembler.h, from v3.16.  The cache flushing is required
when transitioning from EFI code that runs with cache enable to Xen startup
code which expects the cache to be disabled.

Signed-off-by: Roy Franz <roy.franz@linaro.org>
---
 xen/arch/arm/arm64/Makefile |   1 +
 xen/arch/arm/arm64/cache.S  | 100 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 101 insertions(+)
 create mode 100644 xen/arch/arm/arm64/cache.S

Comments

Ian Campbell Sept. 22, 2014, 10:54 a.m. UTC | #1
On Thu, 2014-09-18 at 15:50 -0700, Roy Franz wrote:
> __flush_dcache_all added from arch/arm64/mm/cache.S, with helper macros from
> arch/arm64/include/asm/assembler.h, from v3.16.  The cache flushing is required
> when transitioning from EFI code that runs with cache enable to Xen startup
> code which expects the cache to be disabled.
> 
> Signed-off-by: Roy Franz <roy.franz@linaro.org>

Acked-by: Ian Campbell <ian.campbell@citrix.com>
[...]

> +	ENTRY(__flush_dcache_all)

If you need to repost please unindent this (if there's no need to repost
then I can do it on commit).
Roy Franz Sept. 22, 2014, 11:42 p.m. UTC | #2
On Mon, Sep 22, 2014 at 3:54 AM, Ian Campbell <Ian.Campbell@citrix.com> wrote:
> On Thu, 2014-09-18 at 15:50 -0700, Roy Franz wrote:
>> __flush_dcache_all added from arch/arm64/mm/cache.S, with helper macros from
>> arch/arm64/include/asm/assembler.h, from v3.16.  The cache flushing is required
>> when transitioning from EFI code that runs with cache enable to Xen startup
>> code which expects the cache to be disabled.
>>
>> Signed-off-by: Roy Franz <roy.franz@linaro.org>
>
> Acked-by: Ian Campbell <ian.campbell@citrix.com>
> [...]
>
>> +     ENTRY(__flush_dcache_all)
>
> If you need to repost please unindent this (if there's no need to repost
> then I can do it on commit).
>
>
I'll be reposting a new series to address other feedback, so I'll include this.

Roy
Ian Campbell Sept. 23, 2014, 7:42 a.m. UTC | #3
On Mon, 2014-09-22 at 16:42 -0700, Roy Franz wrote:
> On Mon, Sep 22, 2014 at 3:54 AM, Ian Campbell <Ian.Campbell@citrix.com> wrote:
> > On Thu, 2014-09-18 at 15:50 -0700, Roy Franz wrote:
> >> __flush_dcache_all added from arch/arm64/mm/cache.S, with helper macros from
> >> arch/arm64/include/asm/assembler.h, from v3.16.  The cache flushing is required
> >> when transitioning from EFI code that runs with cache enable to Xen startup
> >> code which expects the cache to be disabled.
> >>
> >> Signed-off-by: Roy Franz <roy.franz@linaro.org>
> >
> > Acked-by: Ian Campbell <ian.campbell@citrix.com>
> > [...]
> >
> >> +     ENTRY(__flush_dcache_all)
> >
> > If you need to repost please unindent this (if there's no need to repost
> > then I can do it on commit).
> >
> >
> I'll be reposting a new series to address other feedback, so I'll include this.

No need, I applied this one already (and fixed it up)

Ian.
diff mbox

Patch

diff --git a/xen/arch/arm/arm64/Makefile b/xen/arch/arm/arm64/Makefile
index d2d5875..c7243f5 100644
--- a/xen/arch/arm/arm64/Makefile
+++ b/xen/arch/arm/arm64/Makefile
@@ -7,5 +7,6 @@  obj-y += domain.o
 obj-y += vfp.o
 obj-y += smpboot.o
 obj-y += domctl.o
+obj-y += cache.o
 
 obj-$(EARLY_PRINTK) += debug.o
diff --git a/xen/arch/arm/arm64/cache.S b/xen/arch/arm/arm64/cache.S
new file mode 100644
index 0000000..fb6dff1
--- /dev/null
+++ b/xen/arch/arm/arm64/cache.S
@@ -0,0 +1,100 @@ 
+/*
+ * Cache maintenance
+ *
+ * Copyright (C) 2001 Deep Blue Solutions Ltd.
+ * Copyright (C) 2012 ARM Ltd.
+ * Copyright (C) 1996-2000 Russell King
+ * Copyright (C) 2012 ARM Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+/*
+ * Enable and disable interrupts.
+ */
+	.macro	disable_irq
+	msr	daifset, #2
+	.endm
+
+	.macro	enable_irq
+	msr	daifclr, #2
+	.endm
+
+/*
+ * Save/disable and restore interrupts.
+ */
+	.macro	save_and_disable_irqs, olddaif
+	mrs	\olddaif, daif
+	disable_irq
+	.endm
+
+	.macro	restore_irqs, olddaif
+	msr	daif, \olddaif
+	.endm
+
+/*
+ *	__flush_dcache_all()
+ *
+ *	Flush the whole D-cache.
+ *
+ *	Corrupted registers: x0-x7, x9-x11
+ */
+	ENTRY(__flush_dcache_all)
+__flush_dcache_all:
+	dmb	sy				// ensure ordering with previous memory accesses
+	mrs	x0, clidr_el1			// read clidr
+	and	x3, x0, #0x7000000		// extract loc from clidr
+	lsr	x3, x3, #23			// left align loc bit field
+	cbz	x3, finished			// if loc is 0, then no need to clean
+	mov	x10, #0				// start clean at cache level 0
+loop1:
+	add	x2, x10, x10, lsr #1		// work out 3x current cache level
+	lsr	x1, x0, x2			// extract cache type bits from clidr
+	and	x1, x1, #7			// mask of the bits for current cache only
+	cmp	x1, #2				// see what cache we have at this level
+	b.lt	skip				// skip if no cache, or just i-cache
+	save_and_disable_irqs x9		// make CSSELR and CCSIDR access atomic
+	msr	csselr_el1, x10			// select current cache level in csselr
+	isb					// isb to sych the new cssr&csidr
+	mrs	x1, ccsidr_el1			// read the new ccsidr
+	restore_irqs x9
+	and	x2, x1, #7			// extract the length of the cache lines
+	add	x2, x2, #4			// add 4 (line length offset)
+	mov	x4, #0x3ff
+	and	x4, x4, x1, lsr #3		// find maximum number on the way size
+	clz	w5, w4				// find bit position of way size increment
+	mov	x7, #0x7fff
+	and	x7, x7, x1, lsr #13		// extract max number of the index size
+loop2:
+	mov	x9, x4				// create working copy of max way size
+loop3:
+	lsl	x6, x9, x5
+	orr	x11, x10, x6			// factor way and cache number into x11
+	lsl	x6, x7, x2
+	orr	x11, x11, x6			// factor index number into x11
+	dc	cisw, x11			// clean & invalidate by set/way
+	subs	x9, x9, #1			// decrement the way
+	b.ge	loop3
+	subs	x7, x7, #1			// decrement the index
+	b.ge	loop2
+skip:
+	add	x10, x10, #2			// increment cache number
+	cmp	x3, x10
+	b.gt	loop1
+finished:
+	mov	x10, #0				// swith back to cache level 0
+	msr	csselr_el1, x10			// select current cache level in csselr
+	dsb	sy
+	isb
+	ret
+ENDPROC(__flush_dcache_all)