diff options
author | Thi Tran <thi@us.ibm.com> | 2013-07-29 15:26:05 -0500 |
---|---|---|
committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2013-07-30 12:40:18 -0500 |
commit | f68322ccb2aaf92486f1af352deff3987011e8c7 (patch) | |
tree | 8b7ce2c0a1e43067e8e3e54a0a246246c8753bb9 /src/usr/pore | |
parent | 7d14c1e4d4297c8537d4c003fe8d7130ae490169 (diff) | |
download | talos-hostboot-f68322ccb2aaf92486f1af352deff3987011e8c7.tar.gz talos-hostboot-f68322ccb2aaf92486f1af352deff3987011e8c7.zip |
HOSTBOOT - Add workaround for Centaur SBE Repair Loader failure
SW212513
Change-Id: Ic459656aa6c650938bedd63ada72559efeae0ef8
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/5626
Tested-by: Jenkins Server
Reviewed-by: Brian H. Horton <brianh@linux.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr/pore')
-rw-r--r-- | src/usr/pore/makefile | 2 | ||||
-rw-r--r-- | src/usr/pore/poreve/porevesrc/pib2cfam.C | 7 | ||||
-rw-r--r-- | src/usr/pore/poreve/porevesrc/pib2cfam.H | 9 |
3 files changed, 11 insertions, 7 deletions
diff --git a/src/usr/pore/makefile b/src/usr/pore/makefile index 3f4a10460..35a9b805f 100644 --- a/src/usr/pore/makefile +++ b/src/usr/pore/makefile @@ -23,5 +23,5 @@ ROOTPATH = ../../.. SUBDIRS = fapiporeve.d poreve.d test.d -BINARY_FILES = $(IMGDIR)/centaur.sbe_pnor.bin:08498a624168c7b2aecb423fca8bd2361ec5e9e2 +BINARY_FILES = $(IMGDIR)/centaur.sbe_pnor.bin:97621f98ecec1ee446086712534755998fc59ee5 include ${ROOTPATH}/config.mk diff --git a/src/usr/pore/poreve/porevesrc/pib2cfam.C b/src/usr/pore/poreve/porevesrc/pib2cfam.C index 689c456b7..3c9171ccf 100644 --- a/src/usr/pore/poreve/porevesrc/pib2cfam.C +++ b/src/usr/pore/poreve/porevesrc/pib2cfam.C @@ -21,7 +21,7 @@ /* */ /* IBM_PROLOG_END_TAG */ // -*- mode: C++; c-file-style: "linux"; -*- -// $Id: pib2cfam.C,v 1.14 2013/01/11 15:54:22 thi Exp $ +// $Id: pib2cfam.C,v 1.15 2013/06/24 14:51:53 jeshua Exp $ /// \file pib2cfam.C /// \brief A simple PibSlave that maps a small range of PIB addresses to CFAM @@ -79,7 +79,8 @@ Pib2Cfam::operation(Transaction& io_transaction) case ACCESS_MODE_READ: switch (io_transaction.iv_address) { - case 0x00050007: + case 0x00050006: + case 0x00050007: case 0x00050012: case 0x00050013: case 0x00050014: @@ -110,6 +111,8 @@ Pib2Cfam::operation(Transaction& io_transaction) switch (io_transaction.iv_address) { + case 0x00050006: + case 0x00050007: case 0x00050012: case 0x00050013: case 0x00050014: diff --git a/src/usr/pore/poreve/porevesrc/pib2cfam.H b/src/usr/pore/poreve/porevesrc/pib2cfam.H index 2220323c8..0f55cc4c9 100644 --- a/src/usr/pore/poreve/porevesrc/pib2cfam.H +++ b/src/usr/pore/poreve/porevesrc/pib2cfam.H @@ -23,7 +23,7 @@ #ifndef __VSBE_PIB2CFAM_H #define __VSBE_PIB2CFAM_H -// $Id: pib2cfam.H,v 1.4 2013/01/11 15:53:49 thi Exp $ +// $Id: pib2cfam.H,v 1.6 2013/07/30 15:15:30 jeshua Exp $ /// \file pib2cfam.H /// \brief A temporary hack while waiting for hardware updates - a simple @@ -36,10 +36,10 @@ namespace vsbe { class Pib2Cfam; /// PIB base address of PIB range mapped by Pib2Cfam - const uint32_t PIB2CFAM_PIB_BASE = 0x00050007; + const uint32_t PIB2CFAM_PIB_BASE = 0x00050006; /// Number of PIB addresses mapped by Pib2Cfam - const int PIB2CFAM_PIB_SIZE = ((0x0005001b - 0x00050007) + 1); + const int PIB2CFAM_PIB_SIZE = ((0x0005001b - 0x00050006) + 1); } @@ -69,7 +69,8 @@ public: /// /// The following PIB registers are mapped to CFAM registers: /// - /// - PIB 0x00050007 -> CFAM 0x1007, FSI2PIB.STATUS, R + /// - PIB 0x00050006 -> CFAM 0x1006, FSI2PIB Reset, W + /// - PIB 0x00050007 -> CFAM 0x1007, FSI2PIB STATUS (R), PIB RESET (W) /// - PIB 0x00050012 -> CFAM 0x1012, FSIGP3, R/W /// - PIB 0x00050013 -> CFAM 0x1013, FSIGP4, R/W /// - PIB 0x00050014 -> CFAM 0x1014, FSIGP5, R/W |