XSCOM Error path updates for P9

Modified the register addresses that are used to collect XSCOM
error data and to reset the logic.
Also updated the devtree values for the xscom node.

Change-Id: I7cc426857258d460b79afc4b43493ee1a0a8a7d0
RTC: 128077
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/25727
Tested-by: Jenkins Server
Tested-by: FSP CI Jenkins
Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>
Reviewed-by: Matthew A. Ploetz <maploetz@us.ibm.com>
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 2 insertions, 10 deletions

diff --git a/src/usr/devtree/bld_devtree.C b/src/usr/devtree/bld_devtree.C
index 698a525a6..d7986e9ee 100644
--- a/src/usr/devtree/bld_devtree.C
+++ b/src/usr/devtree/bld_devtree.C
@@ -711,19 +711,11 @@ void bld_xscom_node(devTree * i_dt, dtOffset_t & i_parentNode,
     const char* todNodeName = "chiptod";
     const char* pciNodeName = "pbcq";
 
-    // Grab a system object to work with
-    TARGETING::Target* sys = NULL;
-    TARGETING::targetService().getTopLevelTarget(sys);
-
-    uint64_t l_xscomBaseAddr =
-      sys->getAttr<TARGETING::ATTR_XSCOM_BASE_ADDRESS>();
-
     /**********************************************************/
     /*                   Xscom node                           */
     /**********************************************************/
-    //@todo-Fix for P9-RTC:128077
-    uint64_t l_xscomAddr = l_xscomBaseAddr +
-      (static_cast<uint64_t>(i_chipid) << XSCOM_CHIP_SHIFT);
+    uint64_t l_xscomAddr =
+      i_pProc->getAttr<TARGETING::ATTR_XSCOM_BASE_ADDRESS>();
 
     dtOffset_t xscomNode = i_dt->addNode(i_parentNode, xscomNodeName,
                                          l_xscomAddr);