From a703e4194969a29d6996f3b749f9dac1cc059b0e Mon Sep 17 00:00:00 2001
From: Francois Isabelle <isabellf@users.sourceforge.net>
Date: Mon, 18 Jun 2007 12:45:04 +0000
Subject: [PATCH] corrected "autodetection" of maximum packet size based on
 src/dest addresses when using IPMB. make sure file uses UNIX EOL

---
 ipmitool/lib/ipmi_hpmfwupg.c | 4910 +++++++++++++++++-----------------
 1 file changed, 2454 insertions(+), 2456 deletions(-)

diff --git a/ipmitool/lib/ipmi_hpmfwupg.c b/ipmitool/lib/ipmi_hpmfwupg.c
index 136c04e..0a26bc8 100644
--- a/ipmitool/lib/ipmi_hpmfwupg.c
+++ b/ipmitool/lib/ipmi_hpmfwupg.c
@@ -1,2458 +1,2456 @@
-/*
- * Copyright (c) 2006 Kontron Canada, Inc.  All Rights Reserved.
- * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * Redistribution of source code must retain the above copyright       
- * notice, this list of conditions and the following disclaimer.
- *
- * Redistribution in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * Neither the name of Sun Microsystems, Inc. or the names of
- * contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
-  * This software is provided "AS IS," without a warranty of any kind.
- * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
- * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
- * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
- * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
- * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
- * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
- * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
- * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
- * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
- * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
- * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
- */
-
-#include <ipmitool/ipmi_intf.h>
-#include <ipmitool/ipmi_mc.h>
-#include <ipmitool/ipmi_hpmfwupg.h>
-#include <ipmitool/helper.h>
-#include <ipmitool/log.h>
-#include "../src/plugins/lan/md5.h"
-#include <stdio.h>
-#include <time.h>
-
+/*
+ * Copyright (c) 2006 Kontron Canada, Inc.  All Rights Reserved.
+ * Copyright (c) 2003 Sun Microsystems, Inc.  All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * Redistribution of source code must retain the above copyright       
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * Redistribution in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * Neither the name of Sun Microsystems, Inc. or the names of
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+  * This software is provided "AS IS," without a warranty of any kind.
+ * ALL EXPRESS OR IMPLIED CONDITIONS, REPRESENTATIONS AND WARRANTIES,
+ * INCLUDING ANY IMPLIED WARRANTY OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE OR NON-INFRINGEMENT, ARE HEREBY EXCLUDED.
+ * SUN MICROSYSTEMS, INC. ("SUN") AND ITS LICENSORS SHALL NOT BE LIABLE
+ * FOR ANY DAMAGES SUFFERED BY LICENSEE AS A RESULT OF USING, MODIFYING
+ * OR DISTRIBUTING THIS SOFTWARE OR ITS DERIVATIVES.  IN NO EVENT WILL
+ * SUN OR ITS LICENSORS BE LIABLE FOR ANY LOST REVENUE, PROFIT OR DATA,
+ * OR FOR DIRECT, INDIRECT, SPECIAL, CONSEQUENTIAL, INCIDENTAL OR
+ * PUNITIVE DAMAGES, HOWEVER CAUSED AND REGARDLESS OF THE THEORY OF
+ * LIABILITY, ARISING OUT OF THE USE OF OR INABILITY TO USE THIS SOFTWARE,
+ * EVEN IF SUN HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ */
+
+#include <ipmitool/ipmi_intf.h>
+#include <ipmitool/ipmi_mc.h>
+#include <ipmitool/ipmi_hpmfwupg.h>
+#include <ipmitool/helper.h>
+#include <ipmitool/log.h>
+#include "../src/plugins/lan/md5.h"
+#include <stdio.h>
+#include <time.h>
+
 #if HAVE_CONFIG_H
   #include <config.h>
-#endif
-
-/****************************************************************************
-*
-*       Copyright (c) 2006 Kontron Canada, Inc.  All Rights Reserved.
-*
-*                              HPM.1 
-*                    Hardware Platform Management
-*              IPM Controller Firmware Upgrade Procedure
-*
-*  This module implements an Upgrade Agent for the IPM Controller
-*  Firmware Upgrade Procedure (HPM.1) specification version 1.0.
-*
-* author: 
-* Frederic.Lelievre@ca.kontron.com
-* Francois.Isabelle@ca.kontron.com
-*
-*****************************************************************************
-*
-* HISTORY
-* ===========================================================================
-* 2007-01-11 
-*
-*  - Incremented to version 0.2
-*  - Added lan packet size reduction mechanism to workaround fact
-*    that lan iface will not return C7 on excessive length
-*  - Fixed some typos
-*  - now uses lprintf()
-* 
-* - Incremented to version 0.3    
-* - added patch for openipmi si driver V39 (send message in driver does not
-*    retry on 82/83 completion code and return 82/83 as response from target
-*    [conditionnaly built with ENABLE_OPENIPMI_V39_PATCH]
-*
-*    see: ipmi-fix-send-msg-retry.pacth in openipmi-developer mailing list
-*
-* 2007-01-16 
-*
-*  - Incremented to version 0.4
-*  - Fixed lan iface inaccesiblity timeout handling. Waiting for firmware 
-*    activation completion (fixed sleep) before re-opening a session and
-*    get the final firmware upgrade status.
-*  - Fixed some user interface stuff.
-*
-* 2007-05-09
-*
-*  - Incremented to version 1.0
-*  - Modifications for compliancy with HPM.1 specification version 1.0
-*
-* TODO
-* ===========================================================================
-* 2007-01-11
-*
-* - Add interpretation of GetSelftestResults
-* - Add interpretation of component ID string
-* 
-*****************************************************************************/
-
-extern int verbose;
-
-/*
- *  Agent version
- */
-#define HPMFWUPG_VERSION_MAJOR 1 
-#define HPMFWUPG_VERSION_MINOR 0
-
-/* 
- *  HPM.1 FIRMWARE UPGRADE COMMANDS (part of PICMG)
- */
-
-#define HPMFWUPG_GET_TARGET_UPG_CAPABILITIES 0x2E
-#define HPMFWUPG_GET_COMPONENT_PROPERTIES    0x2F  
-#define HPMFWUPG_ABORT_UPGRADE               0x30  
-#define HPMFWUPG_INITIATE_UPGRADE_ACTION     0x31  
-#define HPMFWUPG_UPLOAD_FIRMWARE_BLOCK       0x32
-#define HPMFWUPG_FINISH_FIRMWARE_UPLOAD      0x33
-#define HPMFWUPG_GET_UPGRADE_STATUS          0x34
-#define HPMFWUPG_ACTIVATE_FIRMWARE           0x35
-#define HPMFWUPG_QUERY_SELFTEST_RESULT       0x36
-#define HPMFWUPG_QUERY_ROLLBACK_STATUS       0x37
-#define HPMFWUPG_MANUAL_FIRMWARE_ROLLBACK    0x38
-
-/*
- *  HPM.1 SPECIFIC COMPLETION CODES
- */
-#define HPMFWUPG_ROLLBACK_COMPLETED   0x00
-#define HPMFWUPG_COMMAND_IN_PROGRESS  0x80
-#define HPMFWUPG_NOT_SUPPORTED        0x81
-#define HPMFWUPG_SIZE_MISMATCH        0x81
-#define HPMFWUPG_ROLLBACK_FAILURE     0x81
-#define HPMFWUPG_INV_COMP_MASK        0x81
-#define HPMFWUPG__ABORT_FAILURE       0x81
-#define HPMFWUPG_INV_COMP_ID          0x82
-#define HPMFWUPG_INT_CHECKSUM_ERROR   0x82
-#define HPMFWUPG_INV_UPLOAD_MODE      0x82
-#define HPMFWUPG_ROLLBACK_OVERRIDE    0x82
-#define HPMFWUPG_INV_COMP_PROP        0x83
-#define HPMFWUPG_FW_MISMATCH          0x83
-#define HPMFWUPG_ROLLBACK_DENIED      0x83
-
-/* 
- * This error code is used as a temporary PATCH to
- * the latest Open ipmi driver.  This PATCH
- * will be removed once a new Open IPMI driver is released.
- * (Buggy version = 39)
- */ 
-#define ENABLE_OPENIPMI_V39_PATCH
-
-#ifdef ENABLE_OPENIPMI_V39_PATCH
-
-#define RETRY_COUNT_MAX 3
-
-static int errorCount;
-
-#define HPMFWUPG_IS_RETRYABLE(error)                                          \
-((((error==0x83)||(error==0x82)) && (errorCount++<RETRY_COUNT_MAX))?TRUE:FALSE)
-#else
-#define HPMFWUPG_IS_RETRYABLE(error) FALSE
-#endif
-
-/* 
- *  HPM FIRMWARE UPGRADE GENERAL DEFINITIONS
- */
-
-#define HPMFWUPG_PICMG_IDENTIFIER         0
-#define HPMFWUPG_VERSION_SIZE             6
-#define HPMFWUPG_DESC_STRING_LENGTH       12
-#define HPMFWUPG_DEFAULT_INACCESS_TIMEOUT 60 /* sec */
-#define HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT  60 /* sec */
-#define HPMFWUPG_MD5_SIGNATURE_LENGTH     16
-
-/* Component IDs */
-typedef enum eHpmfwupgComponentId
-{
-   HPMFWUPG_COMPONENT_ID_0 = 0,
-   HPMFWUPG_COMPONENT_ID_1,
-   HPMFWUPG_COMPONENT_ID_2,
-   HPMFWUPG_COMPONENT_ID_3,
-   HPMFWUPG_COMPONENT_ID_4,
-   HPMFWUPG_COMPONENT_ID_5,
-   HPMFWUPG_COMPONENT_ID_6,
-   HPMFWUPG_COMPONENT_ID_7,
-   HPMFWUPG_COMPONENT_ID_MAX
-} tHpmfwupgComponentId;   
-
-struct HpmfwupgComponentBitMask
-{
-   union
-   {
-      unsigned char byte;
-      struct
-      {
-      	#ifdef WORDS_BIGENDIAN
-      	unsigned char component7 : 1;
-         unsigned char component6 : 1;
-         unsigned char component5 : 1;
-         unsigned char component4 : 1;
-         unsigned char component3 : 1;
-         unsigned char component2 : 1;
-         unsigned char component1 : 1;
-         unsigned char component0 : 1;
-         #else
-         unsigned char component0 : 1;
-         unsigned char component1 : 1;
-         unsigned char component2 : 1;
-         unsigned char component3 : 1;      
-         unsigned char component4 : 1;
-         unsigned char component5 : 1;
-         unsigned char component6 : 1;
-         unsigned char component7 : 1;
-         #endif
-      }bitField;
-   }ComponentBits;
-}__attribute__ ((packed));
-
-
-static const int HPMFWUPG_SUCCESS              = 0;
-static const int HPMFWUPG_ERROR                = -1;
-/* Upload firmware specific error codes */
-static const int HPMFWUPG_UPLOAD_BLOCK_LENGTH  = 1;
-static const int HPMFWUPG_UPLOAD_RETRY         = 2;
-
-
-/* 
- *  TARGET UPGRADE CAPABILITIES DEFINITIONS
- */
-
-struct HpmfwupgGetTargetUpgCapabilitiesReq
-{
-   unsigned char picmgId;
-}__attribute__ ((packed));
-
-
-struct HpmfwupgGetTargetUpgCapabilitiesResp
-{
-   unsigned char picmgId;
-   unsigned char hpmVersion;
-   union
-   {
-      unsigned char byte;
-      struct
-      {
-      	#if WORDS_BIGENDIAN
-         unsigned char fwUpgUndesirable    : 1;
-         unsigned char autRollbackOverride : 1;
-         unsigned char ipmcDegradedDurinUpg: 1;
-         unsigned char deferActivation     : 1;
-         unsigned char servAffectDuringUpg : 1;         
-         unsigned char manualRollback      : 1;
-         unsigned char autRollback         : 1;
-         unsigned char ipmcSelftestCap     : 1;
-         #else
-         unsigned char ipmcSelftestCap     : 1;
-         unsigned char autRollback         : 1;
-         unsigned char manualRollback      : 1;
-         unsigned char servAffectDuringUpg : 1;
-         unsigned char deferActivation     : 1;
-         unsigned char ipmcDegradedDurinUpg: 1;      
-         unsigned char autRollbackOverride : 1;      
-         unsigned char fwUpgUndesirable    : 1;
-         #endif
-      }bitField;
-   }GlobalCapabilities;
-   unsigned char upgradeTimeout;
-   unsigned char selftestTimeout;
-   unsigned char rollbackTimeout;
-   unsigned char inaccessTimeout;
-   struct HpmfwupgComponentBitMask componentsPresent;
-}__attribute__ ((packed));
-
-struct HpmfwupgGetTargetUpgCapabilitiesCtx
-{
-   struct HpmfwupgGetTargetUpgCapabilitiesReq  req;
-   struct HpmfwupgGetTargetUpgCapabilitiesResp resp;
-}__attribute__ ((packed));   
-
-/* 
- *  COMPONENT PROPERTIES DEFINITIONS
- */
- 
-typedef enum eHpmfwupgCompPropertiesSelect
-{
-   HPMFWUPG_COMP_GEN_PROPERTIES = 0,
-   HPMFWUPG_COMP_CURRENT_VERSION, 
-   HPMFWUPG_COMP_DESCRIPTION_STRING,
-   HPMFWUPG_COMP_ROLLBACK_FIRMWARE_VERSION,
-   HPMFWUPG_COMP_DEFERRED_FIRMWARE_VERSION,
-   HPMFWUPG_COMP_RESERVED,
-   HPMFWUPG_COMP_OEM = 0x192   
-} tHpmfwupgCompPropertiesSelect; 
-
-struct HpmfwupgGetComponentPropertiesReq
-{
-   unsigned char picmgId;
-   unsigned char componentId;
-   unsigned char selector;
-}__attribute__ ((packed));
-
-struct HpmfwupgGetGeneralPropResp 
-{
-   unsigned char picmgId;
-   union
-   {
-      unsigned char byte;
-      struct
-      {
-      	#if WORDS_BIGENDIAN
-         unsigned char reserved           : 2;      
-         unsigned char payloadColdReset   : 1;
-         unsigned char deferredActivation : 1;
-         unsigned char comparisonSupport  : 1;
-         unsigned char preparationSupport : 1;
-         unsigned char rollbackBackup     : 2;
-      	#else
-         unsigned char rollbackBackup     : 2;
-         unsigned char preparationSupport : 1;
-         unsigned char comparisonSupport  : 1;
-         unsigned char deferredActivation : 1;
-         unsigned char payloadColdReset   : 1;
-         unsigned char reserved           : 2;
-         #endif
-      }bitfield;
-   }GeneralCompProperties;
-}__attribute__ ((packed));   
-
-struct HpmfwupgGetCurrentVersionResp 
-{
-   unsigned char picmgId;
-   unsigned char currentVersion[HPMFWUPG_VERSION_SIZE];
-}__attribute__ ((packed));
-
-struct HpmfwupgGetDescStringResp 
-{
-   unsigned char picmgId;
-   char descString[HPMFWUPG_DESC_STRING_LENGTH];
-}__attribute__ ((packed));
-
-struct HpmfwupgGetRollbackFwVersionResp 
-{
-   unsigned char picmgId;
-   unsigned char rollbackFwVersion[HPMFWUPG_VERSION_SIZE];
-}__attribute__ ((packed));
-
-struct HpmfwupgGetDeferredFwVersionResp 
-{
-   unsigned char picmgId;
-   unsigned char deferredFwVersion[HPMFWUPG_VERSION_SIZE];
-}__attribute__ ((packed));
-
-struct HpmfwupgGetComponentPropertiesResp
-{
-   union
-   {
-      struct HpmfwupgGetGeneralPropResp       generalPropResp;
-      struct HpmfwupgGetCurrentVersionResp    currentVersionResp;
-      struct HpmfwupgGetDescStringResp        descStringResp;
-      struct HpmfwupgGetRollbackFwVersionResp rollbackFwVersionResp;
-      struct HpmfwupgGetDeferredFwVersionResp deferredFwVersionResp;
-   }Response;
-}__attribute__ ((packed));
-
-struct HpmfwupgGetComponentPropertiesCtx
-{
-   struct HpmfwupgGetComponentPropertiesReq  req;
-   struct HpmfwupgGetComponentPropertiesResp resp;
-}__attribute__ ((packed));      
-
-
-/* 
- *  ABORT UPGRADE DEFINITIONS
- */
-struct HpmfwupgAbortUpgradeReq
-{
-   unsigned char picmgId;
-}__attribute__ ((packed));
-
-struct HpmfwupgAbortUpgradeResp
-{
-   unsigned char picmgId;
-}__attribute__ ((packed));
-
-struct HpmfwupgAbortUpgradeCtx
-{
-   struct HpmfwupgAbortUpgradeReq  req;
-   struct HpmfwupgAbortUpgradeResp resp;
-}__attribute__ ((packed));
-
-/* 
- * UPGRADE ACTIONS DEFINITIONS
- */
-typedef enum eHpmfwupgUpgradeAction
-{
-   HPMFWUPG_UPGRADE_ACTION_BACKUP = 0,
-   HPMFWUPG_UPGRADE_ACTION_PREPARE,
-   HPMFWUPG_UPGRADE_ACTION_UPGRADE,
-   HPMFWUPG_UPGRADE_ACTION_COMPARE,
-   HPMFWUPG_UPGRADE_ACTION_INVALID = 0xff
-}  tHpmfwupgUpgradeAction;
-
-struct HpmfwupgInitiateUpgradeActionReq
-{
-   unsigned char picmgId;
-   struct HpmfwupgComponentBitMask componentsMask;
-   unsigned char upgradeAction;
-}__attribute__ ((packed));
-
-struct HpmfwupgInitiateUpgradeActionResp
-{
-   unsigned char picmgId;
-}__attribute__ ((packed));
-
-struct HpmfwupgInitiateUpgradeActionCtx
-{
-   struct HpmfwupgInitiateUpgradeActionReq  req;
-   struct HpmfwupgInitiateUpgradeActionResp resp;
-}__attribute__ ((packed));
-
-/* 
- *  UPLOAD FIRMWARE BLOCK DEFINITIONS
- */
-
-#define HPMFWUPG_SEND_DATA_COUNT_MAX   32
-#define HPMFWUPG_SEND_DATA_COUNT_KCS   HPMFWUPG_SEND_DATA_COUNT_MAX
-#define HPMFWUPG_SEND_DATA_COUNT_LAN   26
-#define HPMFWUPG_SEND_DATA_COUNT_IPMB  26
-#define HPMFWUPG_SEND_DATA_COUNT_IPMBL 26
-
-struct HpmfwupgUploadFirmwareBlockReq
-{
-   unsigned char picmgId;
-   unsigned char blockNumber;
-   unsigned char data[HPMFWUPG_SEND_DATA_COUNT_MAX];
-}__attribute__ ((packed));
-
-struct HpmfwupgUploadFirmwareBlockResp
-{
-  unsigned char picmgId;
-}__attribute__ ((packed));
-
-struct HpmfwupgUploadFirmwareBlockCtx
-{
-   struct HpmfwupgUploadFirmwareBlockReq  req;
-   struct HpmfwupgUploadFirmwareBlockResp resp;
-}__attribute__ ((packed));
-
-
-/*
- *   FINISH FIRMWARE UPLOAD DEFINITIONS
- */
-
-#define HPMFWUPG_IMAGE_SIZE_BYTE_COUNT 4
-
-struct HpmfwupgFinishFirmwareUploadReq
-{
-   unsigned char picmgId;
-   struct HpmfwupgComponentBitMask componentsMask;
-   unsigned char imageLength[HPMFWUPG_IMAGE_SIZE_BYTE_COUNT];
-}__attribute__ ((packed));
-
-struct HpmfwupgFinishFirmwareUploadResp
-{
-   unsigned char picmgId;
-}__attribute__ ((packed));
-
-struct HpmfwupgFinishFirmwareUploadCtx
-{
-   struct HpmfwupgFinishFirmwareUploadReq  req;
-   struct HpmfwupgFinishFirmwareUploadResp resp;
-}__attribute__ ((packed));
-
-/*
- *   ACTIVATE FW DEFINITIONS
- */
-
-struct HpmfwupgActivateFirmwareReq
-{
-   unsigned char picmgId;
-}__attribute__ ((packed));
-
-struct HpmfwupgActivateFirmwareResp
-{
-   unsigned char picmgId;
-}__attribute__ ((packed));
-
-struct HpmfwupgActivateFirmwareCtx
-{
-   struct HpmfwupgActivateFirmwareReq  req;
-   struct HpmfwupgActivateFirmwareResp resp;
-}__attribute__ ((packed));
-
-                                                     
-/*
- *   GET UPGRADE STATUS DEFINITIONS
- */
-
-struct HpmfwupgGetUpgradeStatusReq
-{
-   unsigned char picmgId;
-}__attribute__ ((packed));
-
-struct HpmfwupgGetUpgradeStatusResp
-{
-   unsigned char picmgId;
-   unsigned char cmdInProcess;
-   unsigned char lastCmdCompCode;
-}__attribute__ ((packed));
-
-struct HpmfwupgGetUpgradeStatusCtx
-{
-   struct HpmfwupgGetUpgradeStatusReq  req;
-   struct HpmfwupgGetUpgradeStatusResp resp;
-}__attribute__ ((packed));
-                         
-/*
- *   MANUAL FW ROLLBACK DEFINITIONS
- */
-
-struct HpmfwupgManualFirmwareRollbackReq
-{
-   unsigned char picmgId;
-}__attribute__ ((packed));
-
-struct HpmfwupgManualFirmwareRollbackResp
-{
-   unsigned char picmgId;
-}__attribute__ ((packed));
-
-struct HpmfwupgManualFirmwareRollbackCtx
-{
-   struct HpmfwupgManualFirmwareRollbackReq  req;
-   struct HpmfwupgManualFirmwareRollbackResp resp;
-}__attribute__ ((packed));
-
-/*
- *   QUERY ROLLBACK STATUS DEFINITIONS
- */
-
-struct HpmfwupgQueryRollbackStatusReq
-{
-   unsigned char picmgId;
-}__attribute__ ((packed));
-
-struct HpmfwupgQueryRollbackStatusResp
-{
-   unsigned char picmgId;
-   struct HpmfwupgComponentBitMask rollbackComp;
-}__attribute__ ((packed));
-
-struct HpmfwupgQueryRollbackStatusCtx
-{
-   struct HpmfwupgQueryRollbackStatusReq  req;
-   struct HpmfwupgQueryRollbackStatusResp resp;
-}__attribute__ ((packed));
-
-/*
- *   QUERY SELF TEST RESULT DEFINITIONS
- */
-
-struct  HpmfwupgQuerySelftestResultReq
-{
-   unsigned char picmgId;
-}__attribute__ ((packed));
-
-struct  HpmfwupgQuerySelftestResultResp
-{
-   unsigned char picmgId;
-   unsigned char result1;
-   unsigned char result2;
-}__attribute__ ((packed));
-
-struct HpmfwupgQuerySelftestResultCtx
-{
-   struct HpmfwupgQuerySelftestResultReq  req;
-   struct HpmfwupgQuerySelftestResultResp resp;
-}__attribute__ ((packed));
-
-/*
- *  HPM.1 IMAGE DEFINITIONS
- */ 
-
-#define HPMFWUPG_HEADER_SIGNATURE_LENGTH 8
-#define HPMFWUPG_MANUFATURER_ID_LENGTH   3
-#define HPMFWUPG_PRODUCT_ID_LENGTH       2
-#define HPMFWUPG_TIME_LENGTH             4
-#define HPMFWUPG_TIMEOUT_LENGTH          1
-#define HPMFWUPG_COMP_REVISION_LENGTH    2
-#define HPMFWUPG_FIRM_REVISION_LENGTH    6
-#define HPMFWUPG_IMAGE_HEADER_VERSION    0 
-#define HPMFWUPG_IMAGE_SIGNATURE "PICMGFWU"
- 
-struct HpmfwupgImageHeader
-{
-  char           signature[HPMFWUPG_HEADER_SIGNATURE_LENGTH];
-  unsigned char  formatVersion;
-  unsigned char  deviceId;
-  unsigned char  manId[HPMFWUPG_MANUFATURER_ID_LENGTH];
-  unsigned char  prodId[HPMFWUPG_PRODUCT_ID_LENGTH];
-  unsigned char  time[HPMFWUPG_TIME_LENGTH];
-  union	
-  {
- 	 struct 
- 	 {
- 	 	#if WORDS_BIGENDIAN
- 		unsigned char imageSelfTest   : 1;
-      unsigned char autRollback     : 1;      
- 	 	unsigned char manRollback     : 1;
- 	 	unsigned char servAffected    : 1;
- 	 	unsigned char reserved        : 4;
- 	 	#else
- 	   unsigned char reserved        : 4;
- 	   unsigned char servAffected    : 1;
-      unsigned char manRollback     : 1;
-      unsigned char autRollback     : 1;
- 		unsigned char imageSelfTest   : 1;
- 	 	#endif
- 	 }	bitField;
-	 unsigned char byte;
-  }imageCapabilities;
-  struct HpmfwupgComponentBitMask components;
-  unsigned char  selfTestTimeout;
-  unsigned char  rollbackTimeout;
-  unsigned char  inaccessTimeout;
-  unsigned char  compRevision[HPMFWUPG_COMP_REVISION_LENGTH];
-  unsigned char  firmRevision[HPMFWUPG_FIRM_REVISION_LENGTH];
-  unsigned short oemDataLength;
-}__attribute__ ((packed));
-
-
-#define HPMFWUPG_DESCRIPTION_LENGTH   21
-
-struct HpmfwupgActionRecord
-{
-   unsigned char  actionType;
-   struct HpmfwupgComponentBitMask components;
-   unsigned char  checksum;
-}__attribute__ ((packed));
-
-#define HPMFWUPG_FIRMWARE_SIZE_LENGTH 4
-
-struct HpmfwupgFirmwareImage
-{
-   unsigned char version[HPMFWUPG_FIRM_REVISION_LENGTH];
-   char          desc[HPMFWUPG_DESCRIPTION_LENGTH];
-   unsigned char length[HPMFWUPG_FIRMWARE_SIZE_LENGTH];
-}__attribute__ ((packed));
-
-struct HpmfwupgUpgradeCtx
-{
-   unsigned int   imageSize;
-   unsigned char* pImageData;
-   unsigned char  componentId;
-   struct HpmfwupgGetTargetUpgCapabilitiesResp targetCap;
-   struct HpmfwupgGetGeneralPropResp           genCompProp[HPMFWUPG_COMPONENT_ID_MAX];
-   struct ipm_devid_rsp                        devId;
-}__attribute__ ((packed));
-
-typedef enum eHpmfwupgActionType
-{
-   HPMFWUPG_ACTION_BACKUP_COMPONENTS = 0,
-   HPMFWUPG_ACTION_PREPARE_COMPONENTS,
-	HPMFWUPG_ACTION_UPLOAD_FIRMWARE,
-   HPMFWUPG_ACTION_RESERVED = 0xFF
-} tHpmfwupgActionType;
-
-/*
- * FUNCTIONS PROTOTYPES
- */
-
-static int HpmfwupgUpgrade(struct ipmi_intf *intf, char* imageFilename, int activate); 
-static int HpmfwupgValidateImageIntegrity(struct HpmfwupgUpgradeCtx* pFwupgCtx);
-static int HpmfwupgPreparationStage(struct ipmi_intf *intf, 
-                                    struct HpmfwupgUpgradeCtx* pFwupgCtx);
-static int HpmfwupgUpgradeStage(struct ipmi_intf *intf, 
-                                struct HpmfwupgUpgradeCtx* pFwupgCtx);
-static int HpmfwupgActivationStage(struct ipmi_intf *intf, 
-                                  struct HpmfwupgUpgradeCtx* pFwupgCtx);
-static int HpmfwupgGetTargetUpgCapabilities(struct ipmi_intf *intf, 
-                                             struct HpmfwupgGetTargetUpgCapabilitiesCtx* pCtx);
-static int HpmfwupgGetComponentProperties(struct ipmi_intf *intf, 
-                                          struct HpmfwupgGetComponentPropertiesCtx* pCtx);
-static int HpmfwupgQuerySelftestResult(struct ipmi_intf *intf, 
-                                       struct HpmfwupgQuerySelftestResultCtx* pCtx,
-                                       struct HpmfwupgUpgradeCtx* pFwupgCtx);
-static int HpmfwupgQueryRollbackStatus(struct ipmi_intf *intf, 
-                                       struct HpmfwupgQueryRollbackStatusCtx* pCtx,
-                                       struct HpmfwupgUpgradeCtx* pFwupgCtx);
-static int HpmfwupgAbortUpgrade(struct ipmi_intf *intf, 
-                                struct HpmfwupgAbortUpgradeCtx* pCtx);    
-static int HpmfwupgInitiateUpgradeAction(struct ipmi_intf *intf, 
-                                         struct HpmfwupgInitiateUpgradeActionCtx* pCtx,
-                                         struct HpmfwupgUpgradeCtx* pFwupgCtx);  
-static int HpmfwupgUploadFirmwareBlock(struct ipmi_intf *intf, 
-                                       struct HpmfwupgUploadFirmwareBlockCtx* pCtx, 
-                                       struct HpmfwupgUpgradeCtx* pFwupgCtx, int count);
-static int HpmfwupgFinishFirmwareUpload(struct ipmi_intf *intf, 
-                                        struct HpmfwupgFinishFirmwareUploadCtx* pCtx,
-                                        struct HpmfwupgUpgradeCtx* pFwupgCtx);
-static int HpmfwupgActivateFirmware(struct ipmi_intf *intf, 
-                                    struct HpmfwupgActivateFirmwareCtx* pCtx,
-                                    struct HpmfwupgUpgradeCtx* pFwupgCtx);
-static int HpmfwupgGetUpgradeStatus(struct ipmi_intf *intf, 
-                                    struct HpmfwupgGetUpgradeStatusCtx* pCtxstruct, 
-                                    struct HpmfwupgUpgradeCtx* pFwupgCtx);
-static int HpmfwupgManualFirmwareRollback(struct ipmi_intf *intf, 
-                                          struct HpmfwupgManualFirmwareRollbackCtx* pCtx,
-                                          struct HpmfwupgUpgradeCtx* pFwupgCtx);
-static void HpmfwupgPrintUsage(void);
-static unsigned char HpmfwupgCalculateChecksum(unsigned char* pData, unsigned int length);
-static int HpmfwupgGetDeviceId(struct ipmi_intf *intf, struct ipm_devid_rsp* pGetDevId);
-static int HpmfwupgGetBufferFromFile(char* imageFilename, struct HpmfwupgUpgradeCtx* pFwupgCtx);
-static int HpmfwupgWaitLongDurationCmd(struct ipmi_intf *intf, struct HpmfwupgUpgradeCtx* pFwupgCtx);
-
-static struct ipmi_rs *  HpmfwupgSendCmd(struct ipmi_intf *intf, struct ipmi_rq req,
-                                         struct HpmfwupgUpgradeCtx* pFwupgCtx);
-                                    
-/****************************************************************************
-*
-* Function Name:  HpmfwupgUpgrade
-*
-* Description: This function performs the HPM.1 firmware upgrade procedure as
-*              defined the IPM Controller Firmware Upgrade Specification
-*              version 1.0
-*
-*****************************************************************************/
-int HpmfwupgUpgrade(struct ipmi_intf *intf, char* imageFilename, int activate)
-{
-   int rc = HPMFWUPG_SUCCESS;
-   struct HpmfwupgImageHeader imageHeader;
-   struct HpmfwupgUpgradeCtx  fwupgCtx;
-   
-   /*
-    *  GET IMAGE BUFFER FROM FILE
-    */
-    
-   rc = HpmfwupgGetBufferFromFile(imageFilename, &fwupgCtx);
-   
-   /*
-    *  VALIDATE IMAGE INTEGRITY
-    */  
-    
-   if ( rc == HPMFWUPG_SUCCESS )
-   {
-      printf("Validating firmware image integrity...");
-      fflush(stdout);
-      rc = HpmfwupgValidateImageIntegrity(&fwupgCtx);
-      if ( rc == HPMFWUPG_SUCCESS )
-      {
-         printf("OK\n");
-         fflush(stdout);
-      }
-      else
-      {
-         free(fwupgCtx.pImageData);
-      }
-   }
-   
-   /*
-    *  PREPARATION STAGE
-    */
-   
-   if ( rc == HPMFWUPG_SUCCESS )
-   {
-      printf("Performing preparation stage...");
-      fflush(stdout);
-      rc = HpmfwupgPreparationStage(intf, &fwupgCtx);
-      if ( rc == HPMFWUPG_SUCCESS )
-      {
-         printf("OK\n");
-         fflush(stdout);
-         /* Print useful information to user */
-         lprintf(LOG_NOTICE,"    Target Product ID     : %u", buf2short(fwupgCtx.devId.product_id));
-         lprintf(LOG_NOTICE,"    Target Manufacturer ID: %u", buf2short(fwupgCtx.devId.manufacturer_id));
-      }
-      else
-      {
-         free(fwupgCtx.pImageData);
-      }
-   }
-   
-   /*
-    *  UPGRADE STAGE
-    */
-    
-   if ( rc == HPMFWUPG_SUCCESS )
-   {
-      lprintf(LOG_NOTICE,"Performing upgrade stage:");
-      rc = HpmfwupgUpgradeStage(intf, &fwupgCtx);
-      if ( rc != HPMFWUPG_SUCCESS )
-      {
-         free(fwupgCtx.pImageData);
-      }
-   }
-      
-   /*
-    *  ACTIVATION STAGE
-    */
-   if ( rc == HPMFWUPG_SUCCESS && activate )
-   {
-      lprintf(LOG_NOTICE,"Performing activation stage: ");
-      rc = HpmfwupgActivationStage(intf, &fwupgCtx);
-      if ( rc != HPMFWUPG_SUCCESS )
-      {
-         free(fwupgCtx.pImageData);
-      }
-   }
-   
-   if ( rc == HPMFWUPG_SUCCESS )
-   {
-      lprintf(LOG_NOTICE,"\nFirmware upgrade procedure successful\n");
-      free(fwupgCtx.pImageData);
-   }
-   else
-   {
-      lprintf(LOG_NOTICE,"\nFirmware upgrade procedure failed\n");
-   }
-      
-   return rc;
-}                                         
- 
-/****************************************************************************
-*
-* Function Name:  HpmfwupgValidateImageIntegrity
-*
-* Description: This function validates a HPM.1 firmware image file as defined
-*              in section 4 of the IPM Controller Firmware Upgrade 
-*              Specification version 1.0
-*
-*****************************************************************************/
-int HpmfwupgValidateImageIntegrity(struct HpmfwupgUpgradeCtx* pFwupgCtx)
-{
-   int rc = HPMFWUPG_SUCCESS;
-   struct HpmfwupgImageHeader* pImageHeader = (struct HpmfwupgImageHeader*)
-                                                         pFwupgCtx->pImageData;
-   md5_state_t ctx;
-	static unsigned char md[HPMFWUPG_MD5_SIGNATURE_LENGTH];
-   unsigned char* pMd5Sig = pFwupgCtx->pImageData + 
-                           (pFwupgCtx->imageSize - 
-                            HPMFWUPG_MD5_SIGNATURE_LENGTH);
-                                             
-   /* Validate MD5 checksum */
-   memset(md, 0, HPMFWUPG_MD5_SIGNATURE_LENGTH);
-	memset(&ctx, 0, sizeof(md5_state_t));
-   md5_init(&ctx);
-	md5_append(&ctx, pFwupgCtx->pImageData, pFwupgCtx->imageSize - 
-                                           HPMFWUPG_MD5_SIGNATURE_LENGTH);
-	md5_finish(&ctx, md);
-   if ( memcmp(md, pMd5Sig,HPMFWUPG_MD5_SIGNATURE_LENGTH) != 0 )
-   {
-      lprintf(LOG_NOTICE,"\n    Invalid MD5 signature");
-      rc = HPMFWUPG_ERROR;
-   }
-   
-   if ( rc == HPMFWUPG_SUCCESS )
-   {
-      /* Validate Header signature */
-      if( strncmp(pImageHeader->signature, HPMFWUPG_IMAGE_SIGNATURE, HPMFWUPG_HEADER_SIGNATURE_LENGTH) == 0 )
-      {
-         /* Validate Header image format version */
-         if ( pImageHeader->formatVersion == HPMFWUPG_IMAGE_HEADER_VERSION )
-         {
-            /* Validate header checksum */
-            if ( HpmfwupgCalculateChecksum((unsigned char*)pImageHeader, 
-                                           sizeof(struct HpmfwupgImageHeader) + 
-                                           pImageHeader->oemDataLength + 
-                                           sizeof(unsigned char)/*checksum*/) != 0 )
-            {
-               lprintf(LOG_NOTICE,"\n    Invalid header checksum");
-               rc = HPMFWUPG_ERROR;
-            }
-         }
-         else
-         {
-            lprintf(LOG_NOTICE,"\n    Unrecognized image version");
-            rc = HPMFWUPG_ERROR;
-         }
-      }
-      else
-      {
-         lprintf(LOG_NOTICE,"\n    Invalid image signature");
-         rc = HPMFWUPG_ERROR;
-      }
-   }
-   return rc;
-} 
-
-/****************************************************************************
-*
-* Function Name:  HpmfwupgPreparationStage
-*
-* Description: This function the preperation stage of a firmware upgrade 
-*              procedure as defined in section 3.2 of the IPM Controller 
-*              Firmware Upgrade Specification version 1.0
-*
-*****************************************************************************/
-int HpmfwupgPreparationStage(struct ipmi_intf *intf, struct HpmfwupgUpgradeCtx* pFwupgCtx)
-{
-   int rc = HPMFWUPG_SUCCESS;
-   struct HpmfwupgImageHeader* pImageHeader = (struct HpmfwupgImageHeader*)
-                                                         pFwupgCtx->pImageData;
-   
-   /* Get device ID */
-   rc = HpmfwupgGetDeviceId(intf, &pFwupgCtx->devId);
-   
-   /* Match current IPMC IDs with upgrade image */
-   if ( rc == HPMFWUPG_SUCCESS )
-   {
-      /* Validate device ID */
-      if ( pImageHeader->deviceId == pFwupgCtx->devId.device_id )
-      {
-         /* Validate product ID */
-         if ( memcmp(pImageHeader->prodId, pFwupgCtx->devId.product_id, HPMFWUPG_PRODUCT_ID_LENGTH ) == 0 )
-         {
-            /* Validate man ID */
-            if ( memcmp(pImageHeader->manId, pFwupgCtx->devId.manufacturer_id, 
-                                                     HPMFWUPG_MANUFATURER_ID_LENGTH ) != 0 )
-            {
-               lprintf(LOG_NOTICE,"\n    Invalid image file for manufacturer %u", 
-                                      buf2short(pFwupgCtx->devId.manufacturer_id)); 
-               rc = HPMFWUPG_ERROR;
-            }
-         }
-         else
-         {
-            lprintf(LOG_NOTICE,"\n    Invalid image file for product %u", 
-                                            buf2short(pFwupgCtx->devId.product_id));
-            rc = HPMFWUPG_ERROR;
-         }
-      
-      }
-      else
-      {
-         lprintf(LOG_NOTICE,"\n    Invalid device ID %x", pFwupgCtx->devId.device_id);
-         rc = HPMFWUPG_ERROR;
-      }
-   }
-   
-   /* Validate earliest compatible revision */
-   if ( rc == HPMFWUPG_SUCCESS )
-   {
-      /* Validate major & minor revision */
-      if ( pImageHeader->compRevision[0] < pFwupgCtx->devId.fw_rev1 )
-      {
-         /* Do nothing, upgrade accepted */            
-      }
-      else if ( pImageHeader->compRevision[0] == pFwupgCtx->devId.fw_rev1 )
-      {
-         /* Must validate minor revision */
-         if ( pImageHeader->compRevision[1] > pFwupgCtx->devId.fw_rev2 )
-         {
-               /* Version not compatible for upgrade */
-            lprintf(LOG_NOTICE,"\n    Version: Major: %d", pImageHeader->compRevision[0]);
-            lprintf(LOG_NOTICE,"             Minor: %x", pImageHeader->compRevision[1]);
-            lprintf(LOG_NOTICE,"    Not compatible with ");
-            lprintf(LOG_NOTICE,"    Version: Major: %d", pFwupgCtx->devId.fw_rev1);
-            lprintf(LOG_NOTICE,"             Minor: %x", pFwupgCtx->devId.fw_rev2);
-            rc = HPMFWUPG_ERROR;
-         }
-      }
-      else
-      {
-         /* Version not compatible for upgrade */
-         lprintf(LOG_NOTICE,"\n    Version: Major: %d", pImageHeader->compRevision[0]);
-         lprintf(LOG_NOTICE,"             Minor: %x", pImageHeader->compRevision[1]);
-         lprintf(LOG_NOTICE,"    Not compatible with ");
-         lprintf(LOG_NOTICE,"    Version: Major: %d", pFwupgCtx->devId.fw_rev1);
-         lprintf(LOG_NOTICE,"             Minor: %x", pFwupgCtx->devId.fw_rev2);
-         rc = HPMFWUPG_ERROR;                                                     
-      }
-   }
-   
-   /* Get target upgrade capabilities */
-   if ( rc == HPMFWUPG_SUCCESS )
-   {
-      struct HpmfwupgGetTargetUpgCapabilitiesCtx targetCapCmd;
-   
-      rc = HpmfwupgGetTargetUpgCapabilities(intf, &targetCapCmd);
-      
-      if ( rc == HPMFWUPG_SUCCESS )
-      {
-         /* Copy response to context */
-         memcpy(&pFwupgCtx->targetCap, 
-                &targetCapCmd.resp, 
-                sizeof(struct HpmfwupgGetTargetUpgCapabilitiesResp));
-                
-         /* Make sure all component IDs defined in the upgrade  
-            image are supported by the IPMC */
-         if ( (pImageHeader->components.ComponentBits.byte &
-               pFwupgCtx->targetCap.componentsPresent.ComponentBits.byte ) !=
-               pImageHeader->components.ComponentBits.byte )
-         {
-            lprintf(LOG_NOTICE,"\n    Some components present in the image file are not supported by the IPMC");
-            rc = HPMFWUPG_ERROR;                     
-         }
-         
-         /* Make sure the upgrade is desirable rigth now */
-         if ( pFwupgCtx->targetCap.GlobalCapabilities.bitField.fwUpgUndesirable == 1 )
-         {
-            lprintf(LOG_NOTICE,"\n    Upgrade undesirable at this moment");
-            rc = HPMFWUPG_ERROR;                     
-         }
-         
-         /* Get confimation from the user if he wants to continue when service 
-            affected during upgrade */
-         if ( pFwupgCtx->targetCap.GlobalCapabilities.bitField.servAffectDuringUpg == 1 ||
-              pImageHeader->imageCapabilities.bitField.servAffected == 1 )
-         {
-            char answer;
-            printf("\n    Services may be affected during upgrade. Do you wish to continue? y/n ");
-            fflush(stdout);
-            answer = getchar();
-            if ( answer == 'n' )
-            {
-               rc = HPMFWUPG_ERROR;
-            }
-         }
-         
-      }
-   }
-   
-   /* Get the general properties of each component present in image */
-   if ( rc == HPMFWUPG_SUCCESS )
-   {
-      int componentId;
-
-      for ( componentId = HPMFWUPG_COMPONENT_ID_0; 
-            componentId < HPMFWUPG_COMPONENT_ID_MAX;
-            componentId++ )
-      {
-         /* Reset component properties */
-         memset(&pFwupgCtx->genCompProp[0], 0, sizeof (struct HpmfwupgGetGeneralPropResp));
-         
-         if ( (1 << componentId & pImageHeader->components.ComponentBits.byte) )
-         {
-            struct HpmfwupgGetComponentPropertiesCtx getCompPropCmd;
-            
-            /* Get general component properties */
-            getCompPropCmd.req.componentId = componentId;
-            getCompPropCmd.req.selector    = HPMFWUPG_COMP_GEN_PROPERTIES;
-            
-            rc = HpmfwupgGetComponentProperties(intf, &getCompPropCmd);
-            
-            if ( rc == HPMFWUPG_SUCCESS )
-            {
-               /* Copy response to context */
-               memcpy(&pFwupgCtx->genCompProp[componentId], 
-                      &getCompPropCmd.resp, 
-                      sizeof(struct HpmfwupgGetGeneralPropResp));
-            }
-         }
-      }
-   }
-
-   return rc;
-}
-
-/****************************************************************************
-*
-* Function Name:  HpmfwupgUpgradeStage
-*
-* Description: This function the upgrade stage of a firmware upgrade 
-*              procedure as defined in section 3.3 of the IPM Controller 
-*              Firmware Upgrade Specification version 1.0
-*
-*****************************************************************************/
-int HpmfwupgUpgradeStage(struct ipmi_intf *intf, struct HpmfwupgUpgradeCtx* pFwupgCtx)
-{
-   int rc = HPMFWUPG_SUCCESS;
-   unsigned char* pImagePtr;
-   struct HpmfwupgActionRecord* pActionRecord;
-   unsigned int actionsSize;
-   struct HpmfwupgImageHeader* pImageHeader = (struct HpmfwupgImageHeader*)
-                                                         pFwupgCtx->pImageData;
-   
-   /* Put pointer after image header */
-   pImagePtr = (unsigned char*) 
-               (pFwupgCtx->pImageData + sizeof(struct HpmfwupgImageHeader) +
-                pImageHeader->oemDataLength + sizeof(unsigned char)/*checksum*/);
-            
-   /* Deternime actions size */            
-   actionsSize = pFwupgCtx->imageSize - sizeof(struct HpmfwupgImageHeader);   
-   
-   /* Perform actions defined in the image */
-   while( ( pImagePtr < (pFwupgCtx->pImageData + pFwupgCtx->imageSize - 
-            HPMFWUPG_MD5_SIGNATURE_LENGTH)) &&
-          ( rc == HPMFWUPG_SUCCESS) )
-   {
-      /* Get action record */
-      pActionRecord = (struct HpmfwupgActionRecord*)pImagePtr;
-      
-      /* Validate action record checksum */
-      if ( HpmfwupgCalculateChecksum((unsigned char*)pActionRecord, 
-                                     sizeof(struct HpmfwupgActionRecord)) != 0 )
-      {
-         lprintf(LOG_NOTICE,"    Invalid Action record.");
-         rc = HPMFWUPG_ERROR;
-      }
-      
-      if ( rc == HPMFWUPG_SUCCESS )
-      {
-         switch( pActionRecord->actionType )
-         {
-            case HPMFWUPG_ACTION_BACKUP_COMPONENTS:
-            {
-               /* Send prepare components command */
-               struct HpmfwupgInitiateUpgradeActionCtx initUpgActionCmd;
-               
-               initUpgActionCmd.req.componentsMask = pActionRecord->components;
-               /* Action is prepare components */
-               initUpgActionCmd.req.upgradeAction  = HPMFWUPG_UPGRADE_ACTION_BACKUP;
-               rc = HpmfwupgInitiateUpgradeAction(intf, &initUpgActionCmd, pFwupgCtx);
-               pImagePtr += sizeof(struct HpmfwupgActionRecord);                           
-               
-            }
-            break;
-            case HPMFWUPG_ACTION_PREPARE_COMPONENTS:
-            {
-               int componentId;
-               /* Make sure every components specified by this action 
-                  supports the prepare components */
-               for ( componentId = HPMFWUPG_COMPONENT_ID_0; 
-                     componentId < HPMFWUPG_COMPONENT_ID_MAX;
-                     componentId++ )
-               {
-                  if ( (1 << componentId & pActionRecord->components.ComponentBits.byte) )
-                  {
-                     if ( pFwupgCtx->genCompProp[componentId].GeneralCompProperties.bitfield.preparationSupport == 0 )
-                     {
-                        lprintf(LOG_NOTICE,"    Prepare component not supported by component ID %d", componentId);
-                        rc = HPMFWUPG_ERROR;
-                        break;
-                     }
-                  }
-               }
-               
-               if ( rc == HPMFWUPG_SUCCESS )
-               {
-                  /* Send prepare components command */
-                  struct HpmfwupgInitiateUpgradeActionCtx initUpgActionCmd;
-                  
-                  initUpgActionCmd.req.componentsMask = pActionRecord->components;
-                  /* Action is prepare components */
-                  initUpgActionCmd.req.upgradeAction  = HPMFWUPG_UPGRADE_ACTION_PREPARE;
-                  rc = HpmfwupgInitiateUpgradeAction(intf, &initUpgActionCmd, pFwupgCtx);
-                  pImagePtr += sizeof(struct HpmfwupgActionRecord);
-               }
-            }
-            break;
-            case HPMFWUPG_ACTION_UPLOAD_FIRMWARE:
-            /* Upload all firmware blocks */
-            {
-               struct HpmfwupgFirmwareImage* pFwImage;
-               struct HpmfwupgInitiateUpgradeActionCtx initUpgActionCmd;
-               struct HpmfwupgUploadFirmwareBlockCtx   uploadCmd;
-               struct HpmfwupgFinishFirmwareUploadCtx  finishCmd;
-               unsigned char* pData, *pDataInitial;
-               unsigned char  count;
-               unsigned int   totalSent = 0;
-               unsigned char  bufLength = 0;
-               unsigned int   firmwareLength = 0;
-               
-               /* Send initiate command */
-               initUpgActionCmd.req.componentsMask = pActionRecord->components;
-               
-               /* Action is upgrade */
-               initUpgActionCmd.req.upgradeAction  = HPMFWUPG_UPGRADE_ACTION_UPGRADE;
-               rc = HpmfwupgInitiateUpgradeAction(intf, &initUpgActionCmd, pFwupgCtx);
-               
-               if ( rc == HPMFWUPG_SUCCESS )
-               {
-                  /* Save component ID on which the upload is done */
-                  pFwupgCtx->componentId = (1 << pActionRecord->components.ComponentBits.byte);
-                  
-                  /* Initialize parameters */                 
-                  uploadCmd.req.blockNumber = 0;
-                  pFwImage = (struct HpmfwupgFirmwareImage*)(pImagePtr + 
-                              sizeof(struct HpmfwupgActionRecord));
-                  lprintf(LOG_NOTICE,"    Upgrading %s", pFwImage->desc);
-                  lprintf(LOG_NOTICE,"    with Version: Major: %d", pFwImage->version[0]);
-                  lprintf(LOG_NOTICE,"                  Minor: %x", pFwImage->version[1]);
-                  lprintf(LOG_NOTICE,"                  Aux  : %03d %03d %03d %03d", pFwImage->version[2],
-                                                               pFwImage->version[3],
-                                                               pFwImage->version[4],
-                                                               pFwImage->version[5]); 
-                     
-                  pDataInitial = ((unsigned char*)pFwImage + sizeof(struct HpmfwupgFirmwareImage));
-                  pData = pDataInitial;
-                                    
-                  /* Find max buffer length according the connection 
-                     parameters */
-                  if ( strstr(intf->name,"lan") != NULL )
-                  {
-                     bufLength = HPMFWUPG_SEND_DATA_COUNT_LAN;
-                  }
-                  else
-                  {
-                     if
-                     ( 
-                        strstr(intf->name,"open") != NULL
-                        &&
-                        (
-                           intf->target_addr == IPMI_BMC_SLAVE_ADDR 
-                           ||
-                           intf->target_addr ==  intf->my_addr
-                        )
-                     )
-                     {
-                        bufLength = HPMFWUPG_SEND_DATA_COUNT_KCS;
-                     }
-                     else
-                     {
-                        if ( intf->target_channel == 7 )    
-                        {
-                           bufLength = HPMFWUPG_SEND_DATA_COUNT_IPMBL;
-                        }
-                        else
-                        {
-                           bufLength = HPMFWUPG_SEND_DATA_COUNT_IPMB;
-                        }
-                     }
-                  }
-                                 
-                  /* Get firmware length */
-                  firmwareLength  =  pFwImage->length[0];
-                  firmwareLength |= (pFwImage->length[1] << 8)  & 0xff00;
-                  firmwareLength |= (pFwImage->length[2] << 16) & 0xff0000;
-                  firmwareLength |= (pFwImage->length[3] << 24) & 0xff000000;
-
-                  while ( (pData < (pDataInitial + firmwareLength)) && 
-                          (rc == HPMFWUPG_SUCCESS) )
-                  {
-                     if ( pData + bufLength 
-                          <= (pDataInitial + firmwareLength) )
-                     {        
-                        count = bufLength;                
-                     }
-                     else
-                     {
-                        count = (unsigned char)((pDataInitial + firmwareLength) - pData);
-                     }
-                     totalSent += count;
-                     memcpy(&uploadCmd.req.data, pData, bufLength);
-                     
-                     rc = HpmfwupgUploadFirmwareBlock(intf, &uploadCmd, pFwupgCtx, count);
-                  
-                     if ( rc == HPMFWUPG_SUCCESS )
-                     {
-                        uploadCmd.req.blockNumber++;
-                        pData += count;
-                        /* avoid lprintf to control \n generation */
-                        printf("    Writing firmware: %.0f %c completed\r", 
-                               (float)totalSent/firmwareLength*100, '%');
-                        fflush(stdout);
-                     }
-                     else if ( rc == HPMFWUPG_UPLOAD_BLOCK_LENGTH )
-                     {
-                        /* Retry with a smaller buffer length */
-                        bufLength -= (unsigned char)1;
-                        rc = HPMFWUPG_SUCCESS; 
-                     }
-                     else if ( rc == HPMFWUPG_UPLOAD_RETRY )
-                     {
-                        rc = HPMFWUPG_SUCCESS;
-                     }
-                  }
-                  lprintf(LOG_NOTICE,"");
-               
-                  if ( rc == HPMFWUPG_SUCCESS )
-                  {
-                     /* Send finish component */
-                     /* Set image length */
-                     finishCmd.req.componentsMask = pActionRecord->components;
-                     finishCmd.req.imageLength[0] = pFwImage->length[0];
-                     finishCmd.req.imageLength[1] = pFwImage->length[1];
-                     finishCmd.req.imageLength[2] = pFwImage->length[2];
-                     finishCmd.req.imageLength[3] = pFwImage->length[3];
-                     rc = HpmfwupgFinishFirmwareUpload(intf, &finishCmd, pFwupgCtx);
-                     pImagePtr = pDataInitial + firmwareLength;
-                  }
-               }
-            }
-            break;
-            default:
-               lprintf(LOG_NOTICE,"    Invalid Action type. Cannot continue");
-               rc = HPMFWUPG_ERROR;
-            break;
-         }
-      }
-   }
-   return rc;   
-}                                         
- 
-/****************************************************************************
-*
-* Function Name:  HpmfwupgActivationStage
-*
-* Description: This function the validation stage of a firmware upgrade 
-*              procedure as defined in section 3.4 of the IPM Controller 
-*              Firmware Upgrade Specification version 1.0
-*
-*****************************************************************************/                                   
-static int HpmfwupgActivationStage(struct ipmi_intf *intf, struct HpmfwupgUpgradeCtx* pFwupgCtx)
-{
-   int rc = HPMFWUPG_SUCCESS;
-   struct HpmfwupgActivateFirmwareCtx activateCmd;
-   struct HpmfwupgImageHeader* pImageHeader = (struct HpmfwupgImageHeader*)
-                                                         pFwupgCtx->pImageData;
-
-   /* Print out stuf...*/
-   printf("    ");
-   fflush(stdout);
-   /* Activate new firmware */
-   rc = HpmfwupgActivateFirmware(intf, &activateCmd, pFwupgCtx);
-   
-   if ( rc == HPMFWUPG_SUCCESS )
-   {
-      /* Query self test result if supported by target and new image */
-      if ( (pFwupgCtx->targetCap.GlobalCapabilities.bitField.ipmcSelftestCap == 1) || 
-           (pImageHeader->imageCapabilities.bitField.imageSelfTest == 1) )
-      {
-         struct HpmfwupgQuerySelftestResultCtx selfTestCmd;
-         rc = HpmfwupgQuerySelftestResult(intf, &selfTestCmd, pFwupgCtx);
-         
-         if ( rc == HPMFWUPG_SUCCESS )
-         {
-            /* Get the self test result */
-            if ( selfTestCmd.resp.result1 != 0x55 )
-            {
-               /* Perform manual rollback if necessary */
-               /* BACKUP/ MANUAL ROLLBACK not supported by this UA */
-               lprintf(LOG_NOTICE,"    Self test failed:");
-               lprintf(LOG_NOTICE,"    Result1 = %x", selfTestCmd.resp.result1);
-               lprintf(LOG_NOTICE,"    Result2 = %x", selfTestCmd.resp.result2);
-               rc = HPMFWUPG_ERROR;
-            }
-         }
-         else
-         {
-            /* Perform manual rollback if necessary */
-            /* BACKUP / MANUAL ROLLBACK not supported by this UA */
-            lprintf(LOG_NOTICE,"    Self test failed.");
-         }
-      }
-   }
-   
-   /* If activation / self test failed, query rollback status if automatic rollback supported */
-   if ( rc == HPMFWUPG_ERROR )
-   {
-      if ( (pFwupgCtx->targetCap.GlobalCapabilities.bitField.autRollback == 1) &&
-           (pFwupgCtx->genCompProp[pFwupgCtx->componentId].GeneralCompProperties.bitfield.rollbackBackup != 0x00) )
-      {
-         struct HpmfwupgQueryRollbackStatusCtx rollCmd;
-         lprintf(LOG_NOTICE,"    Getting rollback status...");
-         fflush(stdout);
-         rc = HpmfwupgQueryRollbackStatus(intf, &rollCmd, pFwupgCtx);
-      }
-   }
-   
-   return rc;
-}                                         
-
-int HpmfwupgGetBufferFromFile(char* imageFilename, struct HpmfwupgUpgradeCtx* pFwupgCtx)
-{
-   int rc = HPMFWUPG_SUCCESS;
-   FILE* pImageFile = fopen(imageFilename, "rb");
-   
-   if ( pImageFile == NULL )
-   {
-      lprintf(LOG_NOTICE,"Cannot open image file %s", imageFilename);
-      rc = HPMFWUPG_ERROR;
-   }
-   
-   if ( rc == HPMFWUPG_SUCCESS )
-   {
-      /* Get the raw data in file */
-      fseek(pImageFile, 0, SEEK_END);
-      pFwupgCtx->imageSize  = ftell(pImageFile); 
-      pFwupgCtx->pImageData = malloc(sizeof(unsigned char)*pFwupgCtx->imageSize);
-      rewind(pImageFile);
-      if ( pFwupgCtx->pImageData != NULL )
-      {
-         fread(pFwupgCtx->pImageData, sizeof(unsigned char), pFwupgCtx->imageSize, pImageFile);
-      }
-      else
-      {
-         rc = HPMFWUPG_ERROR;
-      }
-   
-      fclose(pImageFile);
-   }
-      
-   return rc;
-}  
-
-int HpmfwupgGetDeviceId(struct ipmi_intf *intf, struct ipm_devid_rsp* pGetDevId)
-{
-   int rc = HPMFWUPG_SUCCESS;
-   struct ipmi_rs * rsp;
-   struct ipmi_rq req;
-   
-   memset(&req, 0, sizeof(req));
-   req.msg.netfn = IPMI_NETFN_APP;
-   req.msg.cmd = BMC_GET_DEVICE_ID;
-   req.msg.data_len = 0;
-
-   rsp = HpmfwupgSendCmd(intf, req, NULL);
-   
-   if ( rsp )
-   {
-      if ( rsp->ccode == 0x00 )
-      {
-         memcpy(pGetDevId, rsp->data, sizeof(struct ipm_devid_rsp));
-      }
-      else
-      {
-         lprintf(LOG_NOTICE,"Error getting device ID, compcode = %x\n", rsp->ccode);
-         rc = HPMFWUPG_ERROR;
-      }
-   }
-   else
-   {
-      lprintf(LOG_NOTICE,"Error getting device ID\n");
-      rc = HPMFWUPG_ERROR;
-   }
-   return rc;
-} 
-
-int HpmfwupgGetTargetUpgCapabilities(struct ipmi_intf *intf, 
-                                     struct HpmfwupgGetTargetUpgCapabilitiesCtx* pCtx)
-{
-   int    rc = HPMFWUPG_SUCCESS;
-   struct ipmi_rs * rsp;
-   struct ipmi_rq   req;
-   
-   pCtx->req.picmgId  = HPMFWUPG_PICMG_IDENTIFIER;
-   
-   memset(&req, 0, sizeof(req));
-   req.msg.netfn    = IPMI_NETFN_PICMG;
-	req.msg.cmd      = HPMFWUPG_GET_TARGET_UPG_CAPABILITIES;
-	req.msg.data     = (unsigned char*)&pCtx->req;
-	req.msg.data_len = sizeof(struct HpmfwupgGetTargetUpgCapabilitiesReq);
-      
-   rsp = HpmfwupgSendCmd(intf, req, NULL);
-   
-   if ( rsp )
-   {
-      if ( rsp->ccode == 0x00 )
-      {
-         memcpy(&pCtx->resp, rsp->data, sizeof(struct HpmfwupgGetTargetUpgCapabilitiesResp));
-         if ( verbose )
-         {
-            lprintf(LOG_NOTICE,"TARGET UPGRADE CAPABILITIES");
-            lprintf(LOG_NOTICE,"-------------------------------");
-            lprintf(LOG_NOTICE,"HPM.1 version............%d    ", pCtx->resp.hpmVersion);
-            lprintf(LOG_NOTICE,"Component 0 presence....[%c]   ", pCtx->resp.componentsPresent.ComponentBits.
-                                                        bitField.component0 ? 'y' : 'n');
-            lprintf(LOG_NOTICE,"Component 1 presence....[%c]   ", pCtx->resp.componentsPresent.ComponentBits.
-                                                        bitField.component1 ? 'y' : 'n');                                                  
-            lprintf(LOG_NOTICE,"Component 2 presence....[%c]   ", pCtx->resp.componentsPresent.ComponentBits.
-                                                        bitField.component2 ? 'y' : 'n');                                                  
-            lprintf(LOG_NOTICE,"Component 3 presence....[%c]   ", pCtx->resp.componentsPresent.ComponentBits.
-                                                        bitField.component3 ? 'y' : 'n');
-            lprintf(LOG_NOTICE,"Component 4 presence....[%c]   ", pCtx->resp.componentsPresent.ComponentBits.
-                                                        bitField.component4 ? 'y' : 'n');
-            lprintf(LOG_NOTICE,"Component 5 presence....[%c]   ", pCtx->resp.componentsPresent.ComponentBits.
-                                                        bitField.component5 ? 'y' : 'n');  
-            lprintf(LOG_NOTICE,"Component 6 presence....[%c]   ", pCtx->resp.componentsPresent.ComponentBits.
-                                                        bitField.component6 ? 'y' : 'n'); 
-            lprintf(LOG_NOTICE,"Component 7 presence....[%c]   ", pCtx->resp.componentsPresent.ComponentBits.
-                                                        bitField.component7 ? 'y' : 'n');
-            lprintf(LOG_NOTICE,"Upgrade undesirable.....[%c]   ", pCtx->resp.GlobalCapabilities.
-                                                        bitField.fwUpgUndesirable ? 'y' : 'n');                                                                                                                                                                             
-            lprintf(LOG_NOTICE,"Aut rollback override...[%c]   ", pCtx->resp.GlobalCapabilities.
-                                                        bitField.autRollbackOverride ? 'y' : 'n');                                                        
-            lprintf(LOG_NOTICE,"IPMC degraded...........[%c]   ", pCtx->resp.GlobalCapabilities.
-                                                        bitField.ipmcDegradedDurinUpg ? 'y' : 'n');
-            lprintf(LOG_NOTICE,"Defered activation......[%c]   ", pCtx->resp.GlobalCapabilities.
-                                                        bitField.deferActivation ? 'y' : 'n');
-            lprintf(LOG_NOTICE,"Service affected........[%c]   ", pCtx->resp.GlobalCapabilities.
-                                                        bitField.servAffectDuringUpg ? 'y' : 'n');                                                                                                      
-            lprintf(LOG_NOTICE,"Manual rollback.........[%c]   ", pCtx->resp.GlobalCapabilities.
-                                                        bitField.manualRollback ? 'y' : 'n');                                              
-            lprintf(LOG_NOTICE,"Automatic rollback......[%c]   ", pCtx->resp.GlobalCapabilities.
-                                                        bitField.autRollback ? 'y' : 'n');                                                        
-            lprintf(LOG_NOTICE,"Self test...............[%c]   ", pCtx->resp.GlobalCapabilities.
-                                                        bitField.ipmcSelftestCap ? 'y' : 'n');
-            lprintf(LOG_NOTICE,"Upgrade timeout.........[%d sec] ", pCtx->resp.upgradeTimeout*5);                                                                                            
-            lprintf(LOG_NOTICE,"Self test timeout.......[%d sec] ", pCtx->resp.selftestTimeout*5);
-            lprintf(LOG_NOTICE,"Rollback timeout........[%d sec] ", pCtx->resp.rollbackTimeout*5);
-            lprintf(LOG_NOTICE,"Inaccessibility timeout.[%d sec] \n", pCtx->resp.rollbackTimeout*5);
-         }
-      }
-      else
-      {
-         lprintf(LOG_NOTICE,"Error getting target upgrade capabilities\n",  rsp->ccode);
-         rc = HPMFWUPG_ERROR;
-      }
-   }
-   else
-   {
-      lprintf(LOG_NOTICE,"Error getting target upgrade capabilities\n");
-      rc = HPMFWUPG_ERROR;
-   }
-   
-   
-   
-   return rc;
-}   
-
-
-int HpmfwupgGetComponentProperties(struct ipmi_intf *intf, struct HpmfwupgGetComponentPropertiesCtx* pCtx)
-{
-   int    rc = HPMFWUPG_SUCCESS;
-   struct ipmi_rs * rsp;
-   struct ipmi_rq   req;
-   
-   pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
-   
-   memset(&req, 0, sizeof(req));
-   req.msg.netfn    = IPMI_NETFN_PICMG;
-	req.msg.cmd      = HPMFWUPG_GET_COMPONENT_PROPERTIES;
-	req.msg.data     = (unsigned char*)&pCtx->req;
-	req.msg.data_len = sizeof(struct HpmfwupgGetComponentPropertiesReq);
-
-   rsp = HpmfwupgSendCmd(intf, req, NULL);
-   
-   if ( rsp )
-   {
-      if ( rsp->ccode == 0x00 )
-      { 
-         switch ( pCtx->req.selector )
-         {
-            case HPMFWUPG_COMP_GEN_PROPERTIES:
-               memcpy(&pCtx->resp, rsp->data, sizeof(struct HpmfwupgGetGeneralPropResp));
-               if ( verbose )
-               {
-                  lprintf(LOG_NOTICE,"GENERAL PROPERTIES");
-                  lprintf(LOG_NOTICE,"-------------------------------");
-                  lprintf(LOG_NOTICE,"Payload cold reset req....[%c]   ", pCtx->resp.Response.generalPropResp.
-                                                              GeneralCompProperties.bitfield.payloadColdReset ? 'y' : 'n');
-                  lprintf(LOG_NOTICE,"Def. activation supported.[%c]   ", pCtx->resp.Response.generalPropResp.
-                                                              GeneralCompProperties.bitfield.deferredActivation ? 'y' : 'n');                                                     
-                  lprintf(LOG_NOTICE,"Comparison supported......[%c]   ", pCtx->resp.Response.generalPropResp.
-                                                              GeneralCompProperties.bitfield.comparisonSupport ? 'y' : 'n');
-                  lprintf(LOG_NOTICE,"Preparation supported.....[%c]   ", pCtx->resp.Response.generalPropResp.
-                                                              GeneralCompProperties.bitfield.preparationSupport ? 'y' : 'n');                                                                                          
-                  lprintf(LOG_NOTICE,"Rollback supported........[%c]   \n", pCtx->resp.Response.generalPropResp.
-                                                              GeneralCompProperties.bitfield.rollbackBackup ? 'y' : 'n');
-               }
-            break;
-            case HPMFWUPG_COMP_CURRENT_VERSION:
-               memcpy(&pCtx->resp, rsp->data, sizeof(struct HpmfwupgGetCurrentVersionResp));
-               if ( verbose )
-               {
-                  lprintf(LOG_NOTICE,"Current Version: ");
-                  lprintf(LOG_NOTICE," Major: %d", pCtx->resp.Response.currentVersionResp.currentVersion[0]);
-                  lprintf(LOG_NOTICE," Minor: %x", pCtx->resp.Response.currentVersionResp.currentVersion[1]);
-                  lprintf(LOG_NOTICE," Aux  : %03d %03d %03d %03d\n", pCtx->resp.Response.currentVersionResp.currentVersion[2],
-                                                    pCtx->resp.Response.currentVersionResp.currentVersion[3],
-                                                    pCtx->resp.Response.currentVersionResp.currentVersion[4],
-                                                    pCtx->resp.Response.currentVersionResp.currentVersion[5]);
-               }                                                 
-            break; 
-            case HPMFWUPG_COMP_DESCRIPTION_STRING:
-               memcpy(&pCtx->resp, rsp->data, sizeof(struct HpmfwupgGetDescStringResp));
-               if ( verbose )
-               {
-                  lprintf(LOG_NOTICE,"Description string: %s\n", pCtx->resp.Response.descStringResp.descString);
-               }
-            break;
-            case HPMFWUPG_COMP_ROLLBACK_FIRMWARE_VERSION:
-               memcpy(&pCtx->resp, rsp->data, sizeof(struct HpmfwupgGetRollbackFwVersionResp));
-               if ( verbose )
-               {
-                  lprintf(LOG_NOTICE,"Rollback FW Version: ");
-                  lprintf(LOG_NOTICE," Major: %d", pCtx->resp.Response.rollbackFwVersionResp.rollbackFwVersion[0]);
-                  lprintf(LOG_NOTICE," Minor: %x", pCtx->resp.Response.rollbackFwVersionResp.rollbackFwVersion[1]);
-                  lprintf(LOG_NOTICE," Aux  : %03d %03d %03d %03d\n", pCtx->resp.Response.rollbackFwVersionResp.rollbackFwVersion[2],
-                                                    pCtx->resp.Response.rollbackFwVersionResp.rollbackFwVersion[3],
-                                                    pCtx->resp.Response.rollbackFwVersionResp.rollbackFwVersion[4],
-                                                    pCtx->resp.Response.rollbackFwVersionResp.rollbackFwVersion[5]);
-               }    
-            break;
-            case HPMFWUPG_COMP_DEFERRED_FIRMWARE_VERSION:
-               memcpy(&pCtx->resp, rsp->data, sizeof(struct HpmfwupgGetDeferredFwVersionResp));
-               if ( verbose )
-               {
-                  lprintf(LOG_NOTICE,"Deferred FW Version: ");
-                  lprintf(LOG_NOTICE," Major: %d", pCtx->resp.Response.deferredFwVersionResp.deferredFwVersion[0]);
-                  lprintf(LOG_NOTICE," Minor: %x", pCtx->resp.Response.deferredFwVersionResp.deferredFwVersion[1]);
-                  lprintf(LOG_NOTICE," Aux  : %03d %03d %03d %03d\n", pCtx->resp.Response.deferredFwVersionResp.deferredFwVersion[2],
-                                                    pCtx->resp.Response.deferredFwVersionResp.deferredFwVersion[3],
-                                                    pCtx->resp.Response.deferredFwVersionResp.deferredFwVersion[4],
-                                                    pCtx->resp.Response.deferredFwVersionResp.deferredFwVersion[5]);
-               }                                                 
-            break;
-            default:
-               lprintf(LOG_NOTICE,"Unsupported component selector");
-               rc = HPMFWUPG_ERROR;
-            break;
-         }
-      }    
-      else
-      {
-         lprintf(LOG_NOTICE,"Error getting component properties, compcode = %x\n",  rsp->ccode);
-         rc = HPMFWUPG_ERROR;
-      }
-   }
-   else
-   {
-      lprintf(LOG_NOTICE,"Error getting component properties\n");
-      rc = HPMFWUPG_ERROR;
-   }
-   
-   
-   return rc;
-} 
-
-int HpmfwupgAbortUpgrade(struct ipmi_intf *intf, struct HpmfwupgAbortUpgradeCtx* pCtx) 
-{
-   int    rc = HPMFWUPG_SUCCESS;
-   struct ipmi_rs * rsp;
-   struct ipmi_rq   req;
-   
-   pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
-   
-   memset(&req, 0, sizeof(req));
-   req.msg.netfn    = IPMI_NETFN_PICMG;
-	req.msg.cmd      = HPMFWUPG_ABORT_UPGRADE;
-	req.msg.data     = (unsigned char*)&pCtx->req;
-	req.msg.data_len = sizeof(struct HpmfwupgAbortUpgradeReq);
-      
-   rsp = HpmfwupgSendCmd(intf, req, NULL); 
-   
-   if ( rsp )
-   {
-      if ( rsp->ccode != 0x00 )
-      {
-         lprintf(LOG_NOTICE,"Error aborting upgrade, compcode = %x\n",  rsp->ccode);
-         rc = HPMFWUPG_ERROR;
-      }
-   }
-   else
-   {
-      lprintf(LOG_NOTICE,"Error aborting upgrade\n");
-      rc = HPMFWUPG_ERROR;
-   }
-   return rc;
-}                               
-
-int HpmfwupgInitiateUpgradeAction(struct ipmi_intf *intf, struct HpmfwupgInitiateUpgradeActionCtx* pCtx,
-                                  struct HpmfwupgUpgradeCtx* pFwupgCtx)
-{
-   int    rc = HPMFWUPG_SUCCESS;
-   struct ipmi_rs * rsp;
-   struct ipmi_rq   req;
-   
-   pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
-   
-   memset(&req, 0, sizeof(req));
-   req.msg.netfn    = IPMI_NETFN_PICMG;
-	req.msg.cmd      = HPMFWUPG_INITIATE_UPGRADE_ACTION;
-	req.msg.data     = (unsigned char*)&pCtx->req;
-	req.msg.data_len = sizeof(struct HpmfwupgInitiateUpgradeActionReq);
-   
-   rsp = HpmfwupgSendCmd(intf, req, pFwupgCtx); 
-   
-   if ( rsp )
-   {
-      /* Long duration command handling */
-      if ( rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS )
-      {
-         rc = HpmfwupgWaitLongDurationCmd(intf, pFwupgCtx);
-      }
-      else if ( rsp->ccode != 0x00 )
-      {
-         lprintf(LOG_NOTICE,"Error initiating upgrade action, compcode = %x\n",  rsp->ccode);
-         rc = HPMFWUPG_ERROR;
-      }
-   }
-   else
-   {
-      lprintf(LOG_NOTICE,"Error initiating upgrade action\n");
-      rc = HPMFWUPG_ERROR;
-   }
-
-   return rc;
-} 
-
-int HpmfwupgUploadFirmwareBlock(struct ipmi_intf *intf, struct HpmfwupgUploadFirmwareBlockCtx* pCtx, 
-                                struct HpmfwupgUpgradeCtx* pFwupgCtx, int count)
-{
-   int rc = HPMFWUPG_SUCCESS;
-   struct ipmi_rs * rsp;                                                       
-   struct ipmi_rq   req;
-   
-   pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
-   
-   memset(&req, 0, sizeof(req));
-   req.msg.netfn    = IPMI_NETFN_PICMG;
-	req.msg.cmd      = HPMFWUPG_UPLOAD_FIRMWARE_BLOCK;
-	req.msg.data     = (unsigned char*)&pCtx->req;
-   /* 2 is the size of the upload struct - data */
-	req.msg.data_len = 2 + count;
-   
-   rsp = HpmfwupgSendCmd(intf, req, pFwupgCtx); 
-   
-   if ( rsp )
-   {
-      /* Long duration command handling */
-      if ( rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS )
-      {
-         rc = HpmfwupgWaitLongDurationCmd(intf, pFwupgCtx);
-      }
-      /* 
-       * If we get 0xcc here this is probably because we send an invalid sequence
-       * number (Packet sent twice). Continue as if we had no error.
-       */
-      else if ( (rsp->ccode != 0x00) && (rsp->ccode != 0xcc) )
-      {
-         /*
-          * PATCH --> This validation is to handle retryables errors codes on IPMB bus.
-          *           This will be fixed in the next release of open ipmi and this 
-          *           check will have to be removed. (Buggy version = 39)
-          */
-         if ( HPMFWUPG_IS_RETRYABLE(rsp->ccode) )
-         {
-            lprintf(LOG_DEBUG,"HPM: [PATCH]Retryable error detected");
-            rc = HPMFWUPG_UPLOAD_RETRY;
-         }
-         /* 
-          * If completion code = 0xc7, we will retry with a reduced buffer length. 
-          * Do not print error.
-          */
-         else if ( rsp->ccode == IPMI_CC_REQ_DATA_INV_LENGTH )
-         {
-            rc = HPMFWUPG_UPLOAD_BLOCK_LENGTH;
-         }
-         else
-         {
-            lprintf(LOG_NOTICE,"Error uploading firmware block, compcode = %x\n",  rsp->ccode);
-            rc = HPMFWUPG_ERROR;
-         }
-      }
-   }
-   else
-   {
-      lprintf(LOG_NOTICE,"Error uploading firmware block\n");
-      rc = HPMFWUPG_ERROR;
-   }
-   
-   return rc;
-}  
-
-int HpmfwupgFinishFirmwareUpload(struct ipmi_intf *intf, struct HpmfwupgFinishFirmwareUploadCtx* pCtx,
-                                 struct HpmfwupgUpgradeCtx* pFwupgCtx)                         
-{
-   int    rc = HPMFWUPG_SUCCESS;
-   struct ipmi_rs * rsp;
-   struct ipmi_rq   req;
-   
-   pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
-   
-   memset(&req, 0, sizeof(req));
-   req.msg.netfn    = IPMI_NETFN_PICMG;
-	req.msg.cmd      = HPMFWUPG_FINISH_FIRMWARE_UPLOAD;
-	req.msg.data     = (unsigned char*)&pCtx->req;
-	req.msg.data_len = sizeof(struct HpmfwupgFinishFirmwareUploadReq);
-   
-   rsp = HpmfwupgSendCmd(intf, req, pFwupgCtx); 
-   
-   if ( rsp )
-   {
-      /* Long duration command handling */
-      if ( rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS )
-      {
-         rc = HpmfwupgWaitLongDurationCmd(intf, pFwupgCtx);
-      }
-      else if ( rsp->ccode != IPMI_CC_OK )
-      {
-         lprintf(LOG_NOTICE,"Error finishing firmware upload, compcode = %x\n",  rsp->ccode);
-         rc = HPMFWUPG_ERROR;
-      }
-   }
-   else
-   {
-      lprintf(LOG_NOTICE,"Error fininshing firmware upload\n");
-      rc = HPMFWUPG_ERROR;
-   }
-   
-   return rc;
-} 
-
-int HpmfwupgActivateFirmware(struct ipmi_intf *intf, struct HpmfwupgActivateFirmwareCtx* pCtx,
-                             struct HpmfwupgUpgradeCtx* pFwupgCtx)               
-{
-   int    rc = HPMFWUPG_SUCCESS;
-   struct ipmi_rs * rsp;
-   struct ipmi_rq   req;
-   
-   pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
-   
-   memset(&req, 0, sizeof(req));
-   req.msg.netfn    = IPMI_NETFN_PICMG;
-	req.msg.cmd      = HPMFWUPG_ACTIVATE_FIRMWARE;
-	req.msg.data     = (unsigned char*)&pCtx->req;
-	req.msg.data_len = sizeof(struct HpmfwupgActivateFirmwareReq);
-      
-   rsp = HpmfwupgSendCmd(intf, req, pFwupgCtx); 
-   
-   if ( rsp )
-   {
-      /* Long duration command handling */
-      if ( rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS )
-      {
-         printf("Waiting firmware activation...");
-         fflush(stdout);
-         
-         rc = HpmfwupgWaitLongDurationCmd(intf, pFwupgCtx);
-
-         if ( rc == HPMFWUPG_SUCCESS )
-         {
-            lprintf(LOG_NOTICE,"OK");
-         }
-         else
-         {
-            lprintf(LOG_NOTICE,"Failed");
-         }
-      }
-      else if ( rsp->ccode != IPMI_CC_OK )
-      {
-         lprintf(LOG_NOTICE,"Error activating firmware, compcode = %x\n",  
-                            rsp->ccode);
-         rc = HPMFWUPG_ERROR;
-      }
-   }
-   else
-   {
-      lprintf(LOG_NOTICE,"Error activating firmware\n");
-      rc = HPMFWUPG_ERROR;
-   }
-
-   return rc;
-}                                
-
-int HpmfwupgGetUpgradeStatus(struct ipmi_intf *intf, struct HpmfwupgGetUpgradeStatusCtx* pCtx,
-                             struct HpmfwupgUpgradeCtx* pFwupgCtx)
-{
-   int    rc = HPMFWUPG_SUCCESS;
-   struct ipmi_rs * rsp;
-   struct ipmi_rq   req;
-   
-   pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
-   
-   memset(&req, 0, sizeof(req));
-   req.msg.netfn    = IPMI_NETFN_PICMG;
-	req.msg.cmd      = HPMFWUPG_GET_UPGRADE_STATUS;
-	req.msg.data     = (unsigned char*)&pCtx->req;
-	req.msg.data_len = sizeof(struct HpmfwupgGetUpgradeStatusReq);
-   
-   rsp = HpmfwupgSendCmd(intf, req, pFwupgCtx);
-   
-   if ( rsp )
-   {                                                                              
-      if ( rsp->ccode == 0x00 )
-      {
-         memcpy(&pCtx->resp, rsp->data, sizeof(struct HpmfwupgGetUpgradeStatusResp));
-         if ( verbose )
-         {
-            lprintf(LOG_NOTICE,"Upgrade status:");
-            lprintf(LOG_NOTICE," Command in progress:          %x", pCtx->resp.cmdInProcess);
-            lprintf(LOG_NOTICE," Last command completion code: %x", pCtx->resp.lastCmdCompCode);
-         }
-      }
-      /*
-       * PATCH --> This validation is to handle retryables errors codes on IPMB bus.
-       *           This will be fixed in the next release of open ipmi and this 
-       *           check will have to be removed. (Buggy version = 39)
-       */
-      else if ( HPMFWUPG_IS_RETRYABLE(rsp->ccode) )
-      {
-         lprintf(LOG_DEBUG,"HPM: [PATCH]Retryable error detected");
-
-         pCtx->resp.lastCmdCompCode = HPMFWUPG_COMMAND_IN_PROGRESS;
-      }
-      else
-      {
-         if ( verbose )
-         {
-            lprintf(LOG_NOTICE,"Error getting upgrade status, compcode = %x\n",  rsp->ccode);
-            rc = HPMFWUPG_ERROR;
-         }
-      }
-   }
-   else
-   {
-      if ( verbose )
-      {
-         lprintf(LOG_NOTICE,"Error getting upgrade status");
-         rc = HPMFWUPG_ERROR;
-      }
-   }
-   
-   return rc;
-}  
-
-int HpmfwupgManualFirmwareRollback(struct ipmi_intf *intf, struct HpmfwupgManualFirmwareRollbackCtx* pCtx,
-                                   struct HpmfwupgUpgradeCtx* pFwupgCtx)
-{
-   int    rc = HPMFWUPG_SUCCESS;
-   struct ipmi_rs * rsp;
-   struct ipmi_rq   req;
-     
-   pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
-   
-   memset(&req, 0, sizeof(req));
-   req.msg.netfn    = IPMI_NETFN_PICMG;
-	req.msg.cmd      = HPMFWUPG_MANUAL_FIRMWARE_ROLLBACK;
-	req.msg.data     = (unsigned char*)&pCtx->req;
-	req.msg.data_len = sizeof(struct HpmfwupgManualFirmwareRollbackReq);
-      
-   rsp = HpmfwupgSendCmd(intf, req, pFwupgCtx); 
-   
-   if ( rsp )
-   {
-      /* Long duration command handling */
-      if ( rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS )
-      {
-         struct HpmfwupgQueryRollbackStatusCtx resCmd;
-         printf("Waiting firmware rollback...");
-         fflush(stdout);
-         rc = HpmfwupgQueryRollbackStatus(intf, &resCmd, pFwupgCtx);
-      }
-      else if ( rsp->ccode != 0x00 )
-      {
-         lprintf(LOG_NOTICE,"Error sending manual rollback, compcode = %x\n",  rsp->ccode);
-         rc = HPMFWUPG_ERROR;
-      }
-   }
-   else
-   {
-      lprintf(LOG_NOTICE,"Error sending manual rollback\n");
-      rc = HPMFWUPG_ERROR;
-   }
-   return rc;
-}                                      
-
-int HpmfwupgQueryRollbackStatus(struct ipmi_intf *intf, struct HpmfwupgQueryRollbackStatusCtx* pCtx,
-                                struct HpmfwupgUpgradeCtx* pFwupgCtx)
-{
-   int    rc = HPMFWUPG_SUCCESS;
-   struct ipmi_rs * rsp;
-   struct ipmi_rq   req;
-   unsigned char rollbackTimeout = 0;
-   unsigned int  timeoutSec1, timeoutSec2;
-     
-   pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
-   
-   memset(&req, 0, sizeof(req));
-   req.msg.netfn    = IPMI_NETFN_PICMG;
-	req.msg.cmd      = HPMFWUPG_QUERY_ROLLBACK_STATUS;
-	req.msg.data     = (unsigned char*)&pCtx->req;
-	req.msg.data_len = sizeof(struct HpmfwupgQueryRollbackStatusReq);
-   
-   /* 
-    * If we are not in upgrade context, we use default timeout values
-    */
-   if ( pFwupgCtx != NULL )
-   {
-      rollbackTimeout = pFwupgCtx->targetCap.rollbackTimeout*5;
-   }
-   else
-   {
-      rollbackTimeout = HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT;
-   }
-   
-   /* Poll rollback status until completion or timeout */
-   timeoutSec1 = time(NULL);
-   timeoutSec2 = time(NULL);
-   do
-   {
-      /* Must wait at least 100 ms between status requests */
-      usleep(100000);
-      rsp = HpmfwupgSendCmd(intf, req, pFwupgCtx);
-      /*
-       * PATCH --> This validation is to handle retryables errors codes on IPMB bus.
-       *           This will be fixed in the next release of open ipmi and this 
-       *           check will have to be removed. (Buggy version = 39)
-       */
-      if ( rsp )
-      {
-         if ( HPMFWUPG_IS_RETRYABLE(rsp->ccode) )
-         {
-            lprintf(LOG_DEBUG,"HPM: [PATCH]Retryable error detected");
-            rsp->ccode = HPMFWUPG_COMMAND_IN_PROGRESS;
-         }
-      }
-      timeoutSec2 = time(NULL);
-      
-   }while( rsp &&
-          (rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS) &&
-          (timeoutSec2 - timeoutSec1 < rollbackTimeout ) );
-   
-   if ( rsp )
-   {
-      if ( rsp->ccode == 0x00 )
-      {
-         memcpy(&pCtx->resp, rsp->data, sizeof(struct HpmfwupgQueryRollbackStatusResp));
-         if ( pCtx->resp.rollbackComp.ComponentBits.byte != 0 )
-         {
-            /* Rollback occured */
-            lprintf(LOG_NOTICE,"Rollback occured on component mask: 0x%02x",
-                                              pCtx->resp.rollbackComp.ComponentBits.byte);
-         }
-         else
-         {
-            lprintf(LOG_NOTICE,"No Firmware rollback occured");
-         }
-      }
-      else if ( rsp->ccode == 0x81 )
-      {
-         lprintf(LOG_NOTICE,"Rollback failed on component mask: 0x%02x",  
-                                                pCtx->resp.rollbackComp.ComponentBits.byte);
-         rc = HPMFWUPG_ERROR;
-      }
-      else
-      {
-          lprintf(LOG_NOTICE,"Error getting rollback status, compcode = %x",  rsp->ccode);
-          rc = HPMFWUPG_ERROR;
-      }
-   }
-   else
-   {
-      lprintf(LOG_NOTICE,"Error getting upgrade status\n");
-      rc = HPMFWUPG_ERROR;
-   }
-   
-   return rc;
-} 
-
-int HpmfwupgQuerySelftestResult(struct ipmi_intf *intf, struct HpmfwupgQuerySelftestResultCtx* pCtx,
-                                struct HpmfwupgUpgradeCtx* pFwupgCtx)                                  
-{
-   int    rc = HPMFWUPG_SUCCESS;
-   struct ipmi_rs * rsp;
-   struct ipmi_rq   req;
-   unsigned char selfTestTimeout = 0;
-   unsigned int  timeoutSec1, timeoutSec2;
-      
-   pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
-   
-   /* 
-    * If we are not in upgrade context, we use default timeout values
-    */
-   if ( pFwupgCtx != NULL )
-   {
-      /* Getting selftest timeout from new image */
-      struct HpmfwupgImageHeader* pImageHeader = (struct HpmfwupgImageHeader*)
-                                                         pFwupgCtx->pImageData;
-      selfTestTimeout = pImageHeader->selfTestTimeout;
-   }
-   else
-   {
-      selfTestTimeout = HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT;
-   }
-   
-   memset(&req, 0, sizeof(req));
-   req.msg.netfn    = IPMI_NETFN_PICMG;
-	req.msg.cmd      = HPMFWUPG_QUERY_SELFTEST_RESULT;
-	req.msg.data     = (unsigned char*)&pCtx->req;
-	req.msg.data_len = sizeof(struct HpmfwupgQuerySelftestResultReq);
-   
-   
-   /* Poll rollback status until completion or timeout */
-   timeoutSec1 = time(NULL);
-   timeoutSec2 = time(NULL);
-   do
-   {
-      /* Must wait at least 100 ms between status requests */
-      usleep(100000);
-      rsp = HpmfwupgSendCmd(intf, req, pFwupgCtx);
-      /*
-       * PATCH --> This validation is to handle retryables errors codes on IPMB bus.
-       *           This will be fixed in the next release of open ipmi and this 
-       *           check will have to be removed. (Buggy version = 39)
-       */
-      if ( rsp )
-      {
-         if ( HPMFWUPG_IS_RETRYABLE(rsp->ccode) )
-         {
-            lprintf(LOG_DEBUG,"HPM: [PATCH]Retryable error detected");
-            rsp->ccode = HPMFWUPG_COMMAND_IN_PROGRESS;
-         }
-      }
-      timeoutSec2 = time(NULL);
-      
-   }while( rsp &&
-          (rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS) &&
-          (timeoutSec2 - timeoutSec1 < selfTestTimeout ) );
-   
-   if ( rsp )
-   {
-      if ( rsp->ccode == 0x00 )
-      {
-         memcpy(&pCtx->resp, rsp->data, sizeof(struct HpmfwupgQuerySelftestResultResp));
-         if ( verbose )
-         {
-            lprintf(LOG_NOTICE,"Self test results:");
-            lprintf(LOG_NOTICE,"Result1 = %x", pCtx->resp.result1);
-            lprintf(LOG_NOTICE,"Result2 = %x", pCtx->resp.result2);
-         }
-      }
-      else
-      {
-         lprintf(LOG_NOTICE,"Error getting self test results, compcode = %x\n",  rsp->ccode);
-         rc = HPMFWUPG_ERROR;
-      }
-   }
-   else
-   {
-       lprintf(LOG_NOTICE,"Error getting upgrade status\n");
-       rc = HPMFWUPG_ERROR;
-   }
-      
-   return rc;
-}
-
-struct ipmi_rs * HpmfwupgSendCmd(struct ipmi_intf *intf, struct ipmi_rq req, 
-                                 struct HpmfwupgUpgradeCtx* pFwupgCtx )
-{
-   struct ipmi_rs * rsp;
-   unsigned char inaccessTimeout = 0, inaccessTimeoutCounter = 0;
-   unsigned char upgradeTimeout  = 0, upgradeTimeoutCounter  = 0;
-   unsigned int  timeoutSec1, timeoutSec2;
-   unsigned char retry = 0; 
-      
-   /* 
-    * If we are not in upgrade context, we use default timeout values
-    */
-   if ( pFwupgCtx != NULL )
-   {
-      inaccessTimeout = pFwupgCtx->targetCap.inaccessTimeout*5;
-      upgradeTimeout  = pFwupgCtx->targetCap.upgradeTimeout*5;
-   }
-   else
-   {
-      inaccessTimeout = HPMFWUPG_DEFAULT_INACCESS_TIMEOUT;
-      upgradeTimeout  = HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT;
-   }
-   
-   timeoutSec1 = time(NULL);
-      
-   do
-   {
-      rsp = intf->sendrecv(intf, &req);
-      
-      if( rsp == NULL ) 
-      {
-         #define HPM_LAN_PACKET_RESIZE_LIMIT 6
-         if(strstr(intf->name,"lan")!= NULL) /* also covers lanplus */
-         {
-            static int errorCount=0;
-            static struct ipmi_rs fakeRsp;
-
-            lprintf(LOG_DEBUG,"HPM: no response available");
-            lprintf(LOG_DEBUG,"HPM: the command may be rejected for " \
-                              "security reasons");
-            if
-            ( 
-               req.msg.netfn == IPMI_NETFN_PICMG
-               &&
-               req.msg.cmd == HPMFWUPG_UPLOAD_FIRMWARE_BLOCK
-               &&
-               errorCount < HPM_LAN_PACKET_RESIZE_LIMIT 
-            )
-            {
-               lprintf(LOG_DEBUG,"HPM: upload firmware block API called");
-               lprintf(LOG_DEBUG,"HPM: returning length error to force resize");
-
-               fakeRsp.ccode = IPMI_CC_REQ_DATA_INV_LENGTH;
-               rsp = &fakeRsp;
-               errorCount++;
-            }
-            else if 
-            ( 
-               req.msg.netfn == IPMI_NETFN_PICMG
-               &&
-               ( req.msg.cmd == HPMFWUPG_ACTIVATE_FIRMWARE ||
-                 req.msg.cmd == HPMFWUPG_MANUAL_FIRMWARE_ROLLBACK )
-                 
-            )
-            {
-               /* 
-                * rsp == NULL and command activate firmware or manual firmware 
-                * rollback most likely occurs when we have sent a firmware activation 
-                * request. Fake a command in progress response.
-                */
-               lprintf(LOG_DEBUG,"HPM: activate/rollback firmware API called");
-               lprintf(LOG_DEBUG,"HPM: returning in progress to handle IOL session lost");
-               
-               fakeRsp.ccode = HPMFWUPG_COMMAND_IN_PROGRESS;
-               rsp = &fakeRsp;
-            }
-            else if 
-            ( 
-               req.msg.netfn == IPMI_NETFN_PICMG
-               &&
-               ( req.msg.cmd == HPMFWUPG_GET_UPGRADE_STATUS ||
-                 req.msg.cmd == HPMFWUPG_QUERY_ROLLBACK_STATUS )
-            )
-            {
-               /* 
-                * rsp == NULL and command get upgrade status or query rollback
-                * status most likely occurs when we are waiting for firmware 
-                * activation. Try to re-open the IOL session (re-open will work
-                * once the IPMC recovers from firmware activation.
-                */
-                
-               lprintf(LOG_DEBUG,"HPM: upg/rollback status firmware API called");
-               lprintf(LOG_DEBUG,"HPM: try to re-open IOL session");
-               
-               sleep(inaccessTimeout-inaccessTimeoutCounter);
-               
-               /* force session re-open */
-               intf->opened              = 0;
-               intf->session->authtype   = IPMI_SESSION_AUTHTYPE_NONE;
-               intf->session->session_id = 0;
-               intf->session->in_seq     = 0;
-               intf->session->active     = 0;
-               intf->open(intf);
-            }
-         }
-      }
-      
-     /* Handle inaccessibility timeout (rsp = NULL if IOL) */
-     if ( rsp == NULL || rsp->ccode == 0xff || rsp->ccode == 0xc3 )
-     {
-
-        if ( inaccessTimeoutCounter < inaccessTimeout ) 
-        {
-           timeoutSec2 = time(NULL);
-           if ( timeoutSec2 > timeoutSec1 )
-           {
-              inaccessTimeoutCounter += timeoutSec2 - timeoutSec1;
-              timeoutSec1 = time(NULL);
-           }
-           retry = 1;
-        }
-        else
-        {
-           retry = 0;
-        }
-     }
-     /* Handle node busy timeout */
-     else if ( rsp->ccode == 0xc0 )
-     {
-        if ( upgradeTimeoutCounter < upgradeTimeout ) 
-        {
-           timeoutSec2 = time(NULL);
-           if ( timeoutSec2 > timeoutSec1 )
-           {
-              timeoutSec1 = time(NULL);
-              upgradeTimeoutCounter += timeoutSec2 - timeoutSec1;
-           }
-           retry = 1;
-        }
-        else
-        {
-           retry = 0;
-        }
-     }
-     else
-     {
-        #ifdef ENABLE_OPENIPMI_V39_PATCH
-        if( rsp->ccode == IPMI_CC_OK )
-        {
-           errorCount = 0 ;
-        }
-        #endif
-        retry = 0;
-     }
-   }while( retry );
-   return rsp;
-} 
-
-int HpmfwupgWaitLongDurationCmd(struct ipmi_intf *intf, struct HpmfwupgUpgradeCtx* pFwupgCtx)
-{
-   int rc = HPMFWUPG_SUCCESS;
-   unsigned char upgradeTimeout = 0;
-   unsigned int  timeoutSec1, timeoutSec2;
-   struct HpmfwupgGetUpgradeStatusCtx upgStatusCmd;
-
-   /* 
-    * If we are not in upgrade context, we use default timeout values
-    */
-   if ( pFwupgCtx != NULL )
-   {
-      upgradeTimeout = pFwupgCtx->targetCap.upgradeTimeout*5;
-   }
-   else
-   {
-      upgradeTimeout = HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT;
-   }
-
-   /* Poll upgrade status until completion or timeout*/
-   timeoutSec1 = time(NULL);
-   timeoutSec2 = time(NULL);
-   rc = HpmfwupgGetUpgradeStatus(intf, &upgStatusCmd, pFwupgCtx);
-   
-   while((upgStatusCmd.resp.lastCmdCompCode == HPMFWUPG_COMMAND_IN_PROGRESS ) &&
-         (timeoutSec2 - timeoutSec1 < upgradeTimeout ) && 
-         (rc == HPMFWUPG_SUCCESS) )
-   {
-      /* Must wait at least 100 ms between status requests */
-      usleep(100000);
-      timeoutSec2 = time(NULL);
-      rc = HpmfwupgGetUpgradeStatus(intf, &upgStatusCmd, pFwupgCtx);
-   }
-  
-   if ( upgStatusCmd.resp.lastCmdCompCode != 0x00 )
-   {
-      if ( verbose )
-      {
-         lprintf(LOG_NOTICE,"Error waiting for command %x, compcode = %x",  
-                            upgStatusCmd.resp.cmdInProcess, 
-                            upgStatusCmd.resp.lastCmdCompCode);
-      }
-      rc = HPMFWUPG_ERROR;
-   }
-   
-   return rc;
-}     
-
-unsigned char HpmfwupgCalculateChecksum(unsigned char* pData, unsigned int length)
-{
-   unsigned char checksum = 0;
-   int dataIdx = 0;
-
-   for ( dataIdx = 0; dataIdx < length; dataIdx++ )
-   {
-      checksum += pData[dataIdx];
-   }
-   return checksum;
-}   
-
-static void HpmfwupgPrintUsage(void)
-{
-   lprintf(LOG_NOTICE,"help                    - This help menu");   
-   lprintf(LOG_NOTICE,"upgrade <file> activate - Upgrade the firmware using a valid HPM.1 image <file>");
-   lprintf(LOG_NOTICE,"                          If activate is specified, activate new firmware rigth");
-   lprintf(LOG_NOTICE,"                          away");
-   lprintf(LOG_NOTICE,"activate                - Activate the newly uploaded firmware");
-   lprintf(LOG_NOTICE,"targetcap               - Get the target upgrade capabilities");
-   lprintf(LOG_NOTICE,"compprop <id> <select>  - Get the specified component properties");
-   lprintf(LOG_NOTICE,"                          Valid component <ID> 0-7 ");
-   lprintf(LOG_NOTICE,"                          Properties <select> can be one of the following: ");
-   lprintf(LOG_NOTICE,"                          0- General properties");
-   lprintf(LOG_NOTICE,"                          1- Current firmware version");
-   lprintf(LOG_NOTICE,"                          2- Description string");
-   lprintf(LOG_NOTICE,"                          3- Rollback firmware version");
-   lprintf(LOG_NOTICE,"                          4- Deferred firmware version");
-   lprintf(LOG_NOTICE,"abort                   - Abort the on-going firmware upgrade");
-   lprintf(LOG_NOTICE,"upgstatus               - Returns the status of the last long duration command");
-   lprintf(LOG_NOTICE,"rollback                - Performs a manual rollback on the IPM Controller");
-   lprintf(LOG_NOTICE,"                          firmware");
-   lprintf(LOG_NOTICE,"rollbackstatus          - Query the rollback status");
-   lprintf(LOG_NOTICE,"selftestresult          - Query the self test results\n");
-}
-
-int ipmi_hpmfwupg_main(struct ipmi_intf * intf, int argc, char ** argv)
-{
-   int rc = HPMFWUPG_SUCCESS;
-   
-   lprintf(LOG_DEBUG,"ipmi_hpmfwupg_main()");
-   
-
-   lprintf(LOG_NOTICE,"\nPICMG HPM.1 Upgrade Agent %d.%d: \n", 
-           HPMFWUPG_VERSION_MAJOR, HPMFWUPG_VERSION_MINOR);
-   
-   if ( (argc == 0) || (strcmp(argv[0], "help") == 0) ) 
-   {
-      HpmfwupgPrintUsage();
-	}
-   else if ( (argc == 2) && (strcmp(argv[0], "upgrade") == 0) )
-   {
-      rc = HpmfwupgUpgrade(intf, argv[1], 0);
-   }
-   else if ( (argc == 3) && (strcmp(argv[0], "upgrade") == 0) )
-   {
-      if ( strcmp(argv[2], "activate") == 0 )
-      {
-         rc = HpmfwupgUpgrade(intf, argv[1], 1);
-      }
-      else
-      {
-         HpmfwupgPrintUsage();         
-      }
-   }
-   else if ( (argc == 1) && (strcmp(argv[0], "activate") == 0) )
-   {
-      struct HpmfwupgActivateFirmwareCtx cmdCtx;
-      rc = HpmfwupgActivateFirmware(intf, &cmdCtx, NULL);
-   }
-   else if ( (argc == 1) && (strcmp(argv[0], "targetcap") == 0) )
-   {
-      struct HpmfwupgGetTargetUpgCapabilitiesCtx cmdCtx;
-      verbose++;
-      rc = HpmfwupgGetTargetUpgCapabilities(intf, &cmdCtx);
-   }
-   else if ( (argc == 3) && (strcmp(argv[0], "compprop") == 0) )
-   {
-      struct HpmfwupgGetComponentPropertiesCtx cmdCtx;
-      cmdCtx.req.componentId = strtol(argv[1], NULL, 0);
-      cmdCtx.req.selector    = strtol(argv[2], NULL, 0);
-      verbose++;
-      rc = HpmfwupgGetComponentProperties(intf, &cmdCtx);
-   }
-   else if ( (argc == 1) && (strcmp(argv[0], "abort") == 0) )
-   {
-      struct HpmfwupgAbortUpgradeCtx cmdCtx;
-      verbose++;
-      rc = HpmfwupgAbortUpgrade(intf, &cmdCtx);
-   }
-   else if ( (argc == 1) && (strcmp(argv[0], "upgstatus") == 0) )
-   {
-      struct HpmfwupgGetUpgradeStatusCtx cmdCtx;
-      verbose++;
-      rc = HpmfwupgGetUpgradeStatus(intf, &cmdCtx, NULL);
-   }   
-   else if ( (argc == 1) && (strcmp(argv[0], "rollback") == 0) )
-   {
-      struct HpmfwupgManualFirmwareRollbackCtx cmdCtx;
-      verbose++;  
-      rc = HpmfwupgManualFirmwareRollback(intf, &cmdCtx, NULL);
-   }
-   else if ( (argc == 1) && (strcmp(argv[0], "rollbackstatus") == 0) )
-   {
-      struct HpmfwupgQueryRollbackStatusCtx  cmdCtx;
-      verbose++;
-      rc = HpmfwupgQueryRollbackStatus(intf, &cmdCtx, NULL);
-   }
-   else if ( (argc == 1) && (strcmp(argv[0], "selftestresult") == 0) )
-   {
-      struct HpmfwupgQuerySelftestResultCtx cmdCtx;
-      verbose++;
-      rc = HpmfwupgQuerySelftestResult(intf, &cmdCtx, NULL);
-   }
-   else
-   {                                                  
-      HpmfwupgPrintUsage(); 
-   }
-   
-   return rc;
-}
-                                    
+#endif
+
+/****************************************************************************
+*
+*       Copyright (c) 2006 Kontron Canada, Inc.  All Rights Reserved.
+*
+*                              HPM.1 
+*                    Hardware Platform Management
+*              IPM Controller Firmware Upgrade Procedure
+*
+*  This module implements an Upgrade Agent for the IPM Controller
+*  Firmware Upgrade Procedure (HPM.1) specification version 1.0.
+*
+* author: 
+* Frederic.Lelievre@ca.kontron.com
+* Francois.Isabelle@ca.kontron.com
+*
+*****************************************************************************
+*
+* HISTORY
+* ===========================================================================
+* 2007-01-11 
+*
+*  - Incremented to version 0.2
+*  - Added lan packet size reduction mechanism to workaround fact
+*    that lan iface will not return C7 on excessive length
+*  - Fixed some typos
+*  - now uses lprintf()
+* 
+* - Incremented to version 0.3    
+* - added patch for openipmi si driver V39 (send message in driver does not
+*    retry on 82/83 completion code and return 82/83 as response from target
+*    [conditionnaly built with ENABLE_OPENIPMI_V39_PATCH]
+*
+*    see: ipmi-fix-send-msg-retry.pacth in openipmi-developer mailing list
+*
+* 2007-01-16 
+*
+*  - Incremented to version 0.4
+*  - Fixed lan iface inaccesiblity timeout handling. Waiting for firmware 
+*    activation completion (fixed sleep) before re-opening a session and
+*    get the final firmware upgrade status.
+*  - Fixed some user interface stuff.
+*
+* 2007-05-09
+*
+*  - Incremented to version 1.0
+*  - Modifications for compliancy with HPM.1 specification version 1.0
+*
+* TODO
+* ===========================================================================
+* 2007-01-11
+*
+* - Add interpretation of GetSelftestResults
+* - Add interpretation of component ID string
+* 
+*****************************************************************************/
+
+extern int verbose;
+
+/*
+ *  Agent version
+ */
+#define HPMFWUPG_VERSION_MAJOR 1 
+#define HPMFWUPG_VERSION_MINOR 0
+
+/* 
+ *  HPM.1 FIRMWARE UPGRADE COMMANDS (part of PICMG)
+ */
+
+#define HPMFWUPG_GET_TARGET_UPG_CAPABILITIES 0x2E
+#define HPMFWUPG_GET_COMPONENT_PROPERTIES    0x2F  
+#define HPMFWUPG_ABORT_UPGRADE               0x30  
+#define HPMFWUPG_INITIATE_UPGRADE_ACTION     0x31  
+#define HPMFWUPG_UPLOAD_FIRMWARE_BLOCK       0x32
+#define HPMFWUPG_FINISH_FIRMWARE_UPLOAD      0x33
+#define HPMFWUPG_GET_UPGRADE_STATUS          0x34
+#define HPMFWUPG_ACTIVATE_FIRMWARE           0x35
+#define HPMFWUPG_QUERY_SELFTEST_RESULT       0x36
+#define HPMFWUPG_QUERY_ROLLBACK_STATUS       0x37
+#define HPMFWUPG_MANUAL_FIRMWARE_ROLLBACK    0x38
+
+/*
+ *  HPM.1 SPECIFIC COMPLETION CODES
+ */
+#define HPMFWUPG_ROLLBACK_COMPLETED   0x00
+#define HPMFWUPG_COMMAND_IN_PROGRESS  0x80
+#define HPMFWUPG_NOT_SUPPORTED        0x81
+#define HPMFWUPG_SIZE_MISMATCH        0x81
+#define HPMFWUPG_ROLLBACK_FAILURE     0x81
+#define HPMFWUPG_INV_COMP_MASK        0x81
+#define HPMFWUPG__ABORT_FAILURE       0x81
+#define HPMFWUPG_INV_COMP_ID          0x82
+#define HPMFWUPG_INT_CHECKSUM_ERROR   0x82
+#define HPMFWUPG_INV_UPLOAD_MODE      0x82
+#define HPMFWUPG_ROLLBACK_OVERRIDE    0x82
+#define HPMFWUPG_INV_COMP_PROP        0x83
+#define HPMFWUPG_FW_MISMATCH          0x83
+#define HPMFWUPG_ROLLBACK_DENIED      0x83
+
+/* 
+ * This error code is used as a temporary PATCH to
+ * the latest Open ipmi driver.  This PATCH
+ * will be removed once a new Open IPMI driver is released.
+ * (Buggy version = 39)
+ */ 
+#define ENABLE_OPENIPMI_V39_PATCH
+
+#ifdef ENABLE_OPENIPMI_V39_PATCH
+
+#define RETRY_COUNT_MAX 3
+
+static int errorCount;
+
+#define HPMFWUPG_IS_RETRYABLE(error)                                          \
+((((error==0x83)||(error==0x82)) && (errorCount++<RETRY_COUNT_MAX))?TRUE:FALSE)
+#else
+#define HPMFWUPG_IS_RETRYABLE(error) FALSE
+#endif
+
+/* 
+ *  HPM FIRMWARE UPGRADE GENERAL DEFINITIONS
+ */
+
+#define HPMFWUPG_PICMG_IDENTIFIER         0
+#define HPMFWUPG_VERSION_SIZE             6
+#define HPMFWUPG_DESC_STRING_LENGTH       12
+#define HPMFWUPG_DEFAULT_INACCESS_TIMEOUT 60 /* sec */
+#define HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT  60 /* sec */
+#define HPMFWUPG_MD5_SIGNATURE_LENGTH     16
+
+/* Component IDs */
+typedef enum eHpmfwupgComponentId
+{
+   HPMFWUPG_COMPONENT_ID_0 = 0,
+   HPMFWUPG_COMPONENT_ID_1,
+   HPMFWUPG_COMPONENT_ID_2,
+   HPMFWUPG_COMPONENT_ID_3,
+   HPMFWUPG_COMPONENT_ID_4,
+   HPMFWUPG_COMPONENT_ID_5,
+   HPMFWUPG_COMPONENT_ID_6,
+   HPMFWUPG_COMPONENT_ID_7,
+   HPMFWUPG_COMPONENT_ID_MAX
+} tHpmfwupgComponentId;   
+
+struct HpmfwupgComponentBitMask
+{
+   union
+   {
+      unsigned char byte;
+      struct
+      {
+      	#ifdef WORDS_BIGENDIAN
+      	unsigned char component7 : 1;
+         unsigned char component6 : 1;
+         unsigned char component5 : 1;
+         unsigned char component4 : 1;
+         unsigned char component3 : 1;
+         unsigned char component2 : 1;
+         unsigned char component1 : 1;
+         unsigned char component0 : 1;
+         #else
+         unsigned char component0 : 1;
+         unsigned char component1 : 1;
+         unsigned char component2 : 1;
+         unsigned char component3 : 1;      
+         unsigned char component4 : 1;
+         unsigned char component5 : 1;
+         unsigned char component6 : 1;
+         unsigned char component7 : 1;
+         #endif
+      }bitField;
+   }ComponentBits;
+}__attribute__ ((packed));
+
+
+static const int HPMFWUPG_SUCCESS              = 0;
+static const int HPMFWUPG_ERROR                = -1;
+/* Upload firmware specific error codes */
+static const int HPMFWUPG_UPLOAD_BLOCK_LENGTH  = 1;
+static const int HPMFWUPG_UPLOAD_RETRY         = 2;
+
+
+/* 
+ *  TARGET UPGRADE CAPABILITIES DEFINITIONS
+ */
+
+struct HpmfwupgGetTargetUpgCapabilitiesReq
+{
+   unsigned char picmgId;
+}__attribute__ ((packed));
+
+
+struct HpmfwupgGetTargetUpgCapabilitiesResp
+{
+   unsigned char picmgId;
+   unsigned char hpmVersion;
+   union
+   {
+      unsigned char byte;
+      struct
+      {
+      	#if WORDS_BIGENDIAN
+         unsigned char fwUpgUndesirable    : 1;
+         unsigned char autRollbackOverride : 1;
+         unsigned char ipmcDegradedDurinUpg: 1;
+         unsigned char deferActivation     : 1;
+         unsigned char servAffectDuringUpg : 1;         
+         unsigned char manualRollback      : 1;
+         unsigned char autRollback         : 1;
+         unsigned char ipmcSelftestCap     : 1;
+         #else
+         unsigned char ipmcSelftestCap     : 1;
+         unsigned char autRollback         : 1;
+         unsigned char manualRollback      : 1;
+         unsigned char servAffectDuringUpg : 1;
+         unsigned char deferActivation     : 1;
+         unsigned char ipmcDegradedDurinUpg: 1;      
+         unsigned char autRollbackOverride : 1;      
+         unsigned char fwUpgUndesirable    : 1;
+         #endif
+      }bitField;
+   }GlobalCapabilities;
+   unsigned char upgradeTimeout;
+   unsigned char selftestTimeout;
+   unsigned char rollbackTimeout;
+   unsigned char inaccessTimeout;
+   struct HpmfwupgComponentBitMask componentsPresent;
+}__attribute__ ((packed));
+
+struct HpmfwupgGetTargetUpgCapabilitiesCtx
+{
+   struct HpmfwupgGetTargetUpgCapabilitiesReq  req;
+   struct HpmfwupgGetTargetUpgCapabilitiesResp resp;
+}__attribute__ ((packed));   
+
+/* 
+ *  COMPONENT PROPERTIES DEFINITIONS
+ */
+ 
+typedef enum eHpmfwupgCompPropertiesSelect
+{
+   HPMFWUPG_COMP_GEN_PROPERTIES = 0,
+   HPMFWUPG_COMP_CURRENT_VERSION, 
+   HPMFWUPG_COMP_DESCRIPTION_STRING,
+   HPMFWUPG_COMP_ROLLBACK_FIRMWARE_VERSION,
+   HPMFWUPG_COMP_DEFERRED_FIRMWARE_VERSION,
+   HPMFWUPG_COMP_RESERVED,
+   HPMFWUPG_COMP_OEM = 0x192   
+} tHpmfwupgCompPropertiesSelect; 
+
+struct HpmfwupgGetComponentPropertiesReq
+{
+   unsigned char picmgId;
+   unsigned char componentId;
+   unsigned char selector;
+}__attribute__ ((packed));
+
+struct HpmfwupgGetGeneralPropResp 
+{
+   unsigned char picmgId;
+   union
+   {
+      unsigned char byte;
+      struct
+      {
+      	#if WORDS_BIGENDIAN
+         unsigned char reserved           : 2;      
+         unsigned char payloadColdReset   : 1;
+         unsigned char deferredActivation : 1;
+         unsigned char comparisonSupport  : 1;
+         unsigned char preparationSupport : 1;
+         unsigned char rollbackBackup     : 2;
+      	#else
+         unsigned char rollbackBackup     : 2;
+         unsigned char preparationSupport : 1;
+         unsigned char comparisonSupport  : 1;
+         unsigned char deferredActivation : 1;
+         unsigned char payloadColdReset   : 1;
+         unsigned char reserved           : 2;
+         #endif
+      }bitfield;
+   }GeneralCompProperties;
+}__attribute__ ((packed));   
+
+struct HpmfwupgGetCurrentVersionResp 
+{
+   unsigned char picmgId;
+   unsigned char currentVersion[HPMFWUPG_VERSION_SIZE];
+}__attribute__ ((packed));
+
+struct HpmfwupgGetDescStringResp 
+{
+   unsigned char picmgId;
+   char descString[HPMFWUPG_DESC_STRING_LENGTH];
+}__attribute__ ((packed));
+
+struct HpmfwupgGetRollbackFwVersionResp 
+{
+   unsigned char picmgId;
+   unsigned char rollbackFwVersion[HPMFWUPG_VERSION_SIZE];
+}__attribute__ ((packed));
+
+struct HpmfwupgGetDeferredFwVersionResp 
+{
+   unsigned char picmgId;
+   unsigned char deferredFwVersion[HPMFWUPG_VERSION_SIZE];
+}__attribute__ ((packed));
+
+struct HpmfwupgGetComponentPropertiesResp
+{
+   union
+   {
+      struct HpmfwupgGetGeneralPropResp       generalPropResp;
+      struct HpmfwupgGetCurrentVersionResp    currentVersionResp;
+      struct HpmfwupgGetDescStringResp        descStringResp;
+      struct HpmfwupgGetRollbackFwVersionResp rollbackFwVersionResp;
+      struct HpmfwupgGetDeferredFwVersionResp deferredFwVersionResp;
+   }Response;
+}__attribute__ ((packed));
+
+struct HpmfwupgGetComponentPropertiesCtx
+{
+   struct HpmfwupgGetComponentPropertiesReq  req;
+   struct HpmfwupgGetComponentPropertiesResp resp;
+}__attribute__ ((packed));      
+
+
+/* 
+ *  ABORT UPGRADE DEFINITIONS
+ */
+struct HpmfwupgAbortUpgradeReq
+{
+   unsigned char picmgId;
+}__attribute__ ((packed));
+
+struct HpmfwupgAbortUpgradeResp
+{
+   unsigned char picmgId;
+}__attribute__ ((packed));
+
+struct HpmfwupgAbortUpgradeCtx
+{
+   struct HpmfwupgAbortUpgradeReq  req;
+   struct HpmfwupgAbortUpgradeResp resp;
+}__attribute__ ((packed));
+
+/* 
+ * UPGRADE ACTIONS DEFINITIONS
+ */
+typedef enum eHpmfwupgUpgradeAction
+{
+   HPMFWUPG_UPGRADE_ACTION_BACKUP = 0,
+   HPMFWUPG_UPGRADE_ACTION_PREPARE,
+   HPMFWUPG_UPGRADE_ACTION_UPGRADE,
+   HPMFWUPG_UPGRADE_ACTION_COMPARE,
+   HPMFWUPG_UPGRADE_ACTION_INVALID = 0xff
+}  tHpmfwupgUpgradeAction;
+
+struct HpmfwupgInitiateUpgradeActionReq
+{
+   unsigned char picmgId;
+   struct HpmfwupgComponentBitMask componentsMask;
+   unsigned char upgradeAction;
+}__attribute__ ((packed));
+
+struct HpmfwupgInitiateUpgradeActionResp
+{
+   unsigned char picmgId;
+}__attribute__ ((packed));
+
+struct HpmfwupgInitiateUpgradeActionCtx
+{
+   struct HpmfwupgInitiateUpgradeActionReq  req;
+   struct HpmfwupgInitiateUpgradeActionResp resp;
+}__attribute__ ((packed));
+
+/* 
+ *  UPLOAD FIRMWARE BLOCK DEFINITIONS
+ */
+
+#define HPMFWUPG_SEND_DATA_COUNT_MAX   32
+#define HPMFWUPG_SEND_DATA_COUNT_KCS   HPMFWUPG_SEND_DATA_COUNT_MAX
+#define HPMFWUPG_SEND_DATA_COUNT_LAN   26
+#define HPMFWUPG_SEND_DATA_COUNT_IPMB  26
+#define HPMFWUPG_SEND_DATA_COUNT_IPMBL 26
+
+struct HpmfwupgUploadFirmwareBlockReq
+{
+   unsigned char picmgId;
+   unsigned char blockNumber;
+   unsigned char data[HPMFWUPG_SEND_DATA_COUNT_MAX];
+}__attribute__ ((packed));
+
+struct HpmfwupgUploadFirmwareBlockResp
+{
+  unsigned char picmgId;
+}__attribute__ ((packed));
+
+struct HpmfwupgUploadFirmwareBlockCtx
+{
+   struct HpmfwupgUploadFirmwareBlockReq  req;
+   struct HpmfwupgUploadFirmwareBlockResp resp;
+}__attribute__ ((packed));
+
+
+/*
+ *   FINISH FIRMWARE UPLOAD DEFINITIONS
+ */
+
+#define HPMFWUPG_IMAGE_SIZE_BYTE_COUNT 4
+
+struct HpmfwupgFinishFirmwareUploadReq
+{
+   unsigned char picmgId;
+   struct HpmfwupgComponentBitMask componentsMask;
+   unsigned char imageLength[HPMFWUPG_IMAGE_SIZE_BYTE_COUNT];
+}__attribute__ ((packed));
+
+struct HpmfwupgFinishFirmwareUploadResp
+{
+   unsigned char picmgId;
+}__attribute__ ((packed));
+
+struct HpmfwupgFinishFirmwareUploadCtx
+{
+   struct HpmfwupgFinishFirmwareUploadReq  req;
+   struct HpmfwupgFinishFirmwareUploadResp resp;
+}__attribute__ ((packed));
+
+/*
+ *   ACTIVATE FW DEFINITIONS
+ */
+
+struct HpmfwupgActivateFirmwareReq
+{
+   unsigned char picmgId;
+}__attribute__ ((packed));
+
+struct HpmfwupgActivateFirmwareResp
+{
+   unsigned char picmgId;
+}__attribute__ ((packed));
+
+struct HpmfwupgActivateFirmwareCtx
+{
+   struct HpmfwupgActivateFirmwareReq  req;
+   struct HpmfwupgActivateFirmwareResp resp;
+}__attribute__ ((packed));
+
+                                                     
+/*
+ *   GET UPGRADE STATUS DEFINITIONS
+ */
+
+struct HpmfwupgGetUpgradeStatusReq
+{
+   unsigned char picmgId;
+}__attribute__ ((packed));
+
+struct HpmfwupgGetUpgradeStatusResp
+{
+   unsigned char picmgId;
+   unsigned char cmdInProcess;
+   unsigned char lastCmdCompCode;
+}__attribute__ ((packed));
+
+struct HpmfwupgGetUpgradeStatusCtx
+{
+   struct HpmfwupgGetUpgradeStatusReq  req;
+   struct HpmfwupgGetUpgradeStatusResp resp;
+}__attribute__ ((packed));
+                         
+/*
+ *   MANUAL FW ROLLBACK DEFINITIONS
+ */
+
+struct HpmfwupgManualFirmwareRollbackReq
+{
+   unsigned char picmgId;
+}__attribute__ ((packed));
+
+struct HpmfwupgManualFirmwareRollbackResp
+{
+   unsigned char picmgId;
+}__attribute__ ((packed));
+
+struct HpmfwupgManualFirmwareRollbackCtx
+{
+   struct HpmfwupgManualFirmwareRollbackReq  req;
+   struct HpmfwupgManualFirmwareRollbackResp resp;
+}__attribute__ ((packed));
+
+/*
+ *   QUERY ROLLBACK STATUS DEFINITIONS
+ */
+
+struct HpmfwupgQueryRollbackStatusReq
+{
+   unsigned char picmgId;
+}__attribute__ ((packed));
+
+struct HpmfwupgQueryRollbackStatusResp
+{
+   unsigned char picmgId;
+   struct HpmfwupgComponentBitMask rollbackComp;
+}__attribute__ ((packed));
+
+struct HpmfwupgQueryRollbackStatusCtx
+{
+   struct HpmfwupgQueryRollbackStatusReq  req;
+   struct HpmfwupgQueryRollbackStatusResp resp;
+}__attribute__ ((packed));
+
+/*
+ *   QUERY SELF TEST RESULT DEFINITIONS
+ */
+
+struct  HpmfwupgQuerySelftestResultReq
+{
+   unsigned char picmgId;
+}__attribute__ ((packed));
+
+struct  HpmfwupgQuerySelftestResultResp
+{
+   unsigned char picmgId;
+   unsigned char result1;
+   unsigned char result2;
+}__attribute__ ((packed));
+
+struct HpmfwupgQuerySelftestResultCtx
+{
+   struct HpmfwupgQuerySelftestResultReq  req;
+   struct HpmfwupgQuerySelftestResultResp resp;
+}__attribute__ ((packed));
+
+/*
+ *  HPM.1 IMAGE DEFINITIONS
+ */ 
+
+#define HPMFWUPG_HEADER_SIGNATURE_LENGTH 8
+#define HPMFWUPG_MANUFATURER_ID_LENGTH   3
+#define HPMFWUPG_PRODUCT_ID_LENGTH       2
+#define HPMFWUPG_TIME_LENGTH             4
+#define HPMFWUPG_TIMEOUT_LENGTH          1
+#define HPMFWUPG_COMP_REVISION_LENGTH    2
+#define HPMFWUPG_FIRM_REVISION_LENGTH    6
+#define HPMFWUPG_IMAGE_HEADER_VERSION    0 
+#define HPMFWUPG_IMAGE_SIGNATURE "PICMGFWU"
+ 
+struct HpmfwupgImageHeader
+{
+  char           signature[HPMFWUPG_HEADER_SIGNATURE_LENGTH];
+  unsigned char  formatVersion;
+  unsigned char  deviceId;
+  unsigned char  manId[HPMFWUPG_MANUFATURER_ID_LENGTH];
+  unsigned char  prodId[HPMFWUPG_PRODUCT_ID_LENGTH];
+  unsigned char  time[HPMFWUPG_TIME_LENGTH];
+  union	
+  {
+ 	 struct 
+ 	 {
+ 	 	#if WORDS_BIGENDIAN
+ 		unsigned char imageSelfTest   : 1;
+      unsigned char autRollback     : 1;      
+ 	 	unsigned char manRollback     : 1;
+ 	 	unsigned char servAffected    : 1;
+ 	 	unsigned char reserved        : 4;
+ 	 	#else
+ 	   unsigned char reserved        : 4;
+ 	   unsigned char servAffected    : 1;
+      unsigned char manRollback     : 1;
+      unsigned char autRollback     : 1;
+ 		unsigned char imageSelfTest   : 1;
+ 	 	#endif
+ 	 }	bitField;
+	 unsigned char byte;
+  }imageCapabilities;
+  struct HpmfwupgComponentBitMask components;
+  unsigned char  selfTestTimeout;
+  unsigned char  rollbackTimeout;
+  unsigned char  inaccessTimeout;
+  unsigned char  compRevision[HPMFWUPG_COMP_REVISION_LENGTH];
+  unsigned char  firmRevision[HPMFWUPG_FIRM_REVISION_LENGTH];
+  unsigned short oemDataLength;
+}__attribute__ ((packed));
+
+
+#define HPMFWUPG_DESCRIPTION_LENGTH   21
+
+struct HpmfwupgActionRecord
+{
+   unsigned char  actionType;
+   struct HpmfwupgComponentBitMask components;
+   unsigned char  checksum;
+}__attribute__ ((packed));
+
+#define HPMFWUPG_FIRMWARE_SIZE_LENGTH 4
+
+struct HpmfwupgFirmwareImage
+{
+   unsigned char version[HPMFWUPG_FIRM_REVISION_LENGTH];
+   char          desc[HPMFWUPG_DESCRIPTION_LENGTH];
+   unsigned char length[HPMFWUPG_FIRMWARE_SIZE_LENGTH];
+}__attribute__ ((packed));
+
+struct HpmfwupgUpgradeCtx
+{
+   unsigned int   imageSize;
+   unsigned char* pImageData;
+   unsigned char  componentId;
+   struct HpmfwupgGetTargetUpgCapabilitiesResp targetCap;
+   struct HpmfwupgGetGeneralPropResp           genCompProp[HPMFWUPG_COMPONENT_ID_MAX];
+   struct ipm_devid_rsp                        devId;
+}__attribute__ ((packed));
+
+typedef enum eHpmfwupgActionType
+{
+   HPMFWUPG_ACTION_BACKUP_COMPONENTS = 0,
+   HPMFWUPG_ACTION_PREPARE_COMPONENTS,
+	HPMFWUPG_ACTION_UPLOAD_FIRMWARE,
+   HPMFWUPG_ACTION_RESERVED = 0xFF
+} tHpmfwupgActionType;
+
+/*
+ * FUNCTIONS PROTOTYPES
+ */
+
+static int HpmfwupgUpgrade(struct ipmi_intf *intf, char* imageFilename, int activate); 
+static int HpmfwupgValidateImageIntegrity(struct HpmfwupgUpgradeCtx* pFwupgCtx);
+static int HpmfwupgPreparationStage(struct ipmi_intf *intf, 
+                                    struct HpmfwupgUpgradeCtx* pFwupgCtx);
+static int HpmfwupgUpgradeStage(struct ipmi_intf *intf, 
+                                struct HpmfwupgUpgradeCtx* pFwupgCtx);
+static int HpmfwupgActivationStage(struct ipmi_intf *intf, 
+                                  struct HpmfwupgUpgradeCtx* pFwupgCtx);
+static int HpmfwupgGetTargetUpgCapabilities(struct ipmi_intf *intf, 
+                                             struct HpmfwupgGetTargetUpgCapabilitiesCtx* pCtx);
+static int HpmfwupgGetComponentProperties(struct ipmi_intf *intf, 
+                                          struct HpmfwupgGetComponentPropertiesCtx* pCtx);
+static int HpmfwupgQuerySelftestResult(struct ipmi_intf *intf, 
+                                       struct HpmfwupgQuerySelftestResultCtx* pCtx,
+                                       struct HpmfwupgUpgradeCtx* pFwupgCtx);
+static int HpmfwupgQueryRollbackStatus(struct ipmi_intf *intf, 
+                                       struct HpmfwupgQueryRollbackStatusCtx* pCtx,
+                                       struct HpmfwupgUpgradeCtx* pFwupgCtx);
+static int HpmfwupgAbortUpgrade(struct ipmi_intf *intf, 
+                                struct HpmfwupgAbortUpgradeCtx* pCtx);    
+static int HpmfwupgInitiateUpgradeAction(struct ipmi_intf *intf, 
+                                         struct HpmfwupgInitiateUpgradeActionCtx* pCtx,
+                                         struct HpmfwupgUpgradeCtx* pFwupgCtx);  
+static int HpmfwupgUploadFirmwareBlock(struct ipmi_intf *intf, 
+                                       struct HpmfwupgUploadFirmwareBlockCtx* pCtx, 
+                                       struct HpmfwupgUpgradeCtx* pFwupgCtx, int count);
+static int HpmfwupgFinishFirmwareUpload(struct ipmi_intf *intf, 
+                                        struct HpmfwupgFinishFirmwareUploadCtx* pCtx,
+                                        struct HpmfwupgUpgradeCtx* pFwupgCtx);
+static int HpmfwupgActivateFirmware(struct ipmi_intf *intf, 
+                                    struct HpmfwupgActivateFirmwareCtx* pCtx,
+                                    struct HpmfwupgUpgradeCtx* pFwupgCtx);
+static int HpmfwupgGetUpgradeStatus(struct ipmi_intf *intf, 
+                                    struct HpmfwupgGetUpgradeStatusCtx* pCtxstruct, 
+                                    struct HpmfwupgUpgradeCtx* pFwupgCtx);
+static int HpmfwupgManualFirmwareRollback(struct ipmi_intf *intf, 
+                                          struct HpmfwupgManualFirmwareRollbackCtx* pCtx,
+                                          struct HpmfwupgUpgradeCtx* pFwupgCtx);
+static void HpmfwupgPrintUsage(void);
+static unsigned char HpmfwupgCalculateChecksum(unsigned char* pData, unsigned int length);
+static int HpmfwupgGetDeviceId(struct ipmi_intf *intf, struct ipm_devid_rsp* pGetDevId);
+static int HpmfwupgGetBufferFromFile(char* imageFilename, struct HpmfwupgUpgradeCtx* pFwupgCtx);
+static int HpmfwupgWaitLongDurationCmd(struct ipmi_intf *intf, struct HpmfwupgUpgradeCtx* pFwupgCtx);
+
+static struct ipmi_rs *  HpmfwupgSendCmd(struct ipmi_intf *intf, struct ipmi_rq req,
+                                         struct HpmfwupgUpgradeCtx* pFwupgCtx);
+                                    
+/****************************************************************************
+*
+* Function Name:  HpmfwupgUpgrade
+*
+* Description: This function performs the HPM.1 firmware upgrade procedure as
+*              defined the IPM Controller Firmware Upgrade Specification
+*              version 1.0
+*
+*****************************************************************************/
+int HpmfwupgUpgrade(struct ipmi_intf *intf, char* imageFilename, int activate)
+{
+   int rc = HPMFWUPG_SUCCESS;
+   struct HpmfwupgImageHeader imageHeader;
+   struct HpmfwupgUpgradeCtx  fwupgCtx;
+   
+   /*
+    *  GET IMAGE BUFFER FROM FILE
+    */
+    
+   rc = HpmfwupgGetBufferFromFile(imageFilename, &fwupgCtx);
+   
+   /*
+    *  VALIDATE IMAGE INTEGRITY
+    */  
+    
+   if ( rc == HPMFWUPG_SUCCESS )
+   {
+      printf("Validating firmware image integrity...");
+      fflush(stdout);
+      rc = HpmfwupgValidateImageIntegrity(&fwupgCtx);
+      if ( rc == HPMFWUPG_SUCCESS )
+      {
+         printf("OK\n");
+         fflush(stdout);
+      }
+      else
+      {
+         free(fwupgCtx.pImageData);
+      }
+   }
+   
+   /*
+    *  PREPARATION STAGE
+    */
+   
+   if ( rc == HPMFWUPG_SUCCESS )
+   {
+      printf("Performing preparation stage...");
+      fflush(stdout);
+      rc = HpmfwupgPreparationStage(intf, &fwupgCtx);
+      if ( rc == HPMFWUPG_SUCCESS )
+      {
+         printf("OK\n");
+         fflush(stdout);
+         /* Print useful information to user */
+         lprintf(LOG_NOTICE,"    Target Product ID     : %u", buf2short(fwupgCtx.devId.product_id));
+         lprintf(LOG_NOTICE,"    Target Manufacturer ID: %u", buf2short(fwupgCtx.devId.manufacturer_id));
+      }
+      else
+      {
+         free(fwupgCtx.pImageData);
+      }
+   }
+   
+   /*
+    *  UPGRADE STAGE
+    */
+    
+   if ( rc == HPMFWUPG_SUCCESS )
+   {
+      lprintf(LOG_NOTICE,"Performing upgrade stage:");
+      rc = HpmfwupgUpgradeStage(intf, &fwupgCtx);
+      if ( rc != HPMFWUPG_SUCCESS )
+      {
+         free(fwupgCtx.pImageData);
+      }
+   }
+      
+   /*
+    *  ACTIVATION STAGE
+    */
+   if ( rc == HPMFWUPG_SUCCESS && activate )
+   {
+      lprintf(LOG_NOTICE,"Performing activation stage: ");
+      rc = HpmfwupgActivationStage(intf, &fwupgCtx);
+      if ( rc != HPMFWUPG_SUCCESS )
+      {
+         free(fwupgCtx.pImageData);
+      }
+   }
+   
+   if ( rc == HPMFWUPG_SUCCESS )
+   {
+      lprintf(LOG_NOTICE,"\nFirmware upgrade procedure successful\n");
+      free(fwupgCtx.pImageData);
+   }
+   else
+   {
+      lprintf(LOG_NOTICE,"\nFirmware upgrade procedure failed\n");
+   }
+      
+   return rc;
+}                                         
+ 
+/****************************************************************************
+*
+* Function Name:  HpmfwupgValidateImageIntegrity
+*
+* Description: This function validates a HPM.1 firmware image file as defined
+*              in section 4 of the IPM Controller Firmware Upgrade 
+*              Specification version 1.0
+*
+*****************************************************************************/
+int HpmfwupgValidateImageIntegrity(struct HpmfwupgUpgradeCtx* pFwupgCtx)
+{
+   int rc = HPMFWUPG_SUCCESS;
+   struct HpmfwupgImageHeader* pImageHeader = (struct HpmfwupgImageHeader*)
+                                                         pFwupgCtx->pImageData;
+   md5_state_t ctx;
+	static unsigned char md[HPMFWUPG_MD5_SIGNATURE_LENGTH];
+   unsigned char* pMd5Sig = pFwupgCtx->pImageData + 
+                           (pFwupgCtx->imageSize - 
+                            HPMFWUPG_MD5_SIGNATURE_LENGTH);
+                                             
+   /* Validate MD5 checksum */
+   memset(md, 0, HPMFWUPG_MD5_SIGNATURE_LENGTH);
+	memset(&ctx, 0, sizeof(md5_state_t));
+   md5_init(&ctx);
+	md5_append(&ctx, pFwupgCtx->pImageData, pFwupgCtx->imageSize - 
+                                           HPMFWUPG_MD5_SIGNATURE_LENGTH);
+	md5_finish(&ctx, md);
+   if ( memcmp(md, pMd5Sig,HPMFWUPG_MD5_SIGNATURE_LENGTH) != 0 )
+   {
+      lprintf(LOG_NOTICE,"\n    Invalid MD5 signature");
+      rc = HPMFWUPG_ERROR;
+   }
+   
+   if ( rc == HPMFWUPG_SUCCESS )
+   {
+      /* Validate Header signature */
+      if( strncmp(pImageHeader->signature, HPMFWUPG_IMAGE_SIGNATURE, HPMFWUPG_HEADER_SIGNATURE_LENGTH) == 0 )
+      {
+         /* Validate Header image format version */
+         if ( pImageHeader->formatVersion == HPMFWUPG_IMAGE_HEADER_VERSION )
+         {
+            /* Validate header checksum */
+            if ( HpmfwupgCalculateChecksum((unsigned char*)pImageHeader, 
+                                           sizeof(struct HpmfwupgImageHeader) + 
+                                           pImageHeader->oemDataLength + 
+                                           sizeof(unsigned char)/*checksum*/) != 0 )
+            {
+               lprintf(LOG_NOTICE,"\n    Invalid header checksum");
+               rc = HPMFWUPG_ERROR;
+            }
+         }
+         else
+         {
+            lprintf(LOG_NOTICE,"\n    Unrecognized image version");
+            rc = HPMFWUPG_ERROR;
+         }
+      }
+      else
+      {
+         lprintf(LOG_NOTICE,"\n    Invalid image signature");
+         rc = HPMFWUPG_ERROR;
+      }
+   }
+   return rc;
+} 
+
+/****************************************************************************
+*
+* Function Name:  HpmfwupgPreparationStage
+*
+* Description: This function the preperation stage of a firmware upgrade 
+*              procedure as defined in section 3.2 of the IPM Controller 
+*              Firmware Upgrade Specification version 1.0
+*
+*****************************************************************************/
+int HpmfwupgPreparationStage(struct ipmi_intf *intf, struct HpmfwupgUpgradeCtx* pFwupgCtx)
+{
+   int rc = HPMFWUPG_SUCCESS;
+   struct HpmfwupgImageHeader* pImageHeader = (struct HpmfwupgImageHeader*)
+                                                         pFwupgCtx->pImageData;
+   
+   /* Get device ID */
+   rc = HpmfwupgGetDeviceId(intf, &pFwupgCtx->devId);
+   
+   /* Match current IPMC IDs with upgrade image */
+   if ( rc == HPMFWUPG_SUCCESS )
+   {
+      /* Validate device ID */
+      if ( pImageHeader->deviceId == pFwupgCtx->devId.device_id )
+      {
+         /* Validate product ID */
+         if ( memcmp(pImageHeader->prodId, pFwupgCtx->devId.product_id, HPMFWUPG_PRODUCT_ID_LENGTH ) == 0 )
+         {
+            /* Validate man ID */
+            if ( memcmp(pImageHeader->manId, pFwupgCtx->devId.manufacturer_id, 
+                                                     HPMFWUPG_MANUFATURER_ID_LENGTH ) != 0 )
+            {
+               lprintf(LOG_NOTICE,"\n    Invalid image file for manufacturer %u", 
+                                      buf2short(pFwupgCtx->devId.manufacturer_id)); 
+               rc = HPMFWUPG_ERROR;
+            }
+         }
+         else
+         {
+            lprintf(LOG_NOTICE,"\n    Invalid image file for product %u", 
+                                            buf2short(pFwupgCtx->devId.product_id));
+            rc = HPMFWUPG_ERROR;
+         }
+      
+      }
+      else
+      {
+         lprintf(LOG_NOTICE,"\n    Invalid device ID %x", pFwupgCtx->devId.device_id);
+         rc = HPMFWUPG_ERROR;
+      }
+   }
+   
+   /* Validate earliest compatible revision */
+   if ( rc == HPMFWUPG_SUCCESS )
+   {
+      /* Validate major & minor revision */
+      if ( pImageHeader->compRevision[0] < pFwupgCtx->devId.fw_rev1 )
+      {
+         /* Do nothing, upgrade accepted */            
+      }
+      else if ( pImageHeader->compRevision[0] == pFwupgCtx->devId.fw_rev1 )
+      {
+         /* Must validate minor revision */
+         if ( pImageHeader->compRevision[1] > pFwupgCtx->devId.fw_rev2 )
+         {
+               /* Version not compatible for upgrade */
+            lprintf(LOG_NOTICE,"\n    Version: Major: %d", pImageHeader->compRevision[0]);
+            lprintf(LOG_NOTICE,"             Minor: %x", pImageHeader->compRevision[1]);
+            lprintf(LOG_NOTICE,"    Not compatible with ");
+            lprintf(LOG_NOTICE,"    Version: Major: %d", pFwupgCtx->devId.fw_rev1);
+            lprintf(LOG_NOTICE,"             Minor: %x", pFwupgCtx->devId.fw_rev2);
+            rc = HPMFWUPG_ERROR;
+         }
+      }
+      else
+      {
+         /* Version not compatible for upgrade */
+         lprintf(LOG_NOTICE,"\n    Version: Major: %d", pImageHeader->compRevision[0]);
+         lprintf(LOG_NOTICE,"             Minor: %x", pImageHeader->compRevision[1]);
+         lprintf(LOG_NOTICE,"    Not compatible with ");
+         lprintf(LOG_NOTICE,"    Version: Major: %d", pFwupgCtx->devId.fw_rev1);
+         lprintf(LOG_NOTICE,"             Minor: %x", pFwupgCtx->devId.fw_rev2);
+         rc = HPMFWUPG_ERROR;                                                     
+      }
+   }
+   
+   /* Get target upgrade capabilities */
+   if ( rc == HPMFWUPG_SUCCESS )
+   {
+      struct HpmfwupgGetTargetUpgCapabilitiesCtx targetCapCmd;
+   
+      rc = HpmfwupgGetTargetUpgCapabilities(intf, &targetCapCmd);
+      
+      if ( rc == HPMFWUPG_SUCCESS )
+      {
+         /* Copy response to context */
+         memcpy(&pFwupgCtx->targetCap, 
+                &targetCapCmd.resp, 
+                sizeof(struct HpmfwupgGetTargetUpgCapabilitiesResp));
+                
+         /* Make sure all component IDs defined in the upgrade  
+            image are supported by the IPMC */
+         if ( (pImageHeader->components.ComponentBits.byte &
+               pFwupgCtx->targetCap.componentsPresent.ComponentBits.byte ) !=
+               pImageHeader->components.ComponentBits.byte )
+         {
+            lprintf(LOG_NOTICE,"\n    Some components present in the image file are not supported by the IPMC");
+            rc = HPMFWUPG_ERROR;                     
+         }
+         
+         /* Make sure the upgrade is desirable rigth now */
+         if ( pFwupgCtx->targetCap.GlobalCapabilities.bitField.fwUpgUndesirable == 1 )
+         {
+            lprintf(LOG_NOTICE,"\n    Upgrade undesirable at this moment");
+            rc = HPMFWUPG_ERROR;                     
+         }
+         
+         /* Get confimation from the user if he wants to continue when service 
+            affected during upgrade */
+         if ( pFwupgCtx->targetCap.GlobalCapabilities.bitField.servAffectDuringUpg == 1 ||
+              pImageHeader->imageCapabilities.bitField.servAffected == 1 )
+         {
+            char answer;
+            printf("\n    Services may be affected during upgrade. Do you wish to continue? y/n ");
+            fflush(stdout);
+            answer = getchar();
+            if ( answer == 'n' )
+            {
+               rc = HPMFWUPG_ERROR;
+            }
+         }
+         
+      }
+   }
+   
+   /* Get the general properties of each component present in image */
+   if ( rc == HPMFWUPG_SUCCESS )
+   {
+      int componentId;
+
+      for ( componentId = HPMFWUPG_COMPONENT_ID_0; 
+            componentId < HPMFWUPG_COMPONENT_ID_MAX;
+            componentId++ )
+      {
+         /* Reset component properties */
+         memset(&pFwupgCtx->genCompProp[0], 0, sizeof (struct HpmfwupgGetGeneralPropResp));
+         
+         if ( (1 << componentId & pImageHeader->components.ComponentBits.byte) )
+         {
+            struct HpmfwupgGetComponentPropertiesCtx getCompPropCmd;
+            
+            /* Get general component properties */
+            getCompPropCmd.req.componentId = componentId;
+            getCompPropCmd.req.selector    = HPMFWUPG_COMP_GEN_PROPERTIES;
+            
+            rc = HpmfwupgGetComponentProperties(intf, &getCompPropCmd);
+            
+            if ( rc == HPMFWUPG_SUCCESS )
+            {
+               /* Copy response to context */
+               memcpy(&pFwupgCtx->genCompProp[componentId], 
+                      &getCompPropCmd.resp, 
+                      sizeof(struct HpmfwupgGetGeneralPropResp));
+            }
+         }
+      }
+   }
+
+   return rc;
+}
+
+/****************************************************************************
+*
+* Function Name:  HpmfwupgUpgradeStage
+*
+* Description: This function the upgrade stage of a firmware upgrade 
+*              procedure as defined in section 3.3 of the IPM Controller 
+*              Firmware Upgrade Specification version 1.0
+*
+*****************************************************************************/
+int HpmfwupgUpgradeStage(struct ipmi_intf *intf, struct HpmfwupgUpgradeCtx* pFwupgCtx)
+{
+   int rc = HPMFWUPG_SUCCESS;
+   unsigned char* pImagePtr;
+   struct HpmfwupgActionRecord* pActionRecord;
+   unsigned int actionsSize;
+   struct HpmfwupgImageHeader* pImageHeader = (struct HpmfwupgImageHeader*)
+                                                         pFwupgCtx->pImageData;
+   
+   /* Put pointer after image header */
+   pImagePtr = (unsigned char*) 
+               (pFwupgCtx->pImageData + sizeof(struct HpmfwupgImageHeader) +
+                pImageHeader->oemDataLength + sizeof(unsigned char)/*checksum*/);
+            
+   /* Deternime actions size */            
+   actionsSize = pFwupgCtx->imageSize - sizeof(struct HpmfwupgImageHeader);   
+   
+   /* Perform actions defined in the image */
+   while( ( pImagePtr < (pFwupgCtx->pImageData + pFwupgCtx->imageSize - 
+            HPMFWUPG_MD5_SIGNATURE_LENGTH)) &&
+          ( rc == HPMFWUPG_SUCCESS) )
+   {
+      /* Get action record */
+      pActionRecord = (struct HpmfwupgActionRecord*)pImagePtr;
+      
+      /* Validate action record checksum */
+      if ( HpmfwupgCalculateChecksum((unsigned char*)pActionRecord, 
+                                     sizeof(struct HpmfwupgActionRecord)) != 0 )
+      {
+         lprintf(LOG_NOTICE,"    Invalid Action record.");
+         rc = HPMFWUPG_ERROR;
+      }
+      
+      if ( rc == HPMFWUPG_SUCCESS )
+      {
+         switch( pActionRecord->actionType )
+         {
+            case HPMFWUPG_ACTION_BACKUP_COMPONENTS:
+            {
+               /* Send prepare components command */
+               struct HpmfwupgInitiateUpgradeActionCtx initUpgActionCmd;
+               
+               initUpgActionCmd.req.componentsMask = pActionRecord->components;
+               /* Action is prepare components */
+               initUpgActionCmd.req.upgradeAction  = HPMFWUPG_UPGRADE_ACTION_BACKUP;
+               rc = HpmfwupgInitiateUpgradeAction(intf, &initUpgActionCmd, pFwupgCtx);
+               pImagePtr += sizeof(struct HpmfwupgActionRecord);                           
+               
+            }
+            break;
+            case HPMFWUPG_ACTION_PREPARE_COMPONENTS:
+            {
+               int componentId;
+               /* Make sure every components specified by this action 
+                  supports the prepare components */
+               for ( componentId = HPMFWUPG_COMPONENT_ID_0; 
+                     componentId < HPMFWUPG_COMPONENT_ID_MAX;
+                     componentId++ )
+               {
+                  if ( (1 << componentId & pActionRecord->components.ComponentBits.byte) )
+                  {
+                     if ( pFwupgCtx->genCompProp[componentId].GeneralCompProperties.bitfield.preparationSupport == 0 )
+                     {
+                        lprintf(LOG_NOTICE,"    Prepare component not supported by component ID %d", componentId);
+                        rc = HPMFWUPG_ERROR;
+                        break;
+                     }
+                  }
+               }
+               
+               if ( rc == HPMFWUPG_SUCCESS )
+               {
+                  /* Send prepare components command */
+                  struct HpmfwupgInitiateUpgradeActionCtx initUpgActionCmd;
+                  
+                  initUpgActionCmd.req.componentsMask = pActionRecord->components;
+                  /* Action is prepare components */
+                  initUpgActionCmd.req.upgradeAction  = HPMFWUPG_UPGRADE_ACTION_PREPARE;
+                  rc = HpmfwupgInitiateUpgradeAction(intf, &initUpgActionCmd, pFwupgCtx);
+                  pImagePtr += sizeof(struct HpmfwupgActionRecord);
+               }
+            }
+            break;
+            case HPMFWUPG_ACTION_UPLOAD_FIRMWARE:
+            /* Upload all firmware blocks */
+            {
+               struct HpmfwupgFirmwareImage* pFwImage;
+               struct HpmfwupgInitiateUpgradeActionCtx initUpgActionCmd;
+               struct HpmfwupgUploadFirmwareBlockCtx   uploadCmd;
+               struct HpmfwupgFinishFirmwareUploadCtx  finishCmd;
+               unsigned char* pData, *pDataInitial;
+               unsigned char  count;
+               unsigned int   totalSent = 0;
+               unsigned char  bufLength = 0;
+               unsigned int   firmwareLength = 0;
+               
+               /* Send initiate command */
+               initUpgActionCmd.req.componentsMask = pActionRecord->components;
+               
+               /* Action is upgrade */
+               initUpgActionCmd.req.upgradeAction  = HPMFWUPG_UPGRADE_ACTION_UPGRADE;
+               rc = HpmfwupgInitiateUpgradeAction(intf, &initUpgActionCmd, pFwupgCtx);
+               
+               if ( rc == HPMFWUPG_SUCCESS )
+               {
+                  /* Save component ID on which the upload is done */
+                  pFwupgCtx->componentId = (1 << pActionRecord->components.ComponentBits.byte);
+                  
+                  /* Initialize parameters */                 
+                  uploadCmd.req.blockNumber = 0;
+                  pFwImage = (struct HpmfwupgFirmwareImage*)(pImagePtr + 
+                              sizeof(struct HpmfwupgActionRecord));
+                  lprintf(LOG_NOTICE,"    Upgrading %s", pFwImage->desc);
+                  lprintf(LOG_NOTICE,"    with Version: Major: %d", pFwImage->version[0]);
+                  lprintf(LOG_NOTICE,"                  Minor: %x", pFwImage->version[1]);
+                  lprintf(LOG_NOTICE,"                  Aux  : %03d %03d %03d %03d", pFwImage->version[2],
+                                                               pFwImage->version[3],
+                                                               pFwImage->version[4],
+                                                               pFwImage->version[5]); 
+                     
+                  pDataInitial = ((unsigned char*)pFwImage + sizeof(struct HpmfwupgFirmwareImage));
+                  pData = pDataInitial;
+                                    
+                  /* Find max buffer length according the connection 
+                     parameters */
+                  if ( strstr(intf->name,"lan") != NULL )
+                  {
+                     bufLength = HPMFWUPG_SEND_DATA_COUNT_LAN;
+                  }
+                  else
+                  {
+                     if
+                     ( 
+                        strstr(intf->name,"open") != NULL
+                        &&
+                        (
+                           intf->target_addr ==  intf->my_addr
+                        )
+                     )
+                     {
+                        bufLength = HPMFWUPG_SEND_DATA_COUNT_KCS;
+                     }
+                     else
+                     {
+                        if ( intf->target_channel == 7 )    
+                        {
+                           bufLength = HPMFWUPG_SEND_DATA_COUNT_IPMBL;
+                        }
+                        else
+                        {
+                           bufLength = HPMFWUPG_SEND_DATA_COUNT_IPMB;
+                        }
+                     }
+                  }
+                                 
+                  /* Get firmware length */
+                  firmwareLength  =  pFwImage->length[0];
+                  firmwareLength |= (pFwImage->length[1] << 8)  & 0xff00;
+                  firmwareLength |= (pFwImage->length[2] << 16) & 0xff0000;
+                  firmwareLength |= (pFwImage->length[3] << 24) & 0xff000000;
+
+                  while ( (pData < (pDataInitial + firmwareLength)) && 
+                          (rc == HPMFWUPG_SUCCESS) )
+                  {
+                     if ( pData + bufLength 
+                          <= (pDataInitial + firmwareLength) )
+                     {        
+                        count = bufLength;                
+                     }
+                     else
+                     {
+                        count = (unsigned char)((pDataInitial + firmwareLength) - pData);
+                     }
+                     totalSent += count;
+                     memcpy(&uploadCmd.req.data, pData, bufLength);
+                     
+                     rc = HpmfwupgUploadFirmwareBlock(intf, &uploadCmd, pFwupgCtx, count);
+                  
+                     if ( rc == HPMFWUPG_SUCCESS )
+                     {
+                        uploadCmd.req.blockNumber++;
+                        pData += count;
+                        /* avoid lprintf to control \n generation */
+                        printf("    Writing firmware: %.0f %c completed\r", 
+                               (float)totalSent/firmwareLength*100, '%');
+                        fflush(stdout);
+                     }
+                     else if ( rc == HPMFWUPG_UPLOAD_BLOCK_LENGTH )
+                     {
+                        /* Retry with a smaller buffer length */
+                        bufLength -= (unsigned char)1;
+                        rc = HPMFWUPG_SUCCESS; 
+                     }
+                     else if ( rc == HPMFWUPG_UPLOAD_RETRY )
+                     {
+                        rc = HPMFWUPG_SUCCESS;
+                     }
+                  }
+                  lprintf(LOG_NOTICE,"");
+               
+                  if ( rc == HPMFWUPG_SUCCESS )
+                  {
+                     /* Send finish component */
+                     /* Set image length */
+                     finishCmd.req.componentsMask = pActionRecord->components;
+                     finishCmd.req.imageLength[0] = pFwImage->length[0];
+                     finishCmd.req.imageLength[1] = pFwImage->length[1];
+                     finishCmd.req.imageLength[2] = pFwImage->length[2];
+                     finishCmd.req.imageLength[3] = pFwImage->length[3];
+                     rc = HpmfwupgFinishFirmwareUpload(intf, &finishCmd, pFwupgCtx);
+                     pImagePtr = pDataInitial + firmwareLength;
+                  }
+               }
+            }
+            break;
+            default:
+               lprintf(LOG_NOTICE,"    Invalid Action type. Cannot continue");
+               rc = HPMFWUPG_ERROR;
+            break;
+         }
+      }
+   }
+   return rc;   
+}                                         
+ 
+/****************************************************************************
+*
+* Function Name:  HpmfwupgActivationStage
+*
+* Description: This function the validation stage of a firmware upgrade 
+*              procedure as defined in section 3.4 of the IPM Controller 
+*              Firmware Upgrade Specification version 1.0
+*
+*****************************************************************************/                                   
+static int HpmfwupgActivationStage(struct ipmi_intf *intf, struct HpmfwupgUpgradeCtx* pFwupgCtx)
+{
+   int rc = HPMFWUPG_SUCCESS;
+   struct HpmfwupgActivateFirmwareCtx activateCmd;
+   struct HpmfwupgImageHeader* pImageHeader = (struct HpmfwupgImageHeader*)
+                                                         pFwupgCtx->pImageData;
+
+   /* Print out stuf...*/
+   printf("    ");
+   fflush(stdout);
+   /* Activate new firmware */
+   rc = HpmfwupgActivateFirmware(intf, &activateCmd, pFwupgCtx);
+   
+   if ( rc == HPMFWUPG_SUCCESS )
+   {
+      /* Query self test result if supported by target and new image */
+      if ( (pFwupgCtx->targetCap.GlobalCapabilities.bitField.ipmcSelftestCap == 1) || 
+           (pImageHeader->imageCapabilities.bitField.imageSelfTest == 1) )
+      {
+         struct HpmfwupgQuerySelftestResultCtx selfTestCmd;
+         rc = HpmfwupgQuerySelftestResult(intf, &selfTestCmd, pFwupgCtx);
+         
+         if ( rc == HPMFWUPG_SUCCESS )
+         {
+            /* Get the self test result */
+            if ( selfTestCmd.resp.result1 != 0x55 )
+            {
+               /* Perform manual rollback if necessary */
+               /* BACKUP/ MANUAL ROLLBACK not supported by this UA */
+               lprintf(LOG_NOTICE,"    Self test failed:");
+               lprintf(LOG_NOTICE,"    Result1 = %x", selfTestCmd.resp.result1);
+               lprintf(LOG_NOTICE,"    Result2 = %x", selfTestCmd.resp.result2);
+               rc = HPMFWUPG_ERROR;
+            }
+         }
+         else
+         {
+            /* Perform manual rollback if necessary */
+            /* BACKUP / MANUAL ROLLBACK not supported by this UA */
+            lprintf(LOG_NOTICE,"    Self test failed.");
+         }
+      }
+   }
+   
+   /* If activation / self test failed, query rollback status if automatic rollback supported */
+   if ( rc == HPMFWUPG_ERROR )
+   {
+      if ( (pFwupgCtx->targetCap.GlobalCapabilities.bitField.autRollback == 1) &&
+           (pFwupgCtx->genCompProp[pFwupgCtx->componentId].GeneralCompProperties.bitfield.rollbackBackup != 0x00) )
+      {
+         struct HpmfwupgQueryRollbackStatusCtx rollCmd;
+         lprintf(LOG_NOTICE,"    Getting rollback status...");
+         fflush(stdout);
+         rc = HpmfwupgQueryRollbackStatus(intf, &rollCmd, pFwupgCtx);
+      }
+   }
+   
+   return rc;
+}                                         
+
+int HpmfwupgGetBufferFromFile(char* imageFilename, struct HpmfwupgUpgradeCtx* pFwupgCtx)
+{
+   int rc = HPMFWUPG_SUCCESS;
+   FILE* pImageFile = fopen(imageFilename, "rb");
+   
+   if ( pImageFile == NULL )
+   {
+      lprintf(LOG_NOTICE,"Cannot open image file %s", imageFilename);
+      rc = HPMFWUPG_ERROR;
+   }
+   
+   if ( rc == HPMFWUPG_SUCCESS )
+   {
+      /* Get the raw data in file */
+      fseek(pImageFile, 0, SEEK_END);
+      pFwupgCtx->imageSize  = ftell(pImageFile); 
+      pFwupgCtx->pImageData = malloc(sizeof(unsigned char)*pFwupgCtx->imageSize);
+      rewind(pImageFile);
+      if ( pFwupgCtx->pImageData != NULL )
+      {
+         fread(pFwupgCtx->pImageData, sizeof(unsigned char), pFwupgCtx->imageSize, pImageFile);
+      }
+      else
+      {
+         rc = HPMFWUPG_ERROR;
+      }
+   
+      fclose(pImageFile);
+   }
+      
+   return rc;
+}  
+
+int HpmfwupgGetDeviceId(struct ipmi_intf *intf, struct ipm_devid_rsp* pGetDevId)
+{
+   int rc = HPMFWUPG_SUCCESS;
+   struct ipmi_rs * rsp;
+   struct ipmi_rq req;
+   
+   memset(&req, 0, sizeof(req));
+   req.msg.netfn = IPMI_NETFN_APP;
+   req.msg.cmd = BMC_GET_DEVICE_ID;
+   req.msg.data_len = 0;
+
+   rsp = HpmfwupgSendCmd(intf, req, NULL);
+   
+   if ( rsp )
+   {
+      if ( rsp->ccode == 0x00 )
+      {
+         memcpy(pGetDevId, rsp->data, sizeof(struct ipm_devid_rsp));
+      }
+      else
+      {
+         lprintf(LOG_NOTICE,"Error getting device ID, compcode = %x\n", rsp->ccode);
+         rc = HPMFWUPG_ERROR;
+      }
+   }
+   else
+   {
+      lprintf(LOG_NOTICE,"Error getting device ID\n");
+      rc = HPMFWUPG_ERROR;
+   }
+   return rc;
+} 
+
+int HpmfwupgGetTargetUpgCapabilities(struct ipmi_intf *intf, 
+                                     struct HpmfwupgGetTargetUpgCapabilitiesCtx* pCtx)
+{
+   int    rc = HPMFWUPG_SUCCESS;
+   struct ipmi_rs * rsp;
+   struct ipmi_rq   req;
+   
+   pCtx->req.picmgId  = HPMFWUPG_PICMG_IDENTIFIER;
+   
+   memset(&req, 0, sizeof(req));
+   req.msg.netfn    = IPMI_NETFN_PICMG;
+	req.msg.cmd      = HPMFWUPG_GET_TARGET_UPG_CAPABILITIES;
+	req.msg.data     = (unsigned char*)&pCtx->req;
+	req.msg.data_len = sizeof(struct HpmfwupgGetTargetUpgCapabilitiesReq);
+      
+   rsp = HpmfwupgSendCmd(intf, req, NULL);
+   
+   if ( rsp )
+   {
+      if ( rsp->ccode == 0x00 )
+      {
+         memcpy(&pCtx->resp, rsp->data, sizeof(struct HpmfwupgGetTargetUpgCapabilitiesResp));
+         if ( verbose )
+         {
+            lprintf(LOG_NOTICE,"TARGET UPGRADE CAPABILITIES");
+            lprintf(LOG_NOTICE,"-------------------------------");
+            lprintf(LOG_NOTICE,"HPM.1 version............%d    ", pCtx->resp.hpmVersion);
+            lprintf(LOG_NOTICE,"Component 0 presence....[%c]   ", pCtx->resp.componentsPresent.ComponentBits.
+                                                        bitField.component0 ? 'y' : 'n');
+            lprintf(LOG_NOTICE,"Component 1 presence....[%c]   ", pCtx->resp.componentsPresent.ComponentBits.
+                                                        bitField.component1 ? 'y' : 'n');                                                  
+            lprintf(LOG_NOTICE,"Component 2 presence....[%c]   ", pCtx->resp.componentsPresent.ComponentBits.
+                                                        bitField.component2 ? 'y' : 'n');                                                  
+            lprintf(LOG_NOTICE,"Component 3 presence....[%c]   ", pCtx->resp.componentsPresent.ComponentBits.
+                                                        bitField.component3 ? 'y' : 'n');
+            lprintf(LOG_NOTICE,"Component 4 presence....[%c]   ", pCtx->resp.componentsPresent.ComponentBits.
+                                                        bitField.component4 ? 'y' : 'n');
+            lprintf(LOG_NOTICE,"Component 5 presence....[%c]   ", pCtx->resp.componentsPresent.ComponentBits.
+                                                        bitField.component5 ? 'y' : 'n');  
+            lprintf(LOG_NOTICE,"Component 6 presence....[%c]   ", pCtx->resp.componentsPresent.ComponentBits.
+                                                        bitField.component6 ? 'y' : 'n'); 
+            lprintf(LOG_NOTICE,"Component 7 presence....[%c]   ", pCtx->resp.componentsPresent.ComponentBits.
+                                                        bitField.component7 ? 'y' : 'n');
+            lprintf(LOG_NOTICE,"Upgrade undesirable.....[%c]   ", pCtx->resp.GlobalCapabilities.
+                                                        bitField.fwUpgUndesirable ? 'y' : 'n');                                                                                                                                                                             
+            lprintf(LOG_NOTICE,"Aut rollback override...[%c]   ", pCtx->resp.GlobalCapabilities.
+                                                        bitField.autRollbackOverride ? 'y' : 'n');                                                        
+            lprintf(LOG_NOTICE,"IPMC degraded...........[%c]   ", pCtx->resp.GlobalCapabilities.
+                                                        bitField.ipmcDegradedDurinUpg ? 'y' : 'n');
+            lprintf(LOG_NOTICE,"Defered activation......[%c]   ", pCtx->resp.GlobalCapabilities.
+                                                        bitField.deferActivation ? 'y' : 'n');
+            lprintf(LOG_NOTICE,"Service affected........[%c]   ", pCtx->resp.GlobalCapabilities.
+                                                        bitField.servAffectDuringUpg ? 'y' : 'n');                                                                                                      
+            lprintf(LOG_NOTICE,"Manual rollback.........[%c]   ", pCtx->resp.GlobalCapabilities.
+                                                        bitField.manualRollback ? 'y' : 'n');                                              
+            lprintf(LOG_NOTICE,"Automatic rollback......[%c]   ", pCtx->resp.GlobalCapabilities.
+                                                        bitField.autRollback ? 'y' : 'n');                                                        
+            lprintf(LOG_NOTICE,"Self test...............[%c]   ", pCtx->resp.GlobalCapabilities.
+                                                        bitField.ipmcSelftestCap ? 'y' : 'n');
+            lprintf(LOG_NOTICE,"Upgrade timeout.........[%d sec] ", pCtx->resp.upgradeTimeout*5);                                                                                            
+            lprintf(LOG_NOTICE,"Self test timeout.......[%d sec] ", pCtx->resp.selftestTimeout*5);
+            lprintf(LOG_NOTICE,"Rollback timeout........[%d sec] ", pCtx->resp.rollbackTimeout*5);
+            lprintf(LOG_NOTICE,"Inaccessibility timeout.[%d sec] \n", pCtx->resp.rollbackTimeout*5);
+         }
+      }
+      else
+      {
+         lprintf(LOG_NOTICE,"Error getting target upgrade capabilities\n",  rsp->ccode);
+         rc = HPMFWUPG_ERROR;
+      }
+   }
+   else
+   {
+      lprintf(LOG_NOTICE,"Error getting target upgrade capabilities\n");
+      rc = HPMFWUPG_ERROR;
+   }
+   
+   
+   
+   return rc;
+}   
+
+
+int HpmfwupgGetComponentProperties(struct ipmi_intf *intf, struct HpmfwupgGetComponentPropertiesCtx* pCtx)
+{
+   int    rc = HPMFWUPG_SUCCESS;
+   struct ipmi_rs * rsp;
+   struct ipmi_rq   req;
+   
+   pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
+   
+   memset(&req, 0, sizeof(req));
+   req.msg.netfn    = IPMI_NETFN_PICMG;
+	req.msg.cmd      = HPMFWUPG_GET_COMPONENT_PROPERTIES;
+	req.msg.data     = (unsigned char*)&pCtx->req;
+	req.msg.data_len = sizeof(struct HpmfwupgGetComponentPropertiesReq);
+
+   rsp = HpmfwupgSendCmd(intf, req, NULL);
+   
+   if ( rsp )
+   {
+      if ( rsp->ccode == 0x00 )
+      { 
+         switch ( pCtx->req.selector )
+         {
+            case HPMFWUPG_COMP_GEN_PROPERTIES:
+               memcpy(&pCtx->resp, rsp->data, sizeof(struct HpmfwupgGetGeneralPropResp));
+               if ( verbose )
+               {
+                  lprintf(LOG_NOTICE,"GENERAL PROPERTIES");
+                  lprintf(LOG_NOTICE,"-------------------------------");
+                  lprintf(LOG_NOTICE,"Payload cold reset req....[%c]   ", pCtx->resp.Response.generalPropResp.
+                                                              GeneralCompProperties.bitfield.payloadColdReset ? 'y' : 'n');
+                  lprintf(LOG_NOTICE,"Def. activation supported.[%c]   ", pCtx->resp.Response.generalPropResp.
+                                                              GeneralCompProperties.bitfield.deferredActivation ? 'y' : 'n');                                                     
+                  lprintf(LOG_NOTICE,"Comparison supported......[%c]   ", pCtx->resp.Response.generalPropResp.
+                                                              GeneralCompProperties.bitfield.comparisonSupport ? 'y' : 'n');
+                  lprintf(LOG_NOTICE,"Preparation supported.....[%c]   ", pCtx->resp.Response.generalPropResp.
+                                                              GeneralCompProperties.bitfield.preparationSupport ? 'y' : 'n');                                                                                          
+                  lprintf(LOG_NOTICE,"Rollback supported........[%c]   \n", pCtx->resp.Response.generalPropResp.
+                                                              GeneralCompProperties.bitfield.rollbackBackup ? 'y' : 'n');
+               }
+            break;
+            case HPMFWUPG_COMP_CURRENT_VERSION:
+               memcpy(&pCtx->resp, rsp->data, sizeof(struct HpmfwupgGetCurrentVersionResp));
+               if ( verbose )
+               {
+                  lprintf(LOG_NOTICE,"Current Version: ");
+                  lprintf(LOG_NOTICE," Major: %d", pCtx->resp.Response.currentVersionResp.currentVersion[0]);
+                  lprintf(LOG_NOTICE," Minor: %x", pCtx->resp.Response.currentVersionResp.currentVersion[1]);
+                  lprintf(LOG_NOTICE," Aux  : %03d %03d %03d %03d\n", pCtx->resp.Response.currentVersionResp.currentVersion[2],
+                                                    pCtx->resp.Response.currentVersionResp.currentVersion[3],
+                                                    pCtx->resp.Response.currentVersionResp.currentVersion[4],
+                                                    pCtx->resp.Response.currentVersionResp.currentVersion[5]);
+               }                                                 
+            break; 
+            case HPMFWUPG_COMP_DESCRIPTION_STRING:
+               memcpy(&pCtx->resp, rsp->data, sizeof(struct HpmfwupgGetDescStringResp));
+               if ( verbose )
+               {
+                  lprintf(LOG_NOTICE,"Description string: %s\n", pCtx->resp.Response.descStringResp.descString);
+               }
+            break;
+            case HPMFWUPG_COMP_ROLLBACK_FIRMWARE_VERSION:
+               memcpy(&pCtx->resp, rsp->data, sizeof(struct HpmfwupgGetRollbackFwVersionResp));
+               if ( verbose )
+               {
+                  lprintf(LOG_NOTICE,"Rollback FW Version: ");
+                  lprintf(LOG_NOTICE," Major: %d", pCtx->resp.Response.rollbackFwVersionResp.rollbackFwVersion[0]);
+                  lprintf(LOG_NOTICE," Minor: %x", pCtx->resp.Response.rollbackFwVersionResp.rollbackFwVersion[1]);
+                  lprintf(LOG_NOTICE," Aux  : %03d %03d %03d %03d\n", pCtx->resp.Response.rollbackFwVersionResp.rollbackFwVersion[2],
+                                                    pCtx->resp.Response.rollbackFwVersionResp.rollbackFwVersion[3],
+                                                    pCtx->resp.Response.rollbackFwVersionResp.rollbackFwVersion[4],
+                                                    pCtx->resp.Response.rollbackFwVersionResp.rollbackFwVersion[5]);
+               }    
+            break;
+            case HPMFWUPG_COMP_DEFERRED_FIRMWARE_VERSION:
+               memcpy(&pCtx->resp, rsp->data, sizeof(struct HpmfwupgGetDeferredFwVersionResp));
+               if ( verbose )
+               {
+                  lprintf(LOG_NOTICE,"Deferred FW Version: ");
+                  lprintf(LOG_NOTICE," Major: %d", pCtx->resp.Response.deferredFwVersionResp.deferredFwVersion[0]);
+                  lprintf(LOG_NOTICE," Minor: %x", pCtx->resp.Response.deferredFwVersionResp.deferredFwVersion[1]);
+                  lprintf(LOG_NOTICE," Aux  : %03d %03d %03d %03d\n", pCtx->resp.Response.deferredFwVersionResp.deferredFwVersion[2],
+                                                    pCtx->resp.Response.deferredFwVersionResp.deferredFwVersion[3],
+                                                    pCtx->resp.Response.deferredFwVersionResp.deferredFwVersion[4],
+                                                    pCtx->resp.Response.deferredFwVersionResp.deferredFwVersion[5]);
+               }                                                 
+            break;
+            default:
+               lprintf(LOG_NOTICE,"Unsupported component selector");
+               rc = HPMFWUPG_ERROR;
+            break;
+         }
+      }    
+      else
+      {
+         lprintf(LOG_NOTICE,"Error getting component properties, compcode = %x\n",  rsp->ccode);
+         rc = HPMFWUPG_ERROR;
+      }
+   }
+   else
+   {
+      lprintf(LOG_NOTICE,"Error getting component properties\n");
+      rc = HPMFWUPG_ERROR;
+   }
+   
+   
+   return rc;
+} 
+
+int HpmfwupgAbortUpgrade(struct ipmi_intf *intf, struct HpmfwupgAbortUpgradeCtx* pCtx) 
+{
+   int    rc = HPMFWUPG_SUCCESS;
+   struct ipmi_rs * rsp;
+   struct ipmi_rq   req;
+   
+   pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
+   
+   memset(&req, 0, sizeof(req));
+   req.msg.netfn    = IPMI_NETFN_PICMG;
+	req.msg.cmd      = HPMFWUPG_ABORT_UPGRADE;
+	req.msg.data     = (unsigned char*)&pCtx->req;
+	req.msg.data_len = sizeof(struct HpmfwupgAbortUpgradeReq);
+      
+   rsp = HpmfwupgSendCmd(intf, req, NULL); 
+   
+   if ( rsp )
+   {
+      if ( rsp->ccode != 0x00 )
+      {
+         lprintf(LOG_NOTICE,"Error aborting upgrade, compcode = %x\n",  rsp->ccode);
+         rc = HPMFWUPG_ERROR;
+      }
+   }
+   else
+   {
+      lprintf(LOG_NOTICE,"Error aborting upgrade\n");
+      rc = HPMFWUPG_ERROR;
+   }
+   return rc;
+}                               
+
+int HpmfwupgInitiateUpgradeAction(struct ipmi_intf *intf, struct HpmfwupgInitiateUpgradeActionCtx* pCtx,
+                                  struct HpmfwupgUpgradeCtx* pFwupgCtx)
+{
+   int    rc = HPMFWUPG_SUCCESS;
+   struct ipmi_rs * rsp;
+   struct ipmi_rq   req;
+   
+   pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
+   
+   memset(&req, 0, sizeof(req));
+   req.msg.netfn    = IPMI_NETFN_PICMG;
+	req.msg.cmd      = HPMFWUPG_INITIATE_UPGRADE_ACTION;
+	req.msg.data     = (unsigned char*)&pCtx->req;
+	req.msg.data_len = sizeof(struct HpmfwupgInitiateUpgradeActionReq);
+   
+   rsp = HpmfwupgSendCmd(intf, req, pFwupgCtx); 
+   
+   if ( rsp )
+   {
+      /* Long duration command handling */
+      if ( rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS )
+      {
+         rc = HpmfwupgWaitLongDurationCmd(intf, pFwupgCtx);
+      }
+      else if ( rsp->ccode != 0x00 )
+      {
+         lprintf(LOG_NOTICE,"Error initiating upgrade action, compcode = %x\n",  rsp->ccode);
+         rc = HPMFWUPG_ERROR;
+      }
+   }
+   else
+   {
+      lprintf(LOG_NOTICE,"Error initiating upgrade action\n");
+      rc = HPMFWUPG_ERROR;
+   }
+
+   return rc;
+} 
+
+int HpmfwupgUploadFirmwareBlock(struct ipmi_intf *intf, struct HpmfwupgUploadFirmwareBlockCtx* pCtx, 
+                                struct HpmfwupgUpgradeCtx* pFwupgCtx, int count)
+{
+   int rc = HPMFWUPG_SUCCESS;
+   struct ipmi_rs * rsp;                                                       
+   struct ipmi_rq   req;
+   
+   pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
+   
+   memset(&req, 0, sizeof(req));
+   req.msg.netfn    = IPMI_NETFN_PICMG;
+	req.msg.cmd      = HPMFWUPG_UPLOAD_FIRMWARE_BLOCK;
+	req.msg.data     = (unsigned char*)&pCtx->req;
+   /* 2 is the size of the upload struct - data */
+	req.msg.data_len = 2 + count;
+   
+   rsp = HpmfwupgSendCmd(intf, req, pFwupgCtx); 
+   
+   if ( rsp )
+   {
+      /* Long duration command handling */
+      if ( rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS )
+      {
+         rc = HpmfwupgWaitLongDurationCmd(intf, pFwupgCtx);
+      }
+      /* 
+       * If we get 0xcc here this is probably because we send an invalid sequence
+       * number (Packet sent twice). Continue as if we had no error.
+       */
+      else if ( (rsp->ccode != 0x00) && (rsp->ccode != 0xcc) )
+      {
+         /*
+          * PATCH --> This validation is to handle retryables errors codes on IPMB bus.
+          *           This will be fixed in the next release of open ipmi and this 
+          *           check will have to be removed. (Buggy version = 39)
+          */
+         if ( HPMFWUPG_IS_RETRYABLE(rsp->ccode) )
+         {
+            lprintf(LOG_DEBUG,"HPM: [PATCH]Retryable error detected");
+            rc = HPMFWUPG_UPLOAD_RETRY;
+         }
+         /* 
+          * If completion code = 0xc7, we will retry with a reduced buffer length. 
+          * Do not print error.
+          */
+         else if ( rsp->ccode == IPMI_CC_REQ_DATA_INV_LENGTH )
+         {
+            rc = HPMFWUPG_UPLOAD_BLOCK_LENGTH;
+         }
+         else
+         {
+            lprintf(LOG_NOTICE,"Error uploading firmware block, compcode = %x\n",  rsp->ccode);
+            rc = HPMFWUPG_ERROR;
+         }
+      }
+   }
+   else
+   {
+      lprintf(LOG_NOTICE,"Error uploading firmware block\n");
+      rc = HPMFWUPG_ERROR;
+   }
+   
+   return rc;
+}  
+
+int HpmfwupgFinishFirmwareUpload(struct ipmi_intf *intf, struct HpmfwupgFinishFirmwareUploadCtx* pCtx,
+                                 struct HpmfwupgUpgradeCtx* pFwupgCtx)                         
+{
+   int    rc = HPMFWUPG_SUCCESS;
+   struct ipmi_rs * rsp;
+   struct ipmi_rq   req;
+   
+   pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
+   
+   memset(&req, 0, sizeof(req));
+   req.msg.netfn    = IPMI_NETFN_PICMG;
+	req.msg.cmd      = HPMFWUPG_FINISH_FIRMWARE_UPLOAD;
+	req.msg.data     = (unsigned char*)&pCtx->req;
+	req.msg.data_len = sizeof(struct HpmfwupgFinishFirmwareUploadReq);
+   
+   rsp = HpmfwupgSendCmd(intf, req, pFwupgCtx); 
+   
+   if ( rsp )
+   {
+      /* Long duration command handling */
+      if ( rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS )
+      {
+         rc = HpmfwupgWaitLongDurationCmd(intf, pFwupgCtx);
+      }
+      else if ( rsp->ccode != IPMI_CC_OK )
+      {
+         lprintf(LOG_NOTICE,"Error finishing firmware upload, compcode = %x\n",  rsp->ccode);
+         rc = HPMFWUPG_ERROR;
+      }
+   }
+   else
+   {
+      lprintf(LOG_NOTICE,"Error fininshing firmware upload\n");
+      rc = HPMFWUPG_ERROR;
+   }
+   
+   return rc;
+} 
+
+int HpmfwupgActivateFirmware(struct ipmi_intf *intf, struct HpmfwupgActivateFirmwareCtx* pCtx,
+                             struct HpmfwupgUpgradeCtx* pFwupgCtx)               
+{
+   int    rc = HPMFWUPG_SUCCESS;
+   struct ipmi_rs * rsp;
+   struct ipmi_rq   req;
+   
+   pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
+   
+   memset(&req, 0, sizeof(req));
+   req.msg.netfn    = IPMI_NETFN_PICMG;
+	req.msg.cmd      = HPMFWUPG_ACTIVATE_FIRMWARE;
+	req.msg.data     = (unsigned char*)&pCtx->req;
+	req.msg.data_len = sizeof(struct HpmfwupgActivateFirmwareReq);
+      
+   rsp = HpmfwupgSendCmd(intf, req, pFwupgCtx); 
+   
+   if ( rsp )
+   {
+      /* Long duration command handling */
+      if ( rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS )
+      {
+         printf("Waiting firmware activation...");
+         fflush(stdout);
+         
+         rc = HpmfwupgWaitLongDurationCmd(intf, pFwupgCtx);
+
+         if ( rc == HPMFWUPG_SUCCESS )
+         {
+            lprintf(LOG_NOTICE,"OK");
+         }
+         else
+         {
+            lprintf(LOG_NOTICE,"Failed");
+         }
+      }
+      else if ( rsp->ccode != IPMI_CC_OK )
+      {
+         lprintf(LOG_NOTICE,"Error activating firmware, compcode = %x\n",  
+                            rsp->ccode);
+         rc = HPMFWUPG_ERROR;
+      }
+   }
+   else
+   {
+      lprintf(LOG_NOTICE,"Error activating firmware\n");
+      rc = HPMFWUPG_ERROR;
+   }
+
+   return rc;
+}                                
+
+int HpmfwupgGetUpgradeStatus(struct ipmi_intf *intf, struct HpmfwupgGetUpgradeStatusCtx* pCtx,
+                             struct HpmfwupgUpgradeCtx* pFwupgCtx)
+{
+   int    rc = HPMFWUPG_SUCCESS;
+   struct ipmi_rs * rsp;
+   struct ipmi_rq   req;
+   
+   pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
+   
+   memset(&req, 0, sizeof(req));
+   req.msg.netfn    = IPMI_NETFN_PICMG;
+	req.msg.cmd      = HPMFWUPG_GET_UPGRADE_STATUS;
+	req.msg.data     = (unsigned char*)&pCtx->req;
+	req.msg.data_len = sizeof(struct HpmfwupgGetUpgradeStatusReq);
+   
+   rsp = HpmfwupgSendCmd(intf, req, pFwupgCtx);
+   
+   if ( rsp )
+   {                                                                              
+      if ( rsp->ccode == 0x00 )
+      {
+         memcpy(&pCtx->resp, rsp->data, sizeof(struct HpmfwupgGetUpgradeStatusResp));
+         if ( verbose )
+         {
+            lprintf(LOG_NOTICE,"Upgrade status:");
+            lprintf(LOG_NOTICE," Command in progress:          %x", pCtx->resp.cmdInProcess);
+            lprintf(LOG_NOTICE," Last command completion code: %x", pCtx->resp.lastCmdCompCode);
+         }
+      }
+      /*
+       * PATCH --> This validation is to handle retryables errors codes on IPMB bus.
+       *           This will be fixed in the next release of open ipmi and this 
+       *           check will have to be removed. (Buggy version = 39)
+       */
+      else if ( HPMFWUPG_IS_RETRYABLE(rsp->ccode) )
+      {
+         lprintf(LOG_DEBUG,"HPM: [PATCH]Retryable error detected");
+
+         pCtx->resp.lastCmdCompCode = HPMFWUPG_COMMAND_IN_PROGRESS;
+      }
+      else
+      {
+         if ( verbose )
+         {
+            lprintf(LOG_NOTICE,"Error getting upgrade status, compcode = %x\n",  rsp->ccode);
+            rc = HPMFWUPG_ERROR;
+         }
+      }
+   }
+   else
+   {
+      if ( verbose )
+      {
+         lprintf(LOG_NOTICE,"Error getting upgrade status");
+         rc = HPMFWUPG_ERROR;
+      }
+   }
+   
+   return rc;
+}  
+
+int HpmfwupgManualFirmwareRollback(struct ipmi_intf *intf, struct HpmfwupgManualFirmwareRollbackCtx* pCtx,
+                                   struct HpmfwupgUpgradeCtx* pFwupgCtx)
+{
+   int    rc = HPMFWUPG_SUCCESS;
+   struct ipmi_rs * rsp;
+   struct ipmi_rq   req;
+     
+   pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
+   
+   memset(&req, 0, sizeof(req));
+   req.msg.netfn    = IPMI_NETFN_PICMG;
+	req.msg.cmd      = HPMFWUPG_MANUAL_FIRMWARE_ROLLBACK;
+	req.msg.data     = (unsigned char*)&pCtx->req;
+	req.msg.data_len = sizeof(struct HpmfwupgManualFirmwareRollbackReq);
+      
+   rsp = HpmfwupgSendCmd(intf, req, pFwupgCtx); 
+   
+   if ( rsp )
+   {
+      /* Long duration command handling */
+      if ( rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS )
+      {
+         struct HpmfwupgQueryRollbackStatusCtx resCmd;
+         printf("Waiting firmware rollback...");
+         fflush(stdout);
+         rc = HpmfwupgQueryRollbackStatus(intf, &resCmd, pFwupgCtx);
+      }
+      else if ( rsp->ccode != 0x00 )
+      {
+         lprintf(LOG_NOTICE,"Error sending manual rollback, compcode = %x\n",  rsp->ccode);
+         rc = HPMFWUPG_ERROR;
+      }
+   }
+   else
+   {
+      lprintf(LOG_NOTICE,"Error sending manual rollback\n");
+      rc = HPMFWUPG_ERROR;
+   }
+   return rc;
+}                                      
+
+int HpmfwupgQueryRollbackStatus(struct ipmi_intf *intf, struct HpmfwupgQueryRollbackStatusCtx* pCtx,
+                                struct HpmfwupgUpgradeCtx* pFwupgCtx)
+{
+   int    rc = HPMFWUPG_SUCCESS;
+   struct ipmi_rs * rsp;
+   struct ipmi_rq   req;
+   unsigned char rollbackTimeout = 0;
+   unsigned int  timeoutSec1, timeoutSec2;
+     
+   pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
+   
+   memset(&req, 0, sizeof(req));
+   req.msg.netfn    = IPMI_NETFN_PICMG;
+	req.msg.cmd      = HPMFWUPG_QUERY_ROLLBACK_STATUS;
+	req.msg.data     = (unsigned char*)&pCtx->req;
+	req.msg.data_len = sizeof(struct HpmfwupgQueryRollbackStatusReq);
+   
+   /* 
+    * If we are not in upgrade context, we use default timeout values
+    */
+   if ( pFwupgCtx != NULL )
+   {
+      rollbackTimeout = pFwupgCtx->targetCap.rollbackTimeout*5;
+   }
+   else
+   {
+      rollbackTimeout = HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT;
+   }
+   
+   /* Poll rollback status until completion or timeout */
+   timeoutSec1 = time(NULL);
+   timeoutSec2 = time(NULL);
+   do
+   {
+      /* Must wait at least 100 ms between status requests */
+      usleep(100000);
+      rsp = HpmfwupgSendCmd(intf, req, pFwupgCtx);
+      /*
+       * PATCH --> This validation is to handle retryables errors codes on IPMB bus.
+       *           This will be fixed in the next release of open ipmi and this 
+       *           check will have to be removed. (Buggy version = 39)
+       */
+      if ( rsp )
+      {
+         if ( HPMFWUPG_IS_RETRYABLE(rsp->ccode) )
+         {
+            lprintf(LOG_DEBUG,"HPM: [PATCH]Retryable error detected");
+            rsp->ccode = HPMFWUPG_COMMAND_IN_PROGRESS;
+         }
+      }
+      timeoutSec2 = time(NULL);
+      
+   }while( rsp &&
+          (rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS) &&
+          (timeoutSec2 - timeoutSec1 < rollbackTimeout ) );
+   
+   if ( rsp )
+   {
+      if ( rsp->ccode == 0x00 )
+      {
+         memcpy(&pCtx->resp, rsp->data, sizeof(struct HpmfwupgQueryRollbackStatusResp));
+         if ( pCtx->resp.rollbackComp.ComponentBits.byte != 0 )
+         {
+            /* Rollback occured */
+            lprintf(LOG_NOTICE,"Rollback occured on component mask: 0x%02x",
+                                              pCtx->resp.rollbackComp.ComponentBits.byte);
+         }
+         else
+         {
+            lprintf(LOG_NOTICE,"No Firmware rollback occured");
+         }
+      }
+      else if ( rsp->ccode == 0x81 )
+      {
+         lprintf(LOG_NOTICE,"Rollback failed on component mask: 0x%02x",  
+                                                pCtx->resp.rollbackComp.ComponentBits.byte);
+         rc = HPMFWUPG_ERROR;
+      }
+      else
+      {
+          lprintf(LOG_NOTICE,"Error getting rollback status, compcode = %x",  rsp->ccode);
+          rc = HPMFWUPG_ERROR;
+      }
+   }
+   else
+   {
+      lprintf(LOG_NOTICE,"Error getting upgrade status\n");
+      rc = HPMFWUPG_ERROR;
+   }
+   
+   return rc;
+} 
+
+int HpmfwupgQuerySelftestResult(struct ipmi_intf *intf, struct HpmfwupgQuerySelftestResultCtx* pCtx,
+                                struct HpmfwupgUpgradeCtx* pFwupgCtx)                                  
+{
+   int    rc = HPMFWUPG_SUCCESS;
+   struct ipmi_rs * rsp;
+   struct ipmi_rq   req;
+   unsigned char selfTestTimeout = 0;
+   unsigned int  timeoutSec1, timeoutSec2;
+      
+   pCtx->req.picmgId = HPMFWUPG_PICMG_IDENTIFIER;
+   
+   /* 
+    * If we are not in upgrade context, we use default timeout values
+    */
+   if ( pFwupgCtx != NULL )
+   {
+      /* Getting selftest timeout from new image */
+      struct HpmfwupgImageHeader* pImageHeader = (struct HpmfwupgImageHeader*)
+                                                         pFwupgCtx->pImageData;
+      selfTestTimeout = pImageHeader->selfTestTimeout;
+   }
+   else
+   {
+      selfTestTimeout = HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT;
+   }
+   
+   memset(&req, 0, sizeof(req));
+   req.msg.netfn    = IPMI_NETFN_PICMG;
+	req.msg.cmd      = HPMFWUPG_QUERY_SELFTEST_RESULT;
+	req.msg.data     = (unsigned char*)&pCtx->req;
+	req.msg.data_len = sizeof(struct HpmfwupgQuerySelftestResultReq);
+   
+   
+   /* Poll rollback status until completion or timeout */
+   timeoutSec1 = time(NULL);
+   timeoutSec2 = time(NULL);
+   do
+   {
+      /* Must wait at least 100 ms between status requests */
+      usleep(100000);
+      rsp = HpmfwupgSendCmd(intf, req, pFwupgCtx);
+      /*
+       * PATCH --> This validation is to handle retryables errors codes on IPMB bus.
+       *           This will be fixed in the next release of open ipmi and this 
+       *           check will have to be removed. (Buggy version = 39)
+       */
+      if ( rsp )
+      {
+         if ( HPMFWUPG_IS_RETRYABLE(rsp->ccode) )
+         {
+            lprintf(LOG_DEBUG,"HPM: [PATCH]Retryable error detected");
+            rsp->ccode = HPMFWUPG_COMMAND_IN_PROGRESS;
+         }
+      }
+      timeoutSec2 = time(NULL);
+      
+   }while( rsp &&
+          (rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS) &&
+          (timeoutSec2 - timeoutSec1 < selfTestTimeout ) );
+   
+   if ( rsp )
+   {
+      if ( rsp->ccode == 0x00 )
+      {
+         memcpy(&pCtx->resp, rsp->data, sizeof(struct HpmfwupgQuerySelftestResultResp));
+         if ( verbose )
+         {
+            lprintf(LOG_NOTICE,"Self test results:");
+            lprintf(LOG_NOTICE,"Result1 = %x", pCtx->resp.result1);
+            lprintf(LOG_NOTICE,"Result2 = %x", pCtx->resp.result2);
+         }
+      }
+      else
+      {
+         lprintf(LOG_NOTICE,"Error getting self test results, compcode = %x\n",  rsp->ccode);
+         rc = HPMFWUPG_ERROR;
+      }
+   }
+   else
+   {
+       lprintf(LOG_NOTICE,"Error getting upgrade status\n");
+       rc = HPMFWUPG_ERROR;
+   }
+      
+   return rc;
+}
+
+struct ipmi_rs * HpmfwupgSendCmd(struct ipmi_intf *intf, struct ipmi_rq req, 
+                                 struct HpmfwupgUpgradeCtx* pFwupgCtx )
+{
+   struct ipmi_rs * rsp;
+   unsigned char inaccessTimeout = 0, inaccessTimeoutCounter = 0;
+   unsigned char upgradeTimeout  = 0, upgradeTimeoutCounter  = 0;
+   unsigned int  timeoutSec1, timeoutSec2;
+   unsigned char retry = 0; 
+      
+   /* 
+    * If we are not in upgrade context, we use default timeout values
+    */
+   if ( pFwupgCtx != NULL )
+   {
+      inaccessTimeout = pFwupgCtx->targetCap.inaccessTimeout*5;
+      upgradeTimeout  = pFwupgCtx->targetCap.upgradeTimeout*5;
+   }
+   else
+   {
+      inaccessTimeout = HPMFWUPG_DEFAULT_INACCESS_TIMEOUT;
+      upgradeTimeout  = HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT;
+   }
+   
+   timeoutSec1 = time(NULL);
+      
+   do
+   {
+      rsp = intf->sendrecv(intf, &req);
+      
+      if( rsp == NULL ) 
+      {
+         #define HPM_LAN_PACKET_RESIZE_LIMIT 6
+         if(strstr(intf->name,"lan")!= NULL) /* also covers lanplus */
+         {
+            static int errorCount=0;
+            static struct ipmi_rs fakeRsp;
+
+            lprintf(LOG_DEBUG,"HPM: no response available");
+            lprintf(LOG_DEBUG,"HPM: the command may be rejected for " \
+                              "security reasons");
+            if
+            ( 
+               req.msg.netfn == IPMI_NETFN_PICMG
+               &&
+               req.msg.cmd == HPMFWUPG_UPLOAD_FIRMWARE_BLOCK
+               &&
+               errorCount < HPM_LAN_PACKET_RESIZE_LIMIT 
+            )
+            {
+               lprintf(LOG_DEBUG,"HPM: upload firmware block API called");
+               lprintf(LOG_DEBUG,"HPM: returning length error to force resize");
+
+               fakeRsp.ccode = IPMI_CC_REQ_DATA_INV_LENGTH;
+               rsp = &fakeRsp;
+               errorCount++;
+            }
+            else if 
+            ( 
+               req.msg.netfn == IPMI_NETFN_PICMG
+               &&
+               ( req.msg.cmd == HPMFWUPG_ACTIVATE_FIRMWARE ||
+                 req.msg.cmd == HPMFWUPG_MANUAL_FIRMWARE_ROLLBACK )
+                 
+            )
+            {
+               /* 
+                * rsp == NULL and command activate firmware or manual firmware 
+                * rollback most likely occurs when we have sent a firmware activation 
+                * request. Fake a command in progress response.
+                */
+               lprintf(LOG_DEBUG,"HPM: activate/rollback firmware API called");
+               lprintf(LOG_DEBUG,"HPM: returning in progress to handle IOL session lost");
+               
+               fakeRsp.ccode = HPMFWUPG_COMMAND_IN_PROGRESS;
+               rsp = &fakeRsp;
+            }
+            else if 
+            ( 
+               req.msg.netfn == IPMI_NETFN_PICMG
+               &&
+               ( req.msg.cmd == HPMFWUPG_GET_UPGRADE_STATUS ||
+                 req.msg.cmd == HPMFWUPG_QUERY_ROLLBACK_STATUS )
+            )
+            {
+               /* 
+                * rsp == NULL and command get upgrade status or query rollback
+                * status most likely occurs when we are waiting for firmware 
+                * activation. Try to re-open the IOL session (re-open will work
+                * once the IPMC recovers from firmware activation.
+                */
+                
+               lprintf(LOG_DEBUG,"HPM: upg/rollback status firmware API called");
+               lprintf(LOG_DEBUG,"HPM: try to re-open IOL session");
+               
+               sleep(inaccessTimeout-inaccessTimeoutCounter);
+               
+               /* force session re-open */
+               intf->opened              = 0;
+               intf->session->authtype   = IPMI_SESSION_AUTHTYPE_NONE;
+               intf->session->session_id = 0;
+               intf->session->in_seq     = 0;
+               intf->session->active     = 0;
+               intf->open(intf);
+            }
+         }
+      }
+      
+     /* Handle inaccessibility timeout (rsp = NULL if IOL) */
+     if ( rsp == NULL || rsp->ccode == 0xff || rsp->ccode == 0xc3 )
+     {
+
+        if ( inaccessTimeoutCounter < inaccessTimeout ) 
+        {
+           timeoutSec2 = time(NULL);
+           if ( timeoutSec2 > timeoutSec1 )
+           {
+              inaccessTimeoutCounter += timeoutSec2 - timeoutSec1;
+              timeoutSec1 = time(NULL);
+           }
+           retry = 1;
+        }
+        else
+        {
+           retry = 0;
+        }
+     }
+     /* Handle node busy timeout */
+     else if ( rsp->ccode == 0xc0 )
+     {
+        if ( upgradeTimeoutCounter < upgradeTimeout ) 
+        {
+           timeoutSec2 = time(NULL);
+           if ( timeoutSec2 > timeoutSec1 )
+           {
+              timeoutSec1 = time(NULL);
+              upgradeTimeoutCounter += timeoutSec2 - timeoutSec1;
+           }
+           retry = 1;
+        }
+        else
+        {
+           retry = 0;
+        }
+     }
+     else
+     {
+        #ifdef ENABLE_OPENIPMI_V39_PATCH
+        if( rsp->ccode == IPMI_CC_OK )
+        {
+           errorCount = 0 ;
+        }
+        #endif
+        retry = 0;
+     }
+   }while( retry );
+   return rsp;
+} 
+
+int HpmfwupgWaitLongDurationCmd(struct ipmi_intf *intf, struct HpmfwupgUpgradeCtx* pFwupgCtx)
+{
+   int rc = HPMFWUPG_SUCCESS;
+   unsigned char upgradeTimeout = 0;
+   unsigned int  timeoutSec1, timeoutSec2;
+   struct HpmfwupgGetUpgradeStatusCtx upgStatusCmd;
+
+   /* 
+    * If we are not in upgrade context, we use default timeout values
+    */
+   if ( pFwupgCtx != NULL )
+   {
+      upgradeTimeout = pFwupgCtx->targetCap.upgradeTimeout*5;
+   }
+   else
+   {
+      upgradeTimeout = HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT;
+   }
+
+   /* Poll upgrade status until completion or timeout*/
+   timeoutSec1 = time(NULL);
+   timeoutSec2 = time(NULL);
+   rc = HpmfwupgGetUpgradeStatus(intf, &upgStatusCmd, pFwupgCtx);
+   
+   while((upgStatusCmd.resp.lastCmdCompCode == HPMFWUPG_COMMAND_IN_PROGRESS ) &&
+         (timeoutSec2 - timeoutSec1 < upgradeTimeout ) && 
+         (rc == HPMFWUPG_SUCCESS) )
+   {
+      /* Must wait at least 100 ms between status requests */
+      usleep(100000);
+      timeoutSec2 = time(NULL);
+      rc = HpmfwupgGetUpgradeStatus(intf, &upgStatusCmd, pFwupgCtx);
+   }
+  
+   if ( upgStatusCmd.resp.lastCmdCompCode != 0x00 )
+   {
+      if ( verbose )
+      {
+         lprintf(LOG_NOTICE,"Error waiting for command %x, compcode = %x",  
+                            upgStatusCmd.resp.cmdInProcess, 
+                            upgStatusCmd.resp.lastCmdCompCode);
+      }
+      rc = HPMFWUPG_ERROR;
+   }
+   
+   return rc;
+}     
+
+unsigned char HpmfwupgCalculateChecksum(unsigned char* pData, unsigned int length)
+{
+   unsigned char checksum = 0;
+   int dataIdx = 0;
+
+   for ( dataIdx = 0; dataIdx < length; dataIdx++ )
+   {
+      checksum += pData[dataIdx];
+   }
+   return checksum;
+}   
+
+static void HpmfwupgPrintUsage(void)
+{
+   lprintf(LOG_NOTICE,"help                    - This help menu");   
+   lprintf(LOG_NOTICE,"upgrade <file> activate - Upgrade the firmware using a valid HPM.1 image <file>");
+   lprintf(LOG_NOTICE,"                          If activate is specified, activate new firmware rigth");
+   lprintf(LOG_NOTICE,"                          away");
+   lprintf(LOG_NOTICE,"activate                - Activate the newly uploaded firmware");
+   lprintf(LOG_NOTICE,"targetcap               - Get the target upgrade capabilities");
+   lprintf(LOG_NOTICE,"compprop <id> <select>  - Get the specified component properties");
+   lprintf(LOG_NOTICE,"                          Valid component <ID> 0-7 ");
+   lprintf(LOG_NOTICE,"                          Properties <select> can be one of the following: ");
+   lprintf(LOG_NOTICE,"                          0- General properties");
+   lprintf(LOG_NOTICE,"                          1- Current firmware version");
+   lprintf(LOG_NOTICE,"                          2- Description string");
+   lprintf(LOG_NOTICE,"                          3- Rollback firmware version");
+   lprintf(LOG_NOTICE,"                          4- Deferred firmware version");
+   lprintf(LOG_NOTICE,"abort                   - Abort the on-going firmware upgrade");
+   lprintf(LOG_NOTICE,"upgstatus               - Returns the status of the last long duration command");
+   lprintf(LOG_NOTICE,"rollback                - Performs a manual rollback on the IPM Controller");
+   lprintf(LOG_NOTICE,"                          firmware");
+   lprintf(LOG_NOTICE,"rollbackstatus          - Query the rollback status");
+   lprintf(LOG_NOTICE,"selftestresult          - Query the self test results\n");
+}
+
+int ipmi_hpmfwupg_main(struct ipmi_intf * intf, int argc, char ** argv)
+{
+   int rc = HPMFWUPG_SUCCESS;
+   
+   lprintf(LOG_DEBUG,"ipmi_hpmfwupg_main()");
+   
+
+   lprintf(LOG_NOTICE,"\nPICMG HPM.1 Upgrade Agent %d.%d: \n", 
+           HPMFWUPG_VERSION_MAJOR, HPMFWUPG_VERSION_MINOR);
+   
+   if ( (argc == 0) || (strcmp(argv[0], "help") == 0) ) 
+   {
+      HpmfwupgPrintUsage();
+	}
+   else if ( (argc == 2) && (strcmp(argv[0], "upgrade") == 0) )
+   {
+      rc = HpmfwupgUpgrade(intf, argv[1], 0);
+   }
+   else if ( (argc == 3) && (strcmp(argv[0], "upgrade") == 0) )
+   {
+      if ( strcmp(argv[2], "activate") == 0 )
+      {
+         rc = HpmfwupgUpgrade(intf, argv[1], 1);
+      }
+      else
+      {
+         HpmfwupgPrintUsage();         
+      }
+   }
+   else if ( (argc == 1) && (strcmp(argv[0], "activate") == 0) )
+   {
+      struct HpmfwupgActivateFirmwareCtx cmdCtx;
+      rc = HpmfwupgActivateFirmware(intf, &cmdCtx, NULL);
+   }
+   else if ( (argc == 1) && (strcmp(argv[0], "targetcap") == 0) )
+   {
+      struct HpmfwupgGetTargetUpgCapabilitiesCtx cmdCtx;
+      verbose++;
+      rc = HpmfwupgGetTargetUpgCapabilities(intf, &cmdCtx);
+   }
+   else if ( (argc == 3) && (strcmp(argv[0], "compprop") == 0) )
+   {
+      struct HpmfwupgGetComponentPropertiesCtx cmdCtx;
+      cmdCtx.req.componentId = strtol(argv[1], NULL, 0);
+      cmdCtx.req.selector    = strtol(argv[2], NULL, 0);
+      verbose++;
+      rc = HpmfwupgGetComponentProperties(intf, &cmdCtx);
+   }
+   else if ( (argc == 1) && (strcmp(argv[0], "abort") == 0) )
+   {
+      struct HpmfwupgAbortUpgradeCtx cmdCtx;
+      verbose++;
+      rc = HpmfwupgAbortUpgrade(intf, &cmdCtx);
+   }
+   else if ( (argc == 1) && (strcmp(argv[0], "upgstatus") == 0) )
+   {
+      struct HpmfwupgGetUpgradeStatusCtx cmdCtx;
+      verbose++;
+      rc = HpmfwupgGetUpgradeStatus(intf, &cmdCtx, NULL);
+   }   
+   else if ( (argc == 1) && (strcmp(argv[0], "rollback") == 0) )
+   {
+      struct HpmfwupgManualFirmwareRollbackCtx cmdCtx;
+      verbose++;  
+      rc = HpmfwupgManualFirmwareRollback(intf, &cmdCtx, NULL);
+   }
+   else if ( (argc == 1) && (strcmp(argv[0], "rollbackstatus") == 0) )
+   {
+      struct HpmfwupgQueryRollbackStatusCtx  cmdCtx;
+      verbose++;
+      rc = HpmfwupgQueryRollbackStatus(intf, &cmdCtx, NULL);
+   }
+   else if ( (argc == 1) && (strcmp(argv[0], "selftestresult") == 0) )
+   {
+      struct HpmfwupgQuerySelftestResultCtx cmdCtx;
+      verbose++;
+      rc = HpmfwupgQuerySelftestResult(intf, &cmdCtx, NULL);
+   }
+   else
+   {                                                  
+      HpmfwupgPrintUsage(); 
+   }
+   
+   return rc;
+}
+