Shift HWP content to align with desired EKB layout

Change-Id: I11cd320c8c79a88362ad6338e953baa1b47fe941
Original-Change-Id: Id22bf63b31e0631685139b9695c5a443cf4f2298
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/20714
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Reviewed-by: Jennifer A. Stofer <stofer@us.ibm.com>
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/25887
Tested-by: FSP CI Jenkins
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

6 files changed, 280 insertions, 0 deletions

diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_circular.C b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_circular.C
new file mode 100644
index 000000000..55f3f17af
--- /dev/null
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_circular.C
@@ -0,0 +1,55 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: chips/p9/procedures/ipl/hwp/p9_pm_ocb_indir_setup_circular.C $ */
+/*                                                                        */
+/* IBM CONFIDENTIAL                                                       */
+/*                                                                        */
+/* EKB Project                                                            */
+/*                                                                        */
+/* COPYRIGHT 2015                                                         */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
+/*                                                                        */
+/* The source code for this program is not published or otherwise         */
+/* divested of its trade secrets, irrespective of what has been           */
+/* deposited with the U.S. Copyright Office.                              */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+/// @file  p9_pm_ocb_indir_setup_circular.C
+/// @brief  Configure OCB Channels for Circular Push or Pull Mode
+///
+// *HWP HWP Owner       : Greg Still <stillgs@us.ibm.com>
+// *HWP Backup HWP Owner:
+// *HWP FW Owner        : Bilicon Patil <bilpatil@in.ibm.com>
+// *HWP Team            : PM
+// *HWP Level           : 1
+// *HWP Consumed by     : HS
+
+
+/// High-level procedure flow:
+/// @verbatim
+///  Setup specified channel to push or pull circular mode by calling
+///  proc proc_ocb_init
+///
+///  Procedure Prereq:
+///     - System clocks are running
+/// @endverbatim
+///
+
+// ----------------------------------------------------------------------
+// Includes
+// ----------------------------------------------------------------------
+
+#include <p9_pm_ocb_indir_setup_circular.H>
+
+fapi2::ReturnCode p9_pm_ocb_indir_setup_circular(
+    const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target,
+    p9ocb::P9_OCB_CHAN_NUM i_ocb_chan,
+    p9ocb::P9_OCB_CHAN_TYPE i_ocb_type)
+{
+    FAPI_IMP("Entering...");
+    FAPI_DBG("For channel %x as type %x", i_ocb_chan, i_ocb_type);
+
+    return fapi2::FAPI2_RC_SUCCESS;
+}
diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_circular.H b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_circular.H
new file mode 100644
index 000000000..bf4754b38
--- /dev/null
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_circular.H
@@ -0,0 +1,60 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: chips/p9/procedures/ipl/hwp/p9_pm_ocb_indir_setup_circular.H $ */
+/*                                                                        */
+/* IBM CONFIDENTIAL                                                       */
+/*                                                                        */
+/* EKB Project                                                            */
+/*                                                                        */
+/* COPYRIGHT 2015                                                         */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
+/*                                                                        */
+/* The source code for this program is not published or otherwise         */
+/* divested of its trade secrets, irrespective of what has been           */
+/* deposited with the U.S. Copyright Office.                              */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+/// @file  p9_pm_ocb_indir_setup_circular.H
+/// @brief  Configure OCB Channels for Circular Push or Pull Mode
+// *HWP HWP Owner       : Greg Still <stillgs@us.ibm.com>
+// *HWP Backup HWP Owner:
+// *HWP FW Owner        : Bilicon Patil <bilpatil@in.ibm.com>
+// *HWP Team            : PM
+// *HWP Level           : 1
+// *HWP Consumed by     : HS
+
+
+#ifndef _P9_PM_OCB_INDIR_SETUP_CIRCULAR_H_
+#define _P9_PM_OCB_INDIR_SETUP_CIRCULAR_H_
+
+#include <fapi2.H>
+#include <p9_pm_ocb_init.H>
+
+// function pointer typedef definition for HWP call support
+typedef fapi2::ReturnCode (*p9_pm_ocb_indir_setup_circular_FP_t)
+(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&,
+ p9ocb::P9_OCB_CHAN_NUM,
+ p9ocb::P9_OCB_CHAN_TYPE);
+
+extern "C"
+{
+
+//------------------------------------------------------------------------------
+// Function prototype
+//------------------------------------------------------------------------------
+/// @brief Configure OCB Channels for Circular Push or Pull Mode
+/// @param[in] i_target Chip Target
+/// @param[in] i_ocb_chan Select channel 0-3 to set up
+/// @param[in] i_ocb_type Circular push;  circular pull
+/// @return FAPI2_RC_SUCCESS on success, error otherwise
+
+    fapi2::ReturnCode p9_pm_ocb_indir_setup_circular(
+        const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target,
+        p9ocb::P9_OCB_CHAN_NUM i_ocb_chan,
+        p9ocb::P9_OCB_CHAN_TYPE i_ocb_type);
+
+} // extern "C"
+
+#endif
diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_circular.mk b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_circular.mk
new file mode 100644
index 000000000..a43bf1119
--- /dev/null
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_circular.mk
@@ -0,0 +1,21 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: chips/p9/procedures/ipl/hwp/p9_pm_ocb_indir_setup_circular.mk $
+#
+# IBM CONFIDENTIAL
+#
+# EKB Project
+#
+# COPYRIGHT 2015
+# [+] International Business Machines Corp.
+#
+#
+# The source code for this program is not published or otherwise
+# divested of its trade secrets, irrespective of what has been
+# deposited with the U.S. Copyright Office.
+#
+# IBM_PROLOG_END_TAG
+PROCEDURE=p9_pm_ocb_indir_setup_circular
+libp9_pm_ocb_indir_setup_circular_DEPLIBS += p9_pm_utils
+$(call BUILD_PROCEDURE)
diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_linear.C b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_linear.C
new file mode 100644
index 000000000..6552402ea
--- /dev/null
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_linear.C
@@ -0,0 +1,61 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: chips/p9/procedures/ipl/hwp/p9_pm_ocb_indir_setup_linear.C $  */
+/*                                                                        */
+/* IBM CONFIDENTIAL                                                       */
+/*                                                                        */
+/* EKB Project                                                            */
+/*                                                                        */
+/* COPYRIGHT 2015                                                         */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
+/*                                                                        */
+/* The source code for this program is not published or otherwise         */
+/* divested of its trade secrets, irrespective of what has been           */
+/* deposited with the U.S. Copyright Office.                              */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+/// @file p8_ocb_indir_setup_linear.C
+/// @brief  Configure OCB Channel for Linear Streaming or Non-streaming mode
+
+// *HWP HWP Owner       : Amit Kumar <akumar3@us.ibm.com>
+// *HWP Backup HWP Owner:
+// *HWP FW Owner        : Bilicon Patil <bilpatil@in.ibm.com>
+// *HWP Team            : PM
+// *HWP Level           : 1
+// *HWP Consumed by     : HS
+
+/// High-level procedure flow:
+/// @verbatim
+///  Setup specified channel to linear streaming or non-streaming mode by
+///  calling proc proc_ocb_init
+///
+///  Procedure Prereq:
+///     - System clocks are running
+/// @endverbatim
+///
+//------------------------------------------------------------------------------
+
+// ----------------------------------------------------------------------
+// Includes
+// ----------------------------------------------------------------------
+
+#include <p9_pm.H>
+#include <p9_pm_ocb_indir_setup_linear.H>
+
+// ----------------------------------------------------------------------
+// Function definitions
+// ----------------------------------------------------------------------
+fapi2::ReturnCode p9_pm_ocb_indir_setup_linear(
+    const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target,
+    p9ocb::P9_OCB_CHAN_NUM  i_ocb_chan,
+    p9ocb::P9_OCB_CHAN_TYPE i_ocb_type,
+    const uint32_t      i_ocb_bar)
+{
+    FAPI_IMP("Entering...");
+    FAPI_DBG("For channel %x as type %x, OCB Bar %x",
+             i_ocb_chan, i_ocb_type, i_ocb_bar);
+
+    return fapi2::FAPI2_RC_SUCCESS;
+}
diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_linear.H b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_linear.H
new file mode 100644
index 000000000..0d92f7300
--- /dev/null
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_linear.H
@@ -0,0 +1,62 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: chips/p9/procedures/ipl/hwp/p9_pm_ocb_indir_setup_linear.H $  */
+/*                                                                        */
+/* IBM CONFIDENTIAL                                                       */
+/*                                                                        */
+/* EKB Project                                                            */
+/*                                                                        */
+/* COPYRIGHT 2015                                                         */
+/* [+] International Business Machines Corp.                              */
+/*                                                                        */
+/*                                                                        */
+/* The source code for this program is not published or otherwise         */
+/* divested of its trade secrets, irrespective of what has been           */
+/* deposited with the U.S. Copyright Office.                              */
+/*                                                                        */
+/* IBM_PROLOG_END_TAG                                                     */
+/// @file p9_pm_ocb_indir_setup_linear.C
+/// @brief  Configure OCB Channel for Linear Streaming or Non-streaming mode
+
+// *HWP HWP Owner       : Amit Kumar <akumar3@us.ibm.com>
+// *HWP Backup HWP Owner:
+// *HWP FW Owner        : Bilicon Patil <bilpatil@in.ibm.com>
+// *HWP Team            : PM
+// *HWP Level           : 1
+// *HWP Consumed by     : HS
+
+#ifndef _P9_PM_OCB_INDIR_SETUP_LINEAR_H_
+#define _P9_PM_OCB_INDIR_SETUP_LINEAR_H_
+
+#include <fapi2.H>
+#include <p9_pm_ocb_init.H>
+
+typedef fapi2::ReturnCode (*p9_pm_ocb_indir_setup_linear_FP_t)
+(const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>&,
+ p9ocb::P9_OCB_CHAN_NUM,
+ p9ocb::P9_OCB_CHAN_TYPE,
+ const uint32_t);
+
+extern "C"
+{
+
+//------------------------------------------------------------------------------
+// Function prototype
+//------------------------------------------------------------------------------
+/// @brief  Configure OCB Channel for Linear Streaming or Non-streaming mode
+/// @param[in]  i_target   Chip Target
+/// @param[in]  i_ocb_chan select channel 0-3 to set up      (see p8_ocb_init.H)
+/// @param[in]  i_ocb_type linear streaming or non-streaming (see p8_ocb_init.H)
+/// @param[in]  i_ocb_bar  32-bit channel base address (29 bits + "000")
+/// @return FAPI2_RC_SUCCESS on success, else error.
+
+    fapi2::ReturnCode p9_pm_ocb_indir_setup_linear(
+        const fapi2::Target<fapi2::TARGET_TYPE_PROC_CHIP>& i_target,
+        p9ocb::P9_OCB_CHAN_NUM  i_ocb_chan,
+        p9ocb::P9_OCB_CHAN_TYPE i_ocb_type,
+        const uint32_t      i_ocb_bar);
+
+} // extern "C"
+
+#endif
diff --git a/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_linear.mk b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_linear.mk
new file mode 100644
index 000000000..f1519199f
--- /dev/null
+++ b/src/import/chips/p9/procedures/hwp/pm/p9_pm_ocb_indir_setup_linear.mk
@@ -0,0 +1,21 @@
+# IBM_PROLOG_BEGIN_TAG
+# This is an automatically generated prolog.
+#
+# $Source: chips/p9/procedures/ipl/hwp/p9_pm_ocb_indir_setup_linear.mk $
+#
+# IBM CONFIDENTIAL
+#
+# EKB Project
+#
+# COPYRIGHT 2015
+# [+] International Business Machines Corp.
+#
+#
+# The source code for this program is not published or otherwise
+# divested of its trade secrets, irrespective of what has been
+# deposited with the U.S. Copyright Office.
+#
+# IBM_PROLOG_END_TAG
+PROCEDURE=p9_pm_ocb_indir_setup_linear
+libp9_pm_ocb_indir_setup_linear_DEPLIBS += p9_pm_utils
+$(call BUILD_PROCEDURE)