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

chassis: Refactor to reduce code duplication

Browse Source 
Get rid of repeated code that sets the set-in-progress parameter.
Introduce chassis_bootparam_set_in_progress() function to do
the job.

Signed-off-by: Alexander Amelkin <alexander@amelkin.msk.ru>
This commit is contained in:
Alexander Amelkin 2019-05-28 14:43:54 +03:00
parent 12e2f5da63
commit 432ea31804
No known key found for this signature in database
GPG Key ID: E893587B5B74178D
1 changed files with 69 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

169
lib/ipmi_chassis.c
View File

@ -472,11 +472,11 @@ ipmi_chassis_set_bootparam(struct ipmi_intf * intf, uint8_t param, uint8_t * dat
lprintf(LOG_ERR, "Set Chassis Boot Parameter %d failed: %s", lprintf(LOG_ERR, "Set Chassis Boot Parameter %d failed: %s",
param, val2str(rsp->ccode, completion_code_vals)); param, val2str(rsp->ccode, completion_code_vals));
} }
return -1; return rsp->ccode;
} }
lprintf(LOG_DEBUG, "Chassis Set Boot Parameter %d to %s", param, buf2str(data, len)); lprintf(LOG_DEBUG, "Chassis Set Boot Parameter %d to %s", param, buf2str(data, len));
return 0; return IPMI_CC_OK;
} }
static int static int
@ -842,77 +842,81 @@ ipmi_chassis_get_bootvalid(struct ipmi_intf * intf)
return(rsp->data[2]); return(rsp->data[2]);
} }
typedef enum {
SET_COMPLETE,
SET_IN_PROGRESS,
COMMIT_WRITE,
RESERVED
} progress_t;
static
void
chassis_bootparam_set_in_progress(struct ipmi_intf *intf, progress_t progress)
{
/*
* By default try to set/clear set-in-progress parameter before/after
* changing any boot parameters. If setting fails, the code will set
* this flag to false and stop trying to fiddle with it for future
* requests.
*/
static bool use_progress = true;
uint8_t flag = progress;
int rc;
if (!use_progress) {
return;
}
rc = ipmi_chassis_set_bootparam(intf,
IPMI_CHASSIS_BOOTPARAM_SET_IN_PROGRESS,
&flag, 1);
/*
* Only disable future checks if set in progress status setting failed.
* Setting of other statuses may fail legitimately.
*/
if (rc && SET_IN_PROGRESS == progress) {
use_progress = false;
}
}
static int static int
ipmi_chassis_set_bootvalid(struct ipmi_intf *intf, uint8_t set_flag, uint8_t clr_flag) ipmi_chassis_set_bootvalid(struct ipmi_intf *intf, uint8_t set_flag, uint8_t clr_flag)
{ {
int bootvalid; int bootvalid;
uint8_t flags[5]; uint8_t flags[2];
int rc = 0; int rc = IPMI_CC_UNSPECIFIED_ERROR;
int use_progress = 1;
uint8_t param_id = IPMI_CHASSIS_BOOTPARAM_FLAG_VALID;
if (use_progress) { chassis_bootparam_set_in_progress(intf, SET_IN_PROGRESS);
/* set set-in-progress flag */
memset(flags, 0, 5);
flags[0] = 0x01;
rc = ipmi_chassis_set_bootparam(intf,
IPMI_CHASSIS_BOOTPARAM_SET_IN_PROGRESS, flags, 1);
if (rc < 0)
use_progress = 0;
}
memset(flags, 0, 5); memset(flags, 0, 5);
flags[0] = 0x01; flags[0] = 0x01;
flags[1] = 0x01; flags[1] = 0x01;
rc = ipmi_chassis_set_bootparam(intf, IPMI_CHASSIS_BOOTPARAM_INFO_ACK, rc = ipmi_chassis_set_bootparam(intf, IPMI_CHASSIS_BOOTPARAM_INFO_ACK,
flags, 2); flags, 2);
if (rc < 0) { if (rc) {
if (use_progress) { goto out;
/* set-in-progress = set-complete */
memset(flags, 0, 5);
ipmi_chassis_set_bootparam(intf,
IPMI_CHASSIS_BOOTPARAM_SET_IN_PROGRESS,
flags, 1);
}
return -1;
} }
bootvalid = ipmi_chassis_get_bootvalid(intf); bootvalid = ipmi_chassis_get_bootvalid(intf);
if (bootvalid < 0) { if (bootvalid < 0) {
if (use_progress) { lprintf(LOG_ERR, "Failed to read boot valid flag");
/* set-in-progress = set-complete */ rc = bootvalid;
memset(flags, 0, 5); goto out;
ipmi_chassis_set_bootparam(intf,
IPMI_CHASSIS_BOOTPARAM_SET_IN_PROGRESS,
flags, 1);
}
return -1;
} }
flags[0] = (bootvalid & ~clr_flag) | set_flag; flags[0] = (bootvalid & ~clr_flag) | set_flag;
rc = ipmi_chassis_set_bootparam(intf,
rc = ipmi_chassis_set_bootparam(intf, param_id, flags, 1); IPMI_CHASSIS_BOOTPARAM_FLAG_VALID,
flags, 1);
if (rc == 0) { if (IPMI_CC_OK == rc) {
if (use_progress) { chassis_bootparam_set_in_progress(intf, COMMIT_WRITE);
/* set-in-progress = commit-write */
memset(flags, 0, 5);
flags[0] = 0x02;
ipmi_chassis_set_bootparam(intf,
IPMI_CHASSIS_BOOTPARAM_SET_IN_PROGRESS,
flags, 1);
}
}
if (use_progress) {
/* set-in-progress = set-complete */
memset(flags, 0, 5);
ipmi_chassis_set_bootparam(intf,
IPMI_CHASSIS_BOOTPARAM_SET_IN_PROGRESS,
flags, 1);
} }
out:
chassis_bootparam_set_in_progress(intf, SET_COMPLETE);
return rc; return rc;
} }
@ -921,17 +925,8 @@ ipmi_chassis_set_bootdev(struct ipmi_intf * intf, char * arg, uint8_t *iflags)
{ {
uint8_t flags[5]; uint8_t flags[5];
int rc = 0; int rc = 0;
int use_progress = 1;
if (use_progress) { chassis_bootparam_set_in_progress(intf, SET_IN_PROGRESS);
/* set set-in-progress flag */
memset(flags, 0, 5);
flags[0] = 0x01;
rc = ipmi_chassis_set_bootparam(intf,
IPMI_CHASSIS_BOOTPARAM_SET_IN_PROGRESS, flags, 1);
if (rc < 0)
use_progress = 0;
}
memset(flags, 0, 5); memset(flags, 0, 5);
flags[0] = 0x01; flags[0] = 0x01;
@ -940,14 +935,7 @@ ipmi_chassis_set_bootdev(struct ipmi_intf * intf, char * arg, uint8_t *iflags)
flags, 2); flags, 2);
if (rc < 0) { if (rc < 0) {
if (use_progress) { goto out;
/* set-in-progress = set-complete */
memset(flags, 0, 5);
ipmi_chassis_set_bootparam(intf,
IPMI_CHASSIS_BOOTPARAM_SET_IN_PROGRESS,
flags, 1);
}
return -1;
} }
if (!iflags) if (!iflags)
@ -982,42 +970,23 @@ ipmi_chassis_set_bootdev(struct ipmi_intf * intf, char * arg, uint8_t *iflags)
flags[1] |= 0x18; flags[1] |= 0x18;
else { else {
lprintf(LOG_ERR, "Invalid argument: %s", arg); lprintf(LOG_ERR, "Invalid argument: %s", arg);
if (use_progress) { rc = -1;
/* set-in-progress = set-complete */ goto out;
memset(flags, 0, 5);
ipmi_chassis_set_bootparam(intf,
IPMI_CHASSIS_BOOTPARAM_SET_IN_PROGRESS,
flags, 1);
}
return -1;
} }
/* set flag valid bit */ /* set flag valid bit */
flags[0] |= 0x80; flags[0] |= 0x80;
rc = ipmi_chassis_set_bootparam(intf, IPMI_CHASSIS_BOOTPARAM_BOOT_FLAGS, rc = ipmi_chassis_set_bootparam(intf,
flags, 5); IPMI_CHASSIS_BOOTPARAM_BOOT_FLAGS,
if (rc == 0) { flags, 5);
if (use_progress) { if (IPMI_CC_OK == rc) {
/* set-in-progress = commit-write */ chassis_bootparam_set_in_progress(intf, COMMIT_WRITE);
memset(flags, 0, 5);
flags[0] = 0x02;
ipmi_chassis_set_bootparam(intf,
IPMI_CHASSIS_BOOTPARAM_SET_IN_PROGRESS,
flags, 1);
}
printf("Set Boot Device to %s\n", arg); printf("Set Boot Device to %s\n", arg);
} }
if (use_progress) { out:
/* set-in-progress = set-complete */ chassis_bootparam_set_in_progress(intf, SET_COMPLETE);
memset(flags, 0, 5);
ipmi_chassis_set_bootparam(intf,
IPMI_CHASSIS_BOOTPARAM_SET_IN_PROGRESS,
flags, 1);
}
return rc; return rc;
} }