From 816d793003e93c1e5eec0a2e90fbd8b9dde9f7a5 Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Mon, 15 Apr 2019 13:42:44 -0700 Subject: Update 4-15-19 Signed-off-by: Ed Tanous --- ...003-Chassis-Power-Control-are-implemented.patch | 45 +++++---- ...ng-the-Session-interface-for-Host-and-LAN.patch | 104 ++++++++++----------- ...0-Change-some-properties-name-in-SOL-Dbus.patch | 73 +++++++++++++++ ...d-interface-suppot-for-provisioning-modes.patch | 52 +++++++++++ 4 files changed, 198 insertions(+), 76 deletions(-) create mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0020-Change-some-properties-name-in-SOL-Dbus.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0021-Add-interface-suppot-for-provisioning-modes.patch (limited to 'meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces') diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0003-Chassis-Power-Control-are-implemented.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0003-Chassis-Power-Control-are-implemented.patch index 79d02ca9b..0e25856ac 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0003-Chassis-Power-Control-are-implemented.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0003-Chassis-Power-Control-are-implemented.patch @@ -1,4 +1,4 @@ -From 35271230690c5d85dc7a6502031b38d93ddd683f Mon Sep 17 00:00:00 2001 +From a20f9fa9941533b591b6bbfe6b22a74b7c0dfe64 Mon Sep 17 00:00:00 2001 From: Ed Tanous Date: Thu, 24 Jan 2019 09:29:01 -0800 Subject: [PATCH] Chassis Power Control are implemented. @@ -38,9 +38,9 @@ Power on/off: curl --noproxy -q1c cjar -b cjar -k -H "Content-Type: ap Signed-off-by: Kuiying Wang Signed-off-by: Yong Li --- - .../Chassis/Control/Chassis.interface.yaml | 94 +++++++++++++++++++ - .../Chassis/Control/Power.interface.yaml | 85 ++++++++++++++--- - 2 files changed, 166 insertions(+), 13 deletions(-) + .../Chassis/Control/Chassis.interface.yaml | 94 ++++++++++++++++++++++ + .../Chassis/Control/Power.interface.yaml | 92 ++++++++++++++++++--- + 2 files changed, 173 insertions(+), 13 deletions(-) create mode 100644 xyz/openbmc_project/Chassis/Control/Chassis.interface.yaml diff --git a/xyz/openbmc_project/Chassis/Control/Chassis.interface.yaml b/xyz/openbmc_project/Chassis/Control/Chassis.interface.yaml @@ -144,10 +144,10 @@ index 0000000..c28492a + - xyz.openbmc_project.Chassis.Common.Error.IOError + diff --git a/xyz/openbmc_project/Chassis/Control/Power.interface.yaml b/xyz/openbmc_project/Chassis/Control/Power.interface.yaml -index 082586f..e77598b 100644 +index 082586f..368beca 100644 --- a/xyz/openbmc_project/Chassis/Control/Power.interface.yaml +++ b/xyz/openbmc_project/Chassis/Control/Power.interface.yaml -@@ -1,31 +1,90 @@ +@@ -1,31 +1,97 @@ description: > - Power control service + Chassis control service @@ -206,13 +206,23 @@ index 082586f..e77598b 100644 - default: false + - name: vrd_good + type: int32 ++ default: 0 ++ description: > ++ ACPI status ++ - name: s4s5_state ++ type: int32 ++ default: 0 ++ description: > ++ ACPI status ++ - name: pgood ++ type: int32 + default: 0 description: > - PSU Power good property - It is a read-only property. - - name: State -+ ACPI status -+ - name: s4s5_state ++ pgood property ++ - name: state type: int32 default: 0 description: > @@ -222,16 +232,6 @@ index 082586f..e77598b 100644 - Setting its value to change the system state - Read its value to get the system state. \ No newline at end of file -+ ACPI status -+ - name: pgood -+ type: int32 -+ default: 0 -+ description: > -+ pgood property -+ - name: state -+ type: int32 -+ default: 0 -+ description: > + state property + - name: pgood_timeout + type: int32 @@ -245,6 +245,13 @@ index 082586f..e77598b 100644 + The current BIOS POST state, + false means not completed or system reset, + true means BIOS POST completed. ++ - name: PFail ++ type: boolean ++ default: true ++ description: > ++ The current booting status, ++ true means booting from AC loss, ++ false means not booting from AC loss. +signals: + - name: PowerGood + description: > @@ -253,5 +260,5 @@ index 082586f..e77598b 100644 + description: > + Signal for powerlost -- -2.17.1 +2.7.4 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0019-Creating-the-Session-interface-for-Host-and-LAN.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0019-Creating-the-Session-interface-for-Host-and-LAN.patch index e1208cf5b..47fab819b 100644 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0019-Creating-the-Session-interface-for-Host-and-LAN.patch +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0019-Creating-the-Session-interface-for-Host-and-LAN.patch @@ -1,4 +1,4 @@ -From f805522921d69eb4ea70248fe7e54557363aacea Mon Sep 17 00:00:00 2001 +From 28fac58dc6ef975e1e9283163d9f1e4c7764c3cc Mon Sep 17 00:00:00 2001 From: Suryakanth Sekar Date: Sat, 2 Mar 2019 03:31:09 +0530 Subject: [PATCH] Creating the Session interface- for Host and LAN @@ -8,23 +8,56 @@ host and also in LAN Change-Id: Ic7cccfc3333a602ee07fcd60077ec58fd8f06304 Signed-off-by: Suryakanth Sekar + +%% original patch: 0019-Creating-the-Session-interface-for-Host-and-LAN.patch --- - xyz/openbmc_project/Session/Info.interface.yaml | 56 +++++++++++++++++++++++++ - xyz/openbmc_project/Session/README.md | 38 +++++++++++++++++ - 2 files changed, 94 insertions(+) - create mode 100644 xyz/openbmc_project/Session/Info.interface.yaml - create mode 100644 xyz/openbmc_project/Session/README.md + xyz/openbmc_project/Ipmi/SESSION_README.md | 25 ++++++++++ + .../Ipmi/SessionInfo.interface.yaml | 57 ++++++++++++++++++++++ + 2 files changed, 82 insertions(+) + create mode 100644 xyz/openbmc_project/Ipmi/SESSION_README.md + create mode 100644 xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml -diff --git a/xyz/openbmc_project/Session/Info.interface.yaml b/xyz/openbmc_project/Session/Info.interface.yaml +diff --git a/xyz/openbmc_project/Ipmi/SESSION_README.md b/xyz/openbmc_project/Ipmi/SESSION_README.md +new file mode 100644 +index 0000000..c59b251 +--- /dev/null ++++ b/xyz/openbmc_project/Ipmi/SESSION_README.md +@@ -0,0 +1,25 @@ ++# Session Management ++ ++## Overview ++IPMI RMCP+ sessions are created and maintained by phosphor-ipmi-net daemon, ++whereas we need to provide details about the same using phosphor-ipmi-host. ++Hence IPMI RMCP+ session details has to be exposed through D-Bus interface, ++so that both phosphor-ipmi-host & phosphr-ipmi-net will be in sync. ++ ++ ++#### xyz.openbmc_project.Ipmi.SessionInfo interface ++##### properties ++* SessionHandle - SessionHandle,unique one-byte number to locate the session. ++* Channel - Session created channel. ++* SessionPrivilege - Privilege of the session. ++* RemoteIPAddr – Remote IP address. ++* RemotePort - Remote port address. ++* RemoteMACAddress -Remote MAC Address. ++* UserID - Session created by given user id. ++ ++ ++ ++#### xyz.openbmc_project.Object.Delete ++#### methods ++* Delete - To delete the session object in the system. ++ +diff --git a/xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml b/xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml new file mode 100644 -index 0000000..fbb5a45 +index 0000000..d461628 --- /dev/null -+++ b/xyz/openbmc_project/Session/Info.interface.yaml -@@ -0,0 +1,56 @@ ++++ b/xyz/openbmc_project/Ipmi/SessionInfo.interface.yaml +@@ -0,0 +1,57 @@ +description: > -+ Provides properties for session objects. -+ As communication to this service is done through authenticated -+ & authorized session, there won't be any validation for the both. ++ Provides properties for IPMI RMCP+ session objects. ++ Provides RMCP+ session information as session objects ++ with Session ID (unique identifier) as path suffix. + +properties: + - name: SessionHandle @@ -71,56 +104,13 @@ index 0000000..fbb5a45 + - xyz.openbmc_project.Common.Error.InternalFailure + - name: State + type: byte ++ default: 0 + description: > + Session state. + errors: + - xyz.openbmc_project.Common.Error.InternalFailure + +# vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4 -diff --git a/xyz/openbmc_project/Session/README.md b/xyz/openbmc_project/Session/README.md -new file mode 100644 -index 0000000..f220885 ---- /dev/null -+++ b/xyz/openbmc_project/Session/README.md -@@ -0,0 +1,38 @@ -+# Session Management -+ -+## Overview -+Session Manager service exposes D-Bus methods for session management operations. -+ -+### Session Manager Interface -+Session manager interface `xyz.openbmc_project.Session.Manager` provides following -+methods, properties and signals. -+ -+#### xyz.openbmc_project.Session.Manager interface -+##### methods -+* CreateSession - To create new session object to the system. -+ -+##### properties -+* MaxSessionSupported - To list all the groups supported in the system. -+* ActiveSessionCount - To hold the no of active sessions. -+ -+Session manager service will create session objects for every session -+in the system under object path `/xyz/openbmc_project/session/`. -+Each session object can be handled through 'org.freedesktop.DBus.ObjectManager'. -+session object will expose following properties and methods. -+ -+#### xyz.openbmc_project.Session.Info interface -+##### properties -+* SessionID - Session ID,random unique number to locate the session. -+* Channel - Session created Channel. -+* SessionPrivilege - Privilege of the session. -+* RemoteIPAddr – Remote IP address. -+* RemotePort - Remote Port address. -+* RemoteMACAddress -Remote MAC Address. -+* UserID - Session created by given user id. -+ -+ -+ -+#### xyz.openbmc_project.Object.Delete -+#### methods -+* Delete - To delete the session object in the system. -+ -- 2.7.4 diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0020-Change-some-properties-name-in-SOL-Dbus.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0020-Change-some-properties-name-in-SOL-Dbus.patch new file mode 100644 index 000000000..9fe383fda --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0020-Change-some-properties-name-in-SOL-Dbus.patch @@ -0,0 +1,73 @@ +From 2e265e85777345a318084c2f1f3b684f7e7ff4a4 Mon Sep 17 00:00:00 2001 +From: Cheng C Yang +Date: Thu, 28 Mar 2019 18:06:54 +0800 +Subject: [PATCH] Change some properties name in SOL Dbus + +Change some properties name in SOL D-Bus interface to make the meaning +of the properties more clearly. + +Signed-off-by: Cheng C Yang +--- + xyz/openbmc_project/Ipmi/SOL.interface.yaml | 25 +++++++++++++++++-------- + 1 file changed, 17 insertions(+), 8 deletions(-) + +diff --git a/xyz/openbmc_project/Ipmi/SOL.interface.yaml b/xyz/openbmc_project/Ipmi/SOL.interface.yaml +index 94db59f..96c8c87 100644 +--- a/xyz/openbmc_project/Ipmi/SOL.interface.yaml ++++ b/xyz/openbmc_project/Ipmi/SOL.interface.yaml +@@ -2,8 +2,8 @@ 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 ++ through KCS, and current SOL manager is implemented in net-ipmid and ++ cannot be accessed by host-ipmid, add a D-Bus interface for host-ipmid + command to transfer properties to net-ipmid. + This interface will be implemented in phosphor-settings. + properties: +@@ -17,12 +17,20 @@ properties: + description: > + SOL Enable property, this controls whether the SOL payload type + can be activated. +- - name: Authentication ++ - name: ForceEncryption ++ type: boolean ++ description: > ++ If SOL enable Force Payload Encryption. ++ - name: ForceAuthentication ++ type: boolean ++ description: > ++ If SOL enable Force Payload Authentication ++ - name: Privilege + type: byte + description: > +- If SOL enable Force Payload Encryption and Authenticaton. +- And the minimun operating privilege level SOL required. +- - name: Accumulate ++ Sets the minimum operating privilege level that is required to ++ be able to activate SOL by Activate Payload command. ++ - name: AccumulateIntervalMS + type: byte + description: > + Character Accumulate Interval in 5ms increments. +@@ -31,13 +39,14 @@ properties: + type: byte + description: > + BMC will automatically send an SOL character data packet containing +- this number of characters. ++ 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: RetryInterval ++ - 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/0021-Add-interface-suppot-for-provisioning-modes.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0021-Add-interface-suppot-for-provisioning-modes.patch new file mode 100644 index 000000000..f6e200cab --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0021-Add-interface-suppot-for-provisioning-modes.patch @@ -0,0 +1,52 @@ +From 94fb1ac5dd4d54ea5a6d49597e1f15c384be7fd6 Mon Sep 17 00:00:00 2001 +From: Richard Marian Thomaiyar +Date: Mon, 8 Apr 2019 11:48:22 +0530 +Subject: [PATCH] Add interface suppot for provisioning modes + +Support for provisioning modes are added in +RestrictionMode.interface.yaml + +Tested: +1. Verified build, and verified specified modes are available +and able to set / get the same using busctl command + +Signed-off-by: Richard Marian Thomaiyar +--- + .../Security/RestrictionMode.interface.yaml | 24 ++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + +diff --git a/xyz/openbmc_project/Control/Security/RestrictionMode.interface.yaml b/xyz/openbmc_project/Control/Security/RestrictionMode.interface.yaml +index 8e4fd8d..d328dac 100644 +--- a/xyz/openbmc_project/Control/Security/RestrictionMode.interface.yaml ++++ b/xyz/openbmc_project/Control/Security/RestrictionMode.interface.yaml +@@ -21,3 +21,27 @@ enumerations: + - name: Blacklist + description: > + Prevent, if in the blacklist. ++ - name: Provisioning ++ description: > ++ Indicate that system is in provisioning mode ++ and all commands are allowed in KCS inteface ++ in both pre and post BIOS boot. ++ - name: ProvisionedKCSWhiteList ++ description: > ++ Commands in the whitelist will only be executed ++ through KCS interface after BIOS POST complete. ++ All KCS commands are supported before POST complete. ++ - name: ProvisionedKCSDisabled ++ description: > ++ Commands through KCS interface are executed only ++ till BIOS POST complete notification, after ++ which no KCS commands will be executed(other ++ than BIOS SMI based ones). ++ - name: ValidationUnsecure ++ description: > ++ To indicate that BMC is in unsecure mode, and many ++ operations which are not meant for end-user will be ++ allowed in this mode. Interface which sets this ++ property has to make sure due diligence is made ++ as in this mode, many security intrinsic commands ++ can be executed. +-- +2.7.4 + -- cgit v1.2.3