From 646efbab03ef380876d843f9ab244f0c08b3fda1 Mon Sep 17 00:00:00 2001 From: Bill Schwartz Date: Thu, 10 Apr 2014 15:47:55 -0500 Subject: Ensure that all FAPI errors are parsed correctly Remove FAPI_RC_INVALID_PARM Add matching reason code and error log tag for RC_INVALID_CHIP_EC_FEATURE_GET. FSP side will be updated next. 820 only. Change-Id: If7271e71091e5674dcc6a279a83f19d932123ff5 RTC: 102537 Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/10378 Tested-by: Jenkins Server Reviewed-by: MIKE J. JONES Reviewed-by: A. Patrick Williams III --- src/include/usr/hwpf/fapi/fapiReturnCodes.H | 6 ++---- src/include/usr/hwpf/hwpf_reasoncodes.H | 9 ++++++++- 2 files changed, 10 insertions(+), 5 deletions(-) (limited to 'src/include/usr/hwpf') diff --git a/src/include/usr/hwpf/fapi/fapiReturnCodes.H b/src/include/usr/hwpf/fapi/fapiReturnCodes.H index 6db473f27..9f3a7ee49 100644 --- a/src/include/usr/hwpf/fapi/fapiReturnCodes.H +++ b/src/include/usr/hwpf/fapi/fapiReturnCodes.H @@ -20,7 +20,7 @@ /* Origin: 30 */ /* */ /* IBM_PROLOG_END_TAG */ -// $Id: fapiReturnCodes.H,v 1.14 2014/03/26 21:31:19 mjjones Exp $ +// $Id: fapiReturnCodes.H,v 1.15 2014/04/11 13:53:50 whs Exp $ // $Source: /afs/awd/projects/eclipz/KnowledgeBase/.cvsroot/eclipz/hwpf/working/fapi/fapiReturnCodes.H,v $ /** @@ -46,6 +46,7 @@ * mjjones 05/02/2012 Add FAPI_RC_PLAT_ERR_ADU_LOCKED * mjjones 11/14/2012 Add FAPI_RC_UNRECOGNIZED_SBE_ERROR * mjjones 03/26/2014 Remove FAPI_RC_UNRECOGNIZED_SBE_ERROR + * whs 04/09/2014 Remove FAPI_RC_INVALID_PARAM */ #ifndef FAPIRETURNCODES_H_ @@ -84,9 +85,6 @@ enum ReturnCodes // HWP requested a chip EC feature with an invalid attribute ID FAPI_RC_INVALID_CHIP_EC_FEATURE_GET = FAPI_RC_FAPI_MASK | 0x02, - // Invalid parameters passed to a FAPI interface - FAPI_RC_INVALID_PARAM = FAPI_RC_FAPI_MASK | 0x03, - //-------------------------------------------------------------------------- // PLAT generated return codes. Additional details may be contained in // ReturnCode platData (this can only be looked at by PLAT code) diff --git a/src/include/usr/hwpf/hwpf_reasoncodes.H b/src/include/usr/hwpf/hwpf_reasoncodes.H index 37c3b50c9..e3d41c75d 100644 --- a/src/include/usr/hwpf/hwpf_reasoncodes.H +++ b/src/include/usr/hwpf/hwpf_reasoncodes.H @@ -76,7 +76,8 @@ namespace fapi enum hwpfReasonCode { // FAPI generated errors (must match fapiReturnCodes.H) - RC_INVALID_ATTR_GET = HWPF_COMP_ID | 0x01, + RC_INVALID_ATTR_GET = HWPF_COMP_ID | 0x01, + RC_INVALID_CHIP_EC_FEATURE_GET = HWPF_COMP_ID | 0x02, // HWP generated errors RC_HWP_GENERATED_ERROR = HWPF_COMP_ID | 0x0f, @@ -137,5 +138,11 @@ namespace fapi * @reasoncode RC_INVALID_ATTR_GET * @devdesc InitFile HW Procedure requested an invalid attribute */ +/*@ + * @errortype + * @moduleid MOD_FAPI_RC_TO_ERRL + * @reasoncode RC_INVALID_CHIP_EC_FEATURE_GET + * @devdesc Request for EC features on an attribute without EC features + */ #endif -- cgit v1.2.3