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

- Change wait duration command sleep to 1 seconds

Browse Source 
- In dual stage mode, use target capabilities command instead of file when unavailable
This commit is contained in:
Jean-Michel Audet 2010-05-13 17:43:55 +00:00
parent 5e0e128eb3
commit 31bee2ebff
1 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
ipmitool/lib/ipmi_hpmfwupg.c
View File

@ -206,7 +206,7 @@ extern int verbose;
static int errorCount; static int errorCount;
#define HPMFWUPG_IS_RETRYABLE(error) \ #define HPMFWUPG_IS_RETRYABLE(error) \
((((error==0x83)||(error==0x82)) && (errorCount++<RETRY_COUNT_MAX))?TRUE:FALSE) ((((error==0x83)||(error==0x82)||(error==0x80)) && (errorCount++<RETRY_COUNT_MAX))?TRUE:FALSE)
#else #else
#define HPMFWUPG_IS_RETRYABLE(error) FALSE #define HPMFWUPG_IS_RETRYABLE(error) FALSE
#endif #endif
@ -596,7 +596,7 @@ struct HpmfwupgInitiateUpgradeActionCtx
* UPLOAD FIRMWARE BLOCK DEFINITIONS * UPLOAD FIRMWARE BLOCK DEFINITIONS
*/ */
#define HPMFWUPG_SEND_DATA_COUNT_MAX 128 #define HPMFWUPG_SEND_DATA_COUNT_MAX 256
#define HPMFWUPG_SEND_DATA_COUNT_KCS 30 #define HPMFWUPG_SEND_DATA_COUNT_KCS 30
#define HPMFWUPG_SEND_DATA_COUNT_LAN 25 #define HPMFWUPG_SEND_DATA_COUNT_LAN 25
#define HPMFWUPG_SEND_DATA_COUNT_IPMB 26 #define HPMFWUPG_SEND_DATA_COUNT_IPMB 26
@ -3580,27 +3580,49 @@ int HpmfwupgWaitLongDurationCmd(struct ipmi_intf *intf, struct HpmfwupgUpgradeCt
if ( pFwupgCtx != NULL ) if ( pFwupgCtx != NULL )
{ {
upgradeTimeout = pFwupgCtx->targetCap.upgradeTimeout*5; upgradeTimeout = pFwupgCtx->targetCap.upgradeTimeout*5;
if ( verbose )
printf("Use File Upgrade Capabilities: %i seconds\n", upgradeTimeout);
} }
else else
{ {
upgradeTimeout = HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT; /* Try to retreive from Caps */
struct HpmfwupgGetTargetUpgCapabilitiesCtx targetCapCmd;
if(HpmfwupgGetTargetUpgCapabilities(intf, &targetCapCmd) != HPMFWUPG_SUCCESS)
{
upgradeTimeout = HPMFWUPG_DEFAULT_UPGRADE_TIMEOUT;
if ( verbose )
printf("Use default timeout: %i seconds\n", upgradeTimeout);
}
else
{
upgradeTimeout = (targetCapCmd.resp.upgradeTimeout * 5);
if ( verbose )
printf("Use Command Upgrade Capabilities Timeout: %i seconds\n", upgradeTimeout);
}
} }
/* Poll upgrade status until completion or timeout*/ if(rc == HPMFWUPG_SUCCESS)
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 */ /* Poll upgrade status until completion or timeout*/
usleep(100000); timeoutSec1 = time(NULL);
timeoutSec2 = time(NULL); timeoutSec2 = time(NULL);
rc = HpmfwupgGetUpgradeStatus(intf, &upgStatusCmd, pFwupgCtx); rc = HpmfwupgGetUpgradeStatus(intf, &upgStatusCmd, pFwupgCtx);
} }
while(
(upgStatusCmd.resp.lastCmdCompCode == HPMFWUPG_COMMAND_IN_PROGRESS ) &&
(timeoutSec2 - timeoutSec1 < upgradeTimeout ) &&
(rc == HPMFWUPG_SUCCESS)
)
{
/* Must wait at least 1000 ms between status requests */
usleep(1000000);
rc = HpmfwupgGetUpgradeStatus(intf, &upgStatusCmd, pFwupgCtx);
//printf("Get Status: %x - %x = %x _ %x [%x]\n", timeoutSec2, timeoutSec1,(timeoutSec2 - timeoutSec1),upgradeTimeout, rc);
}
if ( upgStatusCmd.resp.lastCmdCompCode != 0x00 ) if ( upgStatusCmd.resp.lastCmdCompCode != 0x00 )
{ {
if ( verbose ) if ( verbose )