diff options
Diffstat (limited to 'arch/arm/mm/proc-arm946.S')
| -rw-r--r-- | arch/arm/mm/proc-arm946.S | 32 | 
1 files changed, 28 insertions, 4 deletions
| diff --git a/arch/arm/mm/proc-arm946.S b/arch/arm/mm/proc-arm946.S index 9a951239c86c..1664b6aaff79 100644 --- a/arch/arm/mm/proc-arm946.S +++ b/arch/arm/mm/proc-arm946.S @@ -215,7 +215,7 @@ ENTRY(arm946_flush_kern_dcache_area)   *	- end	- virtual end address   * (same as arm926)   */ -ENTRY(arm946_dma_inv_range) +arm946_dma_inv_range:  #ifndef CONFIG_CPU_DCACHE_WRITETHROUGH  	tst	r0, #CACHE_DLINESIZE - 1  	mcrne	p15, 0, r0, c7, c10, 1		@ clean D entry @@ -240,7 +240,7 @@ ENTRY(arm946_dma_inv_range)   *   * (same as arm926)   */ -ENTRY(arm946_dma_clean_range) +arm946_dma_clean_range:  #ifndef CONFIG_CPU_DCACHE_WRITETHROUGH  	bic	r0, r0, #CACHE_DLINESIZE - 1  1:	mcr	p15, 0, r0, c7, c10, 1		@ clean D entry @@ -275,6 +275,30 @@ ENTRY(arm946_dma_flush_range)  	mcr	p15, 0, r0, c7, c10, 4		@ drain WB  	mov	pc, lr +/* + *	dma_map_area(start, size, dir) + *	- start	- kernel virtual start address + *	- size	- size of region + *	- dir	- DMA direction + */ +ENTRY(arm946_dma_map_area) +	add	r1, r1, r0 +	cmp	r2, #DMA_TO_DEVICE +	beq	arm946_dma_clean_range +	bcs	arm946_dma_inv_range +	b	arm946_dma_flush_range +ENDPROC(arm946_dma_map_area) + +/* + *	dma_unmap_area(start, size, dir) + *	- start	- kernel virtual start address + *	- size	- size of region + *	- dir	- DMA direction + */ +ENTRY(arm946_dma_unmap_area) +	mov	pc, lr +ENDPROC(arm946_dma_unmap_area) +  ENTRY(arm946_cache_fns)  	.long	arm946_flush_kern_cache_all  	.long	arm946_flush_user_cache_all @@ -282,8 +306,8 @@ ENTRY(arm946_cache_fns)  	.long	arm946_coherent_kern_range  	.long	arm946_coherent_user_range  	.long	arm946_flush_kern_dcache_area -	.long	arm946_dma_inv_range -	.long	arm946_dma_clean_range +	.long	arm946_dma_map_area +	.long	arm946_dma_unmap_area  	.long	arm946_dma_flush_range | 
