* [PATCH phosphor-host-ipmid v4 0/2] IPMID boot options changes
@ 2015-12-17 1:20 OpenBMC Patches
2015-12-17 1:20 ` [PATCH phosphor-host-ipmid v4 1/2] Support host reboot OpenBMC Patches
2015-12-17 1:20 ` [PATCH phosphor-host-ipmid v4 2/2] Add get/set ipmid command support with correct DBUS property handling OpenBMC Patches
0 siblings, 2 replies; 8+ messages in thread
From: OpenBMC Patches @ 2015-12-17 1:20 UTC (permalink / raw)
To: openbmc
1) Implemented ipmid_boot_option_set/get with respect to petitboot requirements.
2) Boot options are handled via dbus property "host_settings".
3) Conversion between dbus property and ipmid command is carefully handled.
4) Service name is got via object mapper.
https://github.com/openbmc/phosphor-host-ipmid/pull/51
Chris Austen (1):
Support host reboot
shgoupf (1):
Add get/set ipmid command support with correct DBUS property handling.
chassishandler.C | 290 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
chassishandler.h | 8 ++
2 files changed, 289 insertions(+), 9 deletions(-)
--
2.6.3
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH phosphor-host-ipmid v4 1/2] Support host reboot
2015-12-17 1:20 [PATCH phosphor-host-ipmid v4 0/2] IPMID boot options changes OpenBMC Patches
@ 2015-12-17 1:20 ` OpenBMC Patches
2015-12-17 1:20 ` [PATCH phosphor-host-ipmid v4 2/2] Add get/set ipmid command support with correct DBUS property handling OpenBMC Patches
1 sibling, 0 replies; 8+ messages in thread
From: OpenBMC Patches @ 2015-12-17 1:20 UTC (permalink / raw)
To: openbmc
From: Chris Austen <austenc@us.ibm.com>
---
chassishandler.C | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/chassishandler.C b/chassishandler.C
index 56b8375..1389db9 100644
--- a/chassishandler.C
+++ b/chassishandler.C
@@ -31,7 +31,7 @@ ipmi_ret_t ipmi_chassis_wildcard(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
//------------------------------------------------------------
// Calls into Chassis Control Dbus object to do the power off
//------------------------------------------------------------
-int ipmi_chassis_power_off()
+int ipmi_chassis_power_control(const char *method)
{
// sd_bus error
int rc = 0;
@@ -50,7 +50,7 @@ int ipmi_chassis_power_off()
chassis_bus_name, // Service to contact
chassis_object_name, // Object path
chassis_intf_name, // Interface name
- "powerOff", // Method to be called
+ method, // Method to be called
&bus_error, // object to return error
&response, // Response buffer if any
NULL); // No input arguments
@@ -69,6 +69,7 @@ int ipmi_chassis_power_off()
return rc;
}
+
//----------------------------------------------------------------------
// Chassis Control commands
//----------------------------------------------------------------------
@@ -89,11 +90,11 @@ ipmi_ret_t ipmi_chassis_control(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
switch(chassis_ctrl_cmd)
{
case CMD_POWER_OFF:
+ rc = ipmi_chassis_power_control("powerOff");
+ break;
case CMD_HARD_RESET:
- {
- rc = ipmi_chassis_power_off();
+ rc = ipmi_chassis_power_control("reboot");
break;
- }
default:
{
fprintf(stderr, "Invalid Chassis Control command:[0x%X] received\n",chassis_ctrl_cmd);
--
2.6.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH phosphor-host-ipmid v4 2/2] Add get/set ipmid command support with correct DBUS property handling.
2015-12-17 1:20 [PATCH phosphor-host-ipmid v4 0/2] IPMID boot options changes OpenBMC Patches
2015-12-17 1:20 ` [PATCH phosphor-host-ipmid v4 1/2] Support host reboot OpenBMC Patches
@ 2015-12-17 1:20 ` OpenBMC Patches
2015-12-17 4:14 ` Chris Austen
` (2 more replies)
1 sibling, 3 replies; 8+ messages in thread
From: OpenBMC Patches @ 2015-12-17 1:20 UTC (permalink / raw)
To: openbmc; +Cc: shgoupf
From: shgoupf <shgoupf@cn.ibm.com>
1) Two methods to handle the dbus property set and get:
a) dbus_set_property()
b) dbus_get_property()
2) The property is stored as a 10 character strings which represents
5-byte information.
3) ipmid set method is registered and implemented since petitboot will
use it to clear the boot options.
4) Get service name via object mapper
a) The connection name is got via objectmapper.
b) The method used to get the connection name is object_mapper_get_connection().
c) dbus_get_property/dbus_set_property will get the connection name via
the above method instead of hard coding.
---
chassishandler.C | 279 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
chassishandler.h | 8 ++
2 files changed, 283 insertions(+), 4 deletions(-)
diff --git a/chassishandler.C b/chassishandler.C
index 1389db9..35b5086 100644
--- a/chassishandler.C
+++ b/chassishandler.C
@@ -9,6 +9,217 @@ const char *chassis_bus_name = "org.openbmc.control.Chassis";
const char *chassis_object_name = "/org/openbmc/control/chassis0";
const char *chassis_intf_name = "org.openbmc.control.Chassis";
+// Host settings in dbus
+// Service name should be referenced by connection name got via object mapper
+// const char *settings_service_name = "org.openbmc.settings.Host";
+const char *settings_object_name = "/org/openbmc/settings/host0";
+const char *settings_intf_name = "org.freedesktop.DBus.Properties";
+
+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";
+
+char* uint8_to_char(uint8_t *a, size_t size)
+{
+ char* buffer;
+ int i;
+
+ buffer = (char*)malloc(size * 2 + 1);
+ if (!buffer)
+ return NULL;
+
+ buffer[size * 2] = 0;
+ for (i = 0; i < size; i++) {
+ uint8_t msb = (a[i] >> 4) & 0xF;
+ uint8_t lsb = a[i] & 0xF;
+ buffer[2*i] = msb > 9 ? msb + 'A' - 10 : msb + '0';
+ buffer[2*i + 1] = lsb > 9 ? lsb + 'A' - 10 : lsb + '0';
+ }
+
+ return buffer;
+}
+
+uint8_t* char_to_uint8(char *a, size_t size)
+{
+ uint8_t* buffer;
+ int i;
+
+ buffer = (uint8_t*)malloc(size);
+ if (!buffer)
+ return NULL;
+
+ for (i = 0; i < size; i++) {
+ uint8_t msb = (uint8_t)(a[2*i] > '9' ? a[2*i] - 'A' + 10 : a[2*i] - '0');
+ uint8_t lsb = (uint8_t)(a[2*i+1] > '9' ? a[2*i+1] - 'A' + 10 : a[2*i+1] - '0');
+ buffer[i] = ((msb << 4) | (lsb & 0xF)) & 0xFF;
+ }
+
+ return buffer;
+}
+
+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;
+ size_t buf_size = 0;
+ int r;
+
+ // Open the system bus where most system services are provided.
+ r = sd_bus_open_system(&bus);
+ if (r < 0) {
+ fprintf(stderr, "Failed to connect to system bus: %s\n", strerror(-r));
+ goto finish;
+ }
+
+ // 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
+ r = sd_bus_message_read(m, "a{sas}", 1, &temp_buf);
+ buf_size = strlen(temp_buf) + 1;
+ printf("IPMID connection name: %s\n", temp_buf);
+ *buf = (char*)malloc(buf_size);
+ memcpy(*buf, temp_buf, buf_size);
+
+finish:
+ sd_bus_error_free(&error);
+ sd_bus_message_unref(m);
+ sd_bus_unref(bus);
+
+ return r;
+}
+
+// TODO: object mapper should be used instead of hard-coding.
+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;
+ uint8_t* get_value = NULL;
+ char* connection = NULL;
+ int r, i;
+
+ // Open the system bus where most system services are provided.
+ r = sd_bus_open_system(&bus);
+ if (r < 0) {
+ fprintf(stderr, "Failed to connect to system bus: %s\n", strerror(-r));
+ goto finish;
+ }
+
+ object_mapper_get_connection(&connection, settings_object_name);
+ printf("connection: %s\n", 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 */
+ settings_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;
+ }
+
+ printf("IPMID boot option property get: {%s}.\n", (char*) temp_buf);
+
+ memcpy(buf, temp_buf, 2*NUM_RETURN_BYTES_OF_GET_USED + 1);
+
+finish:
+ sd_bus_error_free(&error);
+ sd_bus_message_unref(m);
+ sd_bus_unref(bus);
+ free(connection);
+
+ return r;
+}
+
+// TODO: object mapper should be used instead of hard-coding.
+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;
+
+ // Open the system bus where most system services are provided.
+ r = sd_bus_open_system(&bus);
+ if (r < 0) {
+ fprintf(stderr, "Failed to connect to system bus: %s\n", strerror(-r));
+ goto finish;
+ }
+
+ object_mapper_get_connection(&connection, settings_object_name);
+ printf("connection: %s\n", 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 */
+ settings_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);
+ sd_bus_unref(bus);
+ free(connection);
+
+ return r;
+}
+
void register_netfn_chassis_functions() __attribute__((constructor));
struct get_sys_boot_options_t {
@@ -17,6 +228,15 @@ struct get_sys_boot_options_t {
uint8_t block;
} __attribute__ ((packed));
+struct set_sys_boot_options_t {
+ uint8_t parameter;
+ uint8_t data1;
+ uint8_t data2;
+ uint8_t data3;
+ uint8_t data4;
+ uint8_t data5;
+} __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)
@@ -116,16 +336,63 @@ ipmi_ret_t ipmi_chassis_get_sys_boot_options(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
get_sys_boot_options_t *reqptr = (get_sys_boot_options_t*) request;
- // TODO Return default values to OPAL until dbus interface is available
+ char* buf = (char*)malloc(NUM_RETURN_BYTES_OF_GET);
+
+ if (reqptr->parameter == 5) // Parameter #5
+ {
+ dbus_get_property(buf);
+ uint8_t* return_value = char_to_uint8(buf, NUM_RETURN_BYTES_OF_GET_USED);
+ *data_len = NUM_RETURN_BYTES_OF_GET;
+ // TODO: last 3 bytes
+ // (NUM_RETURN_BYTES_OF_GET - NUM_RETURN_BYTES_OF_GET_USED) is meanlingless
+ memcpy(response, return_value, *data_len);
+ free(buf);
+ free(return_value);
+ }
+ else
+ {
+ *data_len = NUM_RETURN_BYTES_OF_GET;
+ // 0x80: parameter not supported
+ buf[0] = 0x80;
+ memcpy(response, buf, *data_len);
+ free(buf);
+ fprintf(stderr, "Unsupported parameter 0x%x\n", reqptr->parameter);
+ return IPMI_CC_PARM_NOT_SUPPORTED;
+ }
+
+ 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;
+
+ printf("IPMI SET_SYS_BOOT_OPTIONS\n");
+ printf("IPMID set command required return bytes: %i\n", *data_len);
+
+ set_sys_boot_options_t *reqptr = (set_sys_boot_options_t*) request;
+
+ char* output_buf = (char*)malloc(NUM_RETURN_BYTES_OF_SET);
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);
+ char* input_buf = uint8_to_char((uint8_t*)(&(reqptr->data1)), NUM_INPUT_BYTES_OF_SET);
+ dbus_set_property(input_buf);
+ *data_len = NUM_RETURN_BYTES_OF_SET;
+ // 0x0: return code OK.
+ output_buf[0] = 0x0;
+ memcpy(response, output_buf, *data_len);
+ free(output_buf);
+ free(input_buf);
}
else
{
+ // 0x80: parameter not supported
+ output_buf[0] = 0x80;
+ memcpy(response, output_buf, *data_len);
+ free(output_buf);
fprintf(stderr, "Unsupported parameter 0x%x\n", reqptr->parameter);
return IPMI_CC_PARM_NOT_SUPPORTED;
}
@@ -133,6 +400,7 @@ ipmi_ret_t ipmi_chassis_get_sys_boot_options(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
return rc;
}
+
void register_netfn_chassis_functions()
{
printf("Registering NetFn:[0x%X], Cmd:[0x%X]\n",NETFUN_CHASSIS, IPMI_CMD_WILDCARD);
@@ -141,6 +409,9 @@ void register_netfn_chassis_functions()
printf("Registering NetFn:[0x%X], Cmd:[0x%X]\n",NETFUN_CHASSIS, IPMI_CMD_GET_SYS_BOOT_OPTIONS);
ipmi_register_callback(NETFUN_CHASSIS, IPMI_CMD_GET_SYS_BOOT_OPTIONS, NULL, ipmi_chassis_get_sys_boot_options);
+ 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);
+
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);
}
diff --git a/chassishandler.h b/chassishandler.h
index 1a26411..0164ce1 100644
--- a/chassishandler.h
+++ b/chassishandler.h
@@ -3,12 +3,20 @@
#include <stdint.h>
+// TODO: Petitboot requires 8 bytes of response
+// however only 5 of them are used.
+#define NUM_RETURN_BYTES_OF_GET 8
+#define NUM_RETURN_BYTES_OF_GET_USED 5
+#define NUM_RETURN_BYTES_OF_SET 1
+#define NUM_INPUT_BYTES_OF_SET 5
+
// IPMI commands for Chassis net functions.
enum ipmi_netfn_app_cmds
{
// Chassis Control
IPMI_CMD_CHASSIS_CONTROL = 0x02,
// Get capability bits
+ IPMI_CMD_SET_SYS_BOOT_OPTIONS = 0x08,
IPMI_CMD_GET_SYS_BOOT_OPTIONS = 0x09,
};
--
2.6.3
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH phosphor-host-ipmid v4 2/2] Add get/set ipmid command support with correct DBUS property handling.
2015-12-17 1:20 ` [PATCH phosphor-host-ipmid v4 2/2] Add get/set ipmid command support with correct DBUS property handling OpenBMC Patches
@ 2015-12-17 4:14 ` Chris Austen
[not found] ` <OF21496544.74E17992-ON00257F1E.001742B8-1450325644659@LocalDomain>
2015-12-17 22:47 ` Stewart Smith
2 siblings, 0 replies; 8+ messages in thread
From: Chris Austen @ 2015-12-17 4:14 UTC (permalink / raw)
To: OpenBMC Patches; +Cc: Peng Fei BG Gou, openbmc
[-- Attachment #1: Type: text/plain, Size: 15833 bytes --]
This commit has patches from a different commit
Id there really a need for uint_to_char like functions?
Sdbus seems to have a bug (or maybe I don't know how to use it) but unref of of a bus doesn't seem to work. So you should not call sdbus_open You should call the get_sbus (my correct spelling but I'm on a plane) function found in the ipmid.c. File
I've never seen a need to create free desktop functions not sure why they are here. Attaching an object manager is a single function call. See the phosphor-event repository
Sent from my iPhone using IBM Verse
On Dec 16, 2015, 8:20:47 PM, "OpenBMC Patches" <openbmc-patches@stwcx.xyz> wrote:
From: shgoupf
1) Two methods to handle the dbus property set and get:
a) dbus_set_property()
b) dbus_get_property()
2) The property is stored as a 10 character strings which represents
5-byte information.
3) ipmid set method is registered and implemented since petitboot will
use it to clear the boot options.
4) Get service name via object mapper
a) The connection name is got via objectmapper.
b) The method used to get the connection name is object_mapper_get_connection().
c) dbus_get_property/dbus_set_property will get the connection name via
the above method instead of hard coding.
---
chassishandler.C | 279 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
chassishandler.h | 8 ++
2 files changed, 283 insertions(+), 4 deletions(-)
diff --git a/chassishandler.C b/chassishandler.C
index 1389db9..35b5086 100644
--- a/chassishandler.C
+++ b/chassishandler.C
@@ -9,6 +9,217 @@ const char *chassis_bus_name = "org.openbmc.control.Chassis";
const char *chassis_object_name = "/org/openbmc/control/chassis0";
const char *chassis_intf_name = "org.openbmc.control.Chassis";
+// Host settings in dbus
+// Service name should be referenced by connection name got via object mapper
+// const char *settings_service_name = "org.openbmc.settings.Host";
+const char *settings_object_name = "/org/openbmc/settings/host0";
+const char *settings_intf_name = "org.freedesktop.DBus.Properties";
+
+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";
+
+char* uint8_to_char(uint8_t *a, size_t size)
+{
+ char* buffer;
+ int i;
+
+ buffer = (char*)malloc(size * 2 + 1);
+ if (!buffer)
+ return NULL;
+
+ buffer[size * 2] = 0;
+ for (i = 0; i < size; i++) {
+ uint8_t msb = (a[i] >> 4) & 0xF;
+ uint8_t lsb = a[i] & 0xF;
+ buffer[2*i] = msb > 9 ? msb + 'A' - 10 : msb + '0';
+ buffer[2*i + 1] = lsb > 9 ? lsb + 'A' - 10 : lsb + '0';
+ }
+
+ return buffer;
+}
+
+uint8_t* char_to_uint8(char *a, size_t size)
+{
+ uint8_t* buffer;
+ int i;
+
+ buffer = (uint8_t*)malloc(size);
+ if (!buffer)
+ return NULL;
+
+ for (i = 0; i < size; i++) {
+ uint8_t msb = (uint8_t)(a[2*i] > '9' ? a[2*i] - 'A' + 10 : a[2*i] - '0');
+ uint8_t lsb = (uint8_t)(a[2*i+1] > '9' ? a[2*i+1] - 'A' + 10 : a[2*i+1] - '0');
+ buffer[i] = ((msb << 4) | (lsb & 0xF)) & 0xFF;
+ }
+
+ return buffer;
+}
+
+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;
+ size_t buf_size = 0;
+ int r;
+
+ // Open the system bus where most system services are provided.
+ r = sd_bus_open_system(&bus);
+ if (r < 0) {
+ fprintf(stderr, "Failed to connect to system bus: %s\n", strerror(-r));
+ goto finish;
+ }
+
+ // 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
+ r = sd_bus_message_read(m, "a{sas}", 1, &temp_buf);
+ buf_size = strlen(temp_buf) + 1;
+ printf("IPMID connection name: %s\n", temp_buf);
+ *buf = (char*)malloc(buf_size);
+ memcpy(*buf, temp_buf, buf_size);
+
+finish:
+ sd_bus_error_free(&error);
+ sd_bus_message_unref(m);
+ sd_bus_unref(bus);
+
+ return r;
+}
+
+// TODO: object mapper should be used instead of hard-coding.
+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;
+ uint8_t* get_value = NULL;
+ char* connection = NULL;
+ int r, i;
+
+ // Open the system bus where most system services are provided.
+ r = sd_bus_open_system(&bus);
+ if (r < 0) {
+ fprintf(stderr, "Failed to connect to system bus: %s\n", strerror(-r));
+ goto finish;
+ }
+
+ object_mapper_get_connection(&connection, settings_object_name);
+ printf("connection: %s\n", 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 */
+ settings_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;
+ }
+
+ printf("IPMID boot option property get: {%s}.\n", (char*) temp_buf);
+
+ memcpy(buf, temp_buf, 2*NUM_RETURN_BYTES_OF_GET_USED + 1);
+
+finish:
+ sd_bus_error_free(&error);
+ sd_bus_message_unref(m);
+ sd_bus_unref(bus);
+ free(connection);
+
+ return r;
+}
+
+// TODO: object mapper should be used instead of hard-coding.
+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;
+
+ // Open the system bus where most system services are provided.
+ r = sd_bus_open_system(&bus);
+ if (r < 0) {
+ fprintf(stderr, "Failed to connect to system bus: %s\n", strerror(-r));
+ goto finish;
+ }
+
+ object_mapper_get_connection(&connection, settings_object_name);
+ printf("connection: %s\n", 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 */
+ settings_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);
+ sd_bus_unref(bus);
+ free(connection);
+
+ return r;
+}
+
void register_netfn_chassis_functions() __attribute__((constructor));
struct get_sys_boot_options_t {
@@ -17,6 +228,15 @@ struct get_sys_boot_options_t {
uint8_t block;
} __attribute__ ((packed));
+struct set_sys_boot_options_t {
+ uint8_t parameter;
+ uint8_t data1;
+ uint8_t data2;
+ uint8_t data3;
+ uint8_t data4;
+ uint8_t data5;
+} __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)
@@ -116,16 +336,63 @@ ipmi_ret_t ipmi_chassis_get_sys_boot_options(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
get_sys_boot_options_t *reqptr = (get_sys_boot_options_t*) request;
- // TODO Return default values to OPAL until dbus interface is available
+ char* buf = (char*)malloc(NUM_RETURN_BYTES_OF_GET);
+
+ if (reqptr->parameter == 5) // Parameter #5
+ {
+ dbus_get_property(buf);
+ uint8_t* return_value = char_to_uint8(buf, NUM_RETURN_BYTES_OF_GET_USED);
+ *data_len = NUM_RETURN_BYTES_OF_GET;
+ // TODO: last 3 bytes
+ // (NUM_RETURN_BYTES_OF_GET - NUM_RETURN_BYTES_OF_GET_USED) is meanlingless
+ memcpy(response, return_value, *data_len);
+ free(buf);
+ free(return_value);
+ }
+ else
+ {
+ *data_len = NUM_RETURN_BYTES_OF_GET;
+ // 0x80: parameter not supported
+ buf[0] = 0x80;
+ memcpy(response, buf, *data_len);
+ free(buf);
+ fprintf(stderr, "Unsupported parameter 0x%x\n", reqptr->parameter);
+ return IPMI_CC_PARM_NOT_SUPPORTED;
+ }
+
+ 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;
+
+ printf("IPMI SET_SYS_BOOT_OPTIONS\n");
+ printf("IPMID set command required return bytes: %i\n", *data_len);
+
+ set_sys_boot_options_t *reqptr = (set_sys_boot_options_t*) request;
+
+ char* output_buf = (char*)malloc(NUM_RETURN_BYTES_OF_SET);
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);
+ char* input_buf = uint8_to_char((uint8_t*)(&(reqptr->data1)), NUM_INPUT_BYTES_OF_SET);
+ dbus_set_property(input_buf);
+ *data_len = NUM_RETURN_BYTES_OF_SET;
+ // 0x0: return code OK.
+ output_buf[0] = 0x0;
+ memcpy(response, output_buf, *data_len);
+ free(output_buf);
+ free(input_buf);
}
else
{
+ // 0x80: parameter not supported
+ output_buf[0] = 0x80;
+ memcpy(response, output_buf, *data_len);
+ free(output_buf);
fprintf(stderr, "Unsupported parameter 0x%x\n", reqptr->parameter);
return IPMI_CC_PARM_NOT_SUPPORTED;
}
@@ -133,6 +400,7 @@ ipmi_ret_t ipmi_chassis_get_sys_boot_options(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
return rc;
}
+
void register_netfn_chassis_functions()
{
printf("Registering NetFn:[0x%X], Cmd:[0x%X]\n",NETFUN_CHASSIS, IPMI_CMD_WILDCARD);
@@ -141,6 +409,9 @@ void register_netfn_chassis_functions()
printf("Registering NetFn:[0x%X], Cmd:[0x%X]\n",NETFUN_CHASSIS, IPMI_CMD_GET_SYS_BOOT_OPTIONS);
ipmi_register_callback(NETFUN_CHASSIS, IPMI_CMD_GET_SYS_BOOT_OPTIONS, NULL, ipmi_chassis_get_sys_boot_options);
+ 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);
+
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);
}
diff --git a/chassishandler.h b/chassishandler.h
index 1a26411..0164ce1 100644
--- a/chassishandler.h
+++ b/chassishandler.h
@@ -3,12 +3,20 @@
#include
+// TODO: Petitboot requires 8 bytes of response
+// however only 5 of them are used.
+#define NUM_RETURN_BYTES_OF_GET 8
+#define NUM_RETURN_BYTES_OF_GET_USED 5
+#define NUM_RETURN_BYTES_OF_SET 1
+#define NUM_INPUT_BYTES_OF_SET 5
+
// IPMI commands for Chassis net functions.
enum ipmi_netfn_app_cmds
{
// Chassis Control
IPMI_CMD_CHASSIS_CONTROL = 0x02,
// Get capability bits
+ IPMI_CMD_SET_SYS_BOOT_OPTIONS = 0x08,
IPMI_CMD_GET_SYS_BOOT_OPTIONS = 0x09,
};
--
2.6.3
_______________________________________________
openbmc mailing list
openbmc@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/openbmc
[-- Attachment #2: Type: text/html, Size: 33365 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH phosphor-host-ipmid v4 2/2] Add get/set ipmid command support with correct DBUS property handling.
[not found] ` <OF21496544.74E17992-ON00257F1E.001742B8-1450325644659@LocalDomain>
@ 2015-12-17 5:36 ` Peng Fei BG Gou
2015-12-17 23:11 ` Stewart Smith
0 siblings, 1 reply; 8+ messages in thread
From: Peng Fei BG Gou @ 2015-12-17 5:36 UTC (permalink / raw)
To: Chris Austen; +Cc: openbmc, OpenBMC Patches
[-- Attachment #1.1: Type: text/plain, Size: 17046 bytes --]
This commit has patches from a different commit
As I have mentioned in my previous comments, please ignore this pull
request and refer to the latest one:
https://github.com/openbmc/phosphor-host-ipmid/pull/55
Id there really a need for uint_to_char like functions?
I believe so. Believe that is much more convenient for the conversion
instead of hard coding.
Sdbus seems to have a bug (or maybe I don't know how to use it) but unref
of of a bus doesn't seem to work. So you should not call sdbus_open You
should call the get_sbus (my correct spelling but I'm on a plane) function
found in the ipmid.c. File
I tested those codes, they worked fine. Seems you were talking about
another bug?
I've never seen a need to create free desktop functions not sure why they
are here. Attaching an object manager is a single function call. See the
phosphor-event repository
Not sure what do you mean by "attaching an object manager". Actually what
I'm doing is to call object manager and get the connection name with a
specified object path.
GOU, Peng Fei (苟鹏飞), Ph.D.
OpenPower Team.
From: Chris Austen/Austin/IBM
To: "OpenBMC Patches" <openbmc-patches@stwcx.xyz>
Cc: Peng Fei BG Gou/China/IBM@ibmcn, "openbmc"
<openbmc@lists.ozlabs.org>
Date: 12/17/2015 12:14 PM
Subject: Re: [PATCH phosphor-host-ipmid v4 2/2] Add get/set ipmid
command support with correct DBUS property handling.
This commit has patches from a different commit
Id there really a need for uint_to_char like functions?
Sdbus seems to have a bug (or maybe I don't know how to use it) but unref
of of a bus doesn't seem to work. So you should not call sdbus_open You
should call the get_sbus (my correct spelling but I'm on a plane) function
found in the ipmid.c. File
I've never seen a need to create free desktop functions not sure why they
are here. Attaching an object manager is a single function call. See the
phosphor-event repository
Sent from my iPhone using IBM Verse
On Dec 16, 2015, 8:20:47 PM, "OpenBMC Patches" <openbmc-patches@stwcx.xyz>
wrote:
From: shgoupf
1) Two methods to handle the dbus property set and get:
a) dbus_set_property()
b) dbus_get_property()
2) The property is stored as a 10 character strings which represents
5-byte information.
3) ipmid set method is registered and implemented since petitboot will
use it to clear the boot options.
4) Get service name via object mapper
a) The connection name is got via objectmapper.
b) The method used to get the connection name is
object_mapper_get_connection().
c) dbus_get_property/dbus_set_property will get the connection name
via
the above method instead of hard coding.
---
chassishandler.C | 279 ++++++++++++++++++++++++++++++++++++++++++++++++++
++++-
chassishandler.h | 8 ++
2 files changed, 283 insertions(+), 4 deletions(-)
diff --git a/chassishandler.C b/chassishandler.C
index 1389db9..35b5086 100644
--- a/chassishandler.C
+++ b/chassishandler.C
@@ -9,6 +9,217 @@ const char *chassis_bus_name =
"org.openbmc.control.Chassis";
const char *chassis_object_name = "/org/openbmc/control/chassis0";
const char *chassis_intf_name = "org.openbmc.control.Chassis";
+// Host settings in dbus
+// Service name should be referenced by connection name got via object
mapper
+// const char *settings_service_name = "org.openbmc.settings.Host";
+const char *settings_object_name = "/org/openbmc/settings/host0";
+const char *settings_intf_name = "org.freedesktop.DBus.Properties";
+
+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";
+
+char* uint8_to_char(uint8_t *a, size_t size)
+{
+ char* buffer;
+ int i;
+
+ buffer = (char*)malloc(size * 2 + 1);
+ if (!buffer)
+ return NULL;
+
+ buffer[size * 2] = 0;
+ for (i = 0; i < size; i++) {
+ uint8_t msb = (a[i] >> 4) & 0xF;
+ uint8_t lsb = a[i] & 0xF;
+ buffer[2*i] = msb > 9 ? msb + 'A' - 10 : msb + '0';
+ buffer[2*i + 1] = lsb > 9 ? lsb + 'A' - 10 : lsb + '0';
+ }
+
+ return buffer;
+}
+
+uint8_t* char_to_uint8(char *a, size_t size)
+{
+ uint8_t* buffer;
+ int i;
+
+ buffer = (uint8_t*)malloc(size);
+ if (!buffer)
+ return NULL;
+
+ for (i = 0; i < size; i++) {
+ uint8_t msb = (uint8_t)(a[2*i] > '9' ? a[2*i] - 'A' + 10 : a
[2*i] - '0');
+ uint8_t lsb = (uint8_t)(a[2*i+1] > '9' ? a[2*i+1] - 'A' + 10 : a
[2*i+1] - '0');
+ buffer[i] = ((msb << 4) | (lsb & 0xF)) & 0xFF;
+ }
+
+ return buffer;
+}
+
+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;
+ size_t buf_size = 0;
+ int r;
+
+ // Open the system bus where most system services are provided.
+ r = sd_bus_open_system(&bus);
+ if (r < 0) {
+ fprintf(stderr, "Failed to connect to system bus: %s\n",
strerror(-r));
+ goto finish;
+ }
+
+ // 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
+ r = sd_bus_message_read(m, "a{sas}", 1, &temp_buf);
+ buf_size = strlen(temp_buf) + 1;
+ printf("IPMID connection name: %s\n", temp_buf);
+ *buf = (char*)malloc(buf_size);
+ memcpy(*buf, temp_buf, buf_size);
+
+finish:
+ sd_bus_error_free(&error);
+ sd_bus_message_unref(m);
+ sd_bus_unref(bus);
+
+ return r;
+}
+
+// TODO: object mapper should be used instead of hard-coding.
+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;
+ uint8_t* get_value = NULL;
+ char* connection = NULL;
+ int r, i;
+
+ // Open the system bus where most system services are provided.
+ r = sd_bus_open_system(&bus);
+ if (r < 0) {
+ fprintf(stderr, "Failed to connect to system bus: %s\n",
strerror(-r));
+ goto finish;
+ }
+
+ object_mapper_get_connection(&connection, settings_object_name);
+ printf("connection: %s\n", 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 */
+ settings_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;
+ }
+
+ printf("IPMID boot option property get: {%s}.\n", (char*) temp_buf);
+
+ memcpy(buf, temp_buf, 2*NUM_RETURN_BYTES_OF_GET_USED + 1);
+
+finish:
+ sd_bus_error_free(&error);
+ sd_bus_message_unref(m);
+ sd_bus_unref(bus);
+ free(connection);
+
+ return r;
+}
+
+// TODO: object mapper should be used instead of hard-coding.
+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;
+
+ // Open the system bus where most system services are provided.
+ r = sd_bus_open_system(&bus);
+ if (r < 0) {
+ fprintf(stderr, "Failed to connect to system bus: %s\n",
strerror(-r));
+ goto finish;
+ }
+
+ object_mapper_get_connection(&connection, settings_object_name);
+ printf("connection: %s\n", 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 */
+ settings_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);
+ sd_bus_unref(bus);
+ free(connection);
+
+ return r;
+}
+
void register_netfn_chassis_functions() __attribute__((constructor));
struct get_sys_boot_options_t {
@@ -17,6 +228,15 @@ struct get_sys_boot_options_t {
uint8_t block;
} __attribute__ ((packed));
+struct set_sys_boot_options_t {
+ uint8_t parameter;
+ uint8_t data1;
+ uint8_t data2;
+ uint8_t data3;
+ uint8_t data4;
+ uint8_t data5;
+} __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)
@@ -116,16 +336,63 @@ ipmi_ret_t ipmi_chassis_get_sys_boot_options
(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
get_sys_boot_options_t *reqptr = (get_sys_boot_options_t*) request;
- // TODO Return default values to OPAL until dbus interface is
available
+ char* buf = (char*)malloc(NUM_RETURN_BYTES_OF_GET);
+
+ if (reqptr->parameter == 5) // Parameter #5
+ {
+ dbus_get_property(buf);
+ uint8_t* return_value = char_to_uint8(buf,
NUM_RETURN_BYTES_OF_GET_USED);
+ *data_len = NUM_RETURN_BYTES_OF_GET;
+ // TODO: last 3 bytes
+ // (NUM_RETURN_BYTES_OF_GET - NUM_RETURN_BYTES_OF_GET_USED) is
meanlingless
+ memcpy(response, return_value, *data_len);
+ free(buf);
+ free(return_value);
+ }
+ else
+ {
+ *data_len = NUM_RETURN_BYTES_OF_GET;
+ // 0x80: parameter not supported
+ buf[0] = 0x80;
+ memcpy(response, buf, *data_len);
+ free(buf);
+ fprintf(stderr, "Unsupported parameter 0x%x\n", reqptr->
parameter);
+ return IPMI_CC_PARM_NOT_SUPPORTED;
+ }
+
+ 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;
+
+ printf("IPMI SET_SYS_BOOT_OPTIONS\n");
+ printf("IPMID set command required return bytes: %i\n", *data_len);
+
+ set_sys_boot_options_t *reqptr = (set_sys_boot_options_t*) request;
+
+ char* output_buf = (char*)malloc(NUM_RETURN_BYTES_OF_SET);
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);
+ char* input_buf = uint8_to_char((uint8_t*)(&(reqptr->data1)),
NUM_INPUT_BYTES_OF_SET);
+ dbus_set_property(input_buf);
+ *data_len = NUM_RETURN_BYTES_OF_SET;
+ // 0x0: return code OK.
+ output_buf[0] = 0x0;
+ memcpy(response, output_buf, *data_len);
+ free(output_buf);
+ free(input_buf);
}
else
{
+ // 0x80: parameter not supported
+ output_buf[0] = 0x80;
+ memcpy(response, output_buf, *data_len);
+ free(output_buf);
fprintf(stderr, "Unsupported parameter 0x%x\n", reqptr->
parameter);
return IPMI_CC_PARM_NOT_SUPPORTED;
}
@@ -133,6 +400,7 @@ ipmi_ret_t ipmi_chassis_get_sys_boot_options
(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
return rc;
}
+
void register_netfn_chassis_functions()
{
printf("Registering NetFn:[0x%X], Cmd:[0x%X]\n",NETFUN_CHASSIS,
IPMI_CMD_WILDCARD);
@@ -141,6 +409,9 @@ void register_netfn_chassis_functions()
printf("Registering NetFn:[0x%X], Cmd:[0x%X]\n",NETFUN_CHASSIS,
IPMI_CMD_GET_SYS_BOOT_OPTIONS);
ipmi_register_callback(NETFUN_CHASSIS, IPMI_CMD_GET_SYS_BOOT_OPTIONS,
NULL, ipmi_chassis_get_sys_boot_options);
+ 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);
+
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);
}
diff --git a/chassishandler.h b/chassishandler.h
index 1a26411..0164ce1 100644
--- a/chassishandler.h
+++ b/chassishandler.h
@@ -3,12 +3,20 @@
#include
+// TODO: Petitboot requires 8 bytes of response
+// however only 5 of them are used.
+#define NUM_RETURN_BYTES_OF_GET 8
+#define NUM_RETURN_BYTES_OF_GET_USED 5
+#define NUM_RETURN_BYTES_OF_SET 1
+#define NUM_INPUT_BYTES_OF_SET 5
+
// IPMI commands for Chassis net functions.
enum ipmi_netfn_app_cmds
{
// Chassis Control
IPMI_CMD_CHASSIS_CONTROL = 0x02,
// Get capability bits
+ IPMI_CMD_SET_SYS_BOOT_OPTIONS = 0x08,
IPMI_CMD_GET_SYS_BOOT_OPTIONS = 0x09,
};
--
2.6.3
_______________________________________________
openbmc mailing list
openbmc@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/openbmc
[-- Attachment #1.2: Type: text/html, Size: 26457 bytes --]
[-- Attachment #2: graycol.gif --]
[-- Type: image/gif, Size: 105 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH phosphor-host-ipmid v4 2/2] Add get/set ipmid command support with correct DBUS property handling.
2015-12-17 1:20 ` [PATCH phosphor-host-ipmid v4 2/2] Add get/set ipmid command support with correct DBUS property handling OpenBMC Patches
2015-12-17 4:14 ` Chris Austen
[not found] ` <OF21496544.74E17992-ON00257F1E.001742B8-1450325644659@LocalDomain>
@ 2015-12-17 22:47 ` Stewart Smith
2015-12-18 2:51 ` Peng Fei BG Gou
2 siblings, 1 reply; 8+ messages in thread
From: Stewart Smith @ 2015-12-17 22:47 UTC (permalink / raw)
To: OpenBMC Patches, openbmc; +Cc: shgoupf
OpenBMC Patches <openbmc-patches@stwcx.xyz> writes:
> diff --git a/chassishandler.C b/chassishandler.C
> index 1389db9..35b5086 100644
> --- a/chassishandler.C
> +++ b/chassishandler.C
> @@ -9,6 +9,217 @@ const char *chassis_bus_name = "org.openbmc.control.Chassis";
> const char *chassis_object_name = "/org/openbmc/control/chassis0";
> const char *chassis_intf_name = "org.openbmc.control.Chassis";
>
> +// Host settings in dbus
> +// Service name should be referenced by connection name got via object mapper
> +// const char *settings_service_name = "org.openbmc.settings.Host";
> +const char *settings_object_name = "/org/openbmc/settings/host0";
> +const char *settings_intf_name = "org.freedesktop.DBus.Properties";
> +
> +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";
> +
> +char* uint8_to_char(uint8_t *a, size_t size)
> +{
> + char* buffer;
> + int i;
> +
> + buffer = (char*)malloc(size * 2 + 1);
> + if (!buffer)
> + return NULL;
> +
> + buffer[size * 2] = 0;
> + for (i = 0; i < size; i++) {
> + uint8_t msb = (a[i] >> 4) & 0xF;
> + uint8_t lsb = a[i] & 0xF;
> + buffer[2*i] = msb > 9 ? msb + 'A' - 10 : msb + '0';
> + buffer[2*i + 1] = lsb > 9 ? lsb + 'A' - 10 : lsb + '0';
> + }
> +
> + return buffer;
> +}
> +
> +uint8_t* char_to_uint8(char *a, size_t size)
> +{
> + uint8_t* buffer;
> + int i;
> +
> + buffer = (uint8_t*)malloc(size);
> + if (!buffer)
> + return NULL;
> +
> + for (i = 0; i < size; i++) {
> + uint8_t msb = (uint8_t)(a[2*i] > '9' ? a[2*i] - 'A' + 10 : a[2*i] - '0');
> + uint8_t lsb = (uint8_t)(a[2*i+1] > '9' ? a[2*i+1] - 'A' + 10 : a[2*i+1] - '0');
> + buffer[i] = ((msb << 4) | (lsb & 0xF)) & 0xFF;
> + }
> +
> + return buffer;
> +}
Use libc.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH phosphor-host-ipmid v4 2/2] Add get/set ipmid command support with correct DBUS property handling.
2015-12-17 5:36 ` Peng Fei BG Gou
@ 2015-12-17 23:11 ` Stewart Smith
0 siblings, 0 replies; 8+ messages in thread
From: Stewart Smith @ 2015-12-17 23:11 UTC (permalink / raw)
To: Peng Fei BG Gou, Chris Austen; +Cc: openbmc, OpenBMC Patches
Peng Fei BG Gou <shgoupf@cn.ibm.com> writes:
> This commit has patches from a different commit
> As I have mentioned in my previous comments, please ignore this pull
> request and refer to the latest one:
> https://github.com/openbmc/phosphor-host-ipmid/pull/55
>
>
> Id there really a need for uint_to_char like functions?
> I believe so. Believe that is much more convenient for the conversion
> instead of hard coding.
>
>
> Sdbus seems to have a bug (or maybe I don't know how to use it) but unref
> of of a bus doesn't seem to work. So you should not call sdbus_open You
> should call the get_sbus (my correct spelling but I'm on a plane) function
> found in the ipmid.c. File
> I tested those codes, they worked fine. Seems you were talking about
> another bug?
>
>
> I've never seen a need to create free desktop functions not sure why they
> are here. Attaching an object manager is a single function call. See the
> phosphor-event repository
> Not sure what do you mean by "attaching an object manager". Actually what
> I'm doing is to call object manager and get the connection name with a
> specified object path.
>
> GOU, Peng Fei (苟鹏飞), Ph.D.
> OpenPower Team.
>
>
>
> From: Chris Austen/Austin/IBM
> To: "OpenBMC Patches" <openbmc-patches@stwcx.xyz>
> Cc: Peng Fei BG Gou/China/IBM@ibmcn, "openbmc"
> <openbmc@lists.ozlabs.org>
> Date: 12/17/2015 12:14 PM
> Subject: Re: [PATCH phosphor-host-ipmid v4 2/2] Add get/set ipmid
> command support with correct DBUS property handling.
>
>
>
> This commit has patches from a different commit
>
> Id there really a need for uint_to_char like functions?
You should fix your email client, there's a bunch of weird quoting going
on and then to posting without any quoting.
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH phosphor-host-ipmid v4 2/2] Add get/set ipmid command support with correct DBUS property handling.
2015-12-17 22:47 ` Stewart Smith
@ 2015-12-18 2:51 ` Peng Fei BG Gou
0 siblings, 0 replies; 8+ messages in thread
From: Peng Fei BG Gou @ 2015-12-18 2:51 UTC (permalink / raw)
To: Stewart Smith; +Cc: openbmc, OpenBMC Patches
[-- Attachment #1: Type: text/plain, Size: 186 bytes --]
Thanks for reminding that clib should be used for int/string conversion.
I have updated my commit by using sscanf/sprintf to do this.
GOU, Peng Fei (苟鹏飞), Ph.D.
OpenPower Team.
[-- Attachment #2: Type: text/html, Size: 357 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2015-12-18 2:51 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-17 1:20 [PATCH phosphor-host-ipmid v4 0/2] IPMID boot options changes OpenBMC Patches
2015-12-17 1:20 ` [PATCH phosphor-host-ipmid v4 1/2] Support host reboot OpenBMC Patches
2015-12-17 1:20 ` [PATCH phosphor-host-ipmid v4 2/2] Add get/set ipmid command support with correct DBUS property handling OpenBMC Patches
2015-12-17 4:14 ` Chris Austen
[not found] ` <OF21496544.74E17992-ON00257F1E.001742B8-1450325644659@LocalDomain>
2015-12-17 5:36 ` Peng Fei BG Gou
2015-12-17 23:11 ` Stewart Smith
2015-12-17 22:47 ` Stewart Smith
2015-12-18 2:51 ` Peng Fei BG Gou
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.