Make RT_TARG id generation code common between IPL time and runtime

For axone we are writing the OMI mmio bars into hdat so the hypervisor
know how to talk to the devices. IPL code needs to be able to lookup
the hbrt-style ids so we can use them to make hdat entries that the
hypervisor will be able to associate targets with. This commit also
move rt_targeting.H to the correct include directory and updates
everywhere that it is included.

Change-Id: I31deaa1a9c5a7523622a8b3b12ad459e2b2feed3
Reviewed-on: http://rchgit01.rchland.ibm.com/gerrit1/80419
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-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>

3 files changed, 52 insertions, 16 deletions

diff --git a/src/include/usr/runtime/customize_attrs_for_payload.H b/src/include/usr/runtime/customize_attrs_for_payload.H
index a5158f996..6d6928bda 100644
--- a/src/include/usr/runtime/customize_attrs_for_payload.H
+++ b/src/include/usr/runtime/customize_attrs_for_payload.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016                             */
+/* Contributors Listed Below - COPYRIGHT 2016,2020                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -33,7 +33,7 @@
  */
 
 #include <errl/errlentry.H>
-#include <runtime/rt_targeting.H>
+#include <targeting/runtime/rt_targeting.H>
 #include <targeting/common/attributes.H>
 
 namespace RUNTIME
@@ -42,7 +42,7 @@ namespace RUNTIME
 static const TARGETING::ATTR_HBRT_HYP_ID_type HBRT_HYP_ID_UNKNOWN
     = 0xFFFFFFFFFFFFFFFFULL;
 
-static const RT_TARG::rtChipId_t RT_TYPE_UNKNOWN
+static const TARGETING::rtChipId_t RT_TYPE_UNKNOWN
     = 0xFFFFFFFFFFFFFFFFULL;
 
 /**
diff --git a/src/include/usr/targeting/common/hbrt_target.H b/src/include/usr/targeting/common/hbrt_target.H
new file mode 100644
index 000000000..1a6989bf4
--- /dev/null
+++ b/src/include/usr/targeting/common/hbrt_target.H
@@ -0,0 +1,45 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: src/include/usr/targeting/common/hbrt_target.H $              */
+/*                                                                        */
+/* OpenPOWER HostBoot Project                                             */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2019,2020                        */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
+/*                                                                        */
+/* Licensed under the Apache License, Version 2.0 (the "License");        */
+/* you may not use this file except in compliance with the License.       */
+/* You may obtain a copy of the License at                                */
+/*                                                                        */
+/*     http://www.apache.org/licenses/LICENSE-2.0                         */
+/*                                                                        */
+/* Unless required by applicable law or agreed to in writing, software    */
+/* distributed under the License is distributed on an "AS IS" BASIS,      */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or        */
+/* implied. See the License for the specific language governing           */
+/* permissions and limitations under the License.                         */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+#ifndef __HBRT_TARGET_H
+#define __HBRT_TARGET_H
+
+#include <errl/errlentry.H>
+
+namespace TARGETING
+{
+    typedef uint64_t rtChipId_t;
+     /**
+     * @brief Convert a TARGETING::Target to an unit ID that can be used
+     * in calls to the runtime host
+     * @param[in] The HB TARGETING::Target
+     * @param[out] Sapphire target id
+     * @return an error handle on error
+     */
+    errlHndl_t getRtTarget(const TARGETING::Target* i_target,
+                           rtChipId_t &o_targetId);
+
+}
+
+#endif
\ No newline at end of file
diff --git a/src/include/usr/runtime/rt_targeting.H b/src/include/usr/targeting/runtime/rt_targeting.H
index 9070dbc88..c94b871a9 100644
--- a/src/include/usr/runtime/rt_targeting.H
+++ b/src/include/usr/targeting/runtime/rt_targeting.H
@@ -1,11 +1,11 @@
 /* IBM_PROLOG_BEGIN_TAG                                                   */
 /* This is an automatically generated prolog.                             */
 /*                                                                        */
-/* $Source: src/include/usr/runtime/rt_targeting.H $                      */
+/* $Source: src/include/usr/targeting/runtime/rt_targeting.H $            */
 /*                                                                        */
 /* OpenPOWER HostBoot Project                                             */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2014,2018                        */
+/* Contributors Listed Below - COPYRIGHT 2014,2020                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -26,6 +26,7 @@
 #define __RT_TARGETING_H
 
 #include <errl/errlentry.H>
+#include <targeting/common/hbrt_target.H>
 
 namespace TARGETING
 {
@@ -34,7 +35,6 @@ namespace TARGETING
 
 namespace RT_TARG
 {
-    typedef uint64_t rtChipId_t;
 
     enum
     {
@@ -43,15 +43,6 @@ namespace RT_TARG
     };
 
 
-    /**
-     * @brief Convert a TARGETING::Target to an unit ID that can be used
-     * in calls to the runtime host
-     * @param[in] The HB TARGETING::Target
-     * @param[out] Sapphire target id
-     * @return an error handle on error
-     */
-    errlHndl_t getRtTarget(const TARGETING::Target* i_target,
-                           rtChipId_t &o_targetId);
 
     /**
      * @brief Convert a runtime chip_id (target) into a TARGETING::Target
@@ -59,7 +50,7 @@ namespace RT_TARG
      * @param[out] The TARGETING::Target pointer
      * @return error log handle on error else NULL
      */
-    errlHndl_t getHbTarget(rtChipId_t i_rt_chip_id,
+    errlHndl_t getHbTarget(TARGETING::rtChipId_t i_rt_chip_id,
                            TARGETING::Target *& o_target);
 
     /**