Update to internal 10-28-19

Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>

6 files changed, 261 insertions, 44 deletions

diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/.clang-format b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/.clang-format
new file mode 100644
index 000000000..ea71ad6e1
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/.clang-format
@@ -0,0 +1,99 @@
+---
+Language:        Cpp
+# BasedOnStyle:  LLVM
+AccessModifierOffset: -2
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlinesLeft: false
+AlignOperands:   true
+AlignTrailingComments: true
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: true
+BinPackArguments: true
+BinPackParameters: true
+BraceWrapping:
+  AfterClass:      true
+  AfterControlStatement: true
+  AfterEnum:       true
+  AfterFunction:   true
+  AfterNamespace:  true
+  AfterObjCDeclaration: true
+  AfterStruct:     true
+  AfterUnion:      true
+  BeforeCatch:     true
+  BeforeElse:      true
+  IndentBraces:    false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Custom
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: AfterColon
+ColumnLimit:     80
+CommentPragmas:  '^ IWYU pragma:'
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+PointerAlignment: Left
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:   [ foreach, Q_FOREACH, BOOST_FOREACH ]
+IncludeBlocks: Regroup
+IncludeCategories:
+  - Regex:           '^[<"](gtest|gmock)'
+    Priority:        5
+  - Regex:           '^"config.h"'
+    Priority:        -1
+  - Regex:           '^".*\.hpp"'
+    Priority:        1
+  - Regex:           '^<.*\.h>'
+    Priority:        2
+  - Regex:           '^<.*'
+    Priority:        3
+  - Regex:           '.*'
+    Priority:        4
+IndentCaseLabels: true
+IndentWidth:     4
+IndentWrappedFunctionNames: true
+KeepEmptyLinesAtTheStartOfBlocks: true
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+ReflowComments:  true
+SortIncludes:    true
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Cpp11
+TabWidth:        4
+UseTab:          Never
+...
+
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0057-Add-timer-use-actions-support.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0057-Add-timer-use-actions-support.patch
deleted file mode 100644
index f091b31fa..000000000
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0057-Add-timer-use-actions-support.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 3c69c94eed1a0c6eecfd53e739fade6596c6f3e5 Mon Sep 17 00:00:00 2001
-From: Yong Li <yong.b.li@linux.intel.com>
-Date: Thu, 12 Sep 2019 17:37:05 +0800
-Subject: [PATCH] Add timer use/actions support
-
-Based on IPMI spec, add timer use/actions support,
-and add input data checking
-
-Signed-off-by: Yong Li <yong.b.li@linux.intel.com>
----
- app/watchdog.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/app/watchdog.cpp b/app/watchdog.cpp
-index c4e594d..18e7e3a 100644
---- a/app/watchdog.cpp
-+++ b/app/watchdog.cpp
-@@ -251,8 +251,8 @@ ipmi::RspType<> ipmiSetWatchdogTimer(
-         return ipmi::responseInvalidFieldRequest();
-     }
- 
--    timerLogFlags = static_cast<uint8_t>(dontLog);
--    timerActions &= static_cast<uint8_t>(timeoutAction) |
-+    timerLogFlags = (static_cast<uint8_t>(dontLog)) << 7;
-+    timerActions = static_cast<uint8_t>(timeoutAction) |
-                     static_cast<uint8_t>(preTimeoutInterrupt) << 4;
- 
-     try
--- 
-2.7.4
-
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0064-Enable-watchdog-to-save-useflag-after-host-power-off.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0064-Enable-watchdog-to-save-useflag-after-host-power-off.patch
index 4ee28bb5c..523a3e1a9 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0064-Enable-watchdog-to-save-useflag-after-host-power-off.patch
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0064-Enable-watchdog-to-save-useflag-after-host-power-off.patch
@@ -1,6 +1,6 @@
-From e7b86ade7db1e9ae86ea39a957bead9090f4ccbf Mon Sep 17 00:00:00 2001
+From c82162866be3c236ed73c6a19b9a0bb3097718ae Mon Sep 17 00:00:00 2001
 From: Yong Li <yong.b.li@linux.intel.com>
-Date: Thu, 12 Sep 2019 13:18:42 +0800
+Date: Sat, 12 Oct 2019 12:23:24 +0800
 Subject: [PATCH] Enable watchdog to save useflag after host power off
 
 Get the right useflag after host power off.
@@ -33,17 +33,16 @@ Signed-off-by: Yong Li <yong.b.li@linux.intel.com>
  1 file changed, 1 insertion(+), 3 deletions(-)
 
 diff --git a/app/watchdog.cpp b/app/watchdog.cpp
-index 4650d89..1562f5e 100644
+index c64a92f..2ff9ee9 100644
 --- a/app/watchdog.cpp
 +++ b/app/watchdog.cpp
-@@ -435,23 +435,21 @@ ipmi::RspType<uint8_t,  // timerUse
+@@ -437,22 +437,20 @@ ipmi::RspType<uint3_t, // timerUse - timer use
                      wdTimerUseToIpmiTimerUse(wd_prop.expiredTimerUse));
          }
  
 +        expireFlags = timerUseExpirationFlags;
          if (wd_prop.enabled)
          {
-             timerUse |= wd_running;
              presentCountdown = htole16(wd_prop.timeRemaining / 100);
 -            expireFlags = 0;
          }
@@ -58,9 +57,9 @@ index 4650d89..1562f5e 100644
              {
                  presentCountdown = 0;
 -                expireFlags = timerUseExpirationFlags;
+                 // Automatically clear it whenever a timer expiration occurs.
+                 timerNotLogFlags = false;
              }
-         }
- 
 -- 
 2.7.4
 
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service
index b09bbf890..30a4dec25 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/phosphor-ipmi-host.service
@@ -11,8 +11,6 @@ Wants=mapper-wait@-xyz-openbmc_project-control-security-restriction_mode.service
 After=mapper-wait@-xyz-openbmc_project-control-security-restriction_mode.service
 Wants=mapper-wait@-xyz-openbmc_project-state-os.service
 After=mapper-wait@-xyz-openbmc_project-state-os.service
-Wants=clear-once.service
-After=clear-once.service
 
 [Service]
 Restart=always
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/transporthandler_oem.cpp b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/transporthandler_oem.cpp
new file mode 100644
index 000000000..3cb79dc3f
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/transporthandler_oem.cpp
@@ -0,0 +1,146 @@
+/* Copyright 2019 Intel
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+
+#include "dcmihandler.hpp"
+
+#include <cstdint>
+#include <ipmid/api-types.hpp>
+#include <ipmid/api.hpp>
+#include <ipmid/message.hpp>
+#include <ipmid/message/types.hpp>
+#include <ipmid/utils.hpp>
+#include <vector>
+
+enum class oemLanParam : uint8_t
+{
+    intelHostnameConfig = 0xc7,
+};
+
+constexpr size_t IpmiHostnameLen = 16;
+constexpr uint8_t CurrentRevision = 0x11; // Current rev per IPMI Spec 2.0
+
+constexpr ipmi::Cc ccParamNotSupported = 0x80;
+constexpr ipmi::Cc ccUnprintable = 0x90;
+
+namespace ipmi::transport
+{
+
+constexpr auto validHostnameChars =
+    "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWX"
+    "YZ0123456789-";
+constexpr int lanOemHostnameLength = 64;
+
+RspType<> setLanOem(uint8_t channel, uint8_t parameter, message::Payload& req)
+{
+    std::vector<uint8_t> dataBytes;
+    switch (static_cast<oemLanParam>(parameter))
+    {
+        case oemLanParam::intelHostnameConfig:
+        {
+            static std::array<uint8_t, lanOemHostnameLength> blockData;
+            uint8_t block = 0;
+            uint8_t complete = 0;
+            if ((req.unpack(block, complete, dataBytes) != 0) ||
+                (!req.fullyUnpacked()))
+            {
+                return responseReqDataLenInvalid();
+            }
+
+            size_t numDataBytes = req.size() - 4;
+            if (numDataBytes > IpmiHostnameLen)
+            {
+                return responseReqDataLenInvalid();
+            }
+
+            if (!((block > 0) && (block < 5)) ||
+                ((complete != 0) && (complete != 1)))
+            {
+                return responseInvalidFieldRequest();
+            }
+
+            if (block == 1)
+            {
+                blockData.fill(0);
+            }
+
+            std::copy(dataBytes.begin(), dataBytes.end(),
+                      blockData.data() + ((block - 1) * IpmiHostnameLen));
+            if (complete)
+            {
+                blockData[lanOemHostnameLength - 1] = 0;
+                // check hostname, and write it
+                std::string newHostname(
+                    reinterpret_cast<char*>(blockData.data()),
+                    lanOemHostnameLength);
+                size_t firstNull = newHostname.find_first_of('\0');
+                if (newHostname.find_first_not_of(validHostnameChars) !=
+                    firstNull)
+                {
+                    return response(ccUnprintable);
+                }
+                std::shared_ptr<sdbusplus::asio::connection> busp = getSdBus();
+                ipmi::setDbusProperty(*busp, ::dcmi::networkServiceName,
+                                      ::dcmi::networkConfigObj,
+                                      ::dcmi::networkConfigIntf,
+                                      ::dcmi::hostNameProp, newHostname);
+            }
+            return responseSuccess();
+        }
+        default:
+            return response(ccParamNotSupported);
+    }
+    return response(ccParamNotSupported);
+}
+
+RspType<message::Payload> getLanOem(uint8_t channel, uint8_t parameter,
+                                    uint8_t set, uint8_t block)
+{
+    message::Payload message;
+    message.pack(CurrentRevision);
+    oemLanParam param = static_cast<oemLanParam>(parameter);
+    switch (param)
+    {
+        case oemLanParam::intelHostnameConfig:
+        {
+            if (set != 0)
+            {
+                return responseInvalidFieldRequest();
+            }
+            if ((block < 1) || (block > 4))
+            {
+                return responseInvalidFieldRequest();
+            }
+            std::shared_ptr<sdbusplus::asio::connection> busp = getSdBus();
+            auto service = ipmi::getService(*busp, ::dcmi::networkConfigIntf,
+                                            ::dcmi::networkConfigObj);
+            auto value = ipmi::getDbusProperty(
+                *busp, service, ::dcmi::networkConfigObj,
+                ::dcmi::networkConfigIntf, ::dcmi::hostNameProp);
+            std::string hostname = std::get<std::string>(value);
+            std::array<char, IpmiHostnameLen> buf = {0};
+            size_t head = (block - 1) * IpmiHostnameLen;
+            if (head < hostname.size())
+            {
+                size_t numToCopy = hostname.size() - head;
+                numToCopy = std::min(IpmiHostnameLen, numToCopy);
+                hostname.copy(buf.data(), numToCopy, head);
+            }
+            message.pack(buf);
+            return responseSuccess(std::move(message));
+        }
+    }
+    return response(ccParamNotSupported);
+}
+} // namespace ipmi::transport
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index a50d5fd7f..522eb9d7f 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -1,8 +1,8 @@
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+PROJECT_SRC_DIR := "${THISDIR}/${PN}"
 
-#todo yong unpin this
-SRC_URI = "git://github.com/openbmc/phosphor-host-ipmid;nobranch=1"
-SRCREV = "c514d874e4ce3ed1f747cfcb4bab5990393c55e8"
+SRC_URI = "git://github.com/openbmc/phosphor-host-ipmid"
+SRCREV = "ddb1f443d1d6e76949a230847e6145b108114a40"
 
 SRC_URI += "file://phosphor-ipmi-host.service \
             file://host-ipmid-whitelist.conf \
@@ -12,7 +12,6 @@ SRC_URI += "file://phosphor-ipmi-host.service \
             file://0050-enable-6-oem-commands.patch \
             file://0053-Fix-keep-looping-issue-when-entering-OS.patch \
             file://0056-add-SetInProgress-to-get-set-boot-option-cmd.patch \
-            file://0057-Add-timer-use-actions-support.patch \
             file://0059-Move-Set-SOL-config-parameter-to-host-ipmid.patch \
             file://0060-Move-Get-SOL-config-parameter-to-host-ipmid.patch \
             file://0062-Update-IPMI-Chassis-Control-command.patch \
@@ -22,6 +21,7 @@ SRC_URI += "file://phosphor-ipmi-host.service \
             "
 
 EXTRA_OECONF_append = " --disable-i2c-whitelist-check"
+EXTRA_OECONF_append = " --enable-transport-oem=yes"
 
 RDEPENDS_${PN}_remove = "clear-once"
 
@@ -36,10 +36,16 @@ FILES_${PN}_remove = " \
     ${systemd_unitdir}/system/obmc-host-shutdown@0.target.requires/ \
     ${systemd_unitdir}/system/obmc-host-shutdown@0.target.requires/xyz.openbmc_project.Ipmi.Internal.SoftPowerOff.service \
     "
+
 do_configure_append(){
     cp -f ${WORKDIR}/host-ipmid-whitelist.conf ${S}
 }
 
+do_compile_prepend(){
+    cp -f ${PROJECT_SRC_DIR}/transporthandler_oem.cpp ${S}
+}
+
 do_install_append(){
     rm -f ${D}/${bindir}/phosphor-softpoweroff
+    rm -f ${S}/transporthandler_oem.cpp
 }