Update to internal

Signed-off-by: Ed Tanous <ed.tanous@intel.com>

7 files changed, 226 insertions, 33 deletions

diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory%.bbappend
deleted file mode 100644
index d79704ec6..000000000
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory%.bbappend
+++ /dev/null
@@ -1,4 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += " file://channel.yaml \
-           "
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory%/channel.yaml b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory%/channel.yaml
deleted file mode 100644
index 032e05127..000000000
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-channel-inventory%/channel.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-# Channel Number (must be unique) is the key
-1:
-  # ifName the ethernet device name (used in the dbus path)
-  ifName: eth0
-2:
-  ifName: eth1
-3:
-  ifName: eth1
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0054-Fix-User-commands-require-channel-layer-lib.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0054-Fix-User-commands-require-channel-layer-lib.patch
new file mode 100644
index 000000000..bf6f672cf
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0054-Fix-User-commands-require-channel-layer-lib.patch
@@ -0,0 +1,37 @@
+From 5d0c9d2217dbe369daffb8a92d7b5e7d7d34d566 Mon Sep 17 00:00:00 2001
+From: Richard Marian Thomaiyar <richard.marian.thomaiyar@linux.intel.com>
+Date: Sat, 2 Mar 2019 20:08:32 +0530
+Subject: [PATCH] Fix: User commands require channel layer lib
+
+As channel layer is separated out from user layer lib, it
+has to be manually included in libusercommands, as user
+command handlers use channel layer API's
+
+Tested-by:
+1. Made sure that libusercommands are loaded on it's own
+without any undefined symbol error.
+2. ipmitool user list 1 works on host interface
+
+Change-Id: I6652ad248e01afc1349e3a9612754dbdb84b96ad
+Signed-off-by: Richard Marian Thomaiyar <richard.marian.thomaiyar@linux.intel.com>
+---
+ Makefile.am | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index bb7bdbf..4e9101e 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -120,7 +120,8 @@ libipmi20_la_CXXFLAGS = $(COMMON_CXX)
+ providers_LTLIBRARIES += libusercmds.la
+ libusercmds_la_LIBADD = \
+ 	libipmid/libipmid.la \
+-	user_channel/libuserlayer.la
++	user_channel/libuserlayer.la \
++	user_channel/libchannellayer.la
+ libusercmds_la_SOURCES = \
+ 	user_channel/usercommands.cpp
+ libusercmds_la_LDFLAGS = \
+-- 
+2.7.4
+
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0055-Implement-set-front-panel-button-enables-command.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0055-Implement-set-front-panel-button-enables-command.patch
new file mode 100644
index 000000000..170e530f9
--- /dev/null
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0055-Implement-set-front-panel-button-enables-command.patch
@@ -0,0 +1,185 @@
+From b8b88a5c0f9e9cb6023cb8d5453e5cfadaa1a375 Mon Sep 17 00:00:00 2001
+From: Kuiying Wang <kuiying.wang@intel.com>
+Date: Fri, 4 Jan 2019 10:50:21 +0800
+Subject: [PATCH] Implement set front panel button enables command
+
+Through modify buttons' property "Enabled" to disable/enable
+corresponding button.
+Currently support power and reset button.
+
+Test-By: ipmitool raw 0x0 0xa 0x2 //disable reset button
+         ipmitool raw 0x0 0xa 0x1 //disable power button
+         ipmitool raw 0x0 0xa 0x0 //enable all buttons
+
+Change-Id: Ice6f58edb898689f7a7fa08ad078d25fccaab27e
+Signed-off-by: Kuiying Wang <kuiying.wang@intel.com>
+---
+ chassishandler.cpp        | 98 +++++++++++++++++++++++++++++++++++++++
+ chassishandler.hpp        |  1 +
+ host-ipmid-whitelist.conf |  1 +
+ 3 files changed, 100 insertions(+)
+
+diff --git a/chassishandler.cpp b/chassishandler.cpp
+index 4b42b3c..1a5b805 100644
+--- a/chassishandler.cpp
++++ b/chassishandler.cpp
+@@ -112,6 +112,8 @@ const static constexpr char chassisSMDevAddrProp[] = "SMDeviceAddress";
+ const static constexpr char chassisBridgeDevAddrProp[] = "BridgeDeviceAddress";
+ static constexpr uint8_t chassisCapFlagMask = 0x0f;
+ static constexpr uint8_t chassisCapAddrMask = 0xfe;
++static constexpr uint8_t disableResetButton = 0x2;
++static constexpr uint8_t disablePowerButton = 0x1;
+ 
+ typedef struct
+ {
+@@ -140,6 +142,19 @@ struct GetPOHCountResponse
+     uint8_t counterReading[4]; ///< Counter reading
+ } __attribute__((packed));
+ 
++typedef struct
++{
++    uint8_t disables; // Front Panel Button Enables
++    //[7:4] - reserved
++    //[3] - 1b = disable Standby (sleep) button for entering standby (sleep)
++    //(control can still be used to wake the system)
++    //[2] - 1b = disable Diagnostic Interrupt button
++    //[1] - 1b = disable Reset button
++    //[0] - 1b = disable Power off button for power off only (in the case there
++    // is a single combined power/standby (sleep) button, then this also
++    // disables sleep requests via that button)
++} __attribute__((packed)) IPMISetFrontPanelButtonEnablesReq;
++
+ // Phosphor Host State manager
+ namespace State = sdbusplus::xyz::openbmc_project::State::server;
+ 
+@@ -948,6 +963,8 @@ ipmi_ret_t ipmi_get_chassis_status(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
+ 
+     //  Front Panel Button Capabilities and disable/enable status(Optional)
+     //  set to 0,  for we don't support them.
++    // TODO, it is tracked by an issue:
++    // https://github.com/openbmc/phosphor-host-ipmid/issues/122
+     chassis_status.front_panel_button_cap_status = 0;
+ 
+     // Pack the actual response
+@@ -1721,6 +1738,82 @@ ipmi_ret_t ipmi_chassis_set_power_restore_policy(
+     return IPMI_CC_OK;
+ }
+ 
++ipmi_ret_t ipmiSetFrontPanelButtonEnables(ipmi_netfn_t netfn, ipmi_cmd_t cmd,
++                                          ipmi_request_t request,
++                                          ipmi_response_t response,
++                                          ipmi_data_len_t data_len,
++                                          ipmi_context_t context)
++{
++    bool enable = false;
++    constexpr const char* powerButtonIntf =
++        "xyz.openbmc_project.Chassis.Buttons.Power";
++    constexpr const char* powerButtonPath =
++        "/xyz/openbmc_project/Chassis/Buttons/Power0";
++    constexpr const char* resetButtonIntf =
++        "xyz.openbmc_project.Chassis.Buttons.Reset";
++    constexpr const char* resetButtonPath =
++        "/xyz/openbmc_project/Chassis/Buttons/Reset0";
++    using namespace chassis::internal;
++
++    IPMISetFrontPanelButtonEnablesReq* req =
++        static_cast<IPMISetFrontPanelButtonEnablesReq*>(request);
++    if (*data_len != 1)
++    {
++        *data_len = 0;
++        log<level::ERR>("IPMI request len is invalid");
++        return IPMI_CC_REQ_DATA_LEN_INVALID;
++    }
++    *data_len = 0;
++    if (req->disables & disablePowerButton)
++    {
++        // Disable power button
++        enable = false;
++    }
++    else
++    {
++        // Enable power button
++        enable = true;
++    }
++    // set power button Enabled property
++    try
++    {
++        auto service = ipmi::getService(dbus, powerButtonIntf, powerButtonPath);
++        ipmi::setDbusProperty(dbus, service, powerButtonPath, powerButtonIntf,
++                              "Enabled", enable);
++    }
++    catch (sdbusplus::exception::SdBusError& e)
++    {
++        log<level::ERR>(e.what());
++        log<level::ERR>("Fail to set power button Enabled property");
++        return IPMI_CC_UNSPECIFIED_ERROR;
++    }
++
++    if (req->disables & disableResetButton)
++    {
++        // disable reset button
++        enable = false;
++    }
++    else
++    {
++        // enable reset button
++        enable = true;
++    }
++    // set reset button Enabled property
++    try
++    {
++        auto service = ipmi::getService(dbus, resetButtonIntf, resetButtonPath);
++        ipmi::setDbusProperty(dbus, service, resetButtonPath, resetButtonIntf,
++                              "Enabled", enable);
++    }
++    catch (sdbusplus::exception::SdBusError& e)
++    {
++        log<level::ERR>(e.what());
++        log<level::ERR>("Fail to set reset button Enabled property");
++        return IPMI_CC_UNSPECIFIED_ERROR;
++    }
++    return IPMI_CC_OK;
++}
++
+ void register_netfn_chassis_functions()
+ {
+     createIdentifyTimer();
+@@ -1733,6 +1826,11 @@ void register_netfn_chassis_functions()
+     ipmi_register_callback(NETFUN_CHASSIS, IPMI_CMD_GET_CHASSIS_CAP, NULL,
+                            ipmi_get_chassis_cap, PRIVILEGE_USER);
+ 
++    // Set Front Panel Button Enables
++    ipmi_register_callback(NETFUN_CHASSIS,
++                           IPMI_CMD_SET_FRONT_PANEL_BUTTON_ENABLES, NULL,
++                           ipmiSetFrontPanelButtonEnables, PRIVILEGE_ADMIN);
++
+     // Set Chassis Capabilities
+     ipmi_register_callback(NETFUN_CHASSIS, IPMI_CMD_SET_CHASSIS_CAP, NULL,
+                            ipmi_set_chassis_cap, PRIVILEGE_USER);
+diff --git a/chassishandler.hpp b/chassishandler.hpp
+index 49b5ef8..f4a6bff 100644
+--- a/chassishandler.hpp
++++ b/chassishandler.hpp
+@@ -19,6 +19,7 @@ enum ipmi_netfn_chassis_cmds
+     // Get capability bits
+     IPMI_CMD_SET_SYS_BOOT_OPTIONS = 0x08,
+     IPMI_CMD_GET_SYS_BOOT_OPTIONS = 0x09,
++    IPMI_CMD_SET_FRONT_PANEL_BUTTON_ENABLES = 0x0A,
+     IPMI_CMD_GET_POH_COUNTER = 0x0F,
+ };
+ 
+diff --git a/host-ipmid-whitelist.conf b/host-ipmid-whitelist.conf
+index e5cd0b5..d96d9ed 100644
+--- a/host-ipmid-whitelist.conf
++++ b/host-ipmid-whitelist.conf
+@@ -6,6 +6,7 @@
+ 0x00:0x06    //<Chassis>:<Set Power Restore Policy>
+ 0x00:0x08    //<Chassis>:<Set System Boot Options>
+ 0x00:0x09    //<Chassis>:<Get System Boot Options>
++0x00:0x0A    //<Chassis>:<Set Front Panel Button Enables>
+ 0x00:0x0F    //<Chassis>:<Get POH Counter Command>
+ 0x04:0x2D    //<Sensor/Event>:<Get Sensor Reading>
+ 0x04:0x2F    //<Sensor/Event>:<Get Sensor Type>
+-- 
+2.19.1
+
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 a92fc833b..56f90ec24 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
@@ -17,6 +17,8 @@ SRC_URI += "file://phosphor-ipmi-host.service \
             file://0050-enable-6-oem-commands.patch \
             file://0051-Fix-Set-LAN-Config-to-work-without-SetInProgress.patch \
             file://0053-Fix-keep-looping-issue-when-entering-OS.patch \
+            file://0054-Fix-User-commands-require-channel-layer-lib.patch \
+            file://0055-Implement-set-front-panel-button-enables-command.patch \
             "
 
 do_install_append(){
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-node-manager-proxy_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-node-manager-proxy_git.bb
deleted file mode 100644
index 24b1dd2a0..000000000
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-node-manager-proxy_git.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "Node Manager Proxy"
-DESCRIPTION = "The Node Manager Proxy provides a simple interface for communicating \
-with Management Engine via IPMB"
-
-SRC_URI = "git://git@github.com/openbmc-intel/node-manager;protocol=ssh"
-SRCREV = "596cd421d4749c8b6d672fb410eccf9f2da08b3a"
-PV = "0.1+git${SRCPV}"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://LICENSE;md5=e3fc50a88d0a364313df4b21ef20c29e"
-
-SYSTEMD_SERVICE_${PN} = "node-manager-proxy.service"
-
-DEPENDS = "sdbusplus \
-           phosphor-logging \
-           boost"
-
-S = "${WORKDIR}/git/"
-inherit cmake systemd
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb
index ead7a92aa..09d2f9c41 100644
--- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb
+++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-node-manager-proxy_git.bb
@@ -2,8 +2,8 @@ SUMMARY = "Node Manager Proxy"
 DESCRIPTION = "The Node Manager Proxy provides a simple interface for communicating \
 with Management Engine via IPMB"
 
-SRC_URI = "git://git@github.com/Intel-BMC/node-manager.git;protocol=ssh"
-SRCREV = "e5a5f6189ce357438f40116717b995bab82c50ae"
+SRC_URI = "git://git@github.com/Intel-BMC/node-manager;protocol=ssh"
+SRCREV = "81133dd32bd0337aec9e026d1c9c2788028c7bdd"
 PV = "0.1+git${SRCPV}"
 
 LICENSE = "Apache-2.0"