From patchwork Mon Dec 4 21:26:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adriana Kobylak X-Patchwork-Id: 844459 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yrHxh71Krz9s7f for ; Tue, 5 Dec 2017 08:26:32 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3yrHxh5wg3zDrKl for ; Tue, 5 Dec 2017 08:26:32 +1100 (AEDT) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=linux.vnet.ibm.com (client-ip=148.163.158.5; helo=mx0a-001b2d01.pphosted.com; envelope-from=anoo@linux.vnet.ibm.com; receiver=) Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3yrHxV6MmKzDrCb for ; Tue, 5 Dec 2017 08:26:22 +1100 (AEDT) Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id vB4LOCuj005569 for ; Mon, 4 Dec 2017 16:26:19 -0500 Received: from e19.ny.us.ibm.com (e19.ny.us.ibm.com [129.33.205.209]) by mx0b-001b2d01.pphosted.com with ESMTP id 2enctfbdpy-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Mon, 04 Dec 2017 16:26:18 -0500 Received: from localhost by e19.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 4 Dec 2017 16:26:18 -0500 Received: from b01cxnp22034.gho.pok.ibm.com (9.57.198.24) by e19.ny.us.ibm.com (146.89.104.206) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 4 Dec 2017 16:26:16 -0500 Received: from b01ledav005.gho.pok.ibm.com (b01ledav005.gho.pok.ibm.com [9.57.199.110]) by b01cxnp22034.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id vB4LQGqw52363510; Mon, 4 Dec 2017 21:26:16 GMT Received: from b01ledav005.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 32A96AE04B; Mon, 4 Dec 2017 16:27:14 -0500 (EST) Received: from habcap11p1.aus.stglabs.ibm.com (unknown [9.41.164.53]) by b01ledav005.gho.pok.ibm.com (Postfix) with ESMTP id D0E04AE034; Mon, 4 Dec 2017 16:27:13 -0500 (EST) From: Adriana Kobylak To: stewart@linux.vnet.ibm.com, cyril.bur@au1.ibm.com, skiboot@lists.ozlabs.org Date: Mon, 4 Dec 2017 15:26:14 -0600 X-Mailer: git-send-email 2.5.0 X-TM-AS-GCONF: 00 x-cbid: 17120421-0056-0000-0000-000003F3AFE8 X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00008152; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000243; SDB=6.00955462; UDB=6.00482900; IPR=6.00735499; BA=6.00005727; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00018345; XFM=3.00000015; UTC=2017-12-04 21:26:17 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17120421-0057-0000-0000-0000082AE387 Message-Id: <1512422774-65933-1-git-send-email-anoo@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-12-04_07:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1011 lowpriorityscore=0 impostorscore=0 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1709140000 definitions=main-1712040301 Subject: [Skiboot] [PATCH] pflash: Support for clean_on_ecc_error flag X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" Add the misc flag clear_on_ecc_error to libflash/pflash. This was the only missing flag. The generator of the virtual pnor image relies on libflash/pflash to provide the partition information, so all flags are needed to build an accurate virtual pnor partition table. Signed-off-by: Adriana Kobylak Reviewed-by: Cyril Bur --- external/ffspart/ffspart.c | 3 +++ external/pflash/pflash.c | 16 +++++++++------- external/pflash/test/files/06-miscprint.ffs | 1 + external/pflash/test/results/01-info.out | 17 +++++++++-------- external/pflash/test/results/06-miscprint.out | 9 +++++++++ libflash/ffs.h | 1 + libflash/libffs.c | 3 +-- libflash/libffs.h | 1 + 8 files changed, 34 insertions(+), 17 deletions(-) diff --git a/external/ffspart/ffspart.c b/external/ffspart/ffspart.c index a477018..0fe5840 100644 --- a/external/ffspart/ffspart.c +++ b/external/ffspart/ffspart.c @@ -298,6 +298,9 @@ int main(int argc, char *argv[]) case 'L': user.miscflags |= FFS_MISCFLAGS_VOLATILE; break; + case 'C': + user.miscflags |= FFS_MISCFLAGS_CLEARECC; + break; /* Not sure these are valid */ case 'B': user.miscflags |= FFS_MISCFLAGS_BACKUP; diff --git a/external/pflash/pflash.c b/external/pflash/pflash.c index a5e7bc3..b3ceef0 100644 --- a/external/pflash/pflash.c +++ b/external/pflash/pflash.c @@ -115,13 +115,14 @@ static uint32_t print_ffs_info(struct ffs_handle *ffsh, uint32_t toc) goto out; } - l = asprintf(&flags, "[%c%c%c%c%c%c]", + l = asprintf(&flags, "[%c%c%c%c%c%c%c]", has_ecc(ent) ? 'E' : '-', has_flag(ent, FFS_MISCFLAGS_PRESERVED) ? 'P' : '-', has_flag(ent, FFS_MISCFLAGS_READONLY) ? 'R' : '-', has_flag(ent, FFS_MISCFLAGS_BACKUP) ? 'B' : '-', has_flag(ent, FFS_MISCFLAGS_REPROVISION) ? 'F' : '-', - has_flag(ent, FFS_MISCFLAGS_VOLATILE) ? 'V' : '-'); + has_flag(ent, FFS_MISCFLAGS_VOLATILE) ? 'V' : '-', + has_flag(ent, FFS_MISCFLAGS_CLEARECC) ? 'C' : '-'); if (l < 0) goto out; @@ -168,9 +169,9 @@ static void print_flash_info(struct flash_details *flash) printf("Flash info:\n"); printf("-----------\n"); printf("Name = %s\n", flash->name); - printf("Total size = %" PRIu64 "MB\t Flags E:ECC, P:PRESERVED, R:READONLY\n", - flash->total_size >> 20); - printf("Erase granule = %2d%-13sB:BACKUP, F:REPROVISION, V:VOLATILE\n", + printf("Total size = %" PRIu64 "MB\t Flags E:ECC, P:PRESERVED, R:READONLY, " + "B:BACKUP\n", flash->total_size >> 20); + printf("Erase granule = %2d%-13sF:REPROVISION, V:VOLATILE, C:CLEARECC\n", flash->erase_granule >> 10, "KB"); if (bmc_flash) @@ -581,13 +582,14 @@ static void print_partition_detail(struct ffs_handle *ffsh, uint32_t part_id) printf("Flags:\n"); - l = asprintf(&flags, "%s%s%s%s%s%s", has_ecc(ent) ? "ECC [E]\n" : "", + l = asprintf(&flags, "%s%s%s%s%s%s%s", has_ecc(ent) ? "ECC [E]\n" : "", has_flag(ent, FFS_MISCFLAGS_PRESERVED) ? "PRESERVED [P]\n" : "", has_flag(ent, FFS_MISCFLAGS_READONLY) ? "READONLY [R]\n" : "", has_flag(ent, FFS_MISCFLAGS_BACKUP) ? "BACKUP [B]\n" : "", has_flag(ent, FFS_MISCFLAGS_REPROVISION) ? "REPROVISION [F]\n" : "", - has_flag(ent, FFS_MISCFLAGS_VOLATILE) ? "VOLATILE [V]\n" : ""); + has_flag(ent, FFS_MISCFLAGS_VOLATILE) ? "VOLATILE [V]\n" : "", + has_flag(ent, FFS_MISCFLAGS_CLEARECC) ? "CLEARECC [C]\n" : ""); if (l < 0) { fprintf(stderr, "Memory allocation failure printing flags!\n"); goto out; diff --git a/external/pflash/test/files/06-miscprint.ffs b/external/pflash/test/files/06-miscprint.ffs index 461e408..353ceb0 100644 --- a/external/pflash/test/files/06-miscprint.ffs +++ b/external/pflash/test/files/06-miscprint.ffs @@ -3,3 +3,4 @@ READONLY,0x0004000,0x1000,R,/dev/zero REPROVISION,0x5000,0x1000,F,/dev/zero BACKUP,0x000006000,0x1000,B,/dev/zero VOLATILE,0x000007000,0x1000,L,/dev/zero +CLEARECC,0x000008000,0x1000,L,/dev/zero diff --git a/external/pflash/test/results/01-info.out b/external/pflash/test/results/01-info.out index 628ddcc..204d594 100644 --- a/external/pflash/test/results/01-info.out +++ b/external/pflash/test/results/01-info.out @@ -1,14 +1,15 @@ Flash info: ----------- Name = FILE -Total size = 0MB Flags E:ECC, P:PRESERVED, R:READONLY -Erase granule = 0KB B:BACKUP, F:REPROVISION, V:VOLATILE +Total size = 0MB Flags E:ECC, P:PRESERVED, R:READONLY, B:BACKUP +Erase granule = 0KB F:REPROVISION, V:VOLATILE, C:CLEARECC TOC@0x00000000 Partitions: ----------- -ID=00 part 0x00000000..0x00001000 (actual=0x00001000) [------] -ID=01 ONE 0x00003000..0x00004000 (actual=0x00001000) [E-----] -ID=02 TWO 0x00004000..0x00005000 (actual=0x00001000) [E---F-] -ID=03 THREE 0x00005000..0x00006000 (actual=0x00001000) [E---F-] -ID=04 FOUR 0x00006000..0x00007000 (actual=0x00001000) [E---F-] -ID=05 FIVE 0x00007000..0x00008000 (actual=0x00001000) [-----V] +ID=00 part 0x00000000..0x00001000 (actual=0x00001000) [-------] +ID=01 ONE 0x00003000..0x00004000 (actual=0x00001000) [E------] +ID=02 TWO 0x00004000..0x00005000 (actual=0x00001000) [E---F--] +ID=03 THREE 0x00005000..0x00006000 (actual=0x00001000) [E---F--] +ID=04 FOUR 0x00006000..0x00007000 (actual=0x00001000) [E---F--] +ID=05 FIVE 0x00007000..0x00008000 (actual=0x00001000) [-----V-] +ID=06 SIX 0x00008000..0x00009000 (actual=0x00001000) [------C] diff --git a/external/pflash/test/results/06-miscprint.out b/external/pflash/test/results/06-miscprint.out index 9ee2af6..f28057d 100644 --- a/external/pflash/test/results/06-miscprint.out +++ b/external/pflash/test/results/06-miscprint.out @@ -43,3 +43,12 @@ Start End Actual Flags: VOLATILE [V] +Detailed partition information +Name: +CLEARECC (ID=06) + +Start End Actual +0x00008000 0x00009000 0x00001000 + +Flags: +CLEARECC [C] diff --git a/libflash/ffs.h b/libflash/ffs.h index 26cb9d8..433ecac 100644 --- a/libflash/ffs.h +++ b/libflash/ffs.h @@ -77,6 +77,7 @@ enum ffs_type { #define FFS_MISCFLAGS_BACKUP 0x20 #define FFS_MISCFLAGS_REPROVISION 0x10 #define FFS_MISCFLAGS_VOLATILE 0x08 +#define FFS_MISCFLAGS_CLEARECC 0x04 /** * struct __ffs_entry_user - On flash user data entries diff --git a/libflash/libffs.c b/libflash/libffs.c index 87c5197..57dca49 100644 --- a/libflash/libffs.c +++ b/libflash/libffs.c @@ -724,8 +724,7 @@ int ffs_entry_user_set(struct ffs_entry *ent, struct ffs_entry_user *user) return -1; if (user->miscflags & ~(FFS_MISCFLAGS_PRESERVED | FFS_MISCFLAGS_BACKUP | FFS_MISCFLAGS_READONLY | FFS_MISCFLAGS_REPROVISION | - FFS_MISCFLAGS_VOLATILE -)) + FFS_MISCFLAGS_VOLATILE | FFS_MISCFLAGS_CLEARECC)) return -1; memcpy(&ent->user, user, sizeof(*user)); diff --git a/libflash/libffs.h b/libflash/libffs.h index 0610399..47a3808 100644 --- a/libflash/libffs.h +++ b/libflash/libffs.h @@ -89,6 +89,7 @@ struct ffs_entry_user { #define FFS_MISCFLAGS_BACKUP 0x20 #define FFS_MISCFLAGS_REPROVISION 0x10 #define FFS_MISCFLAGS_VOLATILE 0x08 +#define FFS_MISCFLAGS_CLEARECC 0x04 bool has_ecc(struct ffs_entry *ent);