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

remove ability to find sensor by number,

Browse Source 
add support for finding all SDR record types
This commit is contained in:
Duncan Laurie 2004-03-31 17:54:29 +00:00
parent 50b4815cf0
commit c7bc504b87
4 changed files with 153 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ipmitool/doc/ipmitool.1.in
View File

@ -302,10 +302,10 @@ This command will read the SDR and extract sensor information, then query each s
This command will list sensors and thresholds in a wide table format. This command will list sensors and thresholds in a wide table format.
.TP .TP
\fIget\fP <\fBid\fR> \fIget\fP <\fBid\fR>
This command will print info for a single sensor specified by numeric ID or name. This command will print info for a single sensor specified by or name.
.TP .TP
\fIthresh\fP <\fBid\fR> <\fBthreshold\fR> <\fBsetting\fR> \fIthresh\fP <\fBid\fR> <\fBthreshold\fR> <\fBsetting\fR>
This allows you to set a particular sensor threshold value. The sensor can be specified by numeric ID or name. This allows you to set a particular sensor threshold value. The sensor is specified by name.
.RS .RS
.TP .TP
Valid thresholds are: Valid thresholds are:

22
ipmitool/include/ipmitool/ipmi_sdr.h
View File

@ -576,6 +576,19 @@ struct ipmi_sdr_iterator
int next; int next;
}; };
struct sdr_record_list {
unsigned short id;
unsigned char type;
struct sdr_record_list * next;
union {
struct sdr_record_full_sensor * full;
struct sdr_record_compact_sensor * compact;
struct sdr_record_eventonly_sensor * eventonly;
struct sdr_record_fru_locator * fruloc;
struct sdr_record_mc_locator * mcloc;
} record;
};
/* unit description codes (IPMI v1.5 section 37.16) */ /* unit description codes (IPMI v1.5 section 37.16) */
#define UNIT_MAX 0x90 #define UNIT_MAX 0x90
static const char * unit_desc[] __attribute__((unused)) = { static const char * unit_desc[] __attribute__((unused)) = {
@ -630,8 +643,13 @@ unsigned char sdr_convert_sensor_value_to_raw(struct sdr_record_full_sensor * se
struct ipmi_rs * ipmi_sdr_get_sensor_reading(struct ipmi_intf * intf, unsigned char sensor); struct ipmi_rs * ipmi_sdr_get_sensor_reading(struct ipmi_intf * intf, unsigned char sensor);
const char * ipmi_sdr_get_sensor_type_desc(const unsigned char type); const char * ipmi_sdr_get_sensor_type_desc(const unsigned char type);
struct sdr_record_full_sensor *ipmi_sdr_find_sdr_byid(struct ipmi_intf * intf, char * id); void ipmi_sdr_print_sensor_full(struct ipmi_intf * intf, struct sdr_record_full_sensor * sensor);
struct sdr_record_full_sensor *ipmi_sdr_find_sdr_bynum(struct ipmi_intf * intf, unsigned char num); void ipmi_sdr_print_sensor_compact(struct ipmi_intf * intf, struct sdr_record_compact_sensor * sensor);
void ipmi_sdr_print_sensor_eventonly(struct ipmi_intf * intf, struct sdr_record_eventonly_sensor * sensor);
void ipmi_sdr_print_fru_locator(struct ipmi_intf * intf, struct sdr_record_fru_locator * fru);
void ipmi_sdr_print_mc_locator(struct ipmi_intf * intf, struct sdr_record_mc_locator * mc);
struct sdr_record_list * ipmi_sdr_find_sdr_byid(struct ipmi_intf * intf, char * id);
void ipmi_sdr_list_empty(void); void ipmi_sdr_list_empty(void);
#endif /* IPMI_SDR_H */ #endif /* IPMI_SDR_H */

159
ipmitool/lib/ipmi_sdr.c
View File

@ -49,11 +49,7 @@
extern int verbose; extern int verbose;
static int sdr_max_read_len = GET_SDR_ENTIRE_RECORD; static int sdr_max_read_len = GET_SDR_ENTIRE_RECORD;
struct sdr_records_full { static struct sdr_record_list * sdr_list_head = NULL;
struct sdr_record_full_sensor * record;
struct sdr_records_full * next;
};
static struct sdr_records_full * sdr_list_head = NULL;
/* convert unsigned value to 2's complement signed */ /* convert unsigned value to 2's complement signed */
int utos(unsigned val, unsigned bits) int utos(unsigned val, unsigned bits)
@ -241,9 +237,8 @@ static inline int get_offset(unsigned char x)
return 0; return 0;
} }
static void void ipmi_sdr_print_sensor_full(struct ipmi_intf * intf,
ipmi_sdr_print_sensor_full(struct ipmi_intf * intf, struct sdr_record_full_sensor * sensor)
struct sdr_record_full_sensor * sensor)
{ {
char sval[16], unitstr[16], desc[17]; char sval[16], unitstr[16], desc[17];
int i=0, validread=1, do_unit=1; int i=0, validread=1, do_unit=1;
@ -513,9 +508,8 @@ ipmi_sdr_print_sensor_full(struct ipmi_intf * intf,
} }
} }
static void void ipmi_sdr_print_sensor_compact(struct ipmi_intf * intf,
ipmi_sdr_print_sensor_compact(struct ipmi_intf * intf, struct sdr_record_compact_sensor * sensor)
struct sdr_record_compact_sensor * sensor)
{ {
struct ipmi_rs * rsp; struct ipmi_rs * rsp;
char desc[17]; char desc[17];
@ -633,9 +627,8 @@ ipmi_sdr_print_sensor_compact(struct ipmi_intf * intf,
} }
} }
static void void ipmi_sdr_print_sensor_eventonly(struct ipmi_intf * intf,
ipmi_sdr_print_sensor_eventonly(struct ipmi_intf * intf, struct sdr_record_eventonly_sensor * sensor)
struct sdr_record_eventonly_sensor * sensor)
{ {
char desc[17]; char desc[17];
@ -669,9 +662,8 @@ ipmi_sdr_print_sensor_eventonly(struct ipmi_intf * intf,
} }
} }
static void void ipmi_sdr_print_mc_locator(struct ipmi_intf * intf,
ipmi_sdr_print_mc_locator(struct ipmi_intf * intf, struct sdr_record_mc_locator * mc)
struct sdr_record_mc_locator * mc)
{ {
char desc[17]; char desc[17];
@ -744,9 +736,8 @@ ipmi_sdr_print_mc_locator(struct ipmi_intf * intf,
printf("\n"); printf("\n");
} }
static void void ipmi_sdr_print_fru_locator(struct ipmi_intf * intf,
ipmi_sdr_print_fru_locator(struct ipmi_intf * intf, struct sdr_record_fru_locator * fru)
struct sdr_record_fru_locator * fru)
{ {
char desc[17]; char desc[17];
@ -790,8 +781,7 @@ ipmi_sdr_print_fru_locator(struct ipmi_intf * intf,
printf("\n"); printf("\n");
} }
void void ipmi_sdr_print_sdr(struct ipmi_intf * intf, unsigned char type)
ipmi_sdr_print_sdr(struct ipmi_intf * intf, unsigned char type)
{ {
struct sdr_get_rs * header; struct sdr_get_rs * header;
struct ipmi_sdr_iterator * itr; struct ipmi_sdr_iterator * itr;
@ -1012,7 +1002,7 @@ int ipmi_sdr_list_fill(struct ipmi_intf * intf)
{ {
struct sdr_get_rs * header; struct sdr_get_rs * header;
struct ipmi_sdr_iterator * itr; struct ipmi_sdr_iterator * itr;
static struct sdr_records_full * sdr_list_tail; static struct sdr_record_list * sdr_list_tail;
itr = ipmi_sdr_start(intf); itr = ipmi_sdr_start(intf);
if (!itr) { if (!itr) {
@ -1021,29 +1011,46 @@ int ipmi_sdr_list_fill(struct ipmi_intf * intf)
} }
while (header = ipmi_sdr_get_next_header(intf, itr)) { while (header = ipmi_sdr_get_next_header(intf, itr)) {
struct sdr_record_full_sensor * sdr; unsigned char * rec;
struct sdr_records_full * sdrr; struct sdr_record_full_sensor * full;
struct sdr_record_compact_sensor * compact;
struct sdr_record_list * sdrr;
if (header->type != SDR_RECORD_TYPE_FULL_SENSOR) sdrr = malloc(sizeof(struct sdr_record_list));
memset(sdrr, 0, sizeof(struct sdr_record_list));
sdrr->id = header->id;
sdrr->type = header->type;
rec = ipmi_sdr_get_record(intf, header, itr);
if (!rec)
continue; continue;
sdr = (struct sdr_record_full_sensor *)ipmi_sdr_get_record(intf, header, itr); switch (header->type) {
if (!sdr) case SDR_RECORD_TYPE_FULL_SENSOR:
sdrr->record.full = (struct sdr_record_full_sensor *)rec;
break;
case SDR_RECORD_TYPE_COMPACT_SENSOR:
sdrr->record.compact = (struct sdr_record_compact_sensor *)rec;
break;
case SDR_RECORD_TYPE_EVENTONLY_SENSOR:
sdrr->record.eventonly = (struct sdr_record_eventonly_sensor *)rec;
break;
case SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR:
sdrr->record.fruloc = (struct sdr_record_fru_locator *)rec;
break;
case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR:
sdrr->record.mcloc = (struct sdr_record_mc_locator *)rec;
break;
default:
free(rec);
continue; continue;
}
sdrr = malloc(sizeof(struct sdr_records_full));
memset(sdrr, 0, sizeof(struct sdr_records_full));
sdrr->record = sdr;
if (!sdr_list_head) if (!sdr_list_head)
sdr_list_head = sdrr; sdr_list_head = sdrr;
else else
sdr_list_tail->next = sdrr; sdr_list_tail->next = sdrr;
sdr_list_tail = sdrr; sdr_list_tail = sdrr;
if (verbose > 3)
printf("added list entry %x\n", sdrr->record->keys.sensor_num);
} }
ipmi_sdr_end(intf, itr); ipmi_sdr_end(intf, itr);
@ -1051,37 +1058,43 @@ int ipmi_sdr_list_fill(struct ipmi_intf * intf)
return 0; return 0;
} }
struct sdr_record_full_sensor * struct sdr_record_list *
ipmi_sdr_find_sdr_byid(struct ipmi_intf * intf, char * id) ipmi_sdr_find_sdr_byid(struct ipmi_intf * intf, char * id)
{ {
static struct sdr_records_full * e; static struct sdr_record_list * e;
if (!sdr_list_head) if (!sdr_list_head)
ipmi_sdr_list_fill(intf); ipmi_sdr_list_fill(intf);
e = sdr_list_head; e = sdr_list_head;
while (e) { while (e) {
if (!strncmp(e->record->id_string, id, e->record->id_code & 0x3f)) switch (e->type) {
return e->record; case SDR_RECORD_TYPE_FULL_SENSOR:
e = e->next; if (!strncmp(e->record.full->id_string, id,
} e->record.full->id_code & 0x1f))
return e;
return NULL; break;
} case SDR_RECORD_TYPE_COMPACT_SENSOR:
if (!strncmp(e->record.compact->id_string, id,
struct sdr_record_full_sensor * e->record.compact->id_code & 0x1f))
ipmi_sdr_find_sdr_bynum(struct ipmi_intf * intf, unsigned char num) return e;
{ break;
static struct sdr_records_full * e; case SDR_RECORD_TYPE_EVENTONLY_SENSOR:
if (!strncmp(e->record.eventonly->id_string, id,
if (!sdr_list_head) e->record.eventonly->id_code & 0x1f))
ipmi_sdr_list_fill(intf); return e;
break;
e = sdr_list_head; case SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR:
if (!strncmp(e->record.fruloc->id_string, id,
while (e) { e->record.fruloc->id_code & 0x1f))
if (e->record->keys.sensor_num == num) return e;
return e->record; break;
case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR:
if (!strncmp(e->record.mcloc->id_string, id,
e->record.mcloc->id_code & 0x1f))
return e;
break;
}
e = e->next; e = e->next;
} }
@ -1090,14 +1103,32 @@ ipmi_sdr_find_sdr_bynum(struct ipmi_intf * intf, unsigned char num)
void ipmi_sdr_list_empty(void) void ipmi_sdr_list_empty(void)
{ {
struct sdr_records_full *list, *next; struct sdr_record_list *list, *next;
list = sdr_list_head; list = sdr_list_head;
while (list) { while (list) {
if (verbose > 3) switch (list->type) {
printf("cleared sdr entry %x\n", list->record->keys.sensor_num); case SDR_RECORD_TYPE_FULL_SENSOR:
if (list->record) if (list->record.full)
free(list->record); free(list->record.full);
break;
case SDR_RECORD_TYPE_COMPACT_SENSOR:
if (list->record.compact)
free(list->record.compact);
break;
case SDR_RECORD_TYPE_EVENTONLY_SENSOR:
if (list->record.eventonly)
free(list->record.eventonly);
break;
case SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR:
if (list->record.fruloc)
free(list->record.fruloc);
break;
case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR:
if (list->record.mcloc)
free(list->record.mcloc);
break;
}
next = list->next; next = list->next;
free(list); free(list);
list = next; list = next;

61
ipmitool/lib/ipmi_sensor.c
View File

@ -617,13 +617,13 @@ ipmi_sensor_set_threshold(struct ipmi_intf * intf, int argc, char ** argv)
* thresh; * thresh;
unsigned char settingMask; unsigned char settingMask;
float setting; float setting;
struct sdr_record_full_sensor * sdr; struct sdr_record_list * sdr;
struct ipmi_rs * rsp; struct ipmi_rs * rsp;
if (argc < 3 || !strncmp(argv[0], "help", 4)) if (argc < 3 || !strncmp(argv[0], "help", 4))
{ {
printf("sensor thresh <id> <threshold> <setting>\n"); printf("sensor thresh <id> <threshold> <setting>\n");
printf(" id : name or number of the sensor for which threshold is to be set\n"); printf(" id : name of the sensor for which threshold is to be set\n");
printf(" threshold : which threshold to set\n"); printf(" threshold : which threshold to set\n");
printf(" unr = upper non-recoverable\n"); printf(" unr = upper non-recoverable\n");
printf(" ucr = upper critical\n"); printf(" ucr = upper critical\n");
@ -669,24 +669,25 @@ ipmi_sensor_set_threshold(struct ipmi_intf * intf, int argc, char ** argv)
} }
printf("Locating sensor record...\n"); printf("Locating sensor record...\n");
/* lookup by sensor name */ /* lookup by sensor name */
sdr = ipmi_sdr_find_sdr_byid(intf, id); sdr = ipmi_sdr_find_sdr_byid(intf, id);
if (!sdr)
{
/* lookup by sensor number */
unsigned char num = (unsigned char)strtol(id, NULL, 0);
sdr = ipmi_sdr_find_sdr_bynum(intf, num);
}
if (sdr) if (sdr)
{ {
printf("Setting sensor \"%s\" %s threshold to %.3f\n", if (sdr->type != SDR_RECORD_TYPE_FULL_SENSOR)
sdr->id_string, val2str(settingMask, threshold_vals), setting); {
rsp = ipmi_sensor_set_sensor_thresholds(intf, printf("Invalid sensor type %02x\n", sdr->type);
sdr->keys.sensor_num, }
settingMask, else
sdr_convert_sensor_value_to_raw(sdr, setting)); {
if (rsp && rsp->ccode) printf("Setting sensor \"%s\" %s threshold to %.3f\n",
printf("Error setting threshold: 0x%x\n", rsp->ccode); sdr->record.full->id_string, val2str(settingMask, threshold_vals), setting);
rsp = ipmi_sensor_set_sensor_thresholds(intf,
sdr->record.full->keys.sensor_num, settingMask,
sdr_convert_sensor_value_to_raw(sdr->record.full, setting));
if (rsp && rsp->ccode)
printf("Error setting threshold: 0x%x\n", rsp->ccode);
}
} }
else else
{ {
@ -698,26 +699,36 @@ ipmi_sensor_set_threshold(struct ipmi_intf * intf, int argc, char ** argv)
static void ipmi_sensor_get(struct ipmi_intf * intf, char * id) static void ipmi_sensor_get(struct ipmi_intf * intf, char * id)
{ {
struct sdr_record_full_sensor * sdr; struct sdr_record_list * sdr;
if (!id || !strncmp(id, "help", 4)) { if (!id || !strncmp(id, "help", 4)) {
printf("sensor get <id>\n"); printf("sensor get <id>\n");
printf(" id : name or number desired sensor\n"); printf(" id : name of desired sensor\n");
return; return;
} }
printf("Locating sensor record...\n"); printf("Locating sensor record...\n");
/* lookup by sensor name */ /* lookup by sensor name */
sdr = ipmi_sdr_find_sdr_byid(intf, id); sdr = ipmi_sdr_find_sdr_byid(intf, id);
if (!sdr) {
/* lookup by sensor number */
unsigned char num = (unsigned char)strtol(id, NULL, 0);
sdr = ipmi_sdr_find_sdr_bynum(intf, num);
}
if (sdr) { if (sdr) {
verbose = verbose ? : 1; verbose = verbose ? : 1;
ipmi_sensor_print_full(intf, sdr); switch (sdr->type) {
case SDR_RECORD_TYPE_FULL_SENSOR:
ipmi_sensor_print_full(intf, sdr->record.full);
break;
case SDR_RECORD_TYPE_COMPACT_SENSOR:
ipmi_sensor_print_compact(intf, sdr->record.compact);
break;
case SDR_RECORD_TYPE_EVENTONLY_SENSOR:
ipmi_sdr_print_sensor_eventonly(intf, sdr->record.eventonly);
break;
case SDR_RECORD_TYPE_FRU_DEVICE_LOCATOR:
ipmi_sdr_print_fru_locator(intf, sdr->record.fruloc);
break;
case SDR_RECORD_TYPE_MC_DEVICE_LOCATOR:
ipmi_sdr_print_mc_locator(intf, sdr->record.mcloc);
break;
}
} else { } else {
printf("Sensor data record not found!\n"); printf("Sensor data record not found!\n");
} }