From b688319c56b1f70aa340c90a023ee7969ee9ab63 Mon Sep 17 00:00:00 2001 From: Vasant Hegde Date: Tue, 23 Apr 2013 04:20:48 +0000 Subject: [PATCH] --- yaml --- r: 370783 b: refs/heads/master c: f51005d7a46d57cd07009816f7a9eabef11cc4c6 h: refs/heads/master i: 370781: bab347aec59ef3652bce15e8ed35d76c629439ec 370779: 8504464fec0195f8041dbf1e0905fa657bfedae8 370775: fe5d6c654839f88cb2d919481c2a74eb2ba82c59 370767: 013352841ff610709755a74208b7ff8f512719a9 370751: 526e4451da1ff70dc8130c5c5817914ca212ea15 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/rtas_flash.c | 27 +++++++++++++++++++------- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index 0b351e7ca72e..535328b4ec85 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51e0eaf98d48dc6fc385d1aee9e208afe3ce0cf1 +refs/heads/master: f51005d7a46d57cd07009816f7a9eabef11cc4c6 diff --git a/trunk/arch/powerpc/kernel/rtas_flash.c b/trunk/arch/powerpc/kernel/rtas_flash.c index a7020d2e368e..bc97a215c191 100644 --- a/trunk/arch/powerpc/kernel/rtas_flash.c +++ b/trunk/arch/powerpc/kernel/rtas_flash.c @@ -57,13 +57,26 @@ #define VALIDATE_READY -1001 /* Firmware image ready for validation */ #define VALIDATE_PARAM_ERR -3 /* RTAS Parameter Error */ #define VALIDATE_HW_ERR -1 /* RTAS Hardware Error */ -#define VALIDATE_TMP_UPDATE 0 /* Validate Return Status */ -#define VALIDATE_FLASH_AUTH 1 /* Validate Return Status */ -#define VALIDATE_INVALID_IMG 2 /* Validate Return Status */ -#define VALIDATE_CUR_UNKNOWN 3 /* Validate Return Status */ -#define VALIDATE_TMP_COMMIT_DL 4 /* Validate Return Status */ -#define VALIDATE_TMP_COMMIT 5 /* Validate Return Status */ -#define VALIDATE_TMP_UPDATE_DL 6 /* Validate Return Status */ + +/* ibm,validate-flash-image update result tokens */ +#define VALIDATE_TMP_UPDATE 0 /* T side will be updated */ +#define VALIDATE_FLASH_AUTH 1 /* Partition does not have authority */ +#define VALIDATE_INVALID_IMG 2 /* Candidate image is not valid */ +#define VALIDATE_CUR_UNKNOWN 3 /* Current fixpack level is unknown */ +/* + * Current T side will be committed to P side before being replace with new + * image, and the new image is downlevel from current image + */ +#define VALIDATE_TMP_COMMIT_DL 4 +/* + * Current T side will be committed to P side before being replaced with new + * image + */ +#define VALIDATE_TMP_COMMIT 5 +/* + * T side will be updated with a downlevel image + */ +#define VALIDATE_TMP_UPDATE_DL 6 /* ibm,manage-flash-image operation tokens */ #define RTAS_REJECT_TMP_IMG 0