From 10bc2ef852277cf8e9858f75cea9f55b482bf85b Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Thu, 6 Jun 2019 09:43:20 -0700 Subject: Update to internal 6-6-19 Signed-off-by: Ed Tanous --- .../0053-Fix-keep-looping-issue-when-entering-OS.patch | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0053-Fix-keep-looping-issue-when-entering-OS.patch') diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0053-Fix-keep-looping-issue-when-entering-OS.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0053-Fix-keep-looping-issue-when-entering-OS.patch index 2a4cc9bb1..903ae96a7 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0053-Fix-keep-looping-issue-when-entering-OS.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0053-Fix-keep-looping-issue-when-entering-OS.patch @@ -1,4 +1,4 @@ -From 9ed3fd11047f8c360b7d808946939ef280813811 Mon Sep 17 00:00:00 2001 +From ad93a6e17310d92ef07b8d367b23c93793562d0f Mon Sep 17 00:00:00 2001 From: Cheng C Yang Date: Wed, 23 Jan 2019 17:02:40 +0800 Subject: [PATCH] Fix keep looping issue when entering OS @@ -20,19 +20,19 @@ correctly through KCS channel. 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/host-cmd-manager.cpp b/host-cmd-manager.cpp -index 0a61e63..6e50684 100644 +index f3aba7f..465eb81 100644 --- a/host-cmd-manager.cpp +++ b/host-cmd-manager.cpp @@ -26,6 +26,8 @@ constexpr auto MAPPER_INTERFACE = "xyz.openbmc_project.ObjectMapper"; constexpr auto HOST_STATE_PATH = "/xyz/openbmc_project/state/host0"; constexpr auto HOST_STATE_INTERFACE = "xyz.openbmc_project.State.Host"; constexpr auto HOST_TRANS_PROP = "RequestedHostTransition"; -+constexpr const char* IPMI_PATH = "/org/openbmc/HostIpmi/1"; -+constexpr const char* IPMI_INTERFACE = "org.openbmc.HostIpmi"; ++constexpr const char* IPMI_PATH = "/xyz/openbmc_project/Ipmi/Channel/ipmi_kcs3"; ++constexpr const char* IPMI_INTERFACE = "xyz.openbmc_project.Ipmi.Channel.SMS"; // For throwing exceptions using namespace phosphor::logging; -@@ -107,6 +109,20 @@ void Manager::clearQueue() +@@ -106,6 +108,20 @@ void Manager::clearQueue() // `false` indicating Failure std::get(command)(ipmiCmdData, false); } @@ -53,7 +53,7 @@ index 0a61e63..6e50684 100644 } // Called for alerting the host -@@ -116,9 +132,6 @@ void Manager::checkQueueAndAlertHost() +@@ -115,9 +131,6 @@ void Manager::checkQueueAndAlertHost() { log("Asserting SMS Attention"); @@ -63,7 +63,7 @@ index 0a61e63..6e50684 100644 auto host = ::ipmi::getService(this->bus, IPMI_INTERFACE, IPMI_PATH); // Start the timer for this transaction -@@ -132,9 +145,8 @@ void Manager::checkQueueAndAlertHost() +@@ -131,9 +144,8 @@ void Manager::checkQueueAndAlertHost() return; } @@ -76,5 +76,5 @@ index 0a61e63..6e50684 100644 if (reply.is_method_error()) -- -2.16.2 +2.7.4 -- cgit v1.2.3