svn commit: r259380 - stable/10/sys/arm/at91

[Ian Lepore]

Author: ian
Date: Sat Dec 14 01:34:24 2013
New Revision: 259380
URL: http://svnweb.freebsd.org/changeset/base/259380

Log:
  MFC r259038, r259039:
  
    Bump the maximum VM space from 3 * memory size to a fixed
    256MB. That's all we have room for since we map the hardware registers
    starting at 0xd0000000. This allows my 64MB AT91SAM9G20 to boot again
    after the unmmaped I/O changes were MFC'd at r251897. Other
    subplatforms may need similar treatment.
  
    Although not strictly required to boot a 64MB board, bump
    vm_max_virtual_address to be KERNVIRTADDR + 256MB. This allows some
    future shock protection since the KVA requirements have gone up since
    the unmapped changes have gone in, as well as preventing us from
    overlapping with the hardware devices, which we map at 0xd0000000,
    which we'd hit with anything more than 85MB...

Modified:
  stable/10/sys/arm/at91/at91_machdep.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/arm/at91/at91_machdep.c
==============================================================================
--- stable/10/sys/arm/at91/at91_machdep.c	Sat Dec 14 01:15:26 2013	(r259379)
+++ stable/10/sys/arm/at91/at91_machdep.c	Sat Dec 14 01:34:24 2013	(r259380)
@@ -633,7 +633,8 @@ initarm(struct arm_boot_params *abp)
 
 	pmap_curmaxkvaddr = afterkern + L1_S_SIZE * (KERNEL_PT_KERN_NUM - 1);
 	arm_dump_avail_init(memsize, sizeof(dump_avail)/sizeof(dump_avail[0]));
-	vm_max_kernel_address = KERNVIRTADDR + 3 * memsize;
+	/* Always use the 256MB of KVA we have available between the kernel and devices */
+	vm_max_kernel_address = KERNVIRTADDR + (256 << 20);
 	pmap_bootstrap(freemempos, &kernel_l1pt);
 	msgbufp = (void*)msgbufpv.pv_va;
 	msgbufinit(msgbufp, msgbufsize);