From ca9f3ccb233ab344bfbb397b345eb8f245779d46 Mon Sep 17 00:00:00 2001
From: Martin Peschke <mpeschke@de.ibm.com>
Date: Tue, 28 Feb 2017 19:32:00 +0100
Subject: p9_xip_tool: fix ring dissect warnings

Fixes
"Ambiguity on input PARMS for calling SEEPROM Ring copy API."
for
p9_xip_tool <SEEPROM image> dissect .ring

Change-Id: If82dddc3a6eba516b0a5ba9bc213074095daee41
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/37201
Reviewed-by: Claus M. Olsen <cmolsen@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: PPE CI <ppe-ci+hostboot@us.ibm.com>
Reviewed-by: Sumit Kumar <sumit_kumar@in.ibm.com>
Reviewed-by: Martin Peschke <mpeschke@de.ibm.com>
---
 import/chips/p9/xip/p9_xip_tool.C | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/import/chips/p9/xip/p9_xip_tool.C b/import/chips/p9/xip/p9_xip_tool.C
index eb8c1fc2..a7f8afb9 100644
--- a/import/chips/p9/xip/p9_xip_tool.C
+++ b/import/chips/p9/xip/p9_xip_tool.C
@@ -1870,6 +1870,13 @@ int dissectRingSectionTor( void*       i_ringSection,
         for (ppeType = 0; ppeType < NUM_PPE_TYPES; ppeType++)
         {
 
+            if ((i_imageMagicNo == P9_XIP_MAGIC_SGPE    && ppeType != SGPE) ||
+                (i_imageMagicNo == P9_XIP_MAGIC_CME     && ppeType != CME)  ||
+                (i_imageMagicNo == P9_XIP_MAGIC_SEEPROM && ppeType != SBE))
+            {
+                continue;
+            }
+
             //--------------------
             // Ring variant loop.
             // - Base, cache, risk, override, overlay
-- 
cgit v1.2.3