From 82dbc15a05125a812c140a3c8cff81c366482229 Mon Sep 17 00:00:00 2001 From: "Jason M. Bills" Date: Mon, 7 Dec 2020 13:45:20 -0800 Subject: Update to internal 0.26 Signed-off-by: Jason M. Bills --- ...Lan-Configuration-IP-Address-Source-to-us.patch | 231 --------------------- ...3-Fix-keep-looping-issue-when-entering-OS.patch | 29 ++- ...-SetInProgress-to-get-set-boot-option-cmd.patch | 101 +++++---- .../ipmi/phosphor-ipmi-host_%.bbappend | 1 - .../ipmi/phosphor-ipmi-ipmb/ipmb-channels.json | 22 ++ .../ipmi/phosphor-ipmi-ipmb_%.bbappend | 11 +- .../ipmi/phosphor-ipmi-kcs_%.bbappend | 2 +- .../0009-Add-dbus-interface-for-sol-commands.patch | 36 ++-- .../ipmi/phosphor-ipmi-net_%.bbappend | 2 +- .../ipmi/phosphor-node-manager-proxy_git.bb | 2 +- 10 files changed, 119 insertions(+), 318 deletions(-) delete mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0001-Modify-Get-Lan-Configuration-IP-Address-Source-to-us.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json (limited to 'meta-openbmc-mods/meta-common/recipes-phosphor/ipmi') diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0001-Modify-Get-Lan-Configuration-IP-Address-Source-to-us.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0001-Modify-Get-Lan-Configuration-IP-Address-Source-to-us.patch deleted file mode 100644 index 7e3f92dbc..000000000 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0001-Modify-Get-Lan-Configuration-IP-Address-Source-to-us.patch +++ /dev/null @@ -1,231 +0,0 @@ -From 8e9fba263179ccc87be7212c7dbd87cd7a37ac30 Mon Sep 17 00:00:00 2001 -From: Johnathan Mantey -Date: Thu, 14 Nov 2019 11:24:19 -0800 -Subject: [PATCH] Modify Get Lan Configuration IP Address Source to use correct - DBus DHCPEnabled type - -The Get/Set Lan Configuration "IP Address Source" subcommand got -broken by phosphor-dbus-interfaces commit 12162be - -12162be changed the DBus DHCPEnabled type from boolean to enum -type. The Get LAN Configuration IP address Source IPMI command did not -get changed to an enum type prior to 12162be being merged. This commit -retroactively updates the boolean type to enum type. - -Tested: - -ipmitool raw 0xc 2 3 4 0 0 # returns correct state -ipmitool raw 0xc 1 3 4 1 # changes DCHP to Static -ipmitool raw 0xc 1 3 4 2 # returns Static to DHCP - -Assigned a static address via Redfish and tested using: -ipmitool raw 0xc 2 3 4 0 0 # returns correct state - -Returned the NIC to use DHCP via Redfish and tested using: -ipmitool raw 0xc 2 3 4 0 0 # returns correct state - -Change-Id: Ia66f7fcf3d5ad0a383b06658b18e8ce2b282e052 -Signed-off-by: Johnathan Mantey ---- - transporthandler.cpp | 97 ++++++++++++++++++++++++++++++++++++-------- - 1 file changed, 79 insertions(+), 18 deletions(-) - -diff --git a/transporthandler.cpp b/transporthandler.cpp -index 16ce2b2..ccc2a97 100644 ---- a/transporthandler.cpp -+++ b/transporthandler.cpp -@@ -109,6 +109,18 @@ constexpr auto INTF_NEIGHBOR_CREATE_STATIC = - constexpr auto INTF_VLAN = "xyz.openbmc_project.Network.VLAN"; - constexpr auto INTF_VLAN_CREATE = "xyz.openbmc_project.Network.VLAN.Create"; - -+static constexpr auto dhcpv4v6 = -+ "xyz.openbmc_project.Network.EthernetInterface.DHCPConf.both"; -+static constexpr auto dhcpv6 = -+ "xyz.openbmc_project.Network.EthernetInterface.DHCPConf.v6"; -+static constexpr auto dhcpv4 = -+ "xyz.openbmc_project.Network.EthernetInterface.DHCPConf.v4"; -+static constexpr auto dhcpoff = -+ "xyz.openbmc_project.Network.EthernetInterface.DHCPConf.none"; -+ -+static std::array dhcpEnumerations = {dhcpv4v6, dhcpv4, dhcpv6, -+ dhcpoff}; -+ - /** @brief Generic paramters for different address families */ - template - struct AddrFamily -@@ -456,25 +468,63 @@ auto channelCall(uint8_t channel, Args&&... args) - * - * @param[in] bus - The bus object used for lookups - * @param[in] params - The parameters for the channel -- * @return True if DHCP is enabled, false otherwise -+ * @return string containing an enumerated value -+ * constexpr's dhcpv4v6, dhcpv4, dhcpv6, and dhcpoff - */ --bool getDHCPProperty(sdbusplus::bus::bus& bus, const ChannelParams& params) -+std::string getDHCPProperty(sdbusplus::bus::bus& bus, -+ const ChannelParams& params) - { -- return std::get(getDbusProperty( -+ return std::get(getDbusProperty( - bus, params.service, params.logicalPath, INTF_ETHERNET, "DHCPEnabled")); - } - - /** @brief Sets the system value for DHCP on the given interface - * -- * @param[in] bus - The bus object used for lookups -- * @param[in] params - The parameters for the channel -- * @param[in] on - Whether or not to enable DHCP -+ * @param[in] bus - The bus object used for lookups -+ * @param[in] params - The parameters for the channel -+ * @param[in] setting - DHCP state to assign (none, v4, v6, both) - */ - void setDHCPProperty(sdbusplus::bus::bus& bus, const ChannelParams& params, -- bool on) -+ const std::string& setting) - { -+ auto it = dhcpEnumerations.begin(); -+ while (it != dhcpEnumerations.end()) -+ { -+ if (*it == setting) -+ { -+ break; -+ } -+ it++; -+ } -+ if (it == dhcpEnumerations.end()) -+ { -+ log("Invalid DHCP setting.", -+ entry("Requested DHCP mode=%s", setting.c_str())); -+ elog(); -+ } -+ -+ std::string dhcp = getDHCPProperty(bus, params); -+ std::string nextDhcp{}; -+ -+ if (((dhcp == dhcpv4) && (setting == dhcpv6)) || -+ ((dhcp == dhcpv6) && (setting == dhcpv4))) -+ { -+ // DHCP is enabled independently for IPv4 and IPv6. If IPv4 -+ // DHCP is enabled, and a request to add IPv6 is received, -+ // change the DHCPEnabled enum to "both" active. The same -+ // logic is applied if IPV6 is already enabled, and an IPv4 -+ // enable request is made. -+ nextDhcp = dhcpv4v6; -+ } -+ else -+ { -+ // "both" enabled -> ipv4 only -+ // "both" enabled -> ipv6 only -+ // "ip4v", "ipv6", or "both" enabled -> no DHCP -+ nextDhcp = setting; -+ } - setDbusProperty(bus, params.service, params.logicalPath, INTF_ETHERNET, -- "DHCPEnabled", on); -+ "DHCPEnabled", nextDhcp); - } - - /** @brief Converts a human readable MAC string into MAC bytes -@@ -1113,7 +1163,7 @@ void deconfigureChannel(sdbusplus::bus::bus& bus, ChannelParams& params) - } - - // Clear out any settings on the lower physical interface -- setDHCPProperty(bus, params, false); -+ setDHCPProperty(bus, params, dhcpoff); - } - - /** @brief Creates a new VLAN on the specified interface -@@ -1401,7 +1451,8 @@ RspType<> setLan(uint4_t channelBits, uint4_t, uint8_t parameter, - } - case LanParam::IP: - { -- if (channelCall(channel)) -+ std::string dhcpSetting = channelCall(channel); -+ if ((dhcpSetting == dhcpv4) || (dhcpSetting == dhcpv4v6)) - { - return responseCommandNotAvailable(); - } -@@ -1431,7 +1482,11 @@ RspType<> setLan(uint4_t channelBits, uint4_t, uint8_t parameter, - { - case IPSrc::DHCP: - { -- channelCall(channel, true); -+ // The IPSrc IPMI command is only for IPv4 -+ // management. Modifying IPv6 state is done using -+ // a completely different Set LAN Configuration -+ // subcommand. -+ channelCall(channel, dhcpv4); - return responseSuccess(); - } - case IPSrc::Unspecified: -@@ -1439,7 +1494,7 @@ RspType<> setLan(uint4_t channelBits, uint4_t, uint8_t parameter, - case IPSrc::BIOS: - case IPSrc::BMC: - { -- channelCall(channel, false); -+ channelCall(channel, dhcpoff); - return responseSuccess(); - } - } -@@ -1464,7 +1519,8 @@ RspType<> setLan(uint4_t channelBits, uint4_t, uint8_t parameter, - } - case LanParam::SubnetMask: - { -- if (channelCall(channel)) -+ std::string dhcpSetting = channelCall(channel); -+ if ((dhcpSetting == dhcpv4) || (dhcpSetting == dhcpv4v6)) - { - return responseCommandNotAvailable(); - } -@@ -1481,7 +1537,8 @@ RspType<> setLan(uint4_t channelBits, uint4_t, uint8_t parameter, - } - case LanParam::Gateway1: - { -- if (channelCall(channel)) -+ std::string dhcpSetting = channelCall(channel); -+ if ((dhcpSetting == dhcpv4) || (dhcpSetting == dhcpv4v6)) - { - return responseCommandNotAvailable(); - } -@@ -1606,7 +1663,8 @@ RspType<> setLan(uint4_t channelBits, uint4_t, uint8_t parameter, - return responseReqDataLenInvalid(); - } - std::bitset<8> expected; -- if (channelCall(channel)) -+ std::string dhcp = channelCall(channel); -+ if ((dhcp == dhcpv4v6) || (dhcp == dhcpv6)) - { - expected[IPv6RouterControlFlag::Dynamic] = 1; - } -@@ -1756,7 +1814,8 @@ RspType getLan(uint4_t channelBits, uint3_t, bool revOnly, - case LanParam::IPSrc: - { - auto src = IPSrc::Static; -- if (channelCall(channel)) -+ std::string dhcp = channelCall(channel); -+ if ((dhcp == dhcpv4) || (dhcp == dhcpv4v6)) - { - src = IPSrc::DHCP; - } -@@ -1877,7 +1936,8 @@ RspType getLan(uint4_t channelBits, uint3_t, bool revOnly, - case LanParam::IPv6RouterControl: - { - std::bitset<8> control; -- if (channelCall(channel)) -+ std::string dhcp = channelCall(channel); -+ if ((dhcp == dhcpv4v6) || (dhcp == dhcpv6)) - { - control[IPv6RouterControlFlag::Dynamic] = 1; - } -@@ -1891,7 +1951,8 @@ RspType getLan(uint4_t channelBits, uint3_t, bool revOnly, - case LanParam::IPv6StaticRouter1IP: - { - in6_addr gateway{}; -- if (!channelCall(channel)) -+ std::string dhcp = channelCall(channel); -+ if ((dhcp == dhcpv4) || (dhcp == dhcpoff)) - { - gateway = - channelCall>(channel).value_or( --- -2.24.1 - 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 903ae96a7..7a7fd0859 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 @@ -23,7 +23,7 @@ diff --git a/host-cmd-manager.cpp b/host-cmd-manager.cpp 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"; +@@ -23,6 +23,8 @@ namespace command 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"; @@ -32,7 +32,7 @@ index f3aba7f..465eb81 100644 // For throwing exceptions using namespace phosphor::logging; -@@ -106,6 +108,20 @@ void Manager::clearQueue() +@@ -103,6 +105,20 @@ void Manager::clearQueue() // `false` indicating Failure std::get(command)(ipmiCmdData, false); } @@ -53,28 +53,37 @@ index f3aba7f..465eb81 100644 } // Called for alerting the host -@@ -115,9 +131,6 @@ void Manager::checkQueueAndAlertHost() +@@ -112,9 +128,7 @@ void Manager::checkQueueAndAlertHost() { log("Asserting SMS Attention"); +- std::string HOST_IPMI_SVC("org.openbmc.HostIpmi"); - std::string IPMI_PATH("/org/openbmc/HostIpmi/1"); - std::string IPMI_INTERFACE("org.openbmc.HostIpmi"); -- - auto host = ::ipmi::getService(this->bus, IPMI_INTERFACE, IPMI_PATH); ++ auto host = ::ipmi::getService(this->bus, IPMI_INTERFACE, IPMI_PATH); // Start the timer for this transaction -@@ -131,9 +144,8 @@ void Manager::checkQueueAndAlertHost() + auto time = std::chrono::duration_cast( +@@ -127,12 +141,13 @@ void Manager::checkQueueAndAlertHost() return; } - auto method = -- this->bus.new_method_call(host.c_str(), IPMI_PATH.c_str(), +- this->bus.new_method_call(HOST_IPMI_SVC.c_str(), IPMI_PATH.c_str(), - IPMI_INTERFACE.c_str(), "setAttention"); +- auto reply = this->bus.call(method); +- +- if (reply.is_method_error()) + auto method = this->bus.new_method_call(host.c_str(), IPMI_PATH, + IPMI_INTERFACE, "setAttention"); - auto reply = this->bus.call(method); - - if (reply.is_method_error()) ++ try ++ { ++ auto reply = this->bus.call(method); ++ } ++ catch (const std::exception&) + { + log("Error in setting SMS attention"); + elog(); -- 2.7.4 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 987e61448..862e9baa8 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,79 +1,76 @@ -From f9f260391f099b4e67999f9d4ca05cbf9b422baf Mon Sep 17 00:00:00 2001 -From: "Jia, chunhui" -Date: Tue, 19 Mar 2019 16:09:06 +0800 -Subject: [PATCH] add SetInProgress to get/set boot option cmd +From d5cfc5a0aaa50cc94054886e5cb7be25ef167c71 Mon Sep 17 00:00:00 2001 +From: huanghe +Date: Sat, 10 Oct 2020 14:40:00 +0800 +Subject: [PATCH 7/7] Add set in progress paramter to set/get boot option + command -It is required by BIOS. BIOS will check setinprogress first. -If this flag is not supported, BIOS will bypass all boot -option flow. - -Change-Id: Ibb0501ea5bc36c4f1f72339efef03724dd4e613f -Signed-off-by: Jia, chunhui -Signed-off-by: Yong Li +Signed-off-by: huanghe --- - chassishandler.cpp | 28 +++++++++++++++++++++++++++- + chassishandler.cpp | 34 ++++++++++++++++++++++++++++++++++ chassishandler.hpp | 3 +++ - 2 files changed, 30 insertions(+), 1 deletion(-) + 2 files changed, 37 insertions(+) diff --git a/chassishandler.cpp b/chassishandler.cpp -index 305897b..ee23845 100644 +index f043340..322aa9e 100644 --- a/chassishandler.cpp +++ b/chassishandler.cpp -@@ -1399,6 +1399,10 @@ static ipmi_ret_t setBootMode(const Mode::Modes& mode) - return IPMI_CC_OK; +@@ -1564,6 +1564,10 @@ static ipmi::Cc setBootMode(const Mode::Modes& mode) + return ipmi::ccSuccess; } +static constexpr uint8_t setComplete = 0x0; +static constexpr uint8_t setInProgress = 0x1; +static uint8_t transferStatus = setComplete; + - 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, -@@ -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; + /** @brief implements the Get Chassis system boot option + * @param bootOptionParameter - boot option parameter selector + * @param reserved1 - reserved bit +@@ -1598,6 +1602,14 @@ ipmi::RspType + IpmiValue bootOption = ipmiDefault; -+ if (reqptr->parameter == -+ static_cast(BootOptionParameter::SET_IN_PROGRESS)) ++ ++ if (static_cast(bootOptionParameter) == ++ static_cast(BootOptionParameter::setInProgress)) + { -+ *data_len = -+ static_cast(BootOptionResponseSize::SET_IN_PROGRESS); -+ resp->version = SET_PARM_VERSION; -+ resp->parm = static_cast(BootOptionParameter::SET_IN_PROGRESS); -+ resp->data[0] = transferStatus; -+ return IPMI_CC_OK; ++ response.pack(bootOptionParameter,reserved1,transferStatus); ++ return ipmi::responseSuccess(std::move(response)); + } + - std::memset(resp, 0, sizeof(*resp)); - resp->version = SET_PARM_VERSION; - resp->parm = 5; - resp->data[0] = SET_PARM_BOOT_FLAGS_VALID_ONE_TIME; -- /* * Parameter #5 means boot flags. Please refer to 28.13 of ipmi doc. * This is the only parameter used by petitboot. -@@ -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; +@@ -1719,6 +1731,28 @@ ipmi::RspType<> ipmiChassisSetSysBootOptions(ipmi::Context::ptr ctx, + using namespace boot_options; + ipmi::Cc rc; -+ if (reqptr->parameter == -+ static_cast(BootOptionParameter::SET_IN_PROGRESS)) ++ if (parameterSelector == ++ static_cast(BootOptionParameter::setInProgress)) + { ++ uint2_t setInProgressFlag; ++ uint6_t rsvd; ++ if (data.unpack(setInProgressFlag,rsvd) != 0 || ++ !data.fullyUnpacked()) ++ { ++ return ipmi::responseReqDataLenInvalid(); ++ } ++ if (rsvd) ++ { ++ return ipmi::responseInvalidFieldRequest(); ++ } + if ((transferStatus == setInProgress) && -+ (reqptr->data[0] != setComplete)) ++ ((uint8_t)setInProgressFlag != setComplete)) + { -+ return IPMI_CC_FAIL_SET_IN_PROGRESS; ++ return ipmi::response(IPMI_CC_FAIL_SET_IN_PROGRESS); + } -+ transferStatus = reqptr->data[0]; -+ return IPMI_CC_OK; ++ transferStatus = (uint8_t)setInProgressFlag; + } + /* 000101 * 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 dcaf06c..353a929 100644 +index 93de2c0..5976abc 100644 --- a/chassishandler.hpp +++ b/chassishandler.hpp @@ -25,6 +25,7 @@ enum ipmi_chassis_return_codes @@ -88,18 +85,18 @@ index dcaf06c..353a929 100644 }; enum class BootOptionParameter : size_t { -+ SET_IN_PROGRESS = 0x0, - BOOT_INFO = 0x4, - BOOT_FLAGS = 0x5, - OPAL_NETWORK_SETTINGS = 0x61 ++ setInProgress= 0x0, + bootInfo = 0x4, + bootFlags = 0x5, + opalNetworkSettings = 0x61 @@ -53,6 +55,7 @@ enum class BootOptionParameter : size_t enum class BootOptionResponseSize : size_t { -+ SET_IN_PROGRESS = 3, - BOOT_FLAGS = 5, - OPAL_NETWORK_SETTINGS = 50 ++ setInProgress = 3, + bootFlags = 5, + opalNetworkSettings = 50 }; -- -2.7.4 +2.17.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 98420b2ef..a3debae71 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 @@ -9,7 +9,6 @@ SRC_URI += "file://phosphor-ipmi-host.service \ file://0060-Move-Get-SOL-config-parameter-to-host-ipmid.patch \ file://0062-Update-IPMI-Chassis-Control-command.patch \ file://0063-Save-the-pre-timeout-interrupt-in-dbus-property.patch \ - file://0001-Modify-Get-Lan-Configuration-IP-Address-Source-to-us.patch \ " EXTRA_OECONF_append = " --disable-i2c-whitelist-check" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json new file mode 100644 index 000000000..2d77aa6e7 --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb/ipmb-channels.json @@ -0,0 +1,22 @@ +{ + "channels": [ + { + "type": "me", + "slave-path": "/dev/ipmb-5", + "bmc-addr": 32, + "remote-addr": 44 + }, + { + "type": "ipmb", + "slave-path": "/dev/ipmb-13", + "bmc-addr": 32, + "remote-addr": 32 + }, + { + "type": "slot-ipmb", + "slave-path": "/dev/ipmb-6", + "bmc-addr": 18, + "remote-addr": 176 + } + ] +} diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend index dcbba98e7..cfc1ae909 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-ipmb_%.bbappend @@ -1,4 +1,11 @@ SRC_URI = "git://github.com/openbmc/ipmbbridge.git" -SRCREV = "a86059348fe133725f4616f3e46ff0d555db4039" +SRCREV = "3e07b9ea353b794f9ef666172265ecc056e5cd4d" FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI += "file://0001-Add-dbus-method-SlotIpmbRequest.patch" +SRC_URI += "file://0001-Add-dbus-method-SlotIpmbRequest.patch \ + file://ipmb-channels.json \ + " + +do_install_append() { + install -D ${WORKDIR}/ipmb-channels.json \ + ${D}/usr/share/ipmbbridge +} \ No newline at end of file diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend index a3dceb01e..0aa63ca03 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-kcs_%.bbappend @@ -11,7 +11,7 @@ SMM_DEVICE = "ipmi_kcs4" SYSTEMD_SERVICE_${PN}_append = " ${PN}@${SMM_DEVICE}.service " SRC_URI = "git://github.com/openbmc/kcsbridge.git" -SRCREV = "d8594e9a62feb8b2fac789159966b4782b4aa31e" +SRCREV = "4a4d1d03d99fabe089e649aa226ad4c61e71684e" SRC_URI += "file://99-ipmi-kcs.rules" diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net/0009-Add-dbus-interface-for-sol-commands.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net/0009-Add-dbus-interface-for-sol-commands.patch index dc7f7357c..5f749af45 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net/0009-Add-dbus-interface-for-sol-commands.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net/0009-Add-dbus-interface-for-sol-commands.patch @@ -1,4 +1,4 @@ -From 97c21a556702a0d65096b30c07ef23f15cb6a7d9 Mon Sep 17 00:00:00 2001 +From e5ab844259f569656e95f5324f7428229dd811a7 Mon Sep 17 00:00:00 2001 From: Cheng C Yang Date: Wed, 3 Jul 2019 07:39:47 +0800 Subject: [PATCH] Add dbus interface for sol commands @@ -25,18 +25,18 @@ to 0 and other properties will not reset to default value. Signed-off-by: Cheng C Yang --- - command/payload_cmds.cpp | 3 ++ - command/sol_cmds.cpp | 84 ------------------------------- - sol/sol_manager.cpp | 125 +++++++++++++++++++++++++++++++++++++++++++++++ + command/payload_cmds.cpp | 3 + + command/sol_cmds.cpp | 84 -------------------------- + sol/sol_manager.cpp | 124 +++++++++++++++++++++++++++++++++++++++ sol/sol_manager.hpp | 1 + - sol_module.cpp | 6 --- - 5 files changed, 129 insertions(+), 90 deletions(-) + sol_module.cpp | 6 -- + 5 files changed, 128 insertions(+), 90 deletions(-) diff --git a/command/payload_cmds.cpp b/command/payload_cmds.cpp -index c32a510..17167a7 100644 +index c8e682e..bc987c5 100644 --- a/command/payload_cmds.cpp +++ b/command/payload_cmds.cpp -@@ -34,6 +34,9 @@ std::vector activatePayload(const std::vector& inPayload, +@@ -41,6 +41,9 @@ std::vector activatePayload(const std::vector& inPayload, return outPayload; } @@ -47,10 +47,10 @@ index c32a510..17167a7 100644 { response->completionCode = IPMI_CC_PAYLOAD_TYPE_DISABLED; diff --git a/command/sol_cmds.cpp b/command/sol_cmds.cpp -index a8fa410..804b5ea 100644 +index fda3e91..a1e820f 100644 --- a/command/sol_cmds.cpp +++ b/command/sol_cmds.cpp -@@ -65,90 +65,6 @@ void activating(uint8_t payloadInstance, uint32_t sessionID) +@@ -71,90 +71,6 @@ void activating(uint8_t payloadInstance, uint32_t sessionID) outPayload); } @@ -142,14 +142,12 @@ index a8fa410..804b5ea 100644 const message::Handler& handler) { diff --git a/sol/sol_manager.cpp b/sol/sol_manager.cpp -index 2046fe4..eedd28a 100644 +index a118457..55d269a 100644 --- a/sol/sol_manager.cpp +++ b/sol/sol_manager.cpp -@@ -12,7 +12,13 @@ - #include - #include +@@ -14,6 +14,11 @@ #include -+#include + #include #include +#include + @@ -159,7 +157,7 @@ index 2046fe4..eedd28a 100644 namespace sol { -@@ -93,6 +99,125 @@ void Manager::stopHostConsole() +@@ -103,6 +108,125 @@ void Manager::stopHostConsole() } } @@ -286,10 +284,10 @@ index 2046fe4..eedd28a 100644 session::SessionID sessionID) { diff --git a/sol/sol_manager.hpp b/sol/sol_manager.hpp -index 5d96890..00da9fb 100644 +index 5b48add..4e797d4 100644 --- a/sol/sol_manager.hpp +++ b/sol/sol_manager.hpp -@@ -248,6 +248,7 @@ class Manager +@@ -252,6 +252,7 @@ class Manager * @return 0 on success and errno on failure. */ int writeConsoleSocket(const std::vector& input) const; @@ -315,5 +313,5 @@ index 8200e74..2b1fb46 100644 {{(static_cast(message::PayloadType::IPMI) << 16) | static_cast(::command::NetFns::TRANSPORT) | 0x22}, -- -2.7.4 +2.17.1 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend index 10d0d8c94..4c00421a9 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-net_%.bbappend @@ -3,7 +3,7 @@ inherit useradd # TODO: This should be removed, once up-stream bump up # issue is resolved SRC_URI += "git://github.com/openbmc/phosphor-net-ipmid" -SRCREV = "ecb32fbc699aaacee4d6a42bb986575c4c5780dc" +SRCREV = "07bb095158b39cedb49dae0972e489a6a2776faf" USERADD_PACKAGES = "${PN}" # add a group called ipmi 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 36d65fd72..dfae096c6 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 @@ -3,7 +3,7 @@ DESCRIPTION = "The Node Manager Proxy provides a simple interface for communicat with Management Engine via IPMB" SRC_URI = "git://github.com/Intel-BMC/node-manager;protocol=ssh" -SRCREV = "de212d839bb515939bd089c66072e4fcf33b8653" +SRCREV = "403434f80e6a6c476516848dde2512b37f7ec5d8" PV = "0.1+git${SRCPV}" LICENSE = "Apache-2.0" -- cgit v1.2.3