Remove references to deprecated ATTR_NEST_FREQ_MHZ

Use of ATTR_NEST_FREQ_MHZ has been replaced by ATTR_FREQ_PB_MHZ, so
references to ATTR_NEST_FREQ_MHZ are being removed.

Change-Id: I7536e55a0bc71a3e40977f9cb4065292a2384e9b
RTC:161596
CMVC-Prereq:1006557
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/31641
Reviewed-by: Matt Derksen <v2cibmd@us.ibm.com>
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

4 files changed, 0 insertions, 47 deletions

diff --git a/src/usr/isteps/istep07/call_mss_freq.C b/src/usr/isteps/istep07/call_mss_freq.C
index 14fb02dc7..3dc294ad1 100644
--- a/src/usr/isteps/istep07/call_mss_freq.C
+++ b/src/usr/isteps/istep07/call_mss_freq.C
@@ -191,9 +191,6 @@ void*    call_mss_freq( void *io_pArgs )
     uint8_t l_mcSyncMode = l_masterProc->getAttr<TARGETING::ATTR_MC_SYNC_MODE>();
     uint32_t l_newNest = l_sys->getAttr<TARGETING::ATTR_FREQ_PB_MHZ>();
 
-    // TODO RTC: 161596 - Set ATTR_NEST_FREQ_MHZ as well until we know it is not being used anymore
-    l_sys->setAttr<TARGETING::ATTR_NEST_FREQ_MHZ>( l_newNest );
-
     if(l_StepError.getErrorHandle() == NULL)
     {
         //Trigger sbe update if the nest frequency changed.
diff --git a/src/usr/targeting/common/target.C b/src/usr/targeting/common/target.C
index 3cdd449a4..6c9741561 100644
--- a/src/usr/targeting/common/target.C
+++ b/src/usr/targeting/common/target.C
@@ -700,14 +700,6 @@ void setFrequencyAttributes( Target * i_sys,
     uint32_t l_oldNestFreq = i_sys->getAttr<TARGETING::ATTR_FREQ_PB_MHZ>();
     uint32_t l_newPll = (i_newNestFreq * l_oldPll)/l_oldNestFreq;
 
-    //NEST_FREQ
-    //TODO RTC: 161596 - Remove references to deprecated NEST_FREQ_MHZ
-    i_sys->setAttr<TARGETING::ATTR_NEST_FREQ_MHZ>(i_newNestFreq);
-    TRACFCOMP(g_trac_targeting,
-            "ATTR_NEST_FREQ_MHZ getting set from %d to %d",
-            l_oldNestFreq,
-            i_newNestFreq );
-
     //FREQ_PB_MHZ
     uint32_t l_freqPb = i_newNestFreq;
     i_sys->setAttr<TARGETING::ATTR_FREQ_PB_MHZ>(l_freqPb);
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index 0c5153074..bb3457158 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -6358,39 +6358,6 @@ firmware notes: Used as override attribute for pstate procedure
 </attribute>
 
 <attribute>
-    <id>PREV_NEST_FREQ_MHZ</id>
-    <description>
-        The Nest frequency in MHz the system booted on last.
-        Populated in istep 6.12 from the SBE.
-    </description>
-    <simpleType>
-        <uint32_t></uint32_t>
-    </simpleType>
-    <persistency>volatile-zeroed</persistency>
-    <readable/>
-    <writeable/>
-</attribute>
-
-<attribute>
-    <id>NEST_FREQ_MHZ</id>
-    <!-- TODO RTC: 161596 - Remove deprecated NEST_FREQ_MHZ -->
-    <description>
-        Nest frequency in MHz
-    </description>
-    <simpleType>
-        <uint32_t>
-        </uint32_t>
-    </simpleType>
-    <persistency>volatile-zeroed</persistency>
-    <readable/>
-    <writeable/>
-    <hwpfToHbAttrMap>
-        <id>ATTR_NEST_FREQ_MHZ</id>
-        <macro>DIRECT</macro>
-    </hwpfToHbAttrMap>
-</attribute>
-
-<attribute>
     <id>CHIP_REGIONS_TO_ENABLE</id>
     <description>
       Called to get data to customize an IPL or SLW image with data indicating
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index 6c72f8d42..eaf9923b7 100755
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -619,9 +619,6 @@
     <attribute><id>FREQ_A_MHZ</id></attribute>
     <attribute><id>FREQ_PB_MHZ</id></attribute>
     <attribute><id>ASYNC_NEST_FREQ_MHZ</id></attribute>
-    <!-- TODO RTC: 161596 - Remove references to deprecated NEST_FREQ_MHZ -->
-    <attribute><id>NEST_FREQ_MHZ</id></attribute>
-    <attribute><id>PREV_NEST_FREQ_MHZ</id></attribute>
     <attribute><id>FREQ_PCIE_MHZ</id></attribute>
     <attribute><id>FREQ_X_MHZ</id></attribute>
     <attribute><id>MSS_MBA_ADDR_INTERLEAVE_BIT</id></attribute>