diff options
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0056-add-SetInProgress-to-get-set-boot-option-cmd.patch')
| -rw-r--r-- | meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0056-add-SetInProgress-to-get-set-boot-option-cmd.patch | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0056-add-SetInProgress-to-get-set-boot-option-cmd.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0056-add-SetInProgress-to-get-set-boot-option-cmd.patch index 3a77887a0..987e61448 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0056-add-SetInProgress-to-get-set-boot-option-cmd.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0056-add-SetInProgress-to-get-set-boot-option-cmd.patch @@ -1,4 +1,4 @@ -From 949db3a985719335d3df77db368eb2b296756749 Mon Sep 17 00:00:00 2001 +From f9f260391f099b4e67999f9d4ca05cbf9b422baf Mon Sep 17 00:00:00 2001 From: "Jia, chunhui" <chunhui.jia@linux.intel.com> Date: Tue, 19 Mar 2019 16:09:06 +0800 Subject: [PATCH] add SetInProgress to get/set boot option cmd @@ -9,16 +9,17 @@ option flow. Change-Id: Ibb0501ea5bc36c4f1f72339efef03724dd4e613f Signed-off-by: Jia, chunhui <chunhui.jia@linux.intel.com> +Signed-off-by: Yong Li <yong.b.li@linux.intel.com> --- - chassishandler.cpp | 26 +++++++++++++++++++++++++- + chassishandler.cpp | 28 +++++++++++++++++++++++++++- chassishandler.hpp | 3 +++ - 2 files changed, 28 insertions(+), 1 deletion(-) + 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/chassishandler.cpp b/chassishandler.cpp -index 6d14d1b..553afa8 100644 +index 305897b..ee23845 100644 --- a/chassishandler.cpp +++ b/chassishandler.cpp -@@ -1351,6 +1351,10 @@ static ipmi_ret_t setBootMode(const Mode::Modes& mode) +@@ -1399,6 +1399,10 @@ static ipmi_ret_t setBootMode(const Mode::Modes& mode) return IPMI_CC_OK; } @@ -29,7 +30,7 @@ index 6d14d1b..553afa8 100644 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, -@@ -1365,11 +1369,21 @@ ipmi_ret_t ipmi_chassis_get_sys_boot_options(ipmi_netfn_t netfn, ipmi_cmd_t cmd, +@@ -1413,11 +1417,21 @@ 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; IpmiValue bootOption = ipmiDefault; @@ -52,14 +53,16 @@ index 6d14d1b..553afa8 100644 /* * Parameter #5 means boot flags. Please refer to 28.13 of ipmi doc. * This is the only parameter used by petitboot. -@@ -1505,6 +1519,16 @@ ipmi_ret_t ipmi_chassis_set_sys_boot_options(ipmi_netfn_t netfn, ipmi_cmd_t cmd, +@@ -1553,6 +1567,18 @@ ipmi_ret_t ipmi_chassis_set_sys_boot_options(ipmi_netfn_t netfn, ipmi_cmd_t cmd, // This IPMI command does not have any resposne data *data_len = 0; + if (reqptr->parameter == + static_cast<uint8_t>(BootOptionParameter::SET_IN_PROGRESS)) + { -+ if (transferStatus == setInProgress) { ++ if ((transferStatus == setInProgress) && ++ (reqptr->data[0] != setComplete)) ++ { + return IPMI_CC_FAIL_SET_IN_PROGRESS; + } + transferStatus = reqptr->data[0]; @@ -70,10 +73,10 @@ index 6d14d1b..553afa8 100644 * Parameter #5 means boot flags. Please refer to 28.13 of ipmi doc. * This is the only parameter used by petitboot. diff --git a/chassishandler.hpp b/chassishandler.hpp -index 2c42b11..6a24507 100644 +index dcaf06c..353a929 100644 --- a/chassishandler.hpp +++ b/chassishandler.hpp -@@ -28,6 +28,7 @@ enum ipmi_chassis_return_codes +@@ -25,6 +25,7 @@ enum ipmi_chassis_return_codes { IPMI_OK = 0x0, IPMI_CC_PARM_NOT_SUPPORTED = 0x80, @@ -81,7 +84,7 @@ index 2c42b11..6a24507 100644 }; // Generic completion codes, -@@ -49,6 +50,7 @@ enum ipmi_chassis_control_cmds : uint8_t +@@ -46,6 +47,7 @@ enum ipmi_chassis_control_cmds : uint8_t }; enum class BootOptionParameter : size_t { @@ -89,7 +92,7 @@ index 2c42b11..6a24507 100644 BOOT_INFO = 0x4, BOOT_FLAGS = 0x5, OPAL_NETWORK_SETTINGS = 0x61 -@@ -56,6 +58,7 @@ enum class BootOptionParameter : size_t +@@ -53,6 +55,7 @@ enum class BootOptionParameter : size_t enum class BootOptionResponseSize : size_t { @@ -98,5 +101,5 @@ index 2c42b11..6a24507 100644 OPAL_NETWORK_SETTINGS = 50 }; -- -2.16.2 +2.7.4 |