Commit 40df2d1d authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] Update Xscale and Xscale3 PTE mappings 



Use 'shared device' mappings for devices, and use the standard
bit combinations for Xscale3.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 40d192b6

arch/arm/mm/proc-xsc3.S

+6 −8
Original line number Diff line number Diff line
@@ -345,23 +345,21 @@ ENTRY(cpu_xsc3_switch_mm) 
 * cpu_xsc3_set_pte_ext(ptep, pte, ext)

 *

 * Set a PTE and flush it out

 *

 */



cpu_xsc3_mt_table:

	.long	0x00						@ L_PTE_MT_UNCACHED

	.long	PTE_BUFFERABLE					@ L_PTE_MT_BUFFERABLE

	.long	PTE_EXT_TEX(5) | PTE_CACHEABLE			@ L_PTE_MT_WRITETHROUGH

	.long	PTE_EXT_TEX(5) | PTE_CACHEABLE | PTE_BUFFERABLE	@ L_PTE_MT_WRITEBACK

	.long	0x00						@ L_PTE_MT_DEV_SHARED

	.long	PTE_EXT_TEX(1)					@ L_PTE_MT_BUFFERABLE

	.long	PTE_CACHEABLE					@ L_PTE_MT_WRITETHROUGH

	.long	PTE_CACHEABLE | PTE_BUFFERABLE			@ L_PTE_MT_WRITEBACK

	.long	PTE_EXT_TEX(1) | PTE_BUFFERABLE			@ L_PTE_MT_DEV_SHARED

	.long	0x00						@ unused

	.long	0x00						@ L_PTE_MT_MINICACHE (not present)

	.long	PTE_EXT_TEX(5) | PTE_CACHEABLE | PTE_BUFFERABLE	@ L_PTE_MT_WRITEALLOC (not present?)

	.long	0x00						@ unused

	.long	PTE_EXT_TEX(1)					@ L_PTE_MT_DEV_WC

	.long	0x00						@ unused

	.long	PTE_EXT_TEX(5) | PTE_CACHEABLE | PTE_BUFFERABLE	@ L_PTE_MT_DEV_CACHED

	.long	0x00						@ L_PTE_MT_DEV_NONSHARED

	.long	PTE_CACHEABLE | PTE_BUFFERABLE			@ L_PTE_MT_DEV_CACHED

	.long	PTE_EXT_TEX(2)					@ L_PTE_MT_DEV_NONSHARED

	.long	0x00						@ L_PTE_MT_DEV_IXP2000 (not present)

	.long	0x00						@ unused

	.long	0x00						@ unused

arch/arm/mm/proc-xscale.S

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ cpu_xscale_mt_table: 
	.long	PTE_BUFFERABLE					@ L_PTE_MT_BUFFERABLE

	.long	PTE_CACHEABLE					@ L_PTE_MT_WRITETHROUGH

	.long	PTE_CACHEABLE | PTE_BUFFERABLE			@ L_PTE_MT_WRITEBACK

	.long	0x00						@ L_PTE_MT_DEV_SHARED

	.long	PTE_EXT_TEX(1) | PTE_BUFFERABLE			@ L_PTE_MT_DEV_SHARED

	.long	0x00						@ unused

	.long	PTE_EXT_TEX(1) | PTE_CACHEABLE			@ L_PTE_MT_MINICACHE

	.long	PTE_EXT_TEX(1) | PTE_CACHEABLE | PTE_BUFFERABLE	@ L_PTE_MT_WRITEALLOC