From f6dc651c4b3243f2569c7b60f7a9e427b8afce49 Mon Sep 17 00:00:00 2001 From: Mike Baiocchi Date: Thu, 16 Apr 2015 10:06:19 -0500 Subject: Enable Micron PNOR Workaround For All Micron Parts This commit executes a HW workaround for Micron PNOR parts where the flag status is checked before reading out the Chip ID of the device. Change-Id: Id1d3c751bab60deeef0bd62aa9e6726256aa4c7a Backport: release-fips830 CQ: SW282841 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/17218 Tested-by: Jenkins Server Reviewed-by: Daniel M. Crowell Reviewed-by: WILLIAM G. HOFFA Reviewed-by: STEPHEN M. CPREK Reviewed-by: A. Patrick Williams III --- src/usr/pnor/nor_micron.C | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/usr/pnor') diff --git a/src/usr/pnor/nor_micron.C b/src/usr/pnor/nor_micron.C index 817b1d3fd..fc0d1197d 100644 --- a/src/usr/pnor/nor_micron.C +++ b/src/usr/pnor/nor_micron.C @@ -5,7 +5,7 @@ /* */ /* OpenPOWER HostBoot Project */ /* */ -/* Contributors Listed Below - COPYRIGHT 2014 */ +/* Contributors Listed Below - COPYRIGHT 2014,2015 */ /* [+] Google Inc. */ /* [+] International Business Machines Corp. */ /* */ @@ -49,6 +49,10 @@ errlHndl_t micronCheckForWorkarounds( SfcDD* i_sfc, // Assume all Micron chips have this bug o_workarounds |= HWWK_MICRON_EXT_READ; + // HW workaround - run this command before reading out chipid + l_err = micronFlagStatus( i_sfc ); + if(l_err) { delete l_err; } + uint32_t outdata[4]; //Read back full 6 bytes of chipid -- cgit v1.2.1