From 8b55f9f85320b08947c3ebe48898eac4daac3adf Mon Sep 17 00:00:00 2001
From: Leandro Lupori <luporl@FreeBSD.org>
Date: Wed, 10 Jul 2019 13:36:17 +0000
Subject: [PATCH] [PPC64] pseries: fix realmaxaddr calculation

On POWER9/pseries, QEMU passes several regions of memory,
instead of a single region containing all memory, as the
code was expecting.

Reviewed by:	jhibbits
Differential Revision:	https://reviews.freebsd.org/D20857
---
 sys/powerpc/pseries/platform_chrp.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/sys/powerpc/pseries/platform_chrp.c b/sys/powerpc/pseries/platform_chrp.c
index a642c6942071..4880dd2cba58 100644
--- a/sys/powerpc/pseries/platform_chrp.c
+++ b/sys/powerpc/pseries/platform_chrp.c
@@ -140,8 +140,15 @@ chrp_attach(platform_t plat)
 	if (!(mfmsr() & PSL_HV)) {
 		struct mem_region *phys, *avail;
 		int nphys, navail;
+		vm_offset_t off;
+
 		mem_regions(&phys, &nphys, &avail, &navail);
-		realmaxaddr = phys[0].mr_size;
+
+		realmaxaddr = 0;
+		for (i = 0; i < nphys; i++) {
+			off = phys[i].mr_start + phys[i].mr_size;
+			realmaxaddr = MAX(off, realmaxaddr);
+		}
 
 		pmap_mmu_install("mmu_phyp", BUS_PROBE_SPECIFIC);
 		cpu_idle_hook = phyp_cpu_idle;