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

ID: 50 - ipmi_hpmfwupg needs a clean up

Browse Source 
HpmfwupgUploadFirmwareBlock() - kill a bit of indent by re-writing one if().
This commit is contained in:
Zdenek Styblik 2013-10-10 11:42:32 +00:00
parent 18aadc30d0
commit 6de0796079
1 changed files with 53 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
ipmitool/lib/ipmi_hpmfwupg.c
View File

@ -1867,65 +1867,64 @@ HpmfwupgUploadFirmwareBlock(struct ipmi_intf *intf,
/* 2 is the size of the upload struct - data */ /* 2 is the size of the upload struct - data */
req.msg.data_len = 2 + count; req.msg.data_len = 2 + count;
rsp = HpmfwupgSendCmd(intf, req, pFwupgCtx); rsp = HpmfwupgSendCmd(intf, req, pFwupgCtx);
if (rsp) { if (rsp == NULL) {
if (rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS lprintf(LOG_NOTICE, "Error uploading firmware block.");
|| rsp->ccode == 0x00) { return HPMFWUPG_ERROR;
}
if (rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS
|| rsp->ccode == 0x00) {
/*
* We need to check if the response also contains the next upload firmware offset
* and the firmware length in its response - These are optional but very vital
*/
if (rsp->data_len > 1) {
/* /*
* We need to check if the response also contains the next upload firmware offset * If the response data length is greater than 1 it should contain both the
* and the firmware length in its response - These are optional but very vital * the Section offset and section length. Because we cannot just have
* Section offset without section length so the length should be 9
*/ */
if (rsp->data_len > 1) { if (rsp->data_len == 9) {
/* /* rsp->data[1] - LSB rsp->data[2] - rsp->data[3] = MSB */
* If the response data length is greater than 1 it should contain both the *imageOffset = (rsp->data[4] << 24) + (rsp->data[3] << 16) + (rsp->data[2] << 8) + rsp->data[1];
* the Section offset and section length. Because we cannot just have *blockLength = (rsp->data[8] << 24) + (rsp->data[7] << 16) + (rsp->data[6] << 8) + rsp->data[5];
* Section offset without section length so the length should be 9
*/
if (rsp->data_len == 9) {
/* rsp->data[1] - LSB rsp->data[2] - rsp->data[3] = MSB */
*imageOffset = (rsp->data[4] << 24) + (rsp->data[3] << 16) + (rsp->data[2] << 8) + rsp->data[1];
*blockLength = (rsp->data[8] << 24) + (rsp->data[7] << 16) + (rsp->data[6] << 8) + rsp->data[5];
} else {
/*
* The Spec does not say much for this kind of errors where the
* firmware returned only offset and length so currently returning it
* as 0x82 - Internal CheckSum Error
*/
lprintf(LOG_NOTICE,
"Error wrong rsp->datalen %d for Upload Firmware block command\n",
rsp->data_len);
rsp->ccode = HPMFWUPG_INT_CHECKSUM_ERROR;
}
}
}
/* Long duration command handling */
if (rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS) {
rc = HpmfwupgWaitLongDurationCmd(intf, pFwupgCtx);
} else if (rsp->ccode != 0x00) {
/* 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;
} else if ( rsp->ccode == IPMI_CC_REQ_DATA_INV_LENGTH ||
rsp->ccode == IPMI_CC_REQ_DATA_FIELD_EXCEED) {
/* If completion code = 0xc7(0xc8), we will retry with a reduced buffer length.
* Do not print error.
*/
rc = HPMFWUPG_UPLOAD_BLOCK_LENGTH;
} else { } else {
lprintf(LOG_NOTICE,"Error uploading firmware block"); /*
lprintf(LOG_NOTICE,"compcode=0x%x: %s", * The Spec does not say much for this kind of errors where the
rsp->ccode, * firmware returned only offset and length so currently returning it
val2str(rsp->ccode, * as 0x82 - Internal CheckSum Error
completion_code_vals)); */
rc = HPMFWUPG_ERROR; lprintf(LOG_NOTICE,
"Error wrong rsp->datalen %d for Upload Firmware block command\n",
rsp->data_len);
rsp->ccode = HPMFWUPG_INT_CHECKSUM_ERROR;
} }
} }
} else { }
lprintf(LOG_NOTICE, "Error uploading firmware block\n"); /* Long duration command handling */
rc = HPMFWUPG_ERROR; if (rsp->ccode == HPMFWUPG_COMMAND_IN_PROGRESS) {
rc = HpmfwupgWaitLongDurationCmd(intf, pFwupgCtx);
} else if (rsp->ccode != 0x00) {
/* 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;
} else if (rsp->ccode == IPMI_CC_REQ_DATA_INV_LENGTH ||
rsp->ccode == IPMI_CC_REQ_DATA_FIELD_EXCEED) {
/* If completion code = 0xc7(0xc8), we will retry with a reduced buffer length.
* Do not print error.
*/
rc = HPMFWUPG_UPLOAD_BLOCK_LENGTH;
} else {
lprintf(LOG_ERR, "Error uploading firmware block");
lprintf(LOG_ERR, "compcode=0x%x: %s",
rsp->ccode,
val2str(rsp->ccode,
completion_code_vals));
rc = HPMFWUPG_ERROR;
}
} }
return rc; return rc;
} }