svn commit: r345844 - stable/12/sys/arm/arm

[Ed Maste]

Author: emaste
Date: Wed Apr  3 13:19:47 2019
New Revision: 345844
URL: https://svnweb.freebsd.org/changeset/base/345844

Log:
  MFC r343764 (jchandra): arm, acpi: increase size of memory region arrays
  
  Bump up MAX_HWCNT and MAX_EXCNT to 32 when ACPI is enabled. These are
  the sizes of the hwregions and exregions arrays respectively. ACPI
  firmware typically has more memory regions and the current value of
  16 is not sufficient for some platforms.
  
  This commit fixes a failure seen with AMI firmware on Cavium's Sabre
  ThunderX2 reference platform. This platform needs 21 physical memory
  regions and 18 excluded regions to boot correctly with the current
  firmware release.

Modified:
  stable/12/sys/arm/arm/physmem.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/arm/arm/physmem.c
==============================================================================
--- stable/12/sys/arm/arm/physmem.c	Wed Apr  3 12:47:49 2019	(r345843)
+++ stable/12/sys/arm/arm/physmem.c	Wed Apr  3 13:19:47 2019	(r345844)
@@ -29,6 +29,7 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
+#include "opt_acpi.h"
 #include "opt_ddb.h"
 
 /*
@@ -48,8 +49,13 @@ __FBSDID("$FreeBSD$");
  * that can be allocated, or both, depending on the exclusion flags associated
  * with the region.
  */
+#ifdef DEV_ACPI
+#define	MAX_HWCNT	32	/* ACPI needs more regions */
+#define	MAX_EXCNT	32
+#else
 #define	MAX_HWCNT	16
 #define	MAX_EXCNT	16
+#endif
 
 #if defined(__arm__)
 #define	MAX_PHYS_ADDR	0xFFFFFFFFull