diff options
| author | Dean Sanner <dsanner@us.ibm.com> | 2018-02-04 08:42:36 -0600 |
|---|---|---|
| committer | William G. Hoffa <wghoffa@us.ibm.com> | 2018-02-07 09:31:15 -0500 |
| commit | a8b5cf5530265ee5f12cecd5bd9f7719d588a9a7 (patch) | |
| tree | f68ca1d16bd53b4ec4b558c9575604c830969e71 /src/usr/pnor | |
| parent | a5f5a3baefa60723a3ad03a827fd07ec47341680 (diff) | |
| download | talos-hostboot-a8b5cf5530265ee5f12cecd5bd9f7719d588a9a7.tar.gz talos-hostboot-a8b5cf5530265ee5f12cecd5bd9f7719d588a9a7.zip | |
Tweak IBM SFC flash settings for Micron chips
-Micron flash chips were failing in FSP based systems
Removed offending settings, but need to figure out why
-Also added in some useful printk's for debug
Change-Id: I46c1c7ce7d5f74d9302985ac821214ff25c6bfc1
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/53344
Tested-by: Jenkins Server <pfd-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP Build CI <op-jenkins+hostboot@us.ibm.com>
Tested-by: Jenkins OP HW <op-hw-jenkins+hostboot@us.ibm.com>
Reviewed-by: Prachi Gupta <pragupta@us.ibm.com>
Reviewed-by: Richard J. Knight <rjknight@us.ibm.com>
Reviewed-by: William G. Hoffa <wghoffa@us.ibm.com>
Diffstat (limited to 'src/usr/pnor')
| -rw-r--r-- | src/usr/pnor/pnorrp.C | 9 | ||||
| -rw-r--r-- | src/usr/pnor/sfc_ibm.C | 13 |
2 files changed, 15 insertions, 7 deletions
diff --git a/src/usr/pnor/pnorrp.C b/src/usr/pnor/pnorrp.C index f596401e9..e33a1b0c3 100644 --- a/src/usr/pnor/pnorrp.C +++ b/src/usr/pnor/pnorrp.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2011,2017 */ +/* Contributors Listed Below - COPYRIGHT 2011,2018 */ /* [+] Google Inc. */ /* [+] International Business Machines Corp. */ /* */ @@ -645,6 +645,9 @@ errlHndl_t PnorRP::findTOC(size_t & o_tocSize) l_ffs_hdr = (ffs_hdr*)l_tmpTocBuffer; l_foundTOC = ((l_ffs_hdr->magic == FFS_MAGIC) && (PNOR::pnor_ffs_checksum(l_ffs_hdr,FFS_HDR_SIZE) == 0)); + + printk("Addr [%lx], magic[%x] checksum[%d]\n", + l_toc,l_ffs_hdr->magic, PNOR::pnor_ffs_checksum(l_ffs_hdr,FFS_HDR_SIZE)); if (!l_foundTOC) { //If TOC not found at 0x0 or 0x2000000 @@ -663,6 +666,8 @@ errlHndl_t PnorRP::findTOC(size_t & o_tocSize) l_foundTOC = ((l_ffs_hdr->magic == FFS_MAGIC) && (PNOR::pnor_ffs_checksum(l_ffs_hdr, FFS_HDR_SIZE) == 0)); + printk("Addr [%lx], magic[%x] checksum[%d]\n", + l_toc,l_ffs_hdr->magic, PNOR::pnor_ffs_checksum(l_ffs_hdr,FFS_HDR_SIZE)); } if (!l_foundTOC) @@ -685,6 +690,8 @@ errlHndl_t PnorRP::findTOC(size_t & o_tocSize) l_foundTOC = ((l_ffs_hdr->magic == FFS_MAGIC) && (PNOR::pnor_ffs_checksum(l_ffs_hdr, FFS_HDR_SIZE) == 0)); + printk("Addr [%lx], magic[%x] checksum[%d]\n", + l_toc,l_ffs_hdr->magic, PNOR::pnor_ffs_checksum(l_ffs_hdr,FFS_HDR_SIZE)); } //Setup for next time -- look for the other side diff --git a/src/usr/pnor/sfc_ibm.C b/src/usr/pnor/sfc_ibm.C index 24ea7eb9c..44d5ba517 100644 --- a/src/usr/pnor/sfc_ibm.C +++ b/src/usr/pnor/sfc_ibm.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2014,2017 */ +/* Contributors Listed Below - COPYRIGHT 2014,2018 */ /* [+] Google Inc. */ /* [+] International Business Machines Corp. */ /* */ @@ -584,11 +584,12 @@ errlHndl_t SfcIBM::hwInit( ) 1 << SFC_REG_SPICLK_CLKHI_SHFT | 1 << SFC_REG_SPICLK_CLKLO_SHFT }, - { PNOR::MICRON_NOR_ID, SFC_REG_CONF8, - 6 << SFC_REG_CONF8_CSINACTIVEREAD_SHFT | - 15 << SFC_REG_CONF8_DUMMY_SHFT | - SPI_JEDEC_FAST_READ << SFC_REG_CONF8_READOP_SHFT - }, + //TODO RTC:187447 figure out why these break newer systems + //{ PNOR::MICRON_NOR_ID, SFC_REG_CONF8, + //6 << SFC_REG_CONF8_CSINACTIVEREAD_SHFT | + //15 << SFC_REG_CONF8_DUMMY_SHFT | + //SPI_JEDEC_FAST_READ << SFC_REG_CONF8_READOP_SHFT + //}, { PNOR::MICRON_NOR_ID, SFC_REG_CONF4, SPI_JEDEC_SECTOR_ERASE }, { PNOR::MICRON_NOR_ID, SFC_REG_CONF5, 4096 }, //*** End Micron |
