diff mbox

[3/8] ipmi: add GET_SYS_RESTART_CAUSE chassis command

Message ID 1452015002-28493-4-git-send-email-clg@fr.ibm.com
State New
Headers show

Commit Message

Cédric Le Goater Jan. 5, 2016, 5:29 p.m. UTC
This is a simulator. Just return an unknown cause (0).

Signed-off-by: Cédric Le Goater <clg@fr.ibm.com>
---
 hw/ipmi/ipmi_bmc_sim.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

Comments

Greg Kurz Jan. 6, 2016, 2:55 p.m. UTC | #1
On Tue,  5 Jan 2016 18:29:57 +0100
Cédric Le Goater <clg@fr.ibm.com> wrote:

> This is a simulator. Just return an unknown cause (0).
> 
> Signed-off-by: Cédric Le Goater <clg@fr.ibm.com>
> ---

Acked-by: Greg Kurz <gkurz@linux.vnet.ibm.com>

>  hw/ipmi/ipmi_bmc_sim.c | 20 ++++++++++++++++++--
>  1 file changed, 18 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c
> index 061db8437479..5db94491b130 100644
> --- a/hw/ipmi/ipmi_bmc_sim.c
> +++ b/hw/ipmi/ipmi_bmc_sim.c
> @@ -30,11 +30,12 @@
>  #include "qemu/error-report.h"
> 
>  #define IPMI_NETFN_CHASSIS            0x00
> -#define IPMI_NETFN_CHASSIS_MAXCMD         0x03
> +#define IPMI_NETFN_CHASSIS_MAXCMD         0x0a
> 

No big deal again but I guess the define would better fit...

>  #define IPMI_CMD_GET_CHASSIS_CAPABILITIES 0x00
>  #define IPMI_CMD_GET_CHASSIS_STATUS       0x01
>  #define IPMI_CMD_CHASSIS_CONTROL          0x02
> +#define IPMI_CMD_GET_SYS_RESTART_CAUSE    0x09
> 

... here.

>  #define IPMI_NETFN_SENSOR_EVENT       0x04
>  #define IPMI_NETFN_SENSOR_EVENT_MAXCMD    0x30
> @@ -201,6 +202,8 @@ struct IPMIBmcSim {
>      uint8_t mfg_id[3];
>      uint8_t product_id[2];
> 
> +    uint8_t restart_cause;
> +
>      IPMISel sel;
>      IPMISdr sdr;
>      IPMISensor sensors[MAX_SENSORS];
> @@ -754,6 +757,17 @@ static void chassis_control(IPMIBmcSim *ibs,
>      return;
>  }
> 
> +static void chassis_get_sys_restart_cause(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->restart_cause & 0xf); /* Restart Cause */

Define a mask ?

> +    IPMI_ADD_RSP_DATA(0);  /* Channel 0 */
> + out:
> +    return;
> +}
> +
>  static void get_device_id(IPMIBmcSim *ibs,
>                            uint8_t *cmd, unsigned int cmd_len,
>                            uint8_t *rsp, unsigned int *rsp_len,
> @@ -1624,7 +1638,8 @@ static void get_sensor_type(IPMIBmcSim *ibs,
>  static const IPMICmdHandler chassis_cmds[IPMI_NETFN_CHASSIS_MAXCMD] = {
>      [IPMI_CMD_GET_CHASSIS_CAPABILITIES] = chassis_capabilities,
>      [IPMI_CMD_GET_CHASSIS_STATUS] = chassis_status,
> -    [IPMI_CMD_CHASSIS_CONTROL] = chassis_control
> +    [IPMI_CMD_CHASSIS_CONTROL] = chassis_control,
> +    [IPMI_CMD_GET_SYS_RESTART_CAUSE] = chassis_get_sys_restart_cause
>  };
>  static const IPMINetfn chassis_netfn = {
>      .cmd_nums = IPMI_NETFN_CHASSIS_MAXCMD,
> @@ -1746,6 +1761,7 @@ static void ipmi_sim_init(Object *obj)
>      ibs->bmc_global_enables = (1 << IPMI_BMC_EVENT_LOG_BIT);
>      ibs->device_id = 0x20;
>      ibs->ipmi_version = 0x02; /* IPMI 2.0 */
> +    ibs->restart_cause = 0;
>      for (i = 0; i < 4; i++) {
>          ibs->sel.last_addition[i] = 0xff;
>          ibs->sel.last_clear[i] = 0xff;
Corey Minyard Jan. 8, 2016, 8:21 p.m. UTC | #2
Acked-by: Corey Minyard <cminyard@mvista.com>

On 01/05/2016 11:29 AM, Cédric Le Goater wrote:
> This is a simulator. Just return an unknown cause (0).
>
> Signed-off-by: Cédric Le Goater <clg@fr.ibm.com>
> ---
>   hw/ipmi/ipmi_bmc_sim.c | 20 ++++++++++++++++++--
>   1 file changed, 18 insertions(+), 2 deletions(-)
>
> diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c
> index 061db8437479..5db94491b130 100644
> --- a/hw/ipmi/ipmi_bmc_sim.c
> +++ b/hw/ipmi/ipmi_bmc_sim.c
> @@ -30,11 +30,12 @@
>   #include "qemu/error-report.h"
>   
>   #define IPMI_NETFN_CHASSIS            0x00
> -#define IPMI_NETFN_CHASSIS_MAXCMD         0x03
> +#define IPMI_NETFN_CHASSIS_MAXCMD         0x0a
>   
>   #define IPMI_CMD_GET_CHASSIS_CAPABILITIES 0x00
>   #define IPMI_CMD_GET_CHASSIS_STATUS       0x01
>   #define IPMI_CMD_CHASSIS_CONTROL          0x02
> +#define IPMI_CMD_GET_SYS_RESTART_CAUSE    0x09
>   
>   #define IPMI_NETFN_SENSOR_EVENT       0x04
>   #define IPMI_NETFN_SENSOR_EVENT_MAXCMD    0x30
> @@ -201,6 +202,8 @@ struct IPMIBmcSim {
>       uint8_t mfg_id[3];
>       uint8_t product_id[2];
>   
> +    uint8_t restart_cause;
> +
>       IPMISel sel;
>       IPMISdr sdr;
>       IPMISensor sensors[MAX_SENSORS];
> @@ -754,6 +757,17 @@ static void chassis_control(IPMIBmcSim *ibs,
>       return;
>   }
>   
> +static void chassis_get_sys_restart_cause(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->restart_cause & 0xf); /* Restart Cause */
> +    IPMI_ADD_RSP_DATA(0);  /* Channel 0 */
> + out:
> +    return;
> +}
> +
>   static void get_device_id(IPMIBmcSim *ibs,
>                             uint8_t *cmd, unsigned int cmd_len,
>                             uint8_t *rsp, unsigned int *rsp_len,
> @@ -1624,7 +1638,8 @@ static void get_sensor_type(IPMIBmcSim *ibs,
>   static const IPMICmdHandler chassis_cmds[IPMI_NETFN_CHASSIS_MAXCMD] = {
>       [IPMI_CMD_GET_CHASSIS_CAPABILITIES] = chassis_capabilities,
>       [IPMI_CMD_GET_CHASSIS_STATUS] = chassis_status,
> -    [IPMI_CMD_CHASSIS_CONTROL] = chassis_control
> +    [IPMI_CMD_CHASSIS_CONTROL] = chassis_control,
> +    [IPMI_CMD_GET_SYS_RESTART_CAUSE] = chassis_get_sys_restart_cause
>   };
>   static const IPMINetfn chassis_netfn = {
>       .cmd_nums = IPMI_NETFN_CHASSIS_MAXCMD,
> @@ -1746,6 +1761,7 @@ static void ipmi_sim_init(Object *obj)
>       ibs->bmc_global_enables = (1 << IPMI_BMC_EVENT_LOG_BIT);
>       ibs->device_id = 0x20;
>       ibs->ipmi_version = 0x02; /* IPMI 2.0 */
> +    ibs->restart_cause = 0;
>       for (i = 0; i < 4; i++) {
>           ibs->sel.last_addition[i] = 0xff;
>           ibs->sel.last_clear[i] = 0xff;
diff mbox

Patch

diff --git a/hw/ipmi/ipmi_bmc_sim.c b/hw/ipmi/ipmi_bmc_sim.c
index 061db8437479..5db94491b130 100644
--- a/hw/ipmi/ipmi_bmc_sim.c
+++ b/hw/ipmi/ipmi_bmc_sim.c
@@ -30,11 +30,12 @@ 
 #include "qemu/error-report.h"
 
 #define IPMI_NETFN_CHASSIS            0x00
-#define IPMI_NETFN_CHASSIS_MAXCMD         0x03
+#define IPMI_NETFN_CHASSIS_MAXCMD         0x0a
 
 #define IPMI_CMD_GET_CHASSIS_CAPABILITIES 0x00
 #define IPMI_CMD_GET_CHASSIS_STATUS       0x01
 #define IPMI_CMD_CHASSIS_CONTROL          0x02
+#define IPMI_CMD_GET_SYS_RESTART_CAUSE    0x09
 
 #define IPMI_NETFN_SENSOR_EVENT       0x04
 #define IPMI_NETFN_SENSOR_EVENT_MAXCMD    0x30
@@ -201,6 +202,8 @@  struct IPMIBmcSim {
     uint8_t mfg_id[3];
     uint8_t product_id[2];
 
+    uint8_t restart_cause;
+
     IPMISel sel;
     IPMISdr sdr;
     IPMISensor sensors[MAX_SENSORS];
@@ -754,6 +757,17 @@  static void chassis_control(IPMIBmcSim *ibs,
     return;
 }
 
+static void chassis_get_sys_restart_cause(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->restart_cause & 0xf); /* Restart Cause */
+    IPMI_ADD_RSP_DATA(0);  /* Channel 0 */
+ out:
+    return;
+}
+
 static void get_device_id(IPMIBmcSim *ibs,
                           uint8_t *cmd, unsigned int cmd_len,
                           uint8_t *rsp, unsigned int *rsp_len,
@@ -1624,7 +1638,8 @@  static void get_sensor_type(IPMIBmcSim *ibs,
 static const IPMICmdHandler chassis_cmds[IPMI_NETFN_CHASSIS_MAXCMD] = {
     [IPMI_CMD_GET_CHASSIS_CAPABILITIES] = chassis_capabilities,
     [IPMI_CMD_GET_CHASSIS_STATUS] = chassis_status,
-    [IPMI_CMD_CHASSIS_CONTROL] = chassis_control
+    [IPMI_CMD_CHASSIS_CONTROL] = chassis_control,
+    [IPMI_CMD_GET_SYS_RESTART_CAUSE] = chassis_get_sys_restart_cause
 };
 static const IPMINetfn chassis_netfn = {
     .cmd_nums = IPMI_NETFN_CHASSIS_MAXCMD,
@@ -1746,6 +1761,7 @@  static void ipmi_sim_init(Object *obj)
     ibs->bmc_global_enables = (1 << IPMI_BMC_EVENT_LOG_BIT);
     ibs->device_id = 0x20;
     ibs->ipmi_version = 0x02; /* IPMI 2.0 */
+    ibs->restart_cause = 0;
     for (i = 0; i < 4; i++) {
         ibs->sel.last_addition[i] = 0xff;
         ibs->sel.last_clear[i] = 0xff;