From fd94eaab5b2f7b76151245f6db0bd20782deed2e Mon Sep 17 00:00:00 2001
From: Roland Veloz <rveloz@us.ibm.com>
Date: Wed, 26 Dec 2018 19:04:12 -0600
Subject: Replace attribute I2C_MUX_INFO with attribute FAPI_I2C_CONTROL_INFO

-- Just removed all instances of I2C_MUX_INFO and replaced with
   FAPI_I2C_CONTROL_INFO if not already there.

Change-Id: Ie161abb25ef75b632d6c429fb247ccbd04eb2135
RTC: 203024
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/70022
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: Nicholas E. Bofferding <bofferdn@us.ibm.com>
Reviewed-by: Christian R. Geddes <crgeddes@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>
---
 src/usr/i2c/i2c.C                                  |  6 +--
 .../targeting/common/xmltohb/attribute_types.xml   | 45 ---------------------
 .../common/xmltohb/simics_AXONE.system.xml         | 11 +-----
 .../common/xmltohb/simics_CUMULUS.system.xml       | 46 +---------------------
 src/usr/targeting/common/xmltohb/target_types.xml  |  3 --
 src/usr/targeting/test/testtargeting.H             |  6 +--
 6 files changed, 8 insertions(+), 109 deletions(-)

(limited to 'src')

diff --git a/src/usr/i2c/i2c.C b/src/usr/i2c/i2c.C
index e74d9ecd4..bba2910c0 100755
--- a/src/usr/i2c/i2c.C
+++ b/src/usr/i2c/i2c.C
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2011,2018                        */
+/* Contributors Listed Below - COPYRIGHT 2011,2019                        */
 /* [+] Google Inc.                                                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
@@ -1053,9 +1053,9 @@ errlHndl_t i2cAccessMux( TARGETING::TargetHandle_t i_masterTarget,
             break;
         }
 
-        TARGETING::I2cMuxInfo l_muxData;
+        TARGETING::FapiI2cControlInfo l_muxData;
 
-        if (! (l_i2cMuxTarget->tryGetAttr<TARGETING::ATTR_I2C_MUX_INFO>(l_muxData)) )
+        if (! (l_i2cMuxTarget->tryGetAttr<TARGETING::ATTR_FAPI_I2C_CONTROL_INFO>(l_muxData)) )
         {
             TRACFCOMP(g_trac_i2c,
             "i2cAccessMux(): get attributes failed");
diff --git a/src/usr/targeting/common/xmltohb/attribute_types.xml b/src/usr/targeting/common/xmltohb/attribute_types.xml
index 5f4edae76..eb281a157 100644
--- a/src/usr/targeting/common/xmltohb/attribute_types.xml
+++ b/src/usr/targeting/common/xmltohb/attribute_types.xml
@@ -2491,51 +2491,6 @@
     </simpleType>
   </attribute>
 
-  <attribute>
-    <complexType>
-      <description>Structure to define the addressing for
-                 an I2C mux target. </description>
-      <!-- Master Target Definition -->
-      <field>
-        <!--- NOTE: default physical sys-0 is not a valid entity path,
-                  this must be populated with a valid entity path.    -->
-        <default>physical:sys-0</default>
-        <description>Entity path to the chip that contains the I2C
-                   master.</description>
-        <name>i2cMasterPath</name>
-        <type>EntityPath</type>
-      </field>
-      <!-- Port Definition -->
-      <field>
-        <default>0x00</default>
-        <description>Port from the I2C Master device. This is a
-                   6-bit value. </description>
-        <name>port</name>
-        <type>uint8_t</type>
-      </field>
-      <!-- Device Address Definition -->
-      <field>
-        <default>0x00</default>
-        <description>Device address on the I2C bus. This is a 7-bit
-                   value, but then shifted 1 bit left. </description>
-        <name>devAddr</name>
-        <type>uint8_t</type>
-      </field>
-      <!-- Engine Definition -->
-      <field>
-        <default>0x00</default>
-        <description>I2C master engine. This is a 2-bit value. </description>
-        <name>engine</name>
-        <type>uint8_t</type>
-      </field>
-    </complexType>
-    <description>Information used to control a specific i2c mux device,
-               to select a particular target bus. </description>
-    <id>I2C_MUX_INFO</id>
-    <persistency>non-volatile</persistency>
-    <readable/>
-  </attribute>
-
   <attribute>
     <complexType>
       <description>Structure which defines which I2C access method to use at
diff --git a/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml b/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml
index 46dea6902..b31183488 100644
--- a/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_AXONE.system.xml
@@ -13302,7 +13302,7 @@
         <default>NA</default>
     </attribute>
     <attribute>
-        <id>I2C_MUX_INFO</id>
+        <id>FAPI_I2C_CONTROL_INFO</id>
         <default>
             <field><id>i2cMasterPath</id><value>physical:sys-0/node-0/proc-0</value></field>
             <field><id>port</id><value>0</value></field>
@@ -13310,15 +13310,6 @@
             <field><id>engine</id><value>3</value></field>
         </default>
     </attribute>
-    <attribute>
-    <id>FAPI_I2C_CONTROL_INFO</id>
-        <default>
-            <field><id>i2cMasterPath</id><value>physical:sys-0/node-0/proc-0</value></field>
-            <field><id>port</id><value>0</value></field>
-            <field><id>devAddr</id><value>0xE0</value></field>
-            <field><id>engine</id><value>3</value></field>
-        </default>
-  </attribute>
 </targetInstance>
 
 </attributes>
diff --git a/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml b/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml
index 2a9c82f72..f776c3aac 100644
--- a/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml
+++ b/src/usr/targeting/common/xmltohb/simics_CUMULUS.system.xml
@@ -5,7 +5,7 @@
 <!--                                                                        -->
 <!-- OpenPOWER HostBoot Project                                             -->
 <!--                                                                        -->
-<!-- Contributors Listed Below - COPYRIGHT 2016,2018                        -->
+<!-- Contributors Listed Below - COPYRIGHT 2016,2019                        -->
 <!-- [+] International Business Machines Corp.                              -->
 <!--                                                                        -->
 <!--                                                                        -->
@@ -13635,48 +13635,4 @@
     </attribute>
 </targetInstance>
 
-<!-- For testing purposes only, will replace with real values later -->
-<targetInstance>
-    <id>sys0node0i2cmux0</id>
-    <type>i2c_mux_pca9847</type>
-    <attribute>
-        <id>HUID</id>
-        <default>0x004D0000</default>
-    </attribute>
-    <attribute>
-        <id>PHYS_PATH</id>
-        <default>physical:sys-0/node-0/i2c_mux-0</default>
-    </attribute>
-    <attribute>
-        <id>AFFINITY_PATH</id>
-        <default>affinity:sys-0/node-0/proc-0/i2c_mux-0</default>
-    </attribute>
-    <attribute>
-        <id>PRIMARY_CAPABILITIES</id>
-        <default>
-            <field><id>reserved</id><value>0</value></field>
-            <field><id>supportsFsiScom</id><value>0</value></field>
-            <field><id>supportsInbandScom</id><value>0</value></field>
-            <field><id>supportsXscom</id><value>0</value></field>
-        </default>
-    </attribute>
-    <attribute>
-        <id>ORDINAL_ID</id>
-        <default>0</default>
-    </attribute>
-    <attribute>
-        <id>FAPI_NAME</id>
-        <default>NA</default>
-    </attribute>
-    <attribute>
-        <id>I2C_MUX_INFO</id>
-        <default>
-            <field><id>i2cMasterPath</id><value>physical:sys-0/node-0/proc-0</value></field>
-            <field><id>port</id><value>4</value></field>
-            <field><id>devAddr</id><value>0xA0</value></field>
-            <field><id>engine</id><value>2</value></field>
-        </default>
-    </attribute>
-</targetInstance>
-
 </attributes>
diff --git a/src/usr/targeting/common/xmltohb/target_types.xml b/src/usr/targeting/common/xmltohb/target_types.xml
index b182cf676..1189f9954 100644
--- a/src/usr/targeting/common/xmltohb/target_types.xml
+++ b/src/usr/targeting/common/xmltohb/target_types.xml
@@ -972,9 +972,6 @@
     <attribute>
       <id>FAPI_I2C_CONTROL_INFO</id>
     </attribute>
-    <attribute>
-      <id>I2C_MUX_INFO</id>
-    </attribute>
     <attribute>
       <id>MODEL</id>
       <default>PCA9847</default>
diff --git a/src/usr/targeting/test/testtargeting.H b/src/usr/targeting/test/testtargeting.H
index 16d2fc99d..1e4792831 100644
--- a/src/usr/targeting/test/testtargeting.H
+++ b/src/usr/targeting/test/testtargeting.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2012,2018                        */
+/* Contributors Listed Below - COPYRIGHT 2012,2019                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -605,8 +605,8 @@ class TargetingTestSuite : public CxxTest::TestSuite
                                 TARGETING::TYPE_I2C_MUX);
                     }
 
-                    TARGETING::I2cMuxInfo l_i2cMuxInfo =
-                          l_targetList->getAttr<TARGETING::ATTR_I2C_MUX_INFO>();
+                    TARGETING::FapiI2cControlInfo l_i2cMuxInfo =
+                          l_targetList->getAttr<TARGETING::ATTR_FAPI_I2C_CONTROL_INFO>();
 
                     if (TARGETING::EntityPath::PATH_PHYSICAL !=
                             l_i2cMuxInfo.i2cMasterPath.type())
-- 
cgit v1.2.3