From 2b26420e72477835ffeacb2dab9970266ef07566 Mon Sep 17 00:00:00 2001
From: Louis Stermole <stermole@us.ibm.com>
Date: Thu, 24 Jan 2019 13:36:56 -0500
Subject: Add p9a_mss_freq procedure

Change-Id: I764e1ade2f63cabb7f6e5cf2b39e89811ea432c4
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/70989
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Tested-by: HWSV CI <hwsv-ci+hostboot@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Reviewed-by: STEPHEN GLANCY <sglancy@us.ibm.com>
Reviewed-by: ANDRE A. MARIN <aamarin@us.ibm.com>
Tested-by: Hostboot CI <hostboot-ci+hostboot@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/75567
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Tested-by: Christian R. Geddes <crgeddes@us.ibm.com>
---
 .../xml/attribute_info/memory_mrw_attributes.xml   | 19 ----------
 .../xml/error_info/p9_memory_mss_freq.xml          | 44 ++++++++++++++++------
 2 files changed, 32 insertions(+), 31 deletions(-)

(limited to 'src/import/chips/p9/procedures/xml')

diff --git a/src/import/chips/p9/procedures/xml/attribute_info/memory_mrw_attributes.xml b/src/import/chips/p9/procedures/xml/attribute_info/memory_mrw_attributes.xml
index 2e8fb7167..b4ab25916 100755
--- a/src/import/chips/p9/procedures/xml/attribute_info/memory_mrw_attributes.xml
+++ b/src/import/chips/p9/procedures/xml/attribute_info/memory_mrw_attributes.xml
@@ -529,25 +529,6 @@
     <mssAccessorName>mrw_dram_2n_mode</mssAccessorName>
   </attribute>
 
-  <attribute>
-    <id>ATTR_MSS_MRW_SUPPORTED_FREQ</id>
-    <targetType>TARGET_TYPE_SYSTEM</targetType>
-    <description>
-      List of memory frequencies supported by the current system.
-    </description>
-    <valueType>uint32</valueType>
-    <array>4</array>
-    <platInit/>
-    <!-- Note, mirrors ATTR_MSS_FREQ -->
-    <enum>
-      MT1866 = 1866,
-      MT2133 = 2133,
-      MT2400 = 2400,
-      MT2666 = 2666
-    </enum>
-    <default> 1866, 2133, 2400, 2666 </default>
-  </attribute>
-
   <attribute>
     <id>ATTR_MSS_MRW_UNSUPPORTED_RANK_CONFIG</id>
     <targetType>TARGET_TYPE_MCS</targetType>
diff --git a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_freq.xml b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_freq.xml
index 8eac08abd..4a1b6f51f 100644
--- a/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_freq.xml
+++ b/src/import/chips/p9/procedures/xml/error_info/p9_memory_mss_freq.xml
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- OpenPOWER HostBoot Project                                             -->
 <!--                                                                        -->
-<!-- Contributors Listed Below - COPYRIGHT 2015,2018                        -->
+<!-- Contributors Listed Below - COPYRIGHT 2015,2019                        -->
 <!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
@@ -47,7 +47,7 @@
     </callout>
     <callout>
       <childTargets>
-          <parent>MCA_TARGET</parent>
+          <parent>PORT_TARGET</parent>
           <childType>TARGET_TYPE_DIMM</childType>
       </childTargets>
       <priority>MEDIUM</priority>
@@ -55,27 +55,47 @@
   </hwpError>
 
   <hwpError>
-    <rc>RC_MSS_FREQ_NOT_EQUAL_NEST_FREQ</rc>
+    <rc>RC_MSS_BAD_FREQ_CALCULATED</rc>
+    <description>
+        No frequency found for MC Either bad mrw attribute or no DIMMS installed?
+        Should be a code bug if we get here
+    </description>
+    <ffdc>MSS_FREQ</ffdc>
+    <ffdc>SUPPORTED_FREQ_0</ffdc>
+    <ffdc>SUPPORTED_FREQ_1</ffdc>
+    <ffdc>SUPPORTED_FREQ_2</ffdc>
+    <ffdc>SUPPORTED_FREQ_3</ffdc>
+    <ffdc>TARGET</ffdc>
+    <ffdc>PROC_TYPE</ffdc>
+    <callout>
+      <procedure>CODE</procedure>
+      <priority>HIGH</priority>
+    </callout>
+  </hwpError>
+
+  <hwpError>
+    <rc>RC_MSS_FREQ_NOT_EQUAL_MAX_DOMAIN_FREQ</rc>
     <description>
       Case when mss_freq speeds are different and sync mode is required,
-      and mss_freq is not equal to nest freq.
+      and mss_freq is not equal to max freq in domain.
     </description>
     <ffdc>MSS_FREQ</ffdc>
-    <ffdc>NEST_FREQ</ffdc>
+    <ffdc>DOMAIN_FREQ</ffdc>
+    <ffdc>DOMAIN_TARGET</ffdc>
     <callout>
       <procedure>CODE</procedure>
       <priority>MEDIUM</priority>
     </callout>
     <callout>
       <childTargets>
-        <parent>MCS_TARGET</parent>
+        <parent>DOMAIN_TARGET</parent>
         <childType>TARGET_TYPE_DIMM</childType>
       </childTargets>
       <priority>HIGH</priority>
     </callout>
     <deconfigure>
       <childTargets>
-        <parent>MCS_TARGET</parent>
+        <parent>DOMAIN_TARGET</parent>
         <childType>TARGET_TYPE_DIMM</childType>
       </childTargets>
     </deconfigure>
@@ -96,9 +116,9 @@
   </hwpError>
 
   <hwpError>
-    <rc>RC_MSS_EMPTY_MCBIST_VECTOR_PASSED</rc>
+    <rc>RC_MSS_EMPTY_FREQ_TARGET_VECTOR_PASSED</rc>
     <description>
-       Empty MCBIST target vector found when constructing dimm speed mapping
+       Empty freq target vector found when constructing dimm speed mapping
     </description>
     <callout>
       <procedure>CODE</procedure>
@@ -144,9 +164,9 @@
   </hwpError>
 
   <hwpError>
-    <rc>RC_MSS_ALL_MCBIST_HAVE_0_FREQ</rc>
+    <rc>RC_MSS_ALL_TARGETS_HAVE_0_FREQ</rc>
     <description>
-       All MCBIST have 0 MSS_FREQ, but there are dimms still configured?
+       All targets in the freq domain (MCBIST or port) have 0 MSS_FREQ, but there are dimms still configured?
     </description>
     <ffdc>VECTOR_SIZE</ffdc>
     <callout>
@@ -275,7 +295,7 @@
     </callout>
     <callout>
         <childTargets>
-          <parent>MCA_TARGET</parent>
+          <parent>PORT_TARGET</parent>
           <childType>TARGET_TYPE_DIMM</childType>
         </childTargets>
         <priority>MEDIUM</priority>
-- 
cgit v1.2.1