diff options
author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-02-28 02:57:13 +0300 |
---|---|---|
committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2020-03-02 22:06:57 +0300 |
commit | 6c1caca70063aa707ba809a6b4695d0f0c5646f1 (patch) | |
tree | 84da2f29a60cb571686d3a4fb93f9d1f1189d989 /meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces | |
parent | 9600a7403ba2848c8751280077503a3e0f2f3481 (diff) | |
download | openbmc-6c1caca70063aa707ba809a6b4695d0f0c5646f1.tar.xz |
Update to internal 2020-02-27
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces')
4 files changed, 9 insertions, 353 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0016-Add-DBUS-interface-of-SMBIOS-MDR-V2.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0016-Add-DBUS-interface-of-SMBIOS-MDR-V2.patch deleted file mode 100644 index 576bae81a..000000000 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0016-Add-DBUS-interface-of-SMBIOS-MDR-V2.patch +++ /dev/null @@ -1,227 +0,0 @@ -From 9490574667485cd407193ff9f0d6a96f8c2c87d3 Mon Sep 17 00:00:00 2001 -From: cyang29 <cheng.c.yang@intel.com> -Date: Wed, 12 Sep 2018 00:27:23 +0800 -Subject: [PATCH] Add DBUS interface of SMBIOS MDR V2 - -Support: - SMBIOS MDR V2 service interface. - SMBIOS MDR V2 IPMI Command - SMBIOS MDR V2 Redfish interface. -Base on SMBIOS spec DSP0134_3.0.0 and Managed Data Region -Specification Revision 4 ---- - xyz/openbmc_project/Smbios/MDR_V2.errors.yaml | 9 + - xyz/openbmc_project/Smbios/MDR_V2.interface.yaml | 158 +++++++++++++++++++++++ - xyz/openbmc_project/Smbios/README.md | 21 +++ - 3 files changed, 188 insertions(+) - create mode 100644 xyz/openbmc_project/Smbios/MDR_V2.errors.yaml - create mode 100644 xyz/openbmc_project/Smbios/MDR_V2.interface.yaml - create mode 100644 xyz/openbmc_project/Smbios/README.md - -diff --git a/xyz/openbmc_project/Smbios/MDR_V2.errors.yaml b/xyz/openbmc_project/Smbios/MDR_V2.errors.yaml -new file mode 100644 -index 0000000..88bd6db ---- /dev/null -+++ b/xyz/openbmc_project/Smbios/MDR_V2.errors.yaml -@@ -0,0 +1,9 @@ -+- name: InvalidParameter -+ description: > -+ An invalid parameter is attempted. -+- name: UpdateInProgress -+ description: > -+ Update is in progress. -+- name: InvalidId -+ description: > -+ An invalid Id is attempted. -diff --git a/xyz/openbmc_project/Smbios/MDR_V2.interface.yaml b/xyz/openbmc_project/Smbios/MDR_V2.interface.yaml -new file mode 100644 -index 0000000..f97700a ---- /dev/null -+++ b/xyz/openbmc_project/Smbios/MDR_V2.interface.yaml -@@ -0,0 +1,158 @@ -+description: > -+ SMBIOS MDR V2 service -+methods: -+ - name: GetDirectoryInformation -+ description: > -+ Get the directory with directory index. -+ parameters: -+ - name: dirIndex -+ type: byte -+ description: > -+ Directory index of SMBIOS. -+ returns: -+ - name: dir -+ type: array[byte] -+ description: > -+ Directory of agent. -+ errors: -+ - self.Error.InvalidParameter -+ -+ - name: GetDataInformation -+ description: > -+ Get the data info with id index and data set ID. -+ parameters: -+ - name: idIndex -+ type: byte -+ description: > -+ Index of SMBIOS directory. -+ returns: -+ - name: dataInfo -+ type: array[byte] -+ description: > -+ Data information of SMBIOS. -+ errors: -+ - self.Error.InvalidParameter -+ -+ - name: SendDirectoryInformation -+ description: > -+ Send directory information to SMBIOS directory. -+ parameters: -+ - name: dirVersion -+ type: byte -+ description: > -+ A counter which increments each time directory updated. -+ - name: dirIndex -+ type: byte -+ description: > -+ Directory index of SMBIOS. -+ - name: returnedEntries -+ type: byte -+ description: > -+ Indicates number of directory entries. -+ - name: remainingEntries -+ type: byte -+ description: > -+ Remaining entries which are higher than index in this transfer. -+ - name: dirEntry -+ type: array[byte] -+ description: > -+ Data set ID of SMBIOS table. -+ returns: -+ - name: status -+ type: boolean -+ description: > -+ Need to continue directory transmisson or not. -+ errors: -+ - self.Error.InvalidParameter -+ -+ - name: GetDataOffer -+ description: > -+ Get data set ID. -+ returns: -+ - name: offer -+ type: array[byte] -+ description: > -+ Data set ID. -+ errors: -+ - self.Error.UpdateInProgress -+ -+ - name: SendDataInformation -+ description: > -+ Send data information with directory index. -+ parameters: -+ - name: idIndex -+ type: byte -+ description: > -+ Index of SMBIOS directory. -+ - name: flag -+ type: byte -+ description: > -+ Valid flag to set dir entry status. -+ - name: dataLen -+ type: uint32 -+ description: > -+ The length of the data in bytes. -+ - name: dataVer -+ type: uint32 -+ description: > -+ The version number of this data. -+ - name: timeStamp -+ type: uint32 -+ description: > -+ Timestamp determinded by the agent. -+ returns: -+ - name: status -+ type: boolean -+ description: > -+ Whether data changes. -+ errors: -+ - self.Error.InvalidParameter -+ -+ - name: FindIdIndex -+ description: > -+ Find id index by data info. -+ parameters: -+ - name: dataInfo -+ type: array[byte] -+ description: > -+ Data info of data entry. -+ returns: -+ - name: idIndex -+ type: int32 -+ description: > -+ Id index of data entry. -+ errors: -+ - self.Error.InvalidId -+ -+ - name: AgentSynchronizeData -+ description: > -+ Synchronize SMBIOS data from file. -+ returns: -+ - name: status -+ type: boolean -+ description: > -+ Whether synchronization succeed or not. -+ -+ - name: SynchronizeDirectoryCommonData -+ description: > -+ Synchronize directory common data. -+ parameters: -+ - name: idIndex -+ type: byte -+ description: > -+ Index of SMBIOS directory. -+ - name: size -+ type: uint32 -+ description: > -+ Size of data that BIOS prepare to transfer. -+ returns: -+ - name: commonData -+ type: array[uint32] -+ description: > -+ Directory common data includes data size, version and timestamp. -+ -+properties: -+ - name: DirectoryEntries -+ type: byte -+ description: > -+ Numbers of directory entries. -diff --git a/xyz/openbmc_project/Smbios/README.md b/xyz/openbmc_project/Smbios/README.md -new file mode 100644 -index 0000000..415ac52 ---- /dev/null -+++ b/xyz/openbmc_project/Smbios/README.md -@@ -0,0 +1,22 @@ -+# SMBIOS MDR V2 -+ -+## Overview -+SMBIOS MDR V2 service exposes D-Bus methods for SMBIOS Version 2 operations. -+ -+### SMBIOS MDR V2 Interface -+SMBIOS MDR V2 interface `xyz.openbmc_project.Smbios.MDR_V2` provides following -+methods. -+#### methods -+* GetDirectoryInformation - Get the directory with directory index. -+* GetDataInformation - Get the data information with id index and data set ID. -+* SendDirectoryInformation - Send directory information to SMBIOS directory. -+* GetDataOffer - Get data set ID. -+* SendDataInformation - Send data information with directory index. -+* FindIdIndex - Find id index by data info. -+* SynchronizeDirectoryCommonData - Synchronize directory common data before -+SMBIOS data start to transfer. -+* AgentSynchronizeData - Synchronize SMBIOS data from file after data transfer -+complete. -+ -+#### properties -+* DirEntries - Numbers of directory entries. Default: 0 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0020-Create-dbus-interface-for-SOL-commands.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0020-Create-dbus-interface-for-SOL-commands.patch deleted file mode 100644 index 68d2c92b7..000000000 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0020-Create-dbus-interface-for-SOL-commands.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 2820ca36ab21c52341cdbde477756f960eaeb68b Mon Sep 17 00:00:00 2001 -From: Cheng C Yang <cheng.c.yang@intel.com> -Date: Wed, 13 Mar 2019 11:19:07 +0800 -Subject: [PATCH] Create dbus interface for SOL commands - -Create dbus properties for Set/Get SOL config parameter command. -Some platforms need to call Set/Get SOL config parameter command -through KCS, and since sol manager in net-ipmid cannot be accessed -by commands in host-ipmid, need to create a dbus interface in -phospher-settings to transfer properties from host-ipmid to -net-ipmid. - -TestedBy: -With the related code change in net-ipmid, busctl introspect -xyz.openbmc_project.Ipmi.SOL /xyz/openbmc_project/SOL -can show all the properties needed. - -Signed-off-by: Cheng C Yang <cheng.c.yang@intel.com> ---- - xyz/openbmc_project/Ipmi/SOL.interface.yaml | 44 ++++++++++++++++++++++++++ - 1 file changed, 44 insertions(+) - create mode 100644 xyz/openbmc_project/Ipmi/SOL.interface.yaml - -diff --git a/xyz/openbmc_project/Ipmi/SOL.interface.yaml b/xyz/openbmc_project/Ipmi/SOL.interface.yaml -new file mode 100644 -index 0000000..94db59f ---- /dev/null -+++ b/xyz/openbmc_project/Ipmi/SOL.interface.yaml -@@ -0,0 +1,44 @@ -+description: > -+ SOL properties use for Get/Set SOL config parameter command in host-ipmid -+ sending config to SOL process in net-ipmid. -+ Since some platforms need to access Get/Set SOL config parameter command -+ through KCS, and current sol manager is implemented in net-ipmid and -+ cannot be accessed by host-ipmid, add a dbus interface for host-ipmid -+ command to transfer properties to net-ipmid. -+ This interface will be implemented in phosphor-settings. -+properties: -+ - name: Progress -+ type: byte -+ description: > -+ Set In Progress property, indicate when any parameters are being -+ updated. -+ - name: Enable -+ type: boolean -+ description: > -+ SOL Enable property, this controls whether the SOL payload type -+ can be activated. -+ - name: Authentication -+ type: byte -+ description: > -+ If SOL enable Force Payload Encryption and Authenticaton. -+ And the minimun operating privilege level SOL required. -+ - name: AccumulateIntervalMS -+ type: byte -+ description: > -+ Character Accumulate Interval in 5ms increments. -+ BMC will wait this time before transmitting a packet. -+ - name: Threshold -+ type: byte -+ description: > -+ BMC will automatically send an SOL character data packet containing -+ this number of characters as soon as this number of characters -+ (or greater) has been accepted from the baseboard serial controller. -+ - name: RetryCount -+ type: byte -+ description: > -+ Packet will be dropped if no ACK/NACK received by time retries -+ expire. -+ - name: RetryIntervalMS -+ type: byte -+ description: > -+ Retry Interval in 10ms increments. --- -2.16.2 - diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0022-Add-chassis-power-cycle-and-reset-to-Chassis-State.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0022-Add-chassis-power-cycle-and-reset-to-Chassis-State.patch deleted file mode 100644 index 181d12428..000000000 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0022-Add-chassis-power-cycle-and-reset-to-Chassis-State.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b55c6847b18fdee5a72d601b871d73085481e4d9 Mon Sep 17 00:00:00 2001 -From: "Jason M. Bills" <jason.m.bills@linux.intel.com> -Date: Mon, 3 Jun 2019 16:31:29 -0700 -Subject: [PATCH] Add chassis power-cycle and reset to Chassis State - -This adds chassis PowerCycle and Reset as possible Transition -values for the Chassis State. These are to support chassis -power cycle and a chassis reset button, respectively. - -Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com> ---- - xyz/openbmc_project/State/Chassis.interface.yaml | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/xyz/openbmc_project/State/Chassis.interface.yaml b/xyz/openbmc_project/State/Chassis.interface.yaml -index 4ae6274..470a3a2 100644 ---- a/xyz/openbmc_project/State/Chassis.interface.yaml -+++ b/xyz/openbmc_project/State/Chassis.interface.yaml -@@ -31,10 +31,17 @@ enumerations: - values: - - name: 'Off' - description: > -- Chassis power should be off -+ Chassis power should be off - - name: 'On' - description: > - Chassis power should be on -+ - name: 'PowerCycle' -+ description: > -+ Chassis power should be cycled -+ - name: 'Reset' -+ description: > -+ Chassis should be reset -+ - - - name: PowerState - description: > --- -2.7.4 - diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0026-Add-StandbySpare-support-for-software-inventory.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0026-Add-StandbySpare-support-for-software-inventory.patch index cbf966a37..36c63ec58 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0026-Add-StandbySpare-support-for-software-inventory.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0026-Add-StandbySpare-support-for-software-inventory.patch @@ -1,6 +1,6 @@ -From ae9e4b2a166dc4f34b255ed5338abbfa8aa37778 Mon Sep 17 00:00:00 2001 -From: Vikram Bodireddy <vikram.bodireddy@linux.intel.com> -Date: Sat, 30 Nov 2019 18:20:13 +0530 +From 0d6556539be9bda478a3cabb6127eace5764fa11 Mon Sep 17 00:00:00 2001 +From: Vikram Bodireddy <vikram.bodireddy@intel.com> +Date: Wed, 15 Jan 2020 10:01:04 +0800 Subject: [PATCH] Add StandbySpare support for software inventory Add support to allow update for active / recovery @@ -9,14 +9,13 @@ the backend modules to advertise whether the software object is active or recovery (StandbySpare) image. -Change-Id: I0d46206463ba566bcaa710fb271aa4d795fa49cd -Signed-off-by: Vikram Bodireddy <vikram.bodireddy@linux.intel.com> +Signed-off-by: Vikram Bodireddy <vikram.bodireddy@intel.com> --- xyz/openbmc_project/Software/Activation.interface.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/xyz/openbmc_project/Software/Activation.interface.yaml b/xyz/openbmc_project/Software/Activation.interface.yaml -index 37c9cb9..b71b8e7 100644 +index efeeeb6..6c9ce75 100644 --- a/xyz/openbmc_project/Software/Activation.interface.yaml +++ b/xyz/openbmc_project/Software/Activation.interface.yaml @@ -28,12 +28,20 @@ enumerations: @@ -37,10 +36,10 @@ index 37c9cb9..b71b8e7 100644 + description: > + The Software.Version is part of a redundancy set and awaits + a failover or external action to activate. - - name: RequestedActivations - description: > - The possible RequestedActivation states of a Software.Version. -@@ -44,6 +52,10 @@ enumerations: + - name: Staged + description: > + The Software.Version is currently in staged flash area. +@@ -48,6 +56,10 @@ enumerations: - name: Active description: > The Software.Version has been requested for Activation. |