diff mbox

[v2,8/9] ipmi: add ACPI power and GUID commands

Message ID 1453396734-9363-9-git-send-email-clg@fr.ibm.com
State New
Headers show

Commit Message

Cédric Le Goater Jan. 21, 2016, 5:18 p.m. UTC 
Signed-off-by: Cédric Le Goater <clg@fr.ibm.com>
---

Changes since v1:
 - added ACPI to command names.
 
 hw/ipmi/ipmi_bmc_sim.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

Comments

Greg Kurz Jan. 22, 2016, 11:24 a.m. UTC | #1 
On Thu, 21 Jan 2016 18:18:53 +0100
Cédric Le Goater <clg@fr.ibm.com> wrote:

> Signed-off-by: Cédric Le Goater <clg@fr.ibm.com>
> ---
> 
> Changes since v1:
>  - added ACPI to command names.
> 
>  hw/ipmi/ipmi_bmc_sim.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 49 insertions(+)
> 
> diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c
> index e882af3f1b40..53c75cb21c1a 100644
> --- a/hw/ipmi/ipmi_bmc_sim.c
> +++ b/hw/ipmi/ipmi_bmc_sim.c
> @@ -25,6 +25,7 @@
>  #include <stdio.h>
>  #include <string.h>
>  #include <stdint.h>
> +#include "sysemu/sysemu.h"
>  #include "qemu/timer.h"
>  #include "hw/ipmi/ipmi.h"
>  #include "qemu/error-report.h"
> @@ -51,6 +52,9 @@
>  #define IPMI_CMD_GET_DEVICE_ID            0x01
>  #define IPMI_CMD_COLD_RESET               0x02
>  #define IPMI_CMD_WARM_RESET               0x03
> +#define IPMI_CMD_SET_ACPI_POWER_STATE     0x06
> +#define IPMI_CMD_GET_ACPI_POWER_STATE     0x07
> +#define IPMI_CMD_GET_DEVICE_GUID          0x08
>  #define IPMI_CMD_RESET_WATCHDOG_TIMER     0x22
>  #define IPMI_CMD_SET_WATCHDOG_TIMER       0x24
>  #define IPMI_CMD_GET_WATCHDOG_TIMER       0x25
> @@ -200,6 +204,9 @@ struct IPMIBmcSim {
> 
>      uint8_t restart_cause;
> 
> +    uint8_t acpi_power_state[2];
> +    uint8_t uuid[16];
> +
>      IPMISel sel;
>      IPMISdr sdr;
>      IPMISensor sensors[MAX_SENSORS];
> @@ -828,6 +835,36 @@ static void warm_reset(IPMIBmcSim *ibs,
>          k->reset(s, false);
>      }
>  }
> +static void set_acpi_power_state(IPMIBmcSim *ibs,
> +                          uint8_t *cmd, unsigned int cmd_len,
> +                          uint8_t *rsp, unsigned int *rsp_len,
> +                          unsigned int max_rsp_len)
> +{
> +    IPMI_CHECK_CMD_LEN(4);
> +    ibs->acpi_power_state[0] = cmd[2];
> +    ibs->acpi_power_state[1] = cmd[3];
> +}
> +
> +static void get_acpi_power_state(IPMIBmcSim *ibs,
> +                          uint8_t *cmd, unsigned int cmd_len,
> +                          uint8_t *rsp, unsigned int *rsp_len,
> +                          unsigned int max_rsp_len)
> +{
> +    IPMI_ADD_RSP_DATA(ibs->acpi_power_state[0]);
> +    IPMI_ADD_RSP_DATA(ibs->acpi_power_state[1]);
> +}
> +
> +static void get_device_guid(IPMIBmcSim *ibs,
> +                          uint8_t *cmd, unsigned int cmd_len,
> +                          uint8_t *rsp, unsigned int *rsp_len,
> +                          unsigned int max_rsp_len)
> +{
> +    unsigned int i;
> +
> +    for (i = 0; i < 16; i++) {
> +        IPMI_ADD_RSP_DATA(ibs->uuid[i]);
> +    }
> +}
> 
>  static void set_bmc_global_enables(IPMIBmcSim *ibs,
>                                     uint8_t *cmd, unsigned int cmd_len,
> @@ -1609,6 +1646,9 @@ static const IPMICmdHandler app_cmds[] = {
>      [IPMI_CMD_GET_DEVICE_ID] = get_device_id,
>      [IPMI_CMD_COLD_RESET] = cold_reset,
>      [IPMI_CMD_WARM_RESET] = warm_reset,
> +    [IPMI_CMD_SET_ACPI_POWER_STATE] = set_acpi_power_state,
> +    [IPMI_CMD_GET_ACPI_POWER_STATE] = get_acpi_power_state,
> +    [IPMI_CMD_GET_DEVICE_GUID] = get_device_guid,
>      [IPMI_CMD_SET_BMC_GLOBAL_ENABLES] = set_bmc_global_enables,
>      [IPMI_CMD_GET_BMC_GLOBAL_ENABLES] = get_bmc_global_enables,
>      [IPMI_CMD_CLR_MSG_FLAGS] = clr_msg_flags,
> @@ -1734,6 +1774,15 @@ static void ipmi_sim_init(Object *obj)
>          i += len;
>      }
> 
> +    ibs->acpi_power_state[0] = 0;
> +    ibs->acpi_power_state[1] = 0;
> +
> +    if (qemu_uuid_set) {
> +        memcpy(&ibs->uuid, qemu_uuid, 16);
> +    } else {
> +        memset(&ibs->uuid, 0, 16);
> +    }
> +

Sorry if this is a dumb question: why does the VM's UUID gets copied here ?

>      ipmi_init_sensors_from_sdrs(ibs);
>      register_cmds(ibs);
>
Cédric Le Goater Jan. 22, 2016, 11:58 a.m. UTC | #2 
On 01/22/2016 12:24 PM, Greg Kurz wrote:
> On Thu, 21 Jan 2016 18:18:53 +0100
> Cédric Le Goater <clg@fr.ibm.com> wrote:
> 
>> Signed-off-by: Cédric Le Goater <clg@fr.ibm.com>
>> ---
>>
>> Changes since v1:
>>  - added ACPI to command names.
>>
>>  hw/ipmi/ipmi_bmc_sim.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
>>  1 file changed, 49 insertions(+)
>>
>> diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c
>> index e882af3f1b40..53c75cb21c1a 100644
>> --- a/hw/ipmi/ipmi_bmc_sim.c
>> +++ b/hw/ipmi/ipmi_bmc_sim.c
>> @@ -25,6 +25,7 @@
>>  #include <stdio.h>
>>  #include <string.h>
>>  #include <stdint.h>
>> +#include "sysemu/sysemu.h"
>>  #include "qemu/timer.h"
>>  #include "hw/ipmi/ipmi.h"
>>  #include "qemu/error-report.h"
>> @@ -51,6 +52,9 @@
>>  #define IPMI_CMD_GET_DEVICE_ID            0x01
>>  #define IPMI_CMD_COLD_RESET               0x02
>>  #define IPMI_CMD_WARM_RESET               0x03
>> +#define IPMI_CMD_SET_ACPI_POWER_STATE     0x06
>> +#define IPMI_CMD_GET_ACPI_POWER_STATE     0x07
>> +#define IPMI_CMD_GET_DEVICE_GUID          0x08
>>  #define IPMI_CMD_RESET_WATCHDOG_TIMER     0x22
>>  #define IPMI_CMD_SET_WATCHDOG_TIMER       0x24
>>  #define IPMI_CMD_GET_WATCHDOG_TIMER       0x25
>> @@ -200,6 +204,9 @@ struct IPMIBmcSim {
>>
>>      uint8_t restart_cause;
>>
>> +    uint8_t acpi_power_state[2];
>> +    uint8_t uuid[16];
>> +
>>      IPMISel sel;
>>      IPMISdr sdr;
>>      IPMISensor sensors[MAX_SENSORS];
>> @@ -828,6 +835,36 @@ static void warm_reset(IPMIBmcSim *ibs,
>>          k->reset(s, false);
>>      }
>>  }
>> +static void set_acpi_power_state(IPMIBmcSim *ibs,
>> +                          uint8_t *cmd, unsigned int cmd_len,
>> +                          uint8_t *rsp, unsigned int *rsp_len,
>> +                          unsigned int max_rsp_len)
>> +{
>> +    IPMI_CHECK_CMD_LEN(4);
>> +    ibs->acpi_power_state[0] = cmd[2];
>> +    ibs->acpi_power_state[1] = cmd[3];
>> +}
>> +
>> +static void get_acpi_power_state(IPMIBmcSim *ibs,
>> +                          uint8_t *cmd, unsigned int cmd_len,
>> +                          uint8_t *rsp, unsigned int *rsp_len,
>> +                          unsigned int max_rsp_len)
>> +{
>> +    IPMI_ADD_RSP_DATA(ibs->acpi_power_state[0]);
>> +    IPMI_ADD_RSP_DATA(ibs->acpi_power_state[1]);
>> +}
>> +
>> +static void get_device_guid(IPMIBmcSim *ibs,
>> +                          uint8_t *cmd, unsigned int cmd_len,
>> +                          uint8_t *rsp, unsigned int *rsp_len,
>> +                          unsigned int max_rsp_len)
>> +{
>> +    unsigned int i;
>> +
>> +    for (i = 0; i < 16; i++) {
>> +        IPMI_ADD_RSP_DATA(ibs->uuid[i]);
>> +    }
>> +}
>>
>>  static void set_bmc_global_enables(IPMIBmcSim *ibs,
>>                                     uint8_t *cmd, unsigned int cmd_len,
>> @@ -1609,6 +1646,9 @@ static const IPMICmdHandler app_cmds[] = {
>>      [IPMI_CMD_GET_DEVICE_ID] = get_device_id,
>>      [IPMI_CMD_COLD_RESET] = cold_reset,
>>      [IPMI_CMD_WARM_RESET] = warm_reset,
>> +    [IPMI_CMD_SET_ACPI_POWER_STATE] = set_acpi_power_state,
>> +    [IPMI_CMD_GET_ACPI_POWER_STATE] = get_acpi_power_state,
>> +    [IPMI_CMD_GET_DEVICE_GUID] = get_device_guid,
>>      [IPMI_CMD_SET_BMC_GLOBAL_ENABLES] = set_bmc_global_enables,
>>      [IPMI_CMD_GET_BMC_GLOBAL_ENABLES] = get_bmc_global_enables,
>>      [IPMI_CMD_CLR_MSG_FLAGS] = clr_msg_flags,
>> @@ -1734,6 +1774,15 @@ static void ipmi_sim_init(Object *obj)
>>          i += len;
>>      }
>>
>> +    ibs->acpi_power_state[0] = 0;
>> +    ibs->acpi_power_state[1] = 0;
>> +
>> +    if (qemu_uuid_set) {
>> +        memcpy(&ibs->uuid, qemu_uuid, 16);
>> +    } else {
>> +        memset(&ibs->uuid, 0, 16);
>> +    }
>> +
> 
> Sorry if this is a dumb question: why does the VM's UUID gets copied here ?

From the specs (20.8 Get Device GUID Command), the command needs to return 
a GUID (Globally Unique ID), or UUID, that should never change over the 
lifetime of the device. 

qemu_uuid looked like a good candidate to start with but we could use a 
property also if needed.

Thanks,

C.
Corey Minyard Jan. 22, 2016, 1:04 p.m. UTC | #3 
On 01/21/2016 11:18 AM, Cédric Le Goater wrote:
> Signed-off-by: Cédric Le Goater <clg@fr.ibm.com>
> ---
>
> Changes since v1:
>   - added ACPI to command names.

Thanks.

Acked-by: Corey Minyard <cminyard@mvista.com>

>   
>   hw/ipmi/ipmi_bmc_sim.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
>   1 file changed, 49 insertions(+)
>
> diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c
> index e882af3f1b40..53c75cb21c1a 100644
> --- a/hw/ipmi/ipmi_bmc_sim.c
> +++ b/hw/ipmi/ipmi_bmc_sim.c
> @@ -25,6 +25,7 @@
>   #include <stdio.h>
>   #include <string.h>
>   #include <stdint.h>
> +#include "sysemu/sysemu.h"
>   #include "qemu/timer.h"
>   #include "hw/ipmi/ipmi.h"
>   #include "qemu/error-report.h"
> @@ -51,6 +52,9 @@
>   #define IPMI_CMD_GET_DEVICE_ID            0x01
>   #define IPMI_CMD_COLD_RESET               0x02
>   #define IPMI_CMD_WARM_RESET               0x03
> +#define IPMI_CMD_SET_ACPI_POWER_STATE     0x06
> +#define IPMI_CMD_GET_ACPI_POWER_STATE     0x07
> +#define IPMI_CMD_GET_DEVICE_GUID          0x08
>   #define IPMI_CMD_RESET_WATCHDOG_TIMER     0x22
>   #define IPMI_CMD_SET_WATCHDOG_TIMER       0x24
>   #define IPMI_CMD_GET_WATCHDOG_TIMER       0x25
> @@ -200,6 +204,9 @@ struct IPMIBmcSim {
>   
>       uint8_t restart_cause;
>   
> +    uint8_t acpi_power_state[2];
> +    uint8_t uuid[16];
> +
>       IPMISel sel;
>       IPMISdr sdr;
>       IPMISensor sensors[MAX_SENSORS];
> @@ -828,6 +835,36 @@ static void warm_reset(IPMIBmcSim *ibs,
>           k->reset(s, false);
>       }
>   }
> +static void set_acpi_power_state(IPMIBmcSim *ibs,
> +                          uint8_t *cmd, unsigned int cmd_len,
> +                          uint8_t *rsp, unsigned int *rsp_len,
> +                          unsigned int max_rsp_len)
> +{
> +    IPMI_CHECK_CMD_LEN(4);
> +    ibs->acpi_power_state[0] = cmd[2];
> +    ibs->acpi_power_state[1] = cmd[3];
> +}
> +
> +static void get_acpi_power_state(IPMIBmcSim *ibs,
> +                          uint8_t *cmd, unsigned int cmd_len,
> +                          uint8_t *rsp, unsigned int *rsp_len,
> +                          unsigned int max_rsp_len)
> +{
> +    IPMI_ADD_RSP_DATA(ibs->acpi_power_state[0]);
> +    IPMI_ADD_RSP_DATA(ibs->acpi_power_state[1]);
> +}
> +
> +static void get_device_guid(IPMIBmcSim *ibs,
> +                          uint8_t *cmd, unsigned int cmd_len,
> +                          uint8_t *rsp, unsigned int *rsp_len,
> +                          unsigned int max_rsp_len)
> +{
> +    unsigned int i;
> +
> +    for (i = 0; i < 16; i++) {
> +        IPMI_ADD_RSP_DATA(ibs->uuid[i]);
> +    }
> +}
>   
>   static void set_bmc_global_enables(IPMIBmcSim *ibs,
>                                      uint8_t *cmd, unsigned int cmd_len,
> @@ -1609,6 +1646,9 @@ static const IPMICmdHandler app_cmds[] = {
>       [IPMI_CMD_GET_DEVICE_ID] = get_device_id,
>       [IPMI_CMD_COLD_RESET] = cold_reset,
>       [IPMI_CMD_WARM_RESET] = warm_reset,
> +    [IPMI_CMD_SET_ACPI_POWER_STATE] = set_acpi_power_state,
> +    [IPMI_CMD_GET_ACPI_POWER_STATE] = get_acpi_power_state,
> +    [IPMI_CMD_GET_DEVICE_GUID] = get_device_guid,
>       [IPMI_CMD_SET_BMC_GLOBAL_ENABLES] = set_bmc_global_enables,
>       [IPMI_CMD_GET_BMC_GLOBAL_ENABLES] = get_bmc_global_enables,
>       [IPMI_CMD_CLR_MSG_FLAGS] = clr_msg_flags,
> @@ -1734,6 +1774,15 @@ static void ipmi_sim_init(Object *obj)
>           i += len;
>       }
>   
> +    ibs->acpi_power_state[0] = 0;
> +    ibs->acpi_power_state[1] = 0;
> +
> +    if (qemu_uuid_set) {
> +        memcpy(&ibs->uuid, qemu_uuid, 16);
> +    } else {
> +        memset(&ibs->uuid, 0, 16);
> +    }
> +
>       ipmi_init_sensors_from_sdrs(ibs);
>       register_cmds(ibs);
>
diff mbox

Patch

diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c
index e882af3f1b40..53c75cb21c1a 100644
--- a/hw/ipmi/ipmi_bmc_sim.c
+++ b/hw/ipmi/ipmi_bmc_sim.c
@@ -25,6 +25,7 @@ 
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
+#include "sysemu/sysemu.h"
 #include "qemu/timer.h"
 #include "hw/ipmi/ipmi.h"
 #include "qemu/error-report.h"
@@ -51,6 +52,9 @@ 
 #define IPMI_CMD_GET_DEVICE_ID            0x01
 #define IPMI_CMD_COLD_RESET               0x02
 #define IPMI_CMD_WARM_RESET               0x03
+#define IPMI_CMD_SET_ACPI_POWER_STATE     0x06
+#define IPMI_CMD_GET_ACPI_POWER_STATE     0x07
+#define IPMI_CMD_GET_DEVICE_GUID          0x08
 #define IPMI_CMD_RESET_WATCHDOG_TIMER     0x22
 #define IPMI_CMD_SET_WATCHDOG_TIMER       0x24
 #define IPMI_CMD_GET_WATCHDOG_TIMER       0x25
@@ -200,6 +204,9 @@  struct IPMIBmcSim {
 
     uint8_t restart_cause;
 
+    uint8_t acpi_power_state[2];
+    uint8_t uuid[16];
+
     IPMISel sel;
     IPMISdr sdr;
     IPMISensor sensors[MAX_SENSORS];
@@ -828,6 +835,36 @@  static void warm_reset(IPMIBmcSim *ibs,
         k->reset(s, false);
     }
 }
+static void set_acpi_power_state(IPMIBmcSim *ibs,
+                          uint8_t *cmd, unsigned int cmd_len,
+                          uint8_t *rsp, unsigned int *rsp_len,
+                          unsigned int max_rsp_len)
+{
+    IPMI_CHECK_CMD_LEN(4);
+    ibs->acpi_power_state[0] = cmd[2];
+    ibs->acpi_power_state[1] = cmd[3];
+}
+
+static void get_acpi_power_state(IPMIBmcSim *ibs,
+                          uint8_t *cmd, unsigned int cmd_len,
+                          uint8_t *rsp, unsigned int *rsp_len,
+                          unsigned int max_rsp_len)
+{
+    IPMI_ADD_RSP_DATA(ibs->acpi_power_state[0]);
+    IPMI_ADD_RSP_DATA(ibs->acpi_power_state[1]);
+}
+
+static void get_device_guid(IPMIBmcSim *ibs,
+                          uint8_t *cmd, unsigned int cmd_len,
+                          uint8_t *rsp, unsigned int *rsp_len,
+                          unsigned int max_rsp_len)
+{
+    unsigned int i;
+
+    for (i = 0; i < 16; i++) {
+        IPMI_ADD_RSP_DATA(ibs->uuid[i]);
+    }
+}
 
 static void set_bmc_global_enables(IPMIBmcSim *ibs,
                                    uint8_t *cmd, unsigned int cmd_len,
@@ -1609,6 +1646,9 @@  static const IPMICmdHandler app_cmds[] = {
     [IPMI_CMD_GET_DEVICE_ID] = get_device_id,
     [IPMI_CMD_COLD_RESET] = cold_reset,
     [IPMI_CMD_WARM_RESET] = warm_reset,
+    [IPMI_CMD_SET_ACPI_POWER_STATE] = set_acpi_power_state,
+    [IPMI_CMD_GET_ACPI_POWER_STATE] = get_acpi_power_state,
+    [IPMI_CMD_GET_DEVICE_GUID] = get_device_guid,
     [IPMI_CMD_SET_BMC_GLOBAL_ENABLES] = set_bmc_global_enables,
     [IPMI_CMD_GET_BMC_GLOBAL_ENABLES] = get_bmc_global_enables,
     [IPMI_CMD_CLR_MSG_FLAGS] = clr_msg_flags,
@@ -1734,6 +1774,15 @@  static void ipmi_sim_init(Object *obj)
         i += len;
     }
 
+    ibs->acpi_power_state[0] = 0;
+    ibs->acpi_power_state[1] = 0;
+
+    if (qemu_uuid_set) {
+        memcpy(&ibs->uuid, qemu_uuid, 16);
+    } else {
+        memset(&ibs->uuid, 0, 16);
+    }
+
     ipmi_init_sensors_from_sdrs(ibs);
     register_cmds(ibs);