aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStewart Smith <stewart@linux.vnet.ibm.com>2016-07-06 11:53:05 +1000
committerStewart Smith <stewart@linux.vnet.ibm.com>2016-07-06 11:53:05 +1000
commitf1f38e6ca8342737ee34d58f6a73abd05ea8d28c (patch)
treece681e4302fece16551e8f85144b7743e13417cb
parent7b3529b8c45b04f147761d1b5e372225ee5c5f7a (diff)
downloadskiboot-f1f38e6ca8342737ee34d58f6a73abd05ea8d28c.zip
skiboot-f1f38e6ca8342737ee34d58f6a73abd05ea8d28c.tar.gz
skiboot-f1f38e6ca8342737ee34d58f6a73abd05ea8d28c.tar.bz2
Revert "flash: Use blocklevel to do ECC reads"
Was causing boot failures on Garrison and Firestone (likely other OpenPower platforms) This reverts commit 74ba83462c64d6a987ed4785aee55309daf9ffb6. Signed-off-by: Stewart Smith <stewart@linux.vnet.ibm.com>
-rw-r--r--core/flash.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/flash.c b/core/flash.c
index 81bb59b..5036707 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;