Cleanup as DD1 is not supported anymore

Change-Id: I57580a088ffc62cc678b32d8d0779d992df6d76a Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/52763 Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com> Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com> Reviewed-by: RAJA DAS <rajadas2@in.ibm.com> Reviewed-by: Shakeeb A. Pasha B K <shakeebbk@in.ibm.com> Reviewed-by: Sachin Gupta <sgupta2m@in.ibm.com>
open-power · Jan 30, 2018 · 3c633a6 · 3c633a6
1 parent 6995522
commit 3c633a6
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 41 deletions.
diff --git a/Makefile b/Makefile
@@ -23,15 +23,15 @@
 #
 # IBM_PROLOG_END_TAG
 BUILD_DIR = src/build
-.PHONY: install all clean tar install_DD1 install_DD2 DD1 DD2
+.PHONY: install
 
 install: all tar
 
 tar:
 	$(MAKE) -C $(BUILD_DIR) tar
 
 DD2:
-	$(MAKE) -C $(BUILD_DIR) all ddlevel=DD2
+	$(MAKE) -C $(BUILD_DIR) all
 
 all: DD2
 

diff --git a/src/build/import_hwp_mk/power/istep2/Makefile b/src/build/import_hwp_mk/power/istep2/Makefile
@@ -6,6 +6,7 @@
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016,2018
+# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,10 +33,6 @@ include istep2files.mk
 
 export VPATH = $(PERV_SRCDIR):$(NEST_SRCDIR):$(CACHE_SRCDIR):$(CORE_SRCDIR):$(PM_SRCDIR):$(INITFILES_SRCDIR):$(LIB_SRCDIR)
 
-ifneq ($(ddlevel), DD2)
-GCC-CFLAGS += -mlongcall
-endif
-
 OBJSISTEP2 := $(addprefix $(OBJDIR-ISTEP2)/, $(ISTEP2_OBJECTS))
 
 .PHONY: clean istep2

diff --git a/src/build/import_hwp_mk/power/istep3/Makefile b/src/build/import_hwp_mk/power/istep3/Makefile
@@ -6,6 +6,7 @@
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016,2018
+# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,10 +33,6 @@ include istep3files.mk
 
 export VPATH = $(PERV_SRCDIR):$(NEST_SRCDIR):$(CACHE_SRCDIR):$(CORE_SRCDIR):$(PM_SRCDIR):$(INITFILES_SRCDIR):$(LIB_SRCDIR)
 
-ifneq ($(ddlevel), DD2)
-GCC-CFLAGS += -mlongcall
-endif
-
 OBJSISTEP3 := $(addprefix $(OBJDIR-ISTEP3)/, $(ISTEP3_OBJECTS))
 
 .PHONY: clean istep3

diff --git a/src/build/import_hwp_mk/power/istep4/Makefile b/src/build/import_hwp_mk/power/istep4/Makefile
@@ -6,6 +6,7 @@
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016,2018
+# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,10 +33,6 @@ include istep4files.mk
 
 export VPATH = $(PERV_SRCDIR):$(NEST_SRCDIR):$(CACHE_SRCDIR):$(CORE_SRCDIR):$(PM_SRCDIR):$(INITFILES_SRCDIR):$(LIB_SRCDIR):$(HWPLIB_SRCDIR):$(HWPFFDC_SRCDIR)
 
-ifneq ($(ddlevel), DD2)
-GCC-CFLAGS += -mlongcall
-endif
-
 OBJSISTEP4 := $(addprefix $(OBJDIR-ISTEP4)/, $(ISTEP4_OBJECTS))
 
 .PHONY: clean istep4

diff --git a/src/build/import_hwp_mk/power/istep4/istep4files.mk b/src/build/import_hwp_mk/power/istep4/istep4files.mk
@@ -6,6 +6,7 @@
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016,2018
+# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -60,12 +61,10 @@ ISTEP4-CPP-SOURCES +=p9_ncu_scom.C
 ISTEP4-CPP-SOURCES +=p9_l2_scom.C
 ISTEP4-CPP-SOURCES +=p9_l3_scom.C
 ISTEP4-CPP-SOURCES +=p9_common_poweronoff.C
-ifeq  ($(ddlevel), DD2)
 ISTEP4-CPP-SOURCES +=p9_eq_clear_atomic_lock.C
 ISTEP4-CPP-SOURCES +=p9_collect_deadman_ffdc.C
 ISTEP4-CPP-SOURCES +=p9_sbe_ppe_ffdc.C
 ISTEP4-CPP-SOURCES +=p9_sbe_ppe_utils.C
-endif
 ISTEP4-CPP-SOURCES +=p9_sbe_check_master_stop15.C
 ISTEP4-C-SOURCES =
 ISTEP4-S-SOURCES =

diff --git a/src/build/import_hwp_mk/power/istepmpipl/Makefile b/src/build/import_hwp_mk/power/istepmpipl/Makefile
@@ -6,6 +6,7 @@
 # OpenPOWER sbe Project
 #
 # Contributors Listed Below - COPYRIGHT 2016,2018
+# [+] International Business Machines Corp.
 #
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -32,10 +33,6 @@ include istepmpiplfiles.mk
 
 export VPATH = $(PERV_SRCDIR):$(NEST_SRCDIR):$(CACHE_SRCDIR):$(CORE_SRCDIR):$(PM_SRCDIR):$(INITFILES_SRCDIR):$(HWPLIB_SRCDIR)
 
-ifneq ($(ddlevel), DD2)
-GCC-CFLAGS += -mlongcall
-endif
-
 OBJSISTEPMPIPL := $(addprefix $(OBJDIR-ISTEPMPIPL)/, $(ISTEPMPIPL_OBJECTS))
 
 .PHONY: clean istepmpipl

diff --git a/src/build/utils/sbe_link.H b/src/build/utils/sbe_link.H
@@ -5,7 +5,7 @@
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2016,2018                        */
 /* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
@@ -64,14 +64,8 @@
 #define SBE_XIP_TOC_OFFSET 8*8
 
 /// The link address of the P9 SBE Base image
-#define SBE_SEEPROM_BASE_ORIGIN 0x80000000
-#define OTPROM_SEEPROM_HIGHER_NIBBLE 0x8000
-#ifdef DD2
-#undef SBE_SEEPROM_BASE_ORIGIN
 #define SBE_SEEPROM_BASE_ORIGIN 0xFF800000
-#undef OTPROM_SEEPROM_HIGHER_NIBBLE
 #define OTPROM_SEEPROM_HIGHER_NIBBLE 0xFF80
-#endif
 
 ///  This Index depends upon XIP HEADER File
 ///  Each section table entry is 12 bytes(SIZE_OF_SBE_XIP_SECTION) size,

diff --git a/src/sbefw/app/power/chipop_table.C b/src/sbefw/app/power/chipop_table.C
@@ -145,7 +145,6 @@ CMD_ARR(
     }
 )
 
-#ifdef DD2
 //////////////////////////////////////////////////////////////
 // @brief g_sbeInstructionCntlCmdArray
 //
@@ -157,7 +156,6 @@ CMD_ARR(
      HARDWARE_FENCED_STATE,
     }
 )
-#endif
 
 //////////////////////////////////////////////////////////////
 // @brief g_sbeRegAccessCmdArray
@@ -286,7 +284,6 @@ CMD_ARR(
     }
 )
 
-#ifdef DD2
 //////////////////////////////////////////////////////////////
 // @brief g_sbePsuGenericCmdArray
 //
@@ -318,7 +315,6 @@ CMD_ARR(
      SBE_NO_FENCE,
     }
 )
-#endif
 
 // Mandatory macro inclusion
 CMD_CLASS_DEFAULT_INTIALISATION
diff --git a/src/sbefw/app/power/sbecmdcntrldmt.C b/src/sbefw/app/power/sbecmdcntrldmt.C
@@ -6,6 +6,7 @@
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
 /* Contributors Listed Below - COPYRIGHT 2016,2018                        */
+/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
@@ -39,9 +40,7 @@
 #include "fapi2.H"
 #include "plat_hw_access.H"
 #include "p9_sbe_check_master_stop15.H"
-#ifdef DD2
 #include "p9_collect_deadman_ffdc.H"
-#endif
 #include "p9_perv_scom_addresses.H"
 #include "p9_block_wakeup_intr.H"
 #include "sbeTimerSvc.H"
@@ -104,15 +103,13 @@ uint32_t sbeCollectDeadmanFfdc (void)
            plat_getTargetHandleByChipletNumber <fapi2::TARGET_TYPE_CORE> (
            (SBE_GLOBAL->deadmanCore + CORE_CHIPLET_OFFSET) ));
 
-#ifdef DD2
     ReturnCode fapiRc = FAPI2_RC_SUCCESS;
     // p9_collect_deadman_ffdc collects the required ffdc into the fapi rc
     // which will be available in the SBE Global HWP FFDC region
     SBE_EXEC_HWP ( fapiRc,
                    p9_collect_deadman_ffdc,
                    coreTarget,
                    SBE_GLOBAL->asyncFfdcRC );
-#endif
 
     return rc;
     #undef SBE_FUNC

diff --git a/src/sbefw/core/sbeFFDC.C b/src/sbefw/core/sbeFFDC.C
@@ -5,7 +5,8 @@
 /*                                                                        */
 /* OpenPOWER sbe Project                                                  */
 /*                                                                        */
-/* Contributors Listed Below - COPYRIGHT 2016,2017                        */
+/* Contributors Listed Below - COPYRIGHT 2016,2018                        */
+/* [+] International Business Machines Corp.                              */
 /*                                                                        */
 /*                                                                        */
 /* Licensed under the Apache License, Version 2.0 (the "License");        */
@@ -104,12 +105,7 @@ uint32_t SbeFFDCPackage::sendOverFIFO(const sbeRespGenHdr_t &i_hdr,
         iv_sbeFFDCDataHeader.primaryStatus = i_hdr.primaryStatus;
         iv_sbeFFDCDataHeader.secondaryStatus = i_hdr.secondaryStatus;
         iv_sbeFFDCDataHeader.fwCommitID = SBE_COMMIT_ID;
-#ifdef DD1
-        iv_sbeFFDCDataHeader.ddLevel = SBE_FFDC_DD1;
-#endif
-#ifdef DD2
         iv_sbeFFDCDataHeader.ddLevel = SBE_FFDC_DD2;
-#endif
         // Set failed command information
         // Sequence Id is 0 by default for Fifo interface
         iv_sbeFFDCHeader.setCmdInfo(0, i_hdr.cmdClass, i_hdr.command);