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 --- ...ance-DHCP-beyond-just-OFF-and-IPv4-IPv6-e.patch | 47 --- ...-interface-of-CPU-and-Memory-s-properties.patch | 65 --- ...0027-Apply-Options-interface-for-Software.patch | 47 --- ...28-MCTP-Daemon-D-Bus-interface-definition.patch | 457 --------------------- ...te-meson-build-files-for-control-and-bios.patch | 156 +++++++ 5 files changed, 156 insertions(+), 616 deletions(-) delete mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0001-Reapply-Enhance-DHCP-beyond-just-OFF-and-IPv4-IPv6-e.patch delete mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0005-Add-DBUS-interface-of-CPU-and-Memory-s-properties.patch delete mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0027-Apply-Options-interface-for-Software.patch delete mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0028-MCTP-Daemon-D-Bus-interface-definition.patch create mode 100644 meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0031-update-meson-build-files-for-control-and-bios.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/0001-Reapply-Enhance-DHCP-beyond-just-OFF-and-IPv4-IPv6-e.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0001-Reapply-Enhance-DHCP-beyond-just-OFF-and-IPv4-IPv6-e.patch deleted file mode 100644 index 3344c27dd..000000000 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0001-Reapply-Enhance-DHCP-beyond-just-OFF-and-IPv4-IPv6-e.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 3789a98fda6e3cafd377b0f4fa1c0c40bb94297e Mon Sep 17 00:00:00 2001 -From: Johnathan Mantey -Date: Wed, 20 Nov 2019 10:56:44 -0500 -Subject: [PATCH] Reapply: "Enhance DHCP beyond just OFF and IPv4/IPv6 - enabled." - -DHCP is not a binary option. The network interface can have DHCP -disabled, IPv4 only, IPv6 only, and IPv4/IPv6. - -Signed-off-by: Johnathan Mantey - -Reapplied -> -Signed-off-by: Brad Bishop -Change-Id: I7654116aa3962de253225271190ce4a2fe229ce9 ---- - .../Network/EthernetInterface.interface.yaml | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/xyz/openbmc_project/Network/EthernetInterface.interface.yaml b/xyz/openbmc_project/Network/EthernetInterface.interface.yaml -index ee54145..56285ee 100644 ---- a/xyz/openbmc_project/Network/EthernetInterface.interface.yaml -+++ b/xyz/openbmc_project/Network/EthernetInterface.interface.yaml -@@ -23,7 +23,7 @@ properties: - description: > - Domain names of the ethernet interface. - - name: DHCPEnabled -- type: boolean -+ type: enum[self.DHCPConf] - description: > - Address mode of the ethernet interface. - - name: Nameservers -@@ -69,4 +69,11 @@ enumerations: - - name: v4 - - name: v6 - - name: none -- -+ - name: DHCPConf -+ description: > -+ A list of the permitted DHCP settings used by systemd. -+ values: -+ - name: both -+ - name: v4 -+ - name: v6 -+ - name: none --- -2.21.0 - diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0005-Add-DBUS-interface-of-CPU-and-Memory-s-properties.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0005-Add-DBUS-interface-of-CPU-and-Memory-s-properties.patch deleted file mode 100644 index 4cfc4acc8..000000000 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0005-Add-DBUS-interface-of-CPU-and-Memory-s-properties.patch +++ /dev/null @@ -1,65 +0,0 @@ -From a30a09f58b9ebfb267c0b9cce9ae25994ea025ca Mon Sep 17 00:00:00 2001 -From: cyang29 -Date: Tue, 17 Jul 2018 16:04:58 +0800 -Subject: [PATCH] Add DBUS interface of CPU properties Feature - Support: SMBIOS service interface. CPU information redfish - interface. Base on smbios spec DSP0134_3.0.0 - -Signed-off-by: cyang29 ---- - .../Inventory/Item/Cpu.interface.yaml | 41 +++++++++++++++++++ - 1 files changed, 41 insertions(+) - -diff --git a/xyz/openbmc_project/Inventory/Item/Cpu.interface.yaml b/xyz/openbmc_project/Inventory/Item/Cpu.interface.yaml -index ab29cf3..313eada 100644 ---- a/xyz/openbmc_project/Inventory/Item/Cpu.interface.yaml -+++ b/xyz/openbmc_project/Inventory/Item/Cpu.interface.yaml -@@ -1,4 +1,45 @@ - description: > - Implement to provide CPU attributes. -+properties: -+ - name: ProcessorSocket -+ type: string -+ description: > -+ Processor Socket on MotherBoard -+ - name: ProcessorType -+ type: string -+ description: > -+ Processor Type of CPU -+ - name: ProcessorFamily -+ type: string -+ description: > -+ Processor Family of CPU -+ - name: ProcessorManufacturer -+ type: string -+ description: > -+ Processor Manufacturer of CPU -+ - name: ProcessorId -+ type: uint32 -+ description: > -+ Processor ID of CPU -+ - name: ProcessorVersion -+ type: string -+ description: > -+ Processor Version of CPU -+ - name: ProcessorMaxSpeed -+ type: uint16 -+ description: > -+ Max Speed CPU Can Support -+ - name: ProcessorCharacteristics -+ type: string -+ description: > -+ The Characteristics CPU Has -+ - name: ProcessorCoreCount -+ type: uint16 -+ description: > -+ The Count of Core in CPU -+ - name: ProcessorThreadCount -+ type: uint16 -+ description: > -+ The Count of Thread CPU Can Support - - # vim: tabstop=8 expandtab shiftwidth=4 softtabstop=4 --- -2.16.2 - diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0027-Apply-Options-interface-for-Software.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0027-Apply-Options-interface-for-Software.patch deleted file mode 100644 index 3d2cc43e2..000000000 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0027-Apply-Options-interface-for-Software.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 153b125043c28f933579330727d82658979caef3 Mon Sep 17 00:00:00 2001 -From: Vikram Bodireddy -Date: Mon, 18 May 2020 20:16:04 +0530 -Subject: [PATCH] Apply Options interface for Software - -Apply Options interface is used to pass the settings related to -firmware image activation such as ClearConfig. -ClearConfig property is used to denote whether to clear firmware -configurations along with firmware image activation or not. - -Example case: -BIOS usually requires its NVRAM configuration to be updated or -erased for certain BIOS firmware updates. Current implementation -doesn't support to take this option and provide interface to do -the necessary actions. - -Signed-off-by: Vikram Bodireddy ---- - .../Software/ApplyOptions.interface.yaml | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - create mode 100644 xyz/openbmc_project/Software/ApplyOptions.interface.yaml - -diff --git a/xyz/openbmc_project/Software/ApplyOptions.interface.yaml b/xyz/openbmc_project/Software/ApplyOptions.interface.yaml -new file mode 100644 -index 0000000..45a68ab ---- /dev/null -+++ b/xyz/openbmc_project/Software/ApplyOptions.interface.yaml -@@ -0,0 +1,16 @@ -+description: > -+ To implement the Activation apply options for a newly uploaded firmware -+ image. The apply options property is global and is specifically used with -+ each firmware update and is used during firmware activation. -+ ApplyOptions usage during firmware activation is implementation specific, -+ not all firmware targets need ApplyOptions. -+ The default value of this property is false. -+properties: -+ - name: ClearConfig -+ type: boolean -+ default: false -+ description: > -+ This property indicates whether to clear the software configurations -+ when the firmware image update is getting applied. A value of true -+ indicates the firmware configurations should be cleared along with -+ firmware image activation. --- -2.17.1 - diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0028-MCTP-Daemon-D-Bus-interface-definition.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0028-MCTP-Daemon-D-Bus-interface-definition.patch deleted file mode 100644 index e6afc0117..000000000 --- a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0028-MCTP-Daemon-D-Bus-interface-definition.patch +++ /dev/null @@ -1,457 +0,0 @@ -From 65d1772312a76ebfdac6391bb97287c62f18c43f Mon Sep 17 00:00:00 2001 -From: "Kowalski, Mariusz" -Date: Thu, 27 Feb 2020 15:48:56 +0100 -Subject: [PATCH] MCTP Daemon D-Bus interface definition. - -This interface definition was created on base of the MCTP design -proposed in this document: -https://gerrit.openbmc-project.xyz/c/openbmc/docs/+/28424/9/designs/mctp.md - -Signed-off-by: Arun P. Mohanan -Signed-off-by: Mariusz Kowalski -Signed-off-by: Karol Wachowski -Change-Id: Ida66f8ffcf00003655edcb0fb0112202797b8e1a ---- - xyz/openbmc_project/MCTP/Base.interface.yaml | 227 ++++++++++++++++++ - .../MCTP/Binding/PCIe.interface.yaml | 29 +++ - .../MCTP/Binding/SMBus.interface.yaml | 17 ++ - .../MCTP/BusOwner.interface.yaml | 17 ++ - .../MCTP/Endpoint.interface.yaml | 13 + - xyz/openbmc_project/MCTP/README.md | 43 ++++ - .../MCTP/SupportedMessageTypes.interface.yaml | 36 +++ - 7 files changed, 382 insertions(+) - create mode 100644 xyz/openbmc_project/MCTP/Base.interface.yaml - create mode 100644 xyz/openbmc_project/MCTP/Binding/PCIe.interface.yaml - create mode 100644 xyz/openbmc_project/MCTP/Binding/SMBus.interface.yaml - create mode 100644 xyz/openbmc_project/MCTP/BusOwner.interface.yaml - create mode 100644 xyz/openbmc_project/MCTP/Endpoint.interface.yaml - create mode 100644 xyz/openbmc_project/MCTP/README.md - create mode 100644 xyz/openbmc_project/MCTP/SupportedMessageTypes.interface.yaml - -diff --git a/xyz/openbmc_project/MCTP/Base.interface.yaml b/xyz/openbmc_project/MCTP/Base.interface.yaml -new file mode 100644 -index 0000000..9438551 ---- /dev/null -+++ b/xyz/openbmc_project/MCTP/Base.interface.yaml -@@ -0,0 +1,227 @@ -+description: > -+ Mandatory interface for each instance of the MCTP Daemon to expose -+ the base MCTP daemon and medium type interfaces. -+ -+methods: -+ - name: SendMctpMessagePayload -+ description: > -+ Sends message over MCTP interface -+ parameters: -+ - name: DestinationEID -+ type: byte -+ description: > -+ Destination Endpoint ID. The logical address used to route MCTP -+ messages to a specific MCTP endpoint. -+ - name: MsgTag -+ type: byte -+ description: > -+ Message tag. Field that, along with the Source Endpoint IDs and the -+ Tag Owner (TO) field, identifies a unique message at the MCTP -+ transport level. -+ - name: TagOwner -+ type: boolean -+ description: > -+ Tag Owner bit identifies whether the message tag was originated by -+ the endpoint that is the source of the message or by the endpoint -+ that is the destination of the message. -+ - name: Payload -+ type: array[byte] -+ description: Payload of message. -+ returns: -+ - name: Status -+ type: byte -+ description: 0 - if success -+ errors: -+ - xyz.openbmc_project.Common.Error.Timeout -+ - xyz.openbmc_project.Common.Error.InvalidArgument -+ - xyz.openbmc_project.Common.Error.InternalFailure -+ -+ - name: SendMctpMessageFileDescriptor -+ description: > -+ Sends message over MCTP interface -+ parameters: -+ - name: DestinationEID -+ type: byte -+ description: > -+ Destination Endpoint ID. The logical address used to route MCTP -+ messages to a specific MCTP endpoint. -+ - name: MsgTag -+ type: byte -+ description: > -+ Message tag. Field that, along with the Source Endpoint IDs and the -+ Tag Owner (TO) field, identifies a unique message at the MCTP -+ transport level. -+ - name: TagOwner -+ type: boolean -+ description: > -+ Tag Owner bit identifies whether the message tag was originated by -+ the endpoint that is the source of the message or by the endpoint -+ that is the destination of the message. -+ - name: FileDescriptor -+ type: unixfd -+ description: File descriptor of message. -+ returns: -+ - name: Status -+ type: byte -+ description: 0 - if success -+ errors: -+ - xyz.openbmc_project.Common.Error.Timeout -+ - xyz.openbmc_project.Common.Error.InvalidArgument -+ - xyz.openbmc_project.Common.Error.InternalFailure -+ -+signals: -+ - name: MessageReceivedSignal -+ description: > -+ Signal indicating upper layers about arrival of a MCTP message. -+ properties: -+ - name: MessageType -+ type: enum[self.MessageTypes] -+ description: > -+ Defines the values for the Message Type field for different message -+ types transported through MCTP. -+ - name: SrcEid -+ type: byte -+ description: > -+ Source Endpoint ID. The logical address used to route MCTP messages -+ to a specific MCTP endpoint. -+ - name: MsgTag -+ type: byte -+ description: > -+ Message tag. Field that, along with the Source Endpoint IDs and the -+ Tag Owner (TO) field, identifies a unique message at the MCTP -+ transport level. -+ - name: TagOwner -+ type: boolean -+ description: > -+ Tag Owner bit identifies whether the message tag was originated by -+ the endpoint that is the source of the message or by the endpoint -+ that is the destination of the message. -+ - name: Payload -+ type: array[byte] -+ description: Payload of message. -+ -+properties: -+ - name: Eid -+ type: byte -+ description: > -+ Endpoint ID. The logical address used to route MCTP messages to a -+ specific MCTP endpoint. -+ -+ - name: BindingID -+ type: enum[self.BindingTypes] -+ -+ - name: BindingMediumID -+ type: enum[self.MctpPhysicalMediumIdentifiers] -+ -+ - name: StaticEid -+ type: boolean -+ description: Support for statically/dynamicly allocated IDs -+ -+ - name: BindingMode -+ type: enum[self.BindingModeTypes] -+ description: Bus Owner / Endpoint / Bridge -+ -+enumerations: -+ - name: BindingTypes -+ description: > -+ All other values than described are reserved. -+ values: -+ - name: MctpOverSmbus -+ - name: MctpOverPcieVdm -+ - name: MctpOverUsb -+ description: Reserved for MCTP over USB -+ - name: MctpOverKcs -+ - name: MctpOverSerial -+ - name: VendorDefined -+ -+ - name: MctpPhysicalMediumIdentifiers -+ description: > -+ Identifies MCTP physical medium identifiers. see DSP0239. -+ values: -+ - name: Smbus -+ descritpion: SMBus 2.0 100 kHz compatible -+ - name: SmbusI2c -+ descritpion: SMBus 2.0 + I2C 100 kHz compatible -+ - name: I2cCompatible -+ description: I2C 100 kHz compatible (Standard-mode) -+ - name: Smbus3OrI2c400khzCompatible -+ description: SMBus 3.0 or I2C 400 kHz compatible (Fast-mode) -+ - name: Smbus3OrI2c1MhzCompatible -+ description: SMBus 3.0 or I2C 1 MHz compatible (Fast-mode Plus) -+ - name: I2c3Mhz4Compatible -+ description: I2C 3.4 MHz compatible (High-speed mode) -+ - name: Pcie11 -+ description: PCIe revision 1.1 compatible -+ - name: Pcie2 -+ description: PCIe revision 2.0 compatible -+ - name: Pcie21 -+ description: PCIe revision 2.1 compatible -+ - name: Pcie3 -+ description: PCIe revision 3.0 compatible -+ - name: Pcie4 -+ description: PCIe revision 4.0 compatible -+ - name: Pcie5 -+ description: PCIe revision 4.0 compatible -+ - name: PciCompatible -+ description: > -+ PCI compatible (PCI 1.0,2.0,2.1,2.2,2.3,3.0,PCI-X 1.0, PCI-X 2.0) -+ - name: Usb11Compatible -+ description: USB 1.1 compatible -+ - name: Usb20Compatible -+ description: USB 2.0 compatible -+ - name: Usb30Compatible -+ description: USB 3.0 compatible -+ - name: NcSiOverRbt -+ description: > -+ NC-SI over RBT (A physical interface based on RMII as defined in -+ DSP0222) -+ - name: KcsLegacy -+ description: KCS1 / Legacy (Fixed Address Decoding) -+ - name: KcsPci -+ description: KCS1 / PCI (Base Class 0xC0 Subclass 0x01) -+ - name: SerialHostLegacy -+ description: Serial Host2 / Legacy (Fixed Address Decoding) -+ - name: SerialHostPci -+ description: Serial Host2 / PCI (Base Class 0x07 Subclass 0x00) -+ - name: AsynchronousSerial -+ description: Asynchronous Serial (Between MCs and IMDs) -+ - name: I3cSDR -+ description: I3C 12.5 MHz compatible (SDR) -+ - name: I3cHDRDDR -+ description: I3C 25 MHz compatible (HDR-DDR) -+ -+ - name: BindingModeTypes -+ values: -+ - name: Endpoint -+ description: > -+ An MCTP communication terminus. An MCTP endpoint is a terminus or -+ origin of MCTP packets or messages. That is, the combined -+ functionality within a physical device that communicates using the -+ MCTP transport protocol and handles MCTP control commands. This -+ includes MCTP-capable management controllers and managed devices. -+ Also referred to in this document as "endpoint". -+ - name: BusOwner -+ description: > -+ The party responsible for managing address assignments (can be -+ logical or physical addresses) on a bus (for example, in MCTP, the -+ bus owner is the party responsible for managing EID assignments for -+ a given bus). A bus owner may also have additional media-specific -+ responsibilities, such as assignment of physical addresses. -+ - name: Bridge -+ description: > -+ An MCTP endpoint that can route MCTP messages not destined for -+ itself that it receives on one interconnect onto another without -+ interpreting them. The ingress and egress media at the bridge may -+ be either homogeneous or heterogeneous. Also referred to in this -+ document as a "bridge". -+ -+ - name: MessageTypes -+ values: -+ - name: MctpControl -+ - name: PLDM -+ - name: NCSI -+ - name: Ethernet -+ - name: NVMeMgmtMsg -+ - name: SPDM -+ - name: VDPCI -+ - name: VDIANA -diff --git a/xyz/openbmc_project/MCTP/Binding/PCIe.interface.yaml b/xyz/openbmc_project/MCTP/Binding/PCIe.interface.yaml -new file mode 100644 -index 0000000..1bd2881 ---- /dev/null -+++ b/xyz/openbmc_project/MCTP/Binding/PCIe.interface.yaml -@@ -0,0 +1,29 @@ -+description: > -+ Interface exposed by MCTP daemon for PCIe binding -+ -+properties: -+ - name: DiscoveredFlag -+ type: enum[self.DiscoveryFlags] -+ description: > -+ Each endpoint (except the bus owner) on the PCIe bus maintains an -+ internal flag called the Discovered flag. The flag is set to the -+ discovered state when the Set Endpoint ID command is received. -+ -+ - name: BDF -+ type: uint16 -+ description: > -+ Byte 1 [7:0] Bus number -+ Byte 2 [7:3] Device number [2:0] Function Number -+ -+enumerations: -+ - name: DiscoveryFlags -+ description: > -+ The Prepare for Endpoint Discovery message causes each recipient -+ endpoint on the PCIe bus to set their respective Discovered flag to -+ the undiscovered state. For the Prepare for Endpoint Discovery request -+ message, the routing in the physical transport header should be set to -+ 011b (Broadcast from Root Complex). -+ values: -+ - name: Discovered -+ - name: Undiscovered -+ - name: NotApplicable -diff --git a/xyz/openbmc_project/MCTP/Binding/SMBus.interface.yaml b/xyz/openbmc_project/MCTP/Binding/SMBus.interface.yaml -new file mode 100644 -index 0000000..9219ad0 ---- /dev/null -+++ b/xyz/openbmc_project/MCTP/Binding/SMBus.interface.yaml -@@ -0,0 +1,17 @@ -+description: > -+ Interface exposed by MCTP daemon for SMBus binding -+ -+properties: -+ - name: ArpMasterSupport -+ type: boolean -+ description: > -+ The SMBus binding can also run ARP Master protocol and -+ assign SMBus addresses to the devices on the bus. -+ -+ - name: BusNumber -+ type: byte -+ description: I2C bus number of the medium used -+ -+ - name: SlaveAddress -+ type: byte -+ description: Slave address to be used for this medium -diff --git a/xyz/openbmc_project/MCTP/BusOwner.interface.yaml b/xyz/openbmc_project/MCTP/BusOwner.interface.yaml -new file mode 100644 -index 0000000..d46298e ---- /dev/null -+++ b/xyz/openbmc_project/MCTP/BusOwner.interface.yaml -@@ -0,0 +1,17 @@ -+description: > -+ Interface exposed by MCTP root object, when executing in Bus Owner mode. -+ -+properties: -+ - name: EidPool -+ type: array[struct[byte, byte]] -+ description: > -+ Pool of allowed EIDs to be used. -+ EID pool of 10-100 can be specified as {{10,100}}. -+ -+ - name: TopMostBusOwner -+ type: boolean -+ description: To indicate whether BMC is topmost Bus Owner -+ -+ - name: OwnEidPool -+ type: boolean -+ description: Indicates Eid pool is managed by self -diff --git a/xyz/openbmc_project/MCTP/Endpoint.interface.yaml b/xyz/openbmc_project/MCTP/Endpoint.interface.yaml -new file mode 100644 -index 0000000..e4ba4d0 ---- /dev/null -+++ b/xyz/openbmc_project/MCTP/Endpoint.interface.yaml -@@ -0,0 +1,13 @@ -+description: -+ Interface exposed by discovered MCTP endpoints. -+ -+properties: -+ - name: Mode -+ type: enum[xyz.openbmc_project.MCTP.Base.BindingModeTypes] -+ description: Endpoint / BusOwner / Bridge -+ -+ - name: NetworkId -+ type: uint16 -+ description: > -+ MCTP network ID a unique identifier to distinguish each independent -+ MCTP network within a platform. -diff --git a/xyz/openbmc_project/MCTP/README.md b/xyz/openbmc_project/MCTP/README.md -new file mode 100644 -index 0000000..c819dbb ---- /dev/null -+++ b/xyz/openbmc_project/MCTP/README.md -@@ -0,0 +1,43 @@ -+# MCTP Daemon -+ -+## Overview -+MCTP service exposes D-Bus methods / properties / signals for managing -+MCTP devices or work as MCTP Endpoint. MCTP daemon will either -+work in Bus Owner or Endpoint mode for the specified physical medium. -+ -+### MCTP service -+MCTP service can be started either in Bus Owner mode or Endpoint mode. -+It will expose following objects. -+1. Base object -+2. MCTP Endpoints (discovered in case of Bus Owner mode, queried using -+routing table in case of Endpoint mode) -+Please refer individual yaml file for details about the -+methods / signals / properties exposed in the interfaces. -+ -+#### Base object -+Exposed under the path `/xyz/openbmc_project/mctp` with the following -+interfaces. -+1. `xyz.openbmc_project.MCTP.Base` which exposes all the common properties -+needed for MCTP Daemon. -+2. `xyz.openbmc_project.MCTP.BusOwner` available only in Bus Owner mode -+which exposes the properties needed by Bus Owner MCTP Daemon. -+3. `xyz.openbmc_project.MCTP.SupportedMessageTypes` which exposes the message -+types supported. -+4. Binding interface `xyz.openbmc_project.MCTP.Binding.PCIe` or -+`xyz.openbmc_project.MCTP.Binding.SMBus` as per the physical medium in which -+this MCTP Daemon is instantiated. -+5. Common UUID interface `xyz.openbmc_project.Common.UUID` which exposes UUID -+in RFC4122 format. -+ -+#### Endpoint object -+Exposed under the path `/xyz/openbmc_project/mctp/device/` with the -+following interfaces. -+1. `xyz.openbmc_project.MCTP.SupportedMessageTypes` which exposes supported MCTP -+message types for the discovered MCTP Endpoint. -+2. `xyz.openbmc_project.MCTP.Endpoint` which exposes properties like Network ID -+and endpoint mode (to identify Bus Owner or Bridge or Endpoint) for the discovered -+MCTP Endpoint. -+3. `xyz.openbmc_project.MCTP.Bridge` available only for discovered MCTP Bridges to -+expose properties like EID pool. (TBD) -+4. Common UUID interface `xyz.openbmc_project.Common.UUID` which exposes UUID -+in RFC4122 format. -diff --git a/xyz/openbmc_project/MCTP/SupportedMessageTypes.interface.yaml b/xyz/openbmc_project/MCTP/SupportedMessageTypes.interface.yaml -new file mode 100644 -index 0000000..fa447ee ---- /dev/null -+++ b/xyz/openbmc_project/MCTP/SupportedMessageTypes.interface.yaml -@@ -0,0 +1,36 @@ -+description: -+ Interface used to represent the supported MCTP message types. -+ This will be exposed by all MCTP endpoints. -+ -+properties: -+ - name: MctpControl -+ type: boolean -+ description: Indicates support availability -+ -+ - name: PLDM -+ type: boolean -+ description: Indicates support availability -+ -+ - name: NCSI -+ type: boolean -+ description: Indicates support availability -+ -+ - name: Ethernet -+ type: boolean -+ description: Indicates support availability -+ -+ - name: NVMeMgmtMsg -+ type: boolean -+ description: Indicates support availability -+ -+ - name: SPDM -+ type: boolean -+ description: Indicates support availability -+ -+ - name: VDPCI -+ type: boolean -+ description: Indicates support availability -+ -+ - name: VDIANA -+ type: boolean -+ description: Indicates support availability --- -2.17.1 - diff --git a/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0031-update-meson-build-files-for-control-and-bios.patch b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0031-update-meson-build-files-for-control-and-bios.patch new file mode 100644 index 000000000..fd31665dc --- /dev/null +++ b/meta-openbmc-mods/meta-common/recipes-phosphor/dbus/phosphor-dbus-interfaces/0031-update-meson-build-files-for-control-and-bios.patch @@ -0,0 +1,156 @@ +From cd3c2ff290e6ff205c32b386c7c8a73d4a8980e5 Mon Sep 17 00:00:00 2001 +From: Zhikui Ren +Date: Tue, 8 Dec 2020 15:08:21 -0800 +Subject: [PATCH 1/4] update meson build files for control and bios + +Signed-off-by: Zhikui Ren +--- + .../Control/Power/RestoreDelay/meson.build | 14 ++++++++++++++ + gen/xyz/openbmc_project/Control/Power/meson.build | 15 +++++++++++++++ + .../Control/Processor/ErrConfig/meson.build | 14 ++++++++++++++ + .../openbmc_project/Control/Processor/meson.build | 15 +++++++++++++++ + .../Inventory/Item/Bios/meson.build | 14 ++++++++++++++ + .../openbmc_project/Inventory/Item/meson.build | 15 +++++++++++++++ + 6 files changed, 87 insertions(+) + create mode 100644 gen/xyz/openbmc_project/Control/Power/RestoreDelay/meson.build + create mode 100644 gen/xyz/openbmc_project/Control/Processor/ErrConfig/meson.build + create mode 100644 gen/xyz/openbmc_project/Inventory/Item/Bios/meson.build + +diff --git a/gen/xyz/openbmc_project/Control/Power/RestoreDelay/meson.build b/gen/xyz/openbmc_project/Control/Power/RestoreDelay/meson.build +new file mode 100644 +index 0000000..91581fd +--- /dev/null ++++ b/gen/xyz/openbmc_project/Control/Power/RestoreDelay/meson.build +@@ -0,0 +1,14 @@ ++# Generated file; do not modify. ++generated_sources += custom_target( ++ 'xyz/openbmc_project/Control/Power/RestoreDelay__cpp'.underscorify(), ++ input: [ meson.source_root() / 'xyz/openbmc_project/Control/Power/RestoreDelay.interface.yaml', ], ++ output: [ 'server.cpp', 'server.hpp', 'client.hpp', ], ++ command: [ ++ sdbuspp_gen_meson_prog, '--command', 'cpp', ++ '--output', meson.current_build_dir(), ++ '--tool', sdbusplusplus_prog, ++ '--directory', meson.source_root(), ++ 'xyz/openbmc_project/Control/Power/RestoreDelay', ++ ], ++) ++ +diff --git a/gen/xyz/openbmc_project/Control/Power/meson.build b/gen/xyz/openbmc_project/Control/Power/meson.build +index 05628ec..ad04479 100644 +--- a/gen/xyz/openbmc_project/Control/Power/meson.build ++++ b/gen/xyz/openbmc_project/Control/Power/meson.build +@@ -29,6 +29,21 @@ generated_others += custom_target( + build_by_default: true, + ) + ++subdir('RestoreDelay') ++generated_others += custom_target( ++ 'xyz/openbmc_project/Control/Power/RestoreDelay__markdown'.underscorify(), ++ input: [ meson.source_root() / 'xyz/openbmc_project/Control/Power/RestoreDelay.interface.yaml', ], ++ output: [ 'RestoreDelay.md' ], ++ command: [ ++ sdbuspp_gen_meson_prog, '--command', 'markdown', ++ '--output', meson.current_build_dir(), ++ '--tool', sdbusplusplus_prog, ++ '--directory', meson.source_root(), ++ 'xyz/openbmc_project/Control/Power/RestoreDelay', ++ ], ++ build_by_default: true, ++) ++ + subdir('RestorePolicy') + generated_others += custom_target( + 'xyz/openbmc_project/Control/Power/RestorePolicy__markdown'.underscorify(), +diff --git a/gen/xyz/openbmc_project/Control/Processor/ErrConfig/meson.build b/gen/xyz/openbmc_project/Control/Processor/ErrConfig/meson.build +new file mode 100644 +index 0000000..12961c2 +--- /dev/null ++++ b/gen/xyz/openbmc_project/Control/Processor/ErrConfig/meson.build +@@ -0,0 +1,14 @@ ++# Generated file; do not modify. ++generated_sources += custom_target( ++ 'xyz/openbmc_project/Control/Processor/ErrConfig__cpp'.underscorify(), ++ input: [ meson.source_root() / 'xyz/openbmc_project/Control/Processor/ErrConfig.interface.yaml', ], ++ output: [ 'server.cpp', 'server.hpp', 'client.hpp', ], ++ command: [ ++ sdbuspp_gen_meson_prog, '--command', 'cpp', ++ '--output', meson.current_build_dir(), ++ '--tool', sdbusplusplus_prog, ++ '--directory', meson.source_root(), ++ 'xyz/openbmc_project/Control/Processor/ErrConfig', ++ ], ++) ++ +diff --git a/gen/xyz/openbmc_project/Control/Processor/meson.build b/gen/xyz/openbmc_project/Control/Processor/meson.build +index adbff0a..816c30d 100644 +--- a/gen/xyz/openbmc_project/Control/Processor/meson.build ++++ b/gen/xyz/openbmc_project/Control/Processor/meson.build +@@ -14,3 +14,18 @@ generated_others += custom_target( + build_by_default: true, + ) + ++subdir('ErrConfig') ++generated_others += custom_target( ++ 'xyz/openbmc_project/Control/Processor/ErrConfig__markdown'.underscorify(), ++ input: [ meson.source_root() / 'xyz/openbmc_project/Control/Processor/ErrConfig.interface.yaml', ], ++ output: [ 'ErrConfig.md' ], ++ command: [ ++ sdbuspp_gen_meson_prog, '--command', 'markdown', ++ '--output', meson.current_build_dir(), ++ '--tool', sdbusplusplus_prog, ++ '--directory', meson.source_root(), ++ 'xyz/openbmc_project/Control/Processor/ErrConfig', ++ ], ++ build_by_default: true, ++) ++ +diff --git a/gen/xyz/openbmc_project/Inventory/Item/Bios/meson.build b/gen/xyz/openbmc_project/Inventory/Item/Bios/meson.build +new file mode 100644 +index 0000000..5c6fce0 +--- /dev/null ++++ b/gen/xyz/openbmc_project/Inventory/Item/Bios/meson.build +@@ -0,0 +1,14 @@ ++# Generated file; do not modify. ++generated_sources += custom_target( ++ 'xyz/openbmc_project/Inventory/Item/Bios__cpp'.underscorify(), ++ input: [ meson.source_root() / 'xyz/openbmc_project/Inventory/Item/Bios.interface.yaml', ], ++ output: [ 'server.cpp', 'server.hpp', 'client.hpp', ], ++ command: [ ++ sdbuspp_gen_meson_prog, '--command', 'cpp', ++ '--output', meson.current_build_dir(), ++ '--tool', sdbusplusplus_prog, ++ '--directory', meson.source_root(), ++ 'xyz/openbmc_project/Inventory/Item/Bios', ++ ], ++) ++ +diff --git a/gen/xyz/openbmc_project/Inventory/Item/meson.build b/gen/xyz/openbmc_project/Inventory/Item/meson.build +index 145bba2..3e036bd 100644 +--- a/gen/xyz/openbmc_project/Inventory/Item/meson.build ++++ b/gen/xyz/openbmc_project/Inventory/Item/meson.build +@@ -27,6 +27,21 @@ generated_others += custom_target( + build_by_default: true, + ) + ++subdir('Bios') ++generated_others += custom_target( ++ 'xyz/openbmc_project/Inventory/Item/Bios__markdown'.underscorify(), ++ input: [ meson.source_root() / 'xyz/openbmc_project/Inventory/Item/Bios.interface.yaml', ], ++ output: [ 'Bios.md' ], ++ command: [ ++ sdbuspp_gen_meson_prog, '--command', 'markdown', ++ '--output', meson.current_build_dir(), ++ '--tool', sdbusplusplus_prog, ++ '--directory', meson.source_root(), ++ 'xyz/openbmc_project/Inventory/Item/Bios', ++ ], ++ build_by_default: true, ++) ++ + subdir('Bmc') + generated_others += custom_target( + 'xyz/openbmc_project/Inventory/Item/Bmc__markdown'.underscorify(), +-- +2.17.1 + -- cgit v1.2.3