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: 46 - ipmi_fwum needs some re-work

Browse Source 
Dismantle KfwumMain() - download/upgrade fw

Commit removes KfwumMain() and creates ipmi_fwum_fwupgrade() instead.
This commit is contained in:
Zdenek Styblik 2013-10-26 19:27:15 +00:00
parent 5416af78a5
commit aca8d6ad7b
1 changed files with 46 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
ipmitool/lib/ipmi_fwum.c
View File

@ -48,17 +48,6 @@
#define VER_MAJOR 1 #define VER_MAJOR 1
#define VER_MINOR 3 #define VER_MINOR 3
typedef enum eKFWUM_Task
{
KFWUM_TASK_INFO,
KFWUM_TASK_STATUS,
KFWUM_TASK_DOWNLOAD,
KFWUM_TASK_UPGRADE,
KFWUM_TASK_START_UPGRADE,
KFWUM_TASK_ROLLBACK,
KFWUM_TASK_TRACELOG
} tKFWUM_Task;
typedef enum eKFWUM_BoardList typedef enum eKFWUM_BoardList
{ {
KFWUM_BOARD_KONTRON_UNKNOWN = 0, KFWUM_BOARD_KONTRON_UNKNOWN = 0,
@ -123,12 +112,10 @@ typedef struct sKFWUM_SaveFirmwareInfo
} tKFWUM_SaveFirmwareInfo; } tKFWUM_SaveFirmwareInfo;
extern int verbose; extern int verbose;
static unsigned char fileName[512];
static unsigned char firmBuf[1024*512]; static unsigned char firmBuf[1024*512];
static tKFWUM_SaveFirmwareInfo saveFirmwareInfo; static tKFWUM_SaveFirmwareInfo saveFirmwareInfo;
void printf_kfwum_help(void); void printf_kfwum_help(void);
int KfwumMain(struct ipmi_intf *intf, tKFWUM_Task task);
static tKFWUM_Status KfwumGetFileSize(unsigned char *pFileName, static tKFWUM_Status KfwumGetFileSize(unsigned char *pFileName,
unsigned long *pFileSize); unsigned long *pFileSize);
static tKFWUM_Status KfwumSetupBuffersFromFile(unsigned char *pFileName, static tKFWUM_Status KfwumSetupBuffersFromFile(unsigned char *pFileName,
@ -163,6 +150,7 @@ void printf_kfwum_info(tKFWUM_BoardInfo boardInfo,
tKFWUM_InFirmwareInfo firmInfo); tKFWUM_InFirmwareInfo firmInfo);
int ipmi_fwum_info(struct ipmi_intf *intf); int ipmi_fwum_info(struct ipmi_intf *intf);
int ipmi_fwum_status(struct ipmi_intf *intf); int ipmi_fwum_status(struct ipmi_intf *intf);
int ipmi_fwum_fwupgrade(struct ipmi_intf *intf, char *file, int action);
/* ipmi_fwum_main - entry point for this ipmitool mode /* ipmi_fwum_main - entry point for this ipmitool mode
* *
@ -198,26 +186,12 @@ ipmi_fwum_main(struct ipmi_intf *intf, int argc, char **argv)
"Path and file name must be specified."); "Path and file name must be specified.");
return (-1); return (-1);
} }
/* There is a file name in the parameters */ printf("Firmware File Name : %s\n", argv[1]);
if (strlen(argv[1]) >= 512) { rc = ipmi_fwum_fwupgrade(intf, argv[1], 0);
lprintf(LOG_ERR,
"File name length is limited to 512 characters.");
return (-1);
}
strcpy((char *)fileName, argv[1]);
printf("Firmware File Name : %s\n", fileName);
rc = KfwumMain(intf, KFWUM_TASK_DOWNLOAD);
} else if (strncmp(argv[0], "upgrade", 7) == 0) { } else if (strncmp(argv[0], "upgrade", 7) == 0) {
if ((argc >= 2) && (strlen(argv[1]) > 0)) { if ((argc >= 2) && (strlen(argv[1]) > 0)) {
/* There is a file name in the parameters */ printf("Upgrading using file name %s\n", argv[1]);
if (strlen(argv[1]) >= 512) { rc = ipmi_fwum_fwupgrade(intf, argv[1], 1);
lprintf(LOG_ERR,
"File name length is limited to 512 characters.");
return (-1);
}
strcpy((char *)fileName, argv[1]);
printf("Upgrading using file name %s\n", fileName);
rc = KfwumMain(intf, KFWUM_TASK_UPGRADE);
} else { } else {
rc = KfwumStartFirmwareUpgrade(intf); rc = KfwumStartFirmwareUpgrade(intf);
} }
@ -288,78 +262,62 @@ ipmi_fwum_status(struct ipmi_intf *intf)
return 0; return 0;
} }
/* KfwumMain - function implements upload of the firmware data received as /* ipmi_fwum_fwupgrade - function implements download/upload of the firmware
* parameters * data received as parameters
* *
* @task: task to do * @file: fw file
* @action: 0 = download, 1 = upload/start upload
* *
* returns 0 on success, otherwise (-1) * returns 0 on success, otherwise (-1)
*/ */
int int
KfwumMain(struct ipmi_intf *intf, tKFWUM_Task task) ipmi_fwum_fwupgrade(struct ipmi_intf *intf, char *file, int action)
{ {
tKFWUM_Status status = KFWUM_STATUS_OK; tKFWUM_BoardInfo b_info;
tKFWUM_BoardInfo boardInfo; tKFWUM_InFirmwareInfo fw_info = { 0 };
tKFWUM_InFirmwareInfo firmInfo = { 0 };
unsigned long fileSize = 0;
static unsigned short padding; static unsigned short padding;
unsigned long fsize = 0;
if ((status == KFWUM_STATUS_OK) unsigned char not_used;
&& ((task == KFWUM_TASK_UPGRADE) if (file == NULL) {
|| (task == KFWUM_TASK_DOWNLOAD))) { lprintf(LOG_ERR, "No file given.");
status = KfwumGetFileSize(fileName, &fileSize); return (-1);
if (status == KFWUM_STATUS_OK) {
status = KfwumSetupBuffersFromFile(fileName, fileSize);
if (status == KFWUM_STATUS_OK) {
padding = KfwumCalculateChecksumPadding(firmBuf, fileSize);
}
}
if (status == KFWUM_STATUS_OK) {
status = KfwumGetInfoFromFirmware(firmBuf, fileSize, &firmInfo);
}
if (status == KFWUM_STATUS_OK) {
status = KfwumGetDeviceInfo(intf, 0, &boardInfo);
}
if (status == KFWUM_STATUS_OK) {
status = ipmi_kfwum_checkfwcompat(boardInfo,firmInfo);
}
if (status == KFWUM_STATUS_OK) {
unsigned char notUsed;
KfwumGetInfo(intf, 0, &notUsed);
}
printf_kfwum_info(boardInfo,firmInfo);
} }
if ((status == KFWUM_STATUS_OK) if (KfwumGetFileSize(file, &fsize) != KFWUM_STATUS_OK) {
&& ((task == KFWUM_TASK_UPGRADE) return (-1);
|| (task == KFWUM_TASK_DOWNLOAD))) {
status = KfwumStartFirmwareImage(intf, fileSize, padding);
} }
if ((status == KFWUM_STATUS_OK) if (KfwumSetupBuffersFromFile(file, fsize) != KFWUM_STATUS_OK) {
&& ((task == KFWUM_TASK_UPGRADE) return (-1);
|| (task == KFWUM_TASK_DOWNLOAD))) {
status = KfwumUploadFirmware(intf, firmBuf, fileSize);
} }
if ((status == KFWUM_STATUS_OK) padding = KfwumCalculateChecksumPadding(firmBuf, fsize);
&& ((task == KFWUM_TASK_UPGRADE) if (KfwumGetInfoFromFirmware(firmBuf, fsize, &fw_info) != KFWUM_STATUS_OK) {
|| (task == KFWUM_TASK_DOWNLOAD))) { return (-1);
status = KfwumFinishFirmwareImage(intf, firmInfo);
} }
if ((status == KFWUM_STATUS_OK) if (KfwumGetDeviceInfo(intf, 0, &b_info) != KFWUM_STATUS_OK) {
&& ((task == KFWUM_TASK_UPGRADE) return (-1);
|| (task == KFWUM_TASK_DOWNLOAD))) {
status = KfwumGetStatus(intf);
} }
if ((status == KFWUM_STATUS_OK) if (ipmi_kfwum_checkfwcompat(b_info, fw_info) != KFWUM_STATUS_OK) {
&& ((task == KFWUM_TASK_UPGRADE) return (-1);
|| (task == KFWUM_TASK_START_UPGRADE))) { }
KfwumGetInfo(intf, 0, &not_used);
printf_kfwum_info(b_info, fw_info);
if (KfwumStartFirmwareImage(intf, fsize, padding) != KFWUM_STATUS_OK) {
return (-1);
}
if (KfwumUploadFirmware(intf, firmBuf, fsize) != KFWUM_STATUS_OK) {
return (-1);
}
if (KfwumFinishFirmwareImage(intf, fw_info) != KFWUM_STATUS_OK) {
return (-1);
}
if (KfwumGetStatus(intf) != KFWUM_STATUS_OK) {
return (-1);
}
if (action != 0) {
if (KfwumStartFirmwareUpgrade(intf) != 0) { if (KfwumStartFirmwareUpgrade(intf) != 0) {
status = KFWUM_STATUS_ERROR; return (-1);
} }
} }
if (status == KFWUM_STATUS_OK) { return 0;
return 0;
}
return (-1);
} }
/* KfwumGetFileSize - gets the file size /* KfwumGetFileSize - gets the file size