Merge pull request #82 from williamli80/code0308
Modify eSEL to follow IPMI spec:
diff --git a/apphandler.C b/apphandler.C
index fc6c811..71dba66 100644
--- a/apphandler.C
+++ b/apphandler.C
@@ -10,6 +10,10 @@
void register_netfn_app_functions() __attribute__((constructor));
+#define DEVICE_FW1 2
+#define DEVICE_FW2 3
+#define DEVICE_AUX 11
+
//---------------------------------------------------------------------
// Called by Host on seeing a SMS_ATN bit set. Return a hardcoded
// value of 0x2 indicating we need Host read some data.
@@ -91,23 +95,105 @@
return rc;
}
+
+typedef struct
+{
+ char major;
+ char minor;
+ uint16_t d[2];
+} rev_t;
+
+
+/* Currently only supports the vx.x-x-[-x] format Will return -1 if not in */
+/* the format this routine knows how to parse */
+/* version = v0.6-19-gf363f61-dirty */
+/* ^ ^ ^^ ^ */
+/* | | |----------|-- additional details */
+/* | |---------------- Minor */
+/* |------------------ Major */
+/* Additional details : If the option group exists it will force Auxiliary */
+/* Firmware Revision Information 4th byte to 1 indicating the build was */
+/* derived with additional edits */
+int convert_version(const char *p, rev_t *rev)
+{
+ char *s, *token;
+ char hexbyte[5];
+ int l;
+ uint16_t commits;
+
+ if (*p != 'v')
+ return -1;
+ p++;
+
+ s = strdup(p);
+ token = strtok(s,".-");
+
+ rev->major = (int8_t) atoi(token);
+
+ token = strtok(NULL, ".-");
+ rev->minor = (int8_t) atoi(token);
+
+ // Capture the number of commits on top of the minor tag.
+ // I'm using BE format like the ipmi spec asked for
+ token = strtok(NULL,".-");
+
+ if (token) {
+ commits = (int16_t) atoi(token);
+ rev->d[0] = (commits>>8) | (commits<<8);
+
+ // commit number we skip
+ token = strtok(NULL,".-");
+
+ } else {
+ rev->d[0] = 0;
+ }
+
+ // Any value of the optional parameter forces it to 1
+ if (token)
+ token = strtok(NULL,".-");
+
+ rev->d[1] = (token != NULL) ? 1 : 0;
+
+ free(s);
+ return 0;
+}
+
ipmi_ret_t ipmi_app_get_device_id(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
ipmi_request_t request, ipmi_response_t response,
ipmi_data_len_t data_len, ipmi_context_t context)
{
ipmi_ret_t rc = IPMI_CC_OK;
+ const char *busname = "org.openbmc.Inventory";
+ const char *objname = "/org/openbmc/inventory/system/chassis/motherboard/bmc";
+ const char *iface = "org.openbmc.InventoryItem";
+ char *ver = NULL;
+ int r;
+ rev_t rev = {0};
// TODO:
// This value is the IANA number assigned to "IBM Platform Firmware
// Division", which is also used by our service processor. We may want
// a different number or at least a different version?
- uint8_t str[] = {0x00, 0, 1, 1,2, 0xD, 0x41, 0xA7, 0x00, 0x43, 0x40};
+ uint8_t dev_id[] = {0, 0, 0, 0, 2, 0xD, 0x41, 0xA7, 0x00, 0x43, 0x40, 0, 0, 0, 0};
// Data length
- *data_len = sizeof(str);
+ *data_len = sizeof(dev_id);
+
+ r = sd_bus_get_property_string(bus,busname,objname,iface,"version", NULL, &ver);
+ if ( r < 0 ) {
+ fprintf(stderr, "Failed to obtain version property: %s\n", strerror(-r));
+ } else {
+ r = convert_version(ver, &rev);
+ if( r >= 0 ) {
+ // bit7 identifies state of SDR repository, hence the mask
+ dev_id[DEVICE_FW1] |= 0x7F & rev.major;
+ dev_id[DEVICE_FW2] = rev.minor;
+ memcpy(&dev_id[DEVICE_AUX], rev.d, 4);
+ }
+ }
// Pack the actual response
- memcpy(response, &str, *data_len);
+ memcpy(response, &dev_id, *data_len);
return rc;
}
diff --git a/ipmid.C b/ipmid.C
index c4a6763..063ded6 100644
--- a/ipmid.C
+++ b/ipmid.C
@@ -572,6 +572,11 @@
r = find_openbmc_path("SENSOR", number, &a);
+ if (r < 0) {
+ fprintf(stderr, "Failed to find Sensor 0x%02x\n", number);
+ return 0;
+ }
+
r = sd_bus_message_new_method_call(bus,&m,a.bus,a.path,a.interface,method);
if (r < 0) {
fprintf(stderr, "Failed to create a method call: %s", strerror(-r));
@@ -609,6 +614,11 @@
r = find_openbmc_path("SENSOR", number, &a);
+ if (r < 0) {
+ fprintf(stderr, "Failed to find Sensor 0x%02x\n", number);
+ return 0;
+ }
+
r = sd_bus_message_new_method_call(bus,&m,a.bus,a.path,a.interface,method);
if (r < 0) {
fprintf(stderr, "Failed to create a method call: %s", strerror(-r));
diff --git a/sensorhandler.C b/sensorhandler.C
index bb14e7a..39de660 100644
--- a/sensorhandler.C
+++ b/sensorhandler.C
@@ -180,6 +180,11 @@
r = find_openbmc_path("SENSOR", reqptr->sennum, &a);
+ if (r < 0) {
+ fprintf(stderr, "Failed to find Sensor 0x%02x\n", reqptr->sennum);
+ return IPMI_CC_SENSOR_INVALID;
+ }
+
type = find_sensor(reqptr->sennum);
fprintf(stderr, "Bus: %s, Path: %s, Interface: %s\n", a.bus, a.path, a.interface);