From patchwork Fri Feb 20 00:37:51 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Neuling X-Patchwork-Id: 441810 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 AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id BD0301400EA for ; Fri, 20 Feb 2015 11:38:44 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id AB9A91A0EDE for ; Fri, 20 Feb 2015 11:38:44 +1100 (AEDT) X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from ozlabs.org (ozlabs.org [103.22.144.67]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id D27461A0E00 for ; Fri, 20 Feb 2015 11:38:19 +1100 (AEDT) Received: from localhost.localdomain (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 12CA2140188; Fri, 20 Feb 2015 11:38:19 +1100 (AEDT) Received: by localhost.localdomain (Postfix, from userid 1000) id 00AB2D47040; Fri, 20 Feb 2015 11:38:18 +1100 (AEDT) From: Michael Neuling To: stewart@linux.vnet.ibm.com Date: Fri, 20 Feb 2015 11:37:51 +1100 Message-Id: <1424392679-27859-8-git-send-email-mikey@neuling.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1424392679-27859-1-git-send-email-mikey@neuling.org> References: <1424392679-27859-1-git-send-email-mikey@neuling.org> Cc: imunsie@au.ibm.com, grimm@linux.vnet.ibm.com, skiboot@lists.ozlabs.org Subject: [Skiboot] [PATCH 08/16] libffs: Add ffs_entry_user field X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.18 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" This adds the correct user structure to ffs_entry as defined from hostboot. No functional changes. Signed-off-by: Michael Neuling --- libflash/ffs.h | 29 +++++++++++++++++++++++------ libflash/libffs.c | 1 + 2 files changed, 24 insertions(+), 6 deletions(-) diff --git a/libflash/ffs.h b/libflash/ffs.h index 09a1d84..5cb6778 100644 --- a/libflash/ffs.h +++ b/libflash/ffs.h @@ -70,10 +70,29 @@ enum type { #define FFS_FLAGS_PROTECTED 0x0001 #define FFS_FLAGS_U_BOOT_ENV 0x0002 -/* - * Number of user data words +/* Data integrity flags */ +#define FFS_ENRY_INTEG_ECC 0x8000 + +/** + * struct ffs_entry_user - User data enties + * + * @chip: Chip Select (0,1) + * @compressType: Compression Indication/alg (0=not compressed) + * @dataInteg: Indicates Data Integrity mechanism + * @verCheck: Indicates Version check type + * @miscFlags: Misc Partition related Flags + * @freeMisc[2]: Unused Miscellaneious Info + * @freeUser[14]: Unused User Data */ -#define FFS_USER_WORDS 16 +struct ffs_entry_user { + uint8_t chip; + uint8_t compresstype; + uint16_t datainteg; + uint8_t vercheck; + uint8_t miscflags; + uint8_t freemisc[2]; + uint32_t reserved[14]; +}; /** * struct ffs_entry - Partition entry @@ -100,9 +119,7 @@ struct ffs_entry { uint32_t flags; uint32_t actual; uint32_t resvd[4]; - struct { - uint32_t data[FFS_USER_WORDS]; - } user; + struct ffs_entry_user user; uint32_t checksum; } __attribute__ ((packed)); diff --git a/libflash/libffs.c b/libflash/libffs.c index abb9775..dbe618c 100644 --- a/libflash/libffs.c +++ b/libflash/libffs.c @@ -183,6 +183,7 @@ static int ffs_check_convert_entry(struct ffs_entry *dst, struct ffs_entry *src) dst->type = be32_to_cpu(src->type); dst->flags = be32_to_cpu(src->flags); dst->actual = be32_to_cpu(src->actual); + dst->user.datainteg = be16_to_cpu(src->user.datainteg); return 0; }