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

Restored ability to resize "firmware block" packets.

Browse Source 
The size was set to 'ok' on any successful command, even if it was not HPMFWUPG_UPLOAD_FIRMWARE_BLOCK.
Incremented subminor revision
This commit is contained in:
Francois Isabelle 2010-01-20 15:01:03 +00:00
parent 57dc49803e
commit 6878547f27
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ipmitool/lib/ipmi_hpmfwupg.c
View File

@ -154,7 +154,7 @@ extern int verbose;
*/ */
#define HPMFWUPG_VERSION_MAJOR 1 #define HPMFWUPG_VERSION_MAJOR 1
#define HPMFWUPG_VERSION_MINOR 0 #define HPMFWUPG_VERSION_MINOR 0
#define HPMFWUPG_VERSION_SUBMINOR 6 #define HPMFWUPG_VERSION_SUBMINOR 8
/* /*
* HPM.1 FIRMWARE UPGRADE COMMANDS (part of PICMG) * HPM.1 FIRMWARE UPGRADE COMMANDS (part of PICMG)
@ -1982,8 +1982,10 @@ int HpmfwupgPreUpgradeCheck(struct ipmi_intf *intf, struct HpmfwupgUpgradeCtx* p
pVersionInfo->skipUpgrade = TRUE; pVersionInfo->skipUpgrade = TRUE;
} }
} }
if ( verbose ) {
lprintf(LOG_NOTICE,"Component %d: %s", componentId , (pVersionInfo->skipUpgrade?"skipped":"to update")); lprintf(LOG_NOTICE,"Component %d: %s", componentId , (pVersionInfo->skipUpgrade?"skipped":"to update"));
} }
}
if( pVersionInfo->skipUpgrade == FALSE ) if( pVersionInfo->skipUpgrade == FALSE )
{ {
pFwupgCtx->compUpdateMask.ComponentBits.byte |= 1<<componentId; pFwupgCtx->compUpdateMask.ComponentBits.byte |= 1<<componentId;
@ -2329,10 +2331,14 @@ static int HpmFwupgActionUploadFirmware
if ( strstr(intf->name,"lan") != NULL ) if ( strstr(intf->name,"lan") != NULL )
{ {
bufLength -= (unsigned char)8; bufLength -= (unsigned char)8;
lprintf(LOG_INFO,"Trying reduced buffer length: %d",
bufLength);
} }
else else
{ {
bufLength -= (unsigned char)1; bufLength -= (unsigned char)1;
lprintf(LOG_INFO,"Trying reduced buffer length: %d",
bufLength);
} }
rc = HPMFWUPG_SUCCESS; rc = HPMFWUPG_SUCCESS;
} }
@ -3501,8 +3507,21 @@ struct ipmi_rs * HpmfwupgSendCmd(struct ipmi_intf *intf, struct ipmi_rq req,
} }
#endif #endif
retry = 0; retry = 0;
if
(
req.msg.netfn == IPMI_NETFN_PICMG
&&
req.msg.cmd == HPMFWUPG_UPLOAD_FIRMWARE_BLOCK
&&
(!isValidSize)
)
{
lprintf(LOG_INFO,"Buffer length is now considered valid" );
isValidSize = TRUE; isValidSize = TRUE;
} }
}
}while( retry ); }while( retry );
return rsp; return rsp;
} }