Merge pull request #55 from shgoupf/master
Add get/set ipmid command support with correct DBUS property handling.
diff --git a/chassishandler.C b/chassishandler.C
index 1389db9..fca3c79 100644
--- a/chassishandler.C
+++ b/chassishandler.C
@@ -9,14 +9,229 @@
const char *chassis_object_name = "/org/openbmc/control/chassis0";
const char *chassis_intf_name = "org.openbmc.control.Chassis";
+
void register_netfn_chassis_functions() __attribute__((constructor));
+// Host settings in dbus
+// Service name should be referenced by connection name got via object mapper
+const char *settings_object_name = "/org/openbmc/settings/host0";
+const char *settings_intf_name = "org.freedesktop.DBus.Properties";
+const char *host_intf_name = "org.openbmc.settings.Host";
+
+const char *objmapper_service_name = "org.openbmc.objectmapper";
+const char *objmapper_object_name = "/org/openbmc/objectmapper/objectmapper";
+const char *objmapper_intf_name = "org.openbmc.objectmapper.ObjectMapper";
+
+int object_mapper_get_connection(char **buf, const char *obj_path)
+{
+ sd_bus_error error = SD_BUS_ERROR_NULL;
+ sd_bus_message *m = NULL;
+ sd_bus *bus = NULL;
+ char *temp_buf = NULL, *intf = NULL;
+ size_t buf_size = 0;
+ int r;
+
+ // Get the system bus where most system services are provided.
+ bus = ipmid_get_sd_bus_connection();
+
+ /*
+ * Bus, service, object path, interface and method are provided to call
+ * the method.
+ * Signatures and input arguments are provided by the arguments at the
+ * end.
+ */
+ r = sd_bus_call_method(bus,
+ objmapper_service_name, /* service to contact */
+ objmapper_object_name, /* object path */
+ objmapper_intf_name, /* interface name */
+ "GetObject", /* method name */
+ &error, /* object to return error in */
+ &m, /* return message on success */
+ "s", /* input signature */
+ obj_path /* first argument */
+ );
+
+ if (r < 0) {
+ fprintf(stderr, "Failed to issue method call: %s\n", error.message);
+ goto finish;
+ }
+
+ // Get the key, aka, the connection name
+ sd_bus_message_read(m, "a{sas}", 1, &temp_buf, 1, &intf);
+
+ /*
+ * TODO: check the return code. Currently for no reason the message
+ * parsing of object mapper is always complaining about
+ * "Device or resource busy", but the result seems OK for now. Need
+ * further checks.
+ * TODO: The following code is preserved in the comments so that it can be
+ * resumed after the problem aforementioned is resolved.
+ *r = sd_bus_message_read(m, "a{sas}", 1, &temp_buf, 1, &intf);
+ *if (r < 0) {
+ * fprintf(stderr, "Failed to parse response message: %s\n", strerror(-r));
+ * goto finish;
+ *}
+ */
+
+ buf_size = strlen(temp_buf) + 1;
+ printf("IPMID connection name: %s\n", temp_buf);
+ *buf = (char *)malloc(buf_size);
+
+ if (*buf == NULL) {
+ fprintf(stderr, "Malloc failed for get_sys_boot_options");
+ r = -1;
+ goto finish;
+ }
+
+ memcpy(*buf, temp_buf, buf_size);
+
+finish:
+ sd_bus_error_free(&error);
+ sd_bus_message_unref(m);
+
+ return r;
+}
+
+int dbus_get_property(char **buf)
+{
+ sd_bus_error error = SD_BUS_ERROR_NULL;
+ sd_bus_message *m = NULL;
+ sd_bus *bus = NULL;
+ char *temp_buf = NULL;
+ char *connection = NULL;
+ int r;
+
+ r = object_mapper_get_connection(&connection, settings_object_name);
+
+ if (r < 0) {
+ fprintf(stderr, "Failed to get connection, return value: %d.\n", r);
+ goto finish;
+ }
+
+ printf("connection: %s\n", connection);
+
+ // Get the system bus where most system services are provided.
+ bus = ipmid_get_sd_bus_connection();
+
+ /*
+ * Bus, service, object path, interface and method are provided to call
+ * the method.
+ * Signatures and input arguments are provided by the arguments at the
+ * end.
+ */
+ r = sd_bus_call_method(bus,
+ connection, /* service to contact */
+ settings_object_name, /* object path */
+ settings_intf_name, /* interface name */
+ "Get", /* method name */
+ &error, /* object to return error in */
+ &m, /* return message on success */
+ "ss", /* input signature */
+ host_intf_name, /* first argument */
+ "boot_flags"); /* second argument */
+
+ if (r < 0) {
+ fprintf(stderr, "Failed to issue method call: %s\n", error.message);
+ goto finish;
+ }
+
+ /*
+ * The output should be parsed exactly the same as the output formatting
+ * specified.
+ */
+ r = sd_bus_message_read(m, "v", "s", &temp_buf);
+ if (r < 0) {
+ fprintf(stderr, "Failed to parse response message: %s\n", strerror(-r));
+ goto finish;
+ }
+
+ asprintf(buf, "%s", temp_buf);
+/* *buf = (char*) malloc(strlen(temp_buf));
+ if (*buf) {
+ strcpy(*buf, temp_buf);
+ }
+*/
+ printf("IPMID boot option property get: {%s}.\n", (char *) temp_buf);
+
+finish:
+ sd_bus_error_free(&error);
+ sd_bus_message_unref(m);
+ free(connection);
+
+ return r;
+}
+
+int dbus_set_property(const char *buf)
+{
+ sd_bus_error error = SD_BUS_ERROR_NULL;
+ sd_bus_message *m = NULL;
+ sd_bus *bus = NULL;
+ char *connection = NULL;
+ int r;
+
+ r = object_mapper_get_connection(&connection, settings_object_name);
+
+ if (r < 0) {
+ fprintf(stderr, "Failed to get connection, return value: %d.\n", r);
+ goto finish;
+ }
+
+ printf("connection: %s\n", connection);
+
+ // Get the system bus where most system services are provided.
+ bus = ipmid_get_sd_bus_connection();
+
+ /*
+ * Bus, service, object path, interface and method are provided to call
+ * the method.
+ * Signatures and input arguments are provided by the arguments at the
+ * end.
+ */
+ r = sd_bus_call_method(bus,
+ connection, /* service to contact */
+ settings_object_name, /* object path */
+ settings_intf_name, /* interface name */
+ "Set", /* method name */
+ &error, /* object to return error in */
+ &m, /* return message on success */
+ "ssv", /* input signature */
+ host_intf_name, /* first argument */
+ "boot_flags", /* second argument */
+ "s", /* third argument */
+ buf); /* fourth argument */
+
+ if (r < 0) {
+ fprintf(stderr, "Failed to issue method call: %s\n", error.message);
+ goto finish;
+ }
+
+ printf("IPMID boot option property set: {%s}.\n", buf);
+
+finish:
+ sd_bus_error_free(&error);
+ sd_bus_message_unref(m);
+ free(connection);
+
+ return r;
+}
+
struct get_sys_boot_options_t {
uint8_t parameter;
uint8_t set;
uint8_t block;
} __attribute__ ((packed));
+struct get_sys_boot_options_response_t {
+ uint8_t version;
+ uint8_t parm;
+ uint8_t data[5];
+} __attribute__ ((packed));
+
+struct set_sys_boot_options_t {
+ uint8_t parameter;
+ uint8_t data[8];
+} __attribute__ ((packed));
+
ipmi_ret_t ipmi_chassis_wildcard(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)
@@ -105,29 +320,152 @@
return ( (rc < 0) ? IPMI_CC_INVALID : IPMI_CC_OK);
}
+struct bootOptionTypeMap_t {
+ uint8_t ipmibootflag;
+ char dbusname[8];
+};
+
+#define INVALID_STRING "Invalid"
+// dbus supports this list of boot devices.
+bootOptionTypeMap_t g_bootOptionTypeMap_t[] = {
+
+ {0x01, "Network"},
+ {0x02, "Disk"},
+ {0x03, "Safe"},
+ {0x05, "CDROM"},
+ {0x06, "Setup"},
+ {0x00, "Default"},
+ {0xFF, INVALID_STRING}
+};
+
+uint8_t get_ipmi_boot_option(char *p) {
+
+ bootOptionTypeMap_t *s = g_bootOptionTypeMap_t;
+
+ while (s->ipmibootflag != 0xFF) {
+ if (!strcmp(s->dbusname,p))
+ break;
+ s++;
+ }
+
+ if (!s->ipmibootflag)
+ printf("Failed to find Sensor Type %s\n", p);
+
+ return s->ipmibootflag;
+}
+
+char* get_boot_option_by_ipmi(uint8_t p) {
+
+ bootOptionTypeMap_t *s = g_bootOptionTypeMap_t;
+
+ while (s->ipmibootflag != 0xFF) {
+
+ if (s->ipmibootflag == p)
+ break;
+
+ s++;
+ }
+
+
+ if (!s->ipmibootflag)
+ printf("Failed to find Sensor Type 0x%x\n", p);
+
+ return s->dbusname;
+}
+
+#define SET_PARM_VERSION 1
+#define SET_PARM_BOOT_FLAGS_VALID 0x80
+
ipmi_ret_t ipmi_chassis_get_sys_boot_options(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;
- *data_len = 0;
+ ipmi_ret_t rc = IPMI_CC_PARM_NOT_SUPPORTED;
+ char *p = NULL;
+ get_sys_boot_options_response_t *resp = (get_sys_boot_options_response_t *) response;
+ get_sys_boot_options_t *reqptr = (get_sys_boot_options_t*) request;
+ uint8_t s;
printf("IPMI GET_SYS_BOOT_OPTIONS\n");
- get_sys_boot_options_t *reqptr = (get_sys_boot_options_t*) request;
+ memset(resp,0,sizeof(*resp));
+ resp->version = SET_PARM_VERSION;
+ resp->parm = 5;
+ resp->data[0] = SET_PARM_BOOT_FLAGS_VALID;
- // TODO Return default values to OPAL until dbus interface is available
+ *data_len = sizeof(*resp);
- if (reqptr->parameter == 5) // Parameter #5
- {
- uint8_t buf[] = {0x1,0x5,80,0,0,0,0};
- *data_len = sizeof(buf);
- memcpy(response, &buf, *data_len);
- }
- else
- {
+ /*
+ * Parameter #5 means boot flags. Please refer to 28.13 of ipmi doc.
+ * This is the only parameter used by petitboot.
+ */
+ if (reqptr->parameter == 5) {
+
+ int r = dbus_get_property(&p);
+
+ if (r < 0) {
+ fprintf(stderr, "Dbus get property failed for get_sys_boot_options.\n");
+ rc = IPMI_CC_UNSPECIFIED_ERROR;
+
+ } else {
+
+ s = get_ipmi_boot_option(p);
+ resp->data[1] = (s << 2);
+ rc = IPMI_CC_OK;
+ }
+
+ } else {
fprintf(stderr, "Unsupported parameter 0x%x\n", reqptr->parameter);
- return IPMI_CC_PARM_NOT_SUPPORTED;
+ }
+
+ if (p)
+ free(p);
+
+ return rc;
+}
+
+
+
+ipmi_ret_t ipmi_chassis_set_sys_boot_options(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;
+ char *s;
+
+ printf("IPMI SET_SYS_BOOT_OPTIONS\n");
+
+ set_sys_boot_options_t *reqptr = (set_sys_boot_options_t *) request;
+
+ // This IPMI command does not have any resposne data
+ *data_len = 0;
+
+ /* 000101
+ * Parameter #5 means boot flags. Please refer to 28.13 of ipmi doc.
+ * This is the only parameter used by petitboot.
+ */
+ if (reqptr->parameter == 5) {
+
+ s = get_boot_option_by_ipmi(((reqptr->data[1] & 0x3C) >> 2));
+
+ printf("%d: %s\n", __LINE__, s);
+ if (!strcmp(s,INVALID_STRING)) {
+
+ rc = IPMI_CC_PARM_NOT_SUPPORTED;
+
+ } else {
+
+ int r = dbus_set_property(s);
+
+ if (r < 0) {
+ fprintf(stderr, "Dbus set property failed for set_sys_boot_options.\n");
+ rc = IPMI_CC_UNSPECIFIED_ERROR;
+ }
+ }
+
+ } else {
+ fprintf(stderr, "Unsupported parameter 0x%x\n", reqptr->parameter);
+ rc = IPMI_CC_PARM_NOT_SUPPORTED;
}
return rc;
@@ -143,4 +481,8 @@
printf("Registering NetFn:[0x%X], Cmd:[0x%X]\n",NETFUN_CHASSIS, IPMI_CMD_CHASSIS_CONTROL);
ipmi_register_callback(NETFUN_CHASSIS, IPMI_CMD_CHASSIS_CONTROL, NULL, ipmi_chassis_control);
+
+ printf("Registering NetFn:[0x%X], Cmd:[0x%X]\n", NETFUN_CHASSIS, IPMI_CMD_SET_SYS_BOOT_OPTIONS);
+ ipmi_register_callback(NETFUN_CHASSIS, IPMI_CMD_SET_SYS_BOOT_OPTIONS, NULL, ipmi_chassis_set_sys_boot_options);
}
+
diff --git a/chassishandler.h b/chassishandler.h
index 1a26411..b6f7d93 100644
--- a/chassishandler.h
+++ b/chassishandler.h
@@ -9,15 +9,24 @@
// Chassis Control
IPMI_CMD_CHASSIS_CONTROL = 0x02,
// Get capability bits
+ IPMI_CMD_SET_SYS_BOOT_OPTIONS = 0x08,
IPMI_CMD_GET_SYS_BOOT_OPTIONS = 0x09,
};
// Command specific completion codes
enum ipmi_chassis_return_codes
{
+ IPMI_OK = 0x0,
IPMI_CC_PARM_NOT_SUPPORTED = 0x80,
};
+// Generic completion codes,
+// see IPMI doc section 5.2
+enum ipmi_generic_return_codes
+{
+ IPMI_OUT_OF_SPACE = 0xC4,
+};
+
// Various Chassis operations under a single command.
enum ipmi_chassis_control_cmds : uint8_t
{