svn commit: r295703 - in head/sys/arm: arm include

[Svatopluk Kraus]

Author: skra
Date: Wed Feb 17 14:39:29 2016
New Revision: 295703
URL: https://svnweb.freebsd.org/changeset/base/295703

Log:
  Do not use PMAP_DOMAIN_KERNEL definition for __ARM_ARCH >= 6 as domains
  are not utilized there. Only domain #0 is used and there is no reference
  to it in the whole pmap-v6.c. Thus initialize domain access register in
  locore-v6.c without reference too.

Modified:
  head/sys/arm/arm/genassym.c
  head/sys/arm/arm/locore-v6.S
  head/sys/arm/include/pmap-v6.h

Modified: head/sys/arm/arm/genassym.c
==============================================================================
--- head/sys/arm/arm/genassym.c	Wed Feb 17 14:34:01 2016	(r295702)
+++ head/sys/arm/arm/genassym.c	Wed Feb 17 14:39:29 2016	(r295703)
@@ -129,7 +129,9 @@ ASSYM(PC_CURPMAP, offsetof(struct pcpu, 
 #endif
 
 ASSYM(PAGE_SIZE, PAGE_SIZE);
+#if __ARM_ARCH < 6
 ASSYM(PMAP_DOMAIN_KERNEL, PMAP_DOMAIN_KERNEL);
+#endif
 #ifdef PMAP_INCLUDE_PTE_SYNC
 ASSYM(PMAP_INCLUDE_PTE_SYNC, 1);
 #endif

Modified: head/sys/arm/arm/locore-v6.S
==============================================================================
--- head/sys/arm/arm/locore-v6.S	Wed Feb 17 14:34:01 2016	(r295702)
+++ head/sys/arm/arm/locore-v6.S	Wed Feb 17 14:39:29 2016	(r295703)
@@ -280,7 +280,7 @@ ASENTRY_NP(init_mmu)
 	mcr	CP15_CONTEXTIDR(r0)	/* Set ASID to 0 */
 
 	/* Set the Domain Access register */
-	mov	r0, #((DOMAIN_CLIENT <<	(PMAP_DOMAIN_KERNEL*2)) | DOMAIN_CLIENT)
+	mov	r0, #DOMAIN_CLIENT	/* Only domain #0 is used */
 	mcr	CP15_DACR(r0)
 
 	/*

Modified: head/sys/arm/include/pmap-v6.h
==============================================================================
--- head/sys/arm/include/pmap-v6.h	Wed Feb 17 14:34:01 2016	(r295702)
+++ head/sys/arm/include/pmap-v6.h	Wed Feb 17 14:39:29 2016	(r295703)
@@ -220,30 +220,4 @@ void pmap_preboot_map_attr(vm_paddr_t, v
     vm_memattr_t);
 
 #endif	/* _KERNEL */
-
-// ----------------- TO BE DELETED ---------------------------------------------
-#ifdef _KERNEL
-
-/*
- * sys/arm/arm/elf_trampoline.c
- * sys/arm/arm/genassym.c
- * sys/arm/arm/machdep.c
- * sys/arm/arm/mp_machdep.c
- * sys/arm/arm/locore.S
- * sys/arm/arm/pmap.c
- * sys/arm/arm/swtch.S
- * sys/arm/at91/at91_machdep.c
- * sys/arm/cavium/cns11xx/econa_machdep.c
- * sys/arm/s3c2xx0/s3c24x0_machdep.c
- * sys/arm/xscale/ixp425/avila_machdep.c
- * sys/arm/xscale/i8134x/crb_machdep.c
- * sys/arm/xscale/i80321/ep80219_machdep.c
- * sys/arm/xscale/i80321/iq31244_machdep.c
- * sys/arm/xscale/pxa/pxa_machdep.c
- */
-#define	PMAP_DOMAIN_KERNEL	0	/* The kernel uses domain #0 */
-
-#endif	/* _KERNEL */
-// -----------------------------------------------------------------------------
-
 #endif	/* !_MACHINE_PMAP_H_ */