[Skiboot] [PATCH] Revert "flash: Use blocklevel to do ECC reads"

Stewart Smith stewart at linux.vnet.ibm.com
Wed Jul 6 11:55:07 AEST 2016


Was causing boot failures on Garrison and Firestone (likely other
OpenPower platforms)

This reverts commit 74ba83462c64d6a987ed4785aee55309daf9ffb6.

Signed-off-by: Stewart Smith <stewart at linux.vnet.ibm.com>
---
 core/flash.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/flash.c b/core/flash.c
index 81bb59bd7892..50367070608f 100644
--- a/core/flash.c
+++ b/core/flash.c
@@ -573,7 +573,7 @@ static int flash_load_resource(enum resource_id id, uint32_t subid,
 		goto out_unlock;
 	}
 
-	rc = ffs_init(0, flash->size, flash->bl, &ffs, 1);
+	rc = ffs_init(0, flash->size, flash->bl, &ffs, 0);
 	if (rc) {
 		prerror("FLASH: Can't open ffs handle\n");
 		goto out_unlock;
@@ -623,7 +623,7 @@ static int flash_load_resource(enum resource_id id, uint32_t subid,
 		goto out_free_ffs;
 	}
 
-	rc = blocklevel_read(flash->bl, part_start, buf, size);
+	rc = flash_read_corrected(flash->bl, part_start, buf, size, ecc);
 	if (rc) {
 		prerror("FLASH: failed to read %s partition\n", name);
 		goto out_free_ffs;
-- 
2.1.4



More information about the Skiboot mailing list