[Skiboot] [PATCH] hdata/memory.c: Fix "Inconsistent MSAREA" warnings

Klaus Heinrich Kiwi klaus at linux.vnet.ibm.com
Mon Apr 27 05:45:33 AEST 2020

add_memory_buffer_mmio() should be exclusive to P9P (AXONE).
Running it on non P9P systems resulted in warnings such as:

MS AREA: Inconsistent MSAREA version 40 for P9P system

So check for PVR and quietly return if not P9P.

Fixes: 38b5c3179 (Add support for memory-buffer mmio)
Cc: skiboot-stable at lists.ozlabs.org
Cc: Oliver O'Halloran <oohall at gmail.com>
Signed-off-by: Klaus Heinrich Kiwi <klaus at linux.vnet.ibm.com>
 hdata/memory.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/hdata/memory.c b/hdata/memory.c
index 7ce927502..f2c440540 100755
--- a/hdata/memory.c
+++ b/hdata/memory.c
@@ -514,6 +514,9 @@ static void add_memory_buffer_mmio(const struct HDIF_common_hdr *msarea)
 	struct dt_node *membuf;
 	uint64_t *reg, *flags;
+	if (PVR_TYPE(mfspr(SPR_PVR)) != PVR_TYPE_P9P)
+		return;
 	if (be32_to_cpu(msarea->version) < 0x50) {
 		prlog(PR_WARNING, "MS AREA: Inconsistent MSAREA version %x for P9P system",

More information about the Skiboot mailing list