diff options
| author | Thi Tran <thi@us.ibm.com> | 2013-01-17 08:29:28 -0600 |
|---|---|---|
| committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2013-01-21 16:45:42 -0600 |
| commit | a5875366d4196f67181d9537e02d5956f982da09 (patch) | |
| tree | 206eddb39e4f9c738fb2cd98afbaf3ab38447295 /src/build/citest/etc | |
| parent | 89546e0444fbc920d81b54cf9b0945d7277a0c30 (diff) | |
| download | talos-hostboot-a5875366d4196f67181d9537e02d5956f982da09.tar.gz talos-hostboot-a5875366d4196f67181d9537e02d5956f982da09.zip | |
VSBE source code and Centaur SBE image update
Change-Id: Iee0155820ebaf2837e67ff4d3a852ab8318c52f6
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/2950
Tested-by: Jenkins Server
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: Van H. Lee <vanlee@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/build/citest/etc')
4 files changed, 41 insertions, 23 deletions
diff --git a/src/build/citest/etc/patches/centaur.act.centaur_sbe_patch b/src/build/citest/etc/patches/centaur.act.centaur_sbe_patch new file mode 100644 index 000000000..52740fa1e --- /dev/null +++ b/src/build/citest/etc/patches/centaur.act.centaur_sbe_patch @@ -0,0 +1,32 @@ +--- centaur.act_build 2013-01-18 10:21:56.829533535 -0600 ++++ centaur.act_new 2013-01-18 10:24:37.680225599 -0600 +@@ -35,6 +35,7 @@ + # SW178996 mjjones 12/13/12 Slew calibration actions + # SW176884 bradleyb 12/15/12 re-enable command complete + # SW180168 vanlee 01/02/13 Centaur Mem PLL lock action ++# SW182865 thi 01/18/13 Action file for Centaur SBE + #******************************************************************** + # + +@@ -350,3 +351,21 @@ + #*************************************** + # END - mem_pll_setup actions + #*************************************** ++ ++#*************************************** ++# BEGIN - SBE Centaur img actions ++#*************************************** ++CAUSE_EFFECT { ++ LABEL=[SBE image: VDD OK] ++ WATCH=[LOGIC(0xFF000008)] # FSI GP3 reg (0x1012) ++ CAUSE: TARGET=[LOGIC(0xFF000008)] OP=[BIT,OFF] BIT=[27] ++ CAUSE: TARGET=[LOGIC(0xFF000008)] OP=[BIT,OFF] BIT=[23] ++ EFFECT: TARGET=[LOGIC(0xFF000100)] OP=[BIT,ON] BIT=[0] ++ EFFECT: TARGET=[LOGIC(0xFF00000F)] OP=[BIT,ON] BIT=[16] ++ # Temporary use this action to turn on Nest PLL lock until Simics creates reg 0x101B ++ EFFECT: TARGET=[LOGIC(0xFF00000F)] OP=[BIT,ON] BIT=[24] ++} ++ ++#*************************************** ++# END - SBE Centaur img actions ++#*************************************** diff --git a/src/build/citest/etc/patches/patchlist.txt b/src/build/citest/etc/patches/patchlist.txt index 67c4cb454..11a1cd440 100644 --- a/src/build/citest/etc/patches/patchlist.txt +++ b/src/build/citest/etc/patches/patchlist.txt @@ -5,10 +5,9 @@ Brief description of the problem or reason for patch -Files: list of files -Coreq: list of associated changes, e.g. workarounds.presimsetup -proc_start_clock_chiplets v1.10 requires some clock bits to be set in the clock status registers -at the time when it runs. Action file need to be updated to set these bits when at the time when -instructions are started --RTC: Task 61816 will remove this patch --CMVC: 865799 --Files: s1.act_proc_start_clock_chiplets.patch +Centaur SBE image requires VDD and Nest PLL lock bits set in 0x1007 reg +Action file need to be updated to set these bits when Centaur SBE code expects them. +-RTC: Task 62644 will remove this patch +-CMVC: SW182865 +-Files: centaur.act.centaur_sbe_patch -Coreq: None
\ No newline at end of file diff --git a/src/build/citest/etc/patches/s1.act.proc_start_clock_chiplets_patch b/src/build/citest/etc/patches/s1.act.proc_start_clock_chiplets_patch deleted file mode 100644 index 1ddb9d540..000000000 --- a/src/build/citest/etc/patches/s1.act.proc_start_clock_chiplets_patch +++ /dev/null @@ -1,13 +0,0 @@ ---- s1.act_sandbox 2013-01-07 14:53:52.585244917 -0600 -+++ s1.act_updated 2013-01-07 14:54:39.095617417 -0600 -@@ -57,7 +57,9 @@ - EFFECT: TARGET=[FSIMBOX(0x1C)] OP=[OR,BUF] DATA=[LITERAL(64,000FFFFF 00000000)] - - #Also has effect of causing clocks on -- EFFECT: TARGET=[REG(0x08030008)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,000007FF FFFFFFFF)] -+ EFFECT: TARGET=[REG(0x08030008)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,007FFFFF FFFFFFFF)] -+ EFFECT: TARGET=[REG(0x04030008)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,00003FFF FFFFFFFF)] -+ EFFECT: TARGET=[REG(0x09030008)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,000E07FF FFFFFFFF)] - EFFECT: TARGET=[LOGIC(0xFF000001)] OP=[EQUALTO,BUF] DATA=[LITERAL(64,0xFDB40000 0x00000001)] - EFFECT: TARGET=[LOGIC(0xFF000001)] OP=[BIT,ON] BIT=[17] # EX5 vital - EFFECT: TARGET=[LOGIC(0xFF000001)] OP=[BIT,ON] BIT=[18] # EX5 diff --git a/src/build/citest/etc/workarounds.postsimsetup b/src/build/citest/etc/workarounds.postsimsetup index c666adb01..66dd3cdbd 100755 --- a/src/build/citest/etc/workarounds.postsimsetup +++ b/src/build/citest/etc/workarounds.postsimsetup @@ -26,10 +26,10 @@ ## to setup the sandbox ## -echo "+++ Updating s1.act" +echo "+++ Updating centaur.act" mkdir -p $sb/simu/data/cec-chip -cp $BACKING_BUILD/src/simu/data/cec-chip/s1.act $sb/simu/data/cec-chip +cp $BACKING_BUILD/src/simu/data/cec-chip/centaur.act $sb/simu/data/cec-chip ## Added action for proc_start_clock_chiplets v1.10 and beyond -echo "+++ Update actions for proc_start_clock_chiplets v1.10" -patch -p0 $sb/simu/data/cec-chip/s1.act $HOSTBOOTROOT/src/build/citest/etc/patches/s1.act.proc_start_clock_chiplets_patch +echo "+++ Update actions for Centaur SBE image" +patch -p0 $sb/simu/data/cec-chip/centaur.act $HOSTBOOTROOT/src/build/citest/etc/patches/centaur.act.centaur_sbe_patch |
