deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-11 19:17:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes for multi-latform support.

Browse Source 
Fix for timeouts during firmware rollback. If completion code is C3, wait till timeout has expired before reporting it.
This commit is contained in:
Marie-Josee Blais 2010-08-11 17:13:21 +00:00
parent fdf49777b9
commit 13bb060366
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ipmitool/lib/ipmi_hpmfwupg.c
View File

@ -265,8 +265,8 @@ struct HpmfwupgComponentBitMask
unsigned char component6 : 1; unsigned char component6 : 1;
unsigned char component7 : 1; unsigned char component7 : 1;
#endif #endif
}bitField; }ATTRIBUTE_PACKING bitField;
}ComponentBits; }ATTRIBUTE_PACKING ComponentBits;
} ATTRIBUTE_PACKING; } ATTRIBUTE_PACKING;
#ifdef HAVE_PRAGMA_PACK #ifdef HAVE_PRAGMA_PACK
#pragma pack(0) #pragma pack(0)
@ -326,8 +326,8 @@ struct HpmfwupgGetTargetUpgCapabilitiesResp
unsigned char autRollbackOverride : 1; unsigned char autRollbackOverride : 1;
unsigned char fwUpgUndesirable : 1; unsigned char fwUpgUndesirable : 1;
#endif #endif
}bitField; }ATTRIBUTE_PACKING bitField;
}GlobalCapabilities; }ATTRIBUTE_PACKING GlobalCapabilities;
unsigned char upgradeTimeout; unsigned char upgradeTimeout;
unsigned char selftestTimeout; unsigned char selftestTimeout;
unsigned char rollbackTimeout; unsigned char rollbackTimeout;
@ -404,8 +404,8 @@ struct HpmfwupgGetGeneralPropResp
unsigned char payloadColdReset : 1; unsigned char payloadColdReset : 1;
unsigned char reserved : 2; unsigned char reserved : 2;
#endif #endif
}bitfield; }ATTRIBUTE_PACKING bitfield;
}GeneralCompProperties; }ATTRIBUTE_PACKING GeneralCompProperties;
} ATTRIBUTE_PACKING; } ATTRIBUTE_PACKING;
#ifdef HAVE_PRAGMA_PACK #ifdef HAVE_PRAGMA_PACK
#pragma pack(0) #pragma pack(0)
@ -488,7 +488,7 @@ struct HpmfwupgGetComponentPropertiesResp
struct HpmfwupgGetRollbackFwVersionResp rollbackFwVersionResp; struct HpmfwupgGetRollbackFwVersionResp rollbackFwVersionResp;
struct HpmfwupgGetDeferredFwVersionResp deferredFwVersionResp; struct HpmfwupgGetDeferredFwVersionResp deferredFwVersionResp;
struct HpmfwupgGetOemProperties oemProperties; struct HpmfwupgGetOemProperties oemProperties;
}Response; }ATTRIBUTE_PACKING Response;
} ATTRIBUTE_PACKING; } ATTRIBUTE_PACKING;
#ifdef HAVE_PRAGMA_PACK #ifdef HAVE_PRAGMA_PACK
#pragma pack(0) #pragma pack(0)
@ -916,9 +916,9 @@ struct HpmfwupgImageHeader
unsigned char autRollback : 1; unsigned char autRollback : 1;
unsigned char imageSelfTest : 1; unsigned char imageSelfTest : 1;
#endif #endif
} bitField; } ATTRIBUTE_PACKING bitField;
unsigned char byte; unsigned char byte;
}imageCapabilities; }ATTRIBUTE_PACKING imageCapabilities;
struct HpmfwupgComponentBitMask components; struct HpmfwupgComponentBitMask components;
unsigned char selfTestTimeout; unsigned char selfTestTimeout;
unsigned char rollbackTimeout; unsigned char rollbackTimeout;
@ -2290,7 +2290,14 @@ static int HpmFwupgActionUploadFirmware
/* Check if we receive size in parameters */ /* Check if we receive size in parameters */
if(intf->channel_buf_size != 0) if(intf->channel_buf_size != 0)
{ {
bufLength = intf->channel_buf_size - 9; /* Plan for overhead */ if (intf->target_addr == intf->my_addr)
{
bufLength = intf->channel_buf_size - 9; /* Plan for overhead */
}
else
{
bufLength = intf->channel_buf_size - 11; /* Plan for overhead */
}
} }
else else
{ {
@ -2352,6 +2359,7 @@ static int HpmFwupgActionUploadFirmware
displayFWLength= firmwareLength; displayFWLength= firmwareLength;
time(&start); time(&start);
while ( (pData < (pDataTemp+lengthOfBlock)) && (rc == HPMFWUPG_SUCCESS) ) while ( (pData < (pDataTemp+lengthOfBlock)) && (rc == HPMFWUPG_SUCCESS) )
{ {
if ( (pData+bufLength) <= (pDataTemp+lengthOfBlock) ) if ( (pData+bufLength) <= (pDataTemp+lengthOfBlock) )
@ -2689,7 +2697,7 @@ int HpmfwupgGetTargetUpgCapabilities(struct ipmi_intf *intf,
lprintf(LOG_NOTICE,"Upgrade timeout.........[%d sec] ", pCtx->resp.upgradeTimeout*5); 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,"Self test timeout.......[%d sec] ", pCtx->resp.selftestTimeout*5);
lprintf(LOG_NOTICE,"Rollback timeout........[%d sec] ", pCtx->resp.rollbackTimeout*5); lprintf(LOG_NOTICE,"Rollback timeout........[%d sec] ", pCtx->resp.rollbackTimeout*5);
lprintf(LOG_NOTICE,"Inaccessibility timeout.[%d sec] \n", pCtx->resp.rollbackTimeout*5); lprintf(LOG_NOTICE,"Inaccessibility timeout.[%d sec] \n", pCtx->resp.inaccessTimeout*5);
} }
} }
else else
@ -3174,7 +3182,6 @@ int HpmfwupgManualFirmwareRollback(struct ipmi_intf *intf, struct HpmfwupgManual
struct HpmfwupgQueryRollbackStatusCtx resCmd; struct HpmfwupgQueryRollbackStatusCtx resCmd;
printf("Waiting firmware rollback..."); printf("Waiting firmware rollback...");
fflush(stdout); fflush(stdout);
rc = HpmfwupgQueryRollbackStatus(intf, &resCmd, pFwupgCtx); rc = HpmfwupgQueryRollbackStatus(intf, &resCmd, pFwupgCtx);
} }
else if ( rsp->ccode != 0x00 ) else if ( rsp->ccode != 0x00 )
@ -3255,7 +3262,8 @@ int HpmfwupgQueryRollbackStatus(struct ipmi_intf *intf, struct HpmfwupgQueryRoll
timeoutSec2 = time(NULL); timeoutSec2 = time(NULL);
}while( rsp && }while( rsp &&
(rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS) && ((rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS) ||
(rsp->ccode == IPMI_CC_TIMEOUT)) &&
(timeoutSec2 - timeoutSec1 < rollbackTimeout ) ); (timeoutSec2 - timeoutSec1 < rollbackTimeout ) );
if ( rsp ) if ( rsp )