deepblue/ipmitool
1
0
Fork 0
mirror of https://github.com/ipmitool/ipmitool.git synced 2025-05-12 11:37:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

nm: Refactor to get rid of magic completion codes

Browse Source 
Replace all magic numbers implied to mean NM completions codes
with descriptive macro names.

Signed-off-by: Alexander Amelkin <alexander@amelkin.msk.ru>
This commit is contained in:
Alexander Amelkin 2019-02-25 18:31:33 +03:00
parent 5372a57297
commit 7469522fbb
No known key found for this signature in database
GPG Key ID: E893587B5B74178D
2 changed files with 50 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/ipmitool/ipmi_nm.h
View File

@ -60,6 +60,22 @@
#define IPMI_NM_RESET_TRIGGER 0x03 #define IPMI_NM_RESET_TRIGGER 0x03
#define IPMI_NM_BOOT_TRIGGER 0x04 #define IPMI_NM_BOOT_TRIGGER 0x04
/* Node Manager status codes, as per
* "Intel Intelligent Power Node Manager 3.0
* External Interface Specification using IPMI"
*/
#define IPMI_NM_CC_POLICY_ID_INVALID 0x80
#define IPMI_NM_CC_POLICY_DOMAIN_INVALID 0x81
#define IPMI_NM_CC_POLICY_TRIGGER_UNKNOWN 0x82
#define IPMI_NM_CC_POLICY_CORRECTION_RANGE 0x85
#define IPMI_NM_CC_POLICY_TRIGGER_RANGE 0x86
#define IPMI_NM_CC_POLICY_STATS_RANGE 0x89
#define IPMI_NM_CC_POLICY_LIMIT_NONE 0xA1
#define IPMI_NM_CC_POLICY_PARAM_BUSY 0xD5
#define IPMI_NM_CC_POLICY_VALUE_INVALID 0x8B
#define IPMI_NM_CC_STATS_MODE_INVALID 0x88
#define IPMI_NM_CC_POWER_LIMIT_RANGE 0x84
/* Policy Exception Actions flags */ /* Policy Exception Actions flags */
#define IPMI_NM_POLICY_ALERT 0x01 #define IPMI_NM_POLICY_ALERT 0x01
#define IPMI_NM_POLICY_SHUT 0x02 #define IPMI_NM_POLICY_SHUT 0x02

50
lib/ipmi_nm.c
View File

@ -269,20 +269,37 @@ const struct dcmi_cmd nm_suspend_cmds[] = {
}; };
const struct valstr nm_ccode_vals[] = { const struct valstr nm_ccode_vals[] = {
{ 0x80, "Policy ID Invalid" }, { IPMI_NM_CC_POLICY_ID_INVALID,
{ 0x81, "Domain ID Invalid" }, "Policy ID Invalid" },
{ 0x82, "Unknown policy trigger type" }, { IPMI_NM_CC_POLICY_DOMAIN_INVALID,
{ 0x84, "Power Limit out of range" }, "Domain ID Invalid" },
{ 0x85, "Correction Time out of range" }, { IPMI_NM_CC_POLICY_LIMIT_NONE,
{ 0x86, "Policy Trigger value out of range" }, "No policy is currently limiting for the specified domain ID" },
{ 0x88, "Invalid Mode" }, { IPMI_NM_CC_POLICY_CORRECTION_RANGE,
{ 0x89, "Statistics Reporting Period out of range" }, "Correction Time out of range" },
{ 0x8B, "Invalid value for Aggressive CPU correction field" }, { IPMI_NM_CC_POLICY_TRIGGER_UNKNOWN,
{ 0xA1, "No policy is currently limiting for the specified domain ID" }, "Unknown policy trigger type" },
{ 0xC4, "No space available" }, { IPMI_NM_CC_POLICY_TRIGGER_RANGE,
{ 0xD4, "Insufficient privilege level due wrong responder LUN" }, "Policy Trigger value out of range" },
{ 0xD5, "Policy exists and param unchangeable while enabled" }, { IPMI_NM_CC_POLICY_PARAM_BUSY,
{ 0xD6, "Command subfunction disabled or unavailable" }, "Policy exists and param unchangeable while enabled" },
{ IPMI_NM_CC_POLICY_DOMAIN_ERR,
"Policies in given power domain cannot be created in the "
"current configuration" },
{ IPMI_NM_CC_POLICY_STATS_RANGE,
"Statistics Reporting Period out of range" },
{ IPMI_NM_CC_POLICY_VALUE_INVALID,
"Invalid value for Aggressive CPU correction field" },
{ IPMI_NM_CC_POWER_LIMIT_RANGE,
"Power Limit out of range" },
{ IPMI_NM_CC_STATS_MODE_INVALID,
"Invalid Mode" },
{ IPMI_CC_OUT_OF_SPACE,
"No space available" },
{ IPMI_CC_INSUFFICIENT_PRIVILEGES,
"Insufficient privilege level or other security restriction" },
{ IPMI_CC_ILLEGAL_COMMAND_DISABLED,
"Command subfunction disabled or unavailable" },
{ 0xFF, NULL }, { 0xFF, NULL },
}; };
/* clang-format on */ /* clang-format on */
@ -306,7 +323,8 @@ chk_nm_rsp(struct ipmi_rs *rsp)
* use val2str from helper.c to print the error from either the DCMI * use val2str from helper.c to print the error from either the DCMI
* completion code struct or the generic IPMI completion_code_vals struct * completion code struct or the generic IPMI completion_code_vals struct
*/ */
if ((rsp->ccode >= 0x80) && (rsp->ccode <= 0xD6)) { if ((rsp->ccode >= IPMI_NM_CC_POLICY_ID_INVALID)
&& (rsp->ccode <= IPMI_NM_CC_POLICY_DOMAIN_ERR)) {
lprintf(LOG_ERR, "\n NM request failed because: %s (%x)", lprintf(LOG_ERR, "\n NM request failed because: %s (%x)",
val2str(rsp->ccode, nm_ccode_vals), rsp->ccode); val2str(rsp->ccode, nm_ccode_vals), rsp->ccode);
return 1; return 1;
@ -435,7 +453,7 @@ _ipmi_nm_policy_limiting(struct ipmi_intf *intf, uint8_t domain)
req.msg.data_len = 4; req.msg.data_len = 4;
rsp = intf->sendrecv(intf, &req); rsp = intf->sendrecv(intf, &req);
/* check for special case error of no policy is limiting */ /* check for special case error of no policy is limiting */
if (rsp && (rsp->ccode == 0xA1)) if (rsp && (rsp->ccode == IPMI_NM_CC_POLICY_LIMIT_NONE))
return 0x80; return 0x80;
else if (chk_nm_rsp(rsp)) else if (chk_nm_rsp(rsp))
return -1; return -1;