Move prevasive procedures to SEEPROM

Change-Id: Ifc930b6b27f73e9dc44a5c03037e7c8a0192364e
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/25190
Tested-by: Jenkins Server
Reviewed-by: AMIT J. TENDOLKAR <amit.tendolkar@in.ibm.com>

6 files changed, 45 insertions, 5 deletions

diff --git a/import/chips/p9/procedures/hwp/nest/Makefile b/import/chips/p9/procedures/hwp/nest/Makefile
index 1be88801..6ae2e44e 100644
--- a/import/chips/p9/procedures/hwp/nest/Makefile
+++ b/import/chips/p9/procedures/hwp/nest/Makefile
@@ -8,6 +8,11 @@ export SUB_OBJDIR = /nest
 include img_defs.mk
 include nestfiles.mk
 
+# TODO via RTC 152424
+# Adding VPATH as there are few procedures which are in
+# perv folder but we are compiling them here. Refer to
+# nestfiles.mk for details.
+export VPATH = $(PERV_SRCDIR):$(NEST_SRCDIR)
 OBJS := $(addprefix $(OBJDIR)/, $(NEST_OBJECTS))
 
 libnest.a: nest
diff --git a/import/chips/p9/procedures/hwp/nest/nestfiles.mk b/import/chips/p9/procedures/hwp/nest/nestfiles.mk
index 8b8a4877..5c3c7b79 100644
--- a/import/chips/p9/procedures/hwp/nest/nestfiles.mk
+++ b/import/chips/p9/procedures/hwp/nest/nestfiles.mk
@@ -17,6 +17,16 @@ NEST-CPP-SOURCES +=p9_pba_setup.C
 NEST-CPP-SOURCES +=p9_adu_access.C
 NEST-CPP-SOURCES +=p9_adu_setup.C
 NEST-CPP-SOURCES +=p9_adu_coherent_utils.C
+# TODO via RTC 152424
+# p9_ram_core.C will go to runtime makefile. Currently this procedure is in
+# perv directory. As we are putting perv procedures currently in SEEPROM.
+# So compiling p9_ram_core.C in nest makefile.
+NEST-CPP-SOURCES +=p9_ram_core.C
+# TODO via RTC 152424
+# swicth gear proecdures are in perv directory. But these procedures needs to
+# be executed from PIBMEM. So compiling these is nest makefile.
+NEST-CPP-SOURCES +=p9_sbe_gear_switcher.C
+NEST-CPP-SOURCES +=p9_sbe_tp_switch_gears.C
 NEST-C-SOURCES =
 NEST-S-SOURCES =
 
diff --git a/import/chips/p9/procedures/hwp/perv/Makefile b/import/chips/p9/procedures/hwp/perv/Makefile
index 5c1fc635..79b77526 100644
--- a/import/chips/p9/procedures/hwp/perv/Makefile
+++ b/import/chips/p9/procedures/hwp/perv/Makefile
@@ -8,6 +8,7 @@ export SUB_OBJDIR = /perv
 include img_defs.mk
 include pervfiles.mk
 
+GCC-CFLAGS += -mlongcall
 
 OBJS := $(addprefix $(OBJDIR)/, $(PERV_OBJECTS))
 
diff --git a/import/chips/p9/procedures/hwp/perv/pervfiles.mk b/import/chips/p9/procedures/hwp/perv/pervfiles.mk
index a4977dee..b274d59f 100644
--- a/import/chips/p9/procedures/hwp/perv/pervfiles.mk
+++ b/import/chips/p9/procedures/hwp/perv/pervfiles.mk
@@ -31,13 +31,10 @@ PERV-CPP-SOURCES +=p9_sbe_tp_chiplet_reset.C
 PERV-CPP-SOURCES +=p9_sbe_tp_enable_ridi.C
 PERV-CPP-SOURCES +=p9_sbe_tp_initf.C
 PERV-CPP-SOURCES +=p9_sbe_tp_ld_image.C
-PERV-CPP-SOURCES +=p9_sbe_tp_switch_gears.C
 PERV-CPP-SOURCES +=p9_sbe_setup_evid.C
 PERV-CPP-SOURCES +=p9_perv_sbe_cmn.C
 PERV-CPP-SOURCES +=p9_sbe_common.C
-PERV-CPP-SOURCES +=p9_sbe_gear_switcher.C
 PERV-CPP-SOURCES +=p9_sbe_check_master_stop15.C
-PERV-CPP-SOURCES +=p9_ram_core.C
 PERV-CPP-SOURCES +=p9_hcd_cache_dcc_skewadjust_setup.C
 PERV-CPP-SOURCES +=p9_sbe_setup_boot_freq.C
 PERV-CPP-SOURCES +=p9_sbe_io_initf.C
diff --git a/sbe/image/linkseeprom.cmd b/sbe/image/linkseeprom.cmd
index 43e7c406..04f5acb1 100644
--- a/sbe/image/linkseeprom.cmd
+++ b/sbe/image/linkseeprom.cmd
@@ -1,3 +1,27 @@
+/* IBM_PROLOG_BEGIN_TAG                                                   */
+/* This is an automatically generated prolog.                             */
+/*                                                                        */
+/* $Source: sbe/image/linkseeprom.cmd $                                   */
+/*                                                                        */
+/* OpenPOWER sbe Project                                                  */
+/*                                                                        */
+/* Contributors Listed Below - COPYRIGHT 2015,2016                        */
+/* [+] 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                                                     */
 // Need to do this so that elf32-powerpc is not modified!
 #undef powerpc
 #include <sbe_link.H>
@@ -95,7 +119,7 @@ SECTIONS
 
     .text ALIGN(8): {
          _text_origin = .; _text_offset = . - _seeprom_origin;
-        *\libcore.a:(.text* ) *\libcache.a:(.text* ) } > seeprom
+        *\libcore.a:(.text* ) *\libcache.a:(.text* ) *\libperv.a:(.text* )} > seeprom
      _text_size = . - _text_origin;
 
     _seeprom_size = . - _seeprom_origin;
diff --git a/sbe/sbefw/sbecmdiplcontrol.C b/sbe/sbefw/sbecmdiplcontrol.C
index 7a138340..3468accb 100644
--- a/sbe/sbefw/sbecmdiplcontrol.C
+++ b/sbe/sbefw/sbecmdiplcontrol.C
@@ -124,6 +124,9 @@ ReturnCode istepStartInstruction( sbeIstepHwp_t i_hwp);
 ReturnCode istepWithCoreConditional( sbeIstepHwp_t i_hwp);
 ReturnCode istepWithEqConditional( sbeIstepHwp_t i_hwp);
 
+// Using function pointer to force long call.
+p9_sbe_select_ex_FP_t p9_sbe_select_ex_hwp = &p9_sbe_select_ex;
+
 //structure for mapping SBE wrapper and HWP functions
 typedef struct
 {
@@ -512,7 +515,7 @@ ReturnCode istepSelectEx( sbeIstepHwp_t i_hwp)
     // TODO via RTC 135345
     // Once multicast targets are supported, we may need to pass
     // p9selectex::ALL as input.
-    return p9_sbe_select_ex(proc, p9selectex::SINGLE);
+    return p9_sbe_select_ex_hwp(proc, p9selectex::SINGLE);
 }
 
 //----------------------------------------------------------------------------