Gitiles
Code Review Sign In
gerrit.openbmc.org / premsjha / op-build / d3a495c8dbece20208763f6000d10c5206a2a24d / . / openpower / package / sbe / sbe-1000-Revert-Adu-moved-to-pibmem-for-lab-performance-im.patch
blob: 6d9255c13de2aa430ed15bdfe69966551eaceb0a [file] [log] [blame]
Sachin Gupta1a4b59c2017-04-13 07:57:04 -0500[diff] [blame]1From d4a199c33929e3257a53506a22f15ab8965ebcac Mon Sep 17 00:00:00 2001
2From: Sachin Gupta <sgupta2m@in.ibm.com>
3Date: Thu, 13 Apr 2017 07:46:05 -0500
4Subject: [PATCH v1] Revert "Adu moved to pibmem for lab performance
5 improvement"
6
7This reverts commit c2482796143deef37befa450b3fa73d4cfa1dcff.
8---
9 src/build/import_hwp_mk/istep2/istep2files.mk | 7 +++++++
10 src/build/import_hwp_mk/istep4/istep4files.mk | 3 +--
11 src/build/import_hwp_mk/istep5/istep5files.mk | 5 +----
12 src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk | 11 +++++------
13 src/build/linkerscripts/linkseeprom.cmd | 2 +-
14 src/sbefw/Makefile | 2 +-
15 6 files changed, 16 insertions(+), 14 deletions(-)
16
17diff --git a/src/build/import_hwp_mk/istep2/istep2files.mk b/src/build/import_hwp_mk/istep2/istep2files.mk
18index b1fa9c0..ad20cb1 100644
19--- a/src/build/import_hwp_mk/istep2/istep2files.mk
20+++ b/src/build/import_hwp_mk/istep2/istep2files.mk
21@@ -41,6 +41,13 @@ ISTEP2-CPP-SOURCES +=p9_sbe_tp_chiplet_init2.C
22 ISTEP2-CPP-SOURCES +=p9_sbe_tp_arrayinit.C
23 ISTEP2-CPP-SOURCES +=p9_sbe_tp_initf.C
24 ISTEP2-CPP-SOURCES +=p9_sbe_tp_chiplet_init3.C
25+# TODO via RTC 170704
26+# These procedures also needed in PIBMEM. Just having a quick fix
27+# for lab
28+ISTEP2-CPP-SOURCES +=p9_pm_ocb_indir_access.C
29+ISTEP2-CPP-SOURCES +=p9_pm_ocb_indir_setup_circular.C
30+ISTEP2-CPP-SOURCES +=p9_pm_ocb_indir_setup_linear.C
31+ISTEP2-CPP-SOURCES +=p9_pm_ocb_init.C
32 ISTEP2-C-SOURCES =
33 ISTEP2-S-SOURCES =
34
35diff --git a/src/build/import_hwp_mk/istep4/istep4files.mk b/src/build/import_hwp_mk/istep4/istep4files.mk
36index e4d0a42..5fa151e 100644
37--- a/src/build/import_hwp_mk/istep4/istep4files.mk
38+++ b/src/build/import_hwp_mk/istep4/istep4files.mk
39@@ -5,7 +5,7 @@
40 #
41 # OpenPOWER sbe Project
42 #
43-# Contributors Listed Below - COPYRIGHT 2016,2017
44+# Contributors Listed Below - COPYRIGHT 2016
45 # [+] International Business Machines Corp.
46 #
47 #
48@@ -60,7 +60,6 @@ ISTEP4-CPP-SOURCES +=p9_ncu_scom.C
49 ISTEP4-CPP-SOURCES +=p9_l2_scom.C
50 ISTEP4-CPP-SOURCES +=p9_l3_scom.C
51 ISTEP4-CPP-SOURCES +=p9_common_poweronoff.C
52-ISTEP4-CPP-SOURCES +=p9_sbe_check_master_stop15.C
53 ISTEP4-C-SOURCES =
54 ISTEP4-S-SOURCES =
55
56diff --git a/src/build/import_hwp_mk/istep5/istep5files.mk b/src/build/import_hwp_mk/istep5/istep5files.mk
57index 6c99335..3593ba2 100644
58--- a/src/build/import_hwp_mk/istep5/istep5files.mk
59+++ b/src/build/import_hwp_mk/istep5/istep5files.mk
60@@ -5,8 +5,7 @@
61 #
62 # OpenPOWER sbe Project
63 #
64-# Contributors Listed Below - COPYRIGHT 2016,2017
65-# [+] International Business Machines Corp.
66+# Contributors Listed Below - COPYRIGHT 2016
67 #
68 #
69 # Licensed under the Apache License, Version 2.0 (the "License");
70@@ -31,8 +30,6 @@
71 ##########################################################################
72
73 ISTEP5-CPP-SOURCES = p9_sbe_instruct_start.C
74-ISTEP5-CPP-SOURCES +=p9_thread_control.C
75-ISTEP5-CPP-SOURCES +=p9_sbe_load_bootloader.C
76 ISTEP5-C-SOURCES =
77 ISTEP5-S-SOURCES =
78
79diff --git a/src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk b/src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk
80index 8833c75..adfa05f 100644
81--- a/src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk
82+++ b/src/build/import_hwp_mk/istepcommon/istepcommonfiles.mk
83@@ -29,21 +29,20 @@
84 ##########################################################################
85 # Object Files
86 ##########################################################################
87-ISTEPCOMMON-CPP-SOURCES +=p9_sbe_common.C
88 ISTEPCOMMON-CPP-SOURCES +=p9_perv_sbe_cmn.C
89+ISTEPCOMMON-CPP-SOURCES +=p9_sbe_common.C
90 ISTEPCOMMON-CPP-SOURCES +=p9_sbe_gear_switcher.C
91+ISTEPCOMMON-CPP-SOURCES +=p9_sbe_check_master_stop15.C
92+ISTEPCOMMON-CPP-SOURCES +=p9_ram_core.C
93+ISTEPCOMMON-CPP-SOURCES +=p9_thread_control.C
94 ISTEPCOMMON-CPP-SOURCES +=p9_fbc_utils.C
95+ISTEPCOMMON-CPP-SOURCES +=p9_sbe_load_bootloader.C
96 ISTEPCOMMON-CPP-SOURCES +=p9_pba_access.C
97 ISTEPCOMMON-CPP-SOURCES +=p9_pba_coherent_utils.C
98 ISTEPCOMMON-CPP-SOURCES +=p9_pba_setup.C
99-ISTEPCOMMON-CPP-SOURCES +=p9_pm_ocb_indir_access.C
100-ISTEPCOMMON-CPP-SOURCES +=p9_pm_ocb_indir_setup_circular.C
101-ISTEPCOMMON-CPP-SOURCES +=p9_pm_ocb_indir_setup_linear.C
102-ISTEPCOMMON-CPP-SOURCES +=p9_pm_ocb_init.C
103 ISTEPCOMMON-CPP-SOURCES +=p9_adu_setup.C
104 ISTEPCOMMON-CPP-SOURCES +=p9_adu_coherent_utils.C
105 ISTEPCOMMON-CPP-SOURCES +=p9_adu_access.C
106-ISTEPCOMMON-CPP-SOURCES +=p9_ram_core.C
107 #Istep2 Procedure but this is required to run from PIBMEM
108 ISTEPCOMMON-CPP-SOURCES +=p9_sbe_tp_switch_gears.C
109 ISTEPCOMMON-CPP-SOURCES +=p9_sbe_npll_setup.C
110diff --git a/src/build/linkerscripts/linkseeprom.cmd b/src/build/linkerscripts/linkseeprom.cmd
111index cabb2c1..feabacc 100644
112--- a/src/build/linkerscripts/linkseeprom.cmd
113+++ b/src/build/linkerscripts/linkseeprom.cmd
114@@ -98,7 +98,7 @@ SECTIONS
115 ////////////////////////////////
116 .text ALIGN(8): {
117 _text_origin = .; _text_offset = . - _seeprom_origin;
118- *\libistep2.a:(.text* ) *\libistep3.a:(.text* ) *\libistep4.a:(.text* ) *\libistepmpipl.a:(.text* ) *\libistep5.a:(.text* ) } > seeprom
119+ *\libistep2.a:(.text* ) *\libistep3.a:(.text* ) *\libistep4.a:(.text* ) *\libistepmpipl.a:(.text* ) } > seeprom
120 _text_size = . - _text_origin;
121
122 ////////////////////////////////
123diff --git a/src/sbefw/Makefile b/src/sbefw/Makefile
124index 89d16d3..56c4fce 100644
125--- a/src/sbefw/Makefile
126+++ b/src/sbefw/Makefile
127@@ -5,7 +5,7 @@
128 #
129 # OpenPOWER sbe Project
130 #
131-# Contributors Listed Below - COPYRIGHT 2016,2017
132+# Contributors Listed Below - COPYRIGHT 2016
133 # [+] International Business Machines Corp.
134 #
135 #
136--
1371.8.2.2
138