diff options
| author | Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com> | 2020-04-26 16:45:33 -0300 |
|---|---|---|
| committer | Vasant Hegde <hegdevasant@linux.vnet.ibm.com> | 2020-06-06 10:20:20 +0530 |
| commit | 13c399021cca3c12ed80bb09e1bc9fe68da4c613 (patch) | |
| tree | fcef6c02dc3b930397bc7bf53c47d8e3a4461fce | |
| parent | 3697c05e61b347f83d35261806b62bd741fda3b3 (diff) | |
| download | skiboot-13c399021cca3c12ed80bb09e1bc9fe68da4c613.zip skiboot-13c399021cca3c12ed80bb09e1bc9fe68da4c613.tar.gz skiboot-13c399021cca3c12ed80bb09e1bc9fe68da4c613.tar.bz2 | |
hdata/memory.c: Fix "Inconsistent MSAREA" warnings
[ Upstream commit 11d12c6fb60af42b89930fe776958f0eb208dd23 ]
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@lists.ozlabs.org
Cc: Oliver O'Halloran <oohall@gmail.com>
Signed-off-by: Klaus Heinrich Kiwi <klaus@linux.vnet.ibm.com>
Signed-off-by: Oliver O'Halloran <oohall@gmail.com>
Signed-off-by: Vasant Hegde <hegdevasant@linux.vnet.ibm.com>
| -rwxr-xr-x | hdata/memory.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/hdata/memory.c b/hdata/memory.c index 7ce9275..f2c4405 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", be32_to_cpu(msarea->version)); |