Age | Commit message (Collapse) | Author | Files | Lines |
|
Add an empty entity map json file. The file is expected to be an array,
if it is present at all. The file provided by default has no real
meaning to your system, therefore you are expected if you use the entity
records, to provide one for your system.
See: https://github.com/openbmc/phosphor-host-ipmid/blob/master/scripts/entity-example.md
for details on how it should be formatted.
Currently formatted:
[{
"id": 1,
# Container entity contains other entities
# Entity Id and entity Instance for the container entity
"containerEntityId": 13,
"containerEntityInstance": 81,
# A record can have contained entities as a four entry list or as upto
# two ranges of entity instances; this record has contained entities
# as a four entry list
"isList": true,
# Records can be linked if necessary to extend the number of contained
# entities within a container entity; this record is not linked
"isLinked": false,
"entities": [
{"entityId1": 10, "entityInstance1": 1},
{"entityId2": 10, "entityInstance2": 3},
{"entityId3": 10, "entityInstance3": 5},
{"entityId4": 10, "entityInstance4": 7}
]
}]
(From meta-phosphor rev: 34d8886d6642eb0b991b696f4d28950c5bec9bf5)
Signed-off-by: Patrick Venture <venture@google.com>
Change-Id: I00956c92d444ac82d4a9aabfd33c26ccbb58e145
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
This reverts commit 7fb0c049d3a290c8f9d7f7c9690cdef9a97b3c52.
Restore function reverted by
7fb0c049d3a290c8f9d7f7c9690cdef9a97b3c52, swift build issue
has now been resolved.
(From meta-phosphor rev: 7106ecfbc78b7ab9aba84dfa3319455cdc833903)
Signed-off-by: Santosh Puranik <santosh.puranik@in.ibm.com>
Change-Id: Iec14a8efc79f9094e6c37e0b1489e4e9ab9406c9
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
The existing scheme for selecting an entity configuration YAML for
building ipmid consists of a virtual (phosphor-ipmi-entity-config) with
the preferred provider set to a default recipe
(phosphor-ipmi-entity-inventory-native) in the Phosphor distro
configuration.
Instead, provide a reasonable default directly in the ipmid metadata.
This is a small step towards enabling ipmid to build without any distro
configuration and should lower the effort required (slightly) to
comprehend where the the entity YAML file is coming from.
There aren't any known clients overriding the entity YAML in the first
place, but a client could still override with an ipmid bbappend and
setting EXTRA_OECONF appropriately.
(From meta-phosphor rev: fe88ee4211c93f4ca4acba5ecec502aef17944ce)
Change-Id: Ie152c413ee6674735b6bf3192b01ec0bc5a39a29
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
We have systems that have no host present, but require the use of the
network ipmi functionality. This requirement doesn't work for these
systems since they don't have a host transfer mechanism.
This doesn't change the ordering requirements of the services.
(From meta-phosphor rev: 484aa1574f390c9a32ba3a31fb5518d94058d7d9)
Change-Id: I455b7dad4aecda64b0bc05c0349b011e0e8885d3
Signed-off-by: William A. Kennington III <wak@google.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
This reverts commit f510f7b6b708b22db1f08faf369994f01edd0ddc.
The change causes a compilation error when building the swift machine,
reverting until a fix is submitted.
Tested: Built swift successfully.
(From meta-phosphor rev: 7fb0c049d3a290c8f9d7f7c9690cdef9a97b3c52)
Change-Id: I690ff08d233ff9e654cfc6fbf1b466f39b447360
Signed-off-by: Adriana Kobylak <anoo@us.ibm.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
This commit adds the xyz.openbmc_project.inventory.Item.Accelerator
interface to GPU inventory items. This is needed so that the inventory
DBUS objects can be queried based on the interface they implement
(using the mapper).
Changes made to merge_yamls script to support interfaces that contain
no properties. This will need a corresponding change in the
phosphor-host-ipmi repo to support empty DBUS interfaces.
https://gerrit.openbmc-project.xyz/c/openbmc/phosphor-host-ipmid/+/21106
Tested:
Verified that the merged YAML file containing sensor config information
has now an empty interface xyz.openbmc_project.Inventory.Item.Accelerator
for the GV100 GPU sensors.
(From meta-phosphor rev: f510f7b6b708b22db1f08faf369994f01edd0ddc)
Signed-off-by: Santosh Puranik <santosh.puranik@in.ibm.com>
Change-Id: I213c4af2e5b09b8a9cd5d37409f37fc7c075a013
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
Expose an alias so if other units depend on the DBus presence of ipmid
they can explicitly depend on it.
(From meta-phosphor rev: beb3181dac206700ce9ab5253448f877b4420b7c)
Change-Id: Ic72d56969edc83422ee7c79d6d7bbb6fc7c8197f
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
A number of corequisites exist so squashing these all into one patch.
meta-ingrasys - refresh master bc513127f4..67bcaf389f
meta-hxt - refresh master 86a4df514f..8fe0d38bbb
meta-phosphor - refresh master 06c09d7cce..df6ddae3d2
meta-quanta - refresh master 4f126361a1..53f3025271
Change-Id: I3daeef2a0467d8ea4f1fd1c617e526f8b11258af
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
Other services rely on phosphor-ipmi-host providing needed dbus
interfaces once its been started. Due to other services providing
identical dbus object paths, the normal mapper wait services are not an
option here.
Ensure systemd does not consider this service active until it has
registered the host control dbus object.
I'm working on a long term fix to this in
https://gerrit.openbmc-project.xyz/#/c/openbmc/phosphor-objmgr/+/17990/
(a refactor with unit tests) and
https://gerrit.openbmc-project.xyz/#/c/openbmc/phosphor-objmgr/+/17837/
(close race condition due to introspection) but I think this change here
makes things better overall so I'd like to get it merged
Testing:
Verified systemd now waits for ipmid to really get up and running and
ran through HW CI
Jan 18 19:56:00 witherspoon systemd[1]: Starting Phosphor Inband IPMI...
Jan 18 19:56:03 witherspoon ipmid[1336]: JSON file not found
Jan 18 19:56:09 witherspoon systemd[1]: Started Phosphor Inband IPMI.
I had our internal test team try out this patch on a Romulus. They were
seeing this issue this is trying to fix on a very regular basis. With
this change, they completed 265 successful boot tests. The ipmid process
does host 2 well-know names, openbmc_project.Ipmi.Host and
xyz.openbmc_project.Control.Host. I verified via a bus capture that
xyz.openbmc_project.Control.Host is the last one to be put on the bus.
Resolves openbmc/phosphor-state-manager#2
(From meta-phosphor rev: bea22141ca95b38f30adcec248a853d3d268af79)
Change-Id: I532b31647951045adc8cbd0141e8630cdc350e27
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
With the implementation of DBus and IPMI transports for the HIOMAP
protocol, mboxd now depends on ipmid being alive in its shutdown
sequence in order to propagate BMC status events to the host firmware.
Mark phosphor-ipmi-host.service as depending on
org.openbmc.HostIpmi.service and mboxd as depending on
phosphor-ipmi-host.service to ensure the mboxd state update
event on SIGTERM is propagated to the host before the services are torn
down.
(From meta-phosphor rev: e66105318af187ba5d4bdbf53668f309785df4f3)
Change-Id: Ia9ff24d0d3376d239b56840d666275d20821c7e6
Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
It will be easier to manage, if all ipmi related
configurations are stored under ipmi folder. So,
make sure that /run/ipmi (volatile) & /var/lib/ipmi
(non-volatile) exists before starting the service.
(From meta-phosphor rev: 8debf3aed29b2c75cffc59bd9fc79afc1ca3be5c)
Change-Id: I2cd90d243ccdd0e93fb7e6873a323c6b243adbe2
Signed-off-by: Richard Marian Thomaiyar <richard.marian.thomaiyar@linux.intel.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|
|
Adopt a more conventional directory hierarchy. meta-phosphor is still
a _long_ way from suitable for hosting on yoctoproject.org but things
like this don't help.
(From meta-phosphor rev: 471cfcefa74b8c7ceb704cb670e6d915cf27c63b)
Change-Id: I3f106b2f6cdc6cec734be28a6090800546f362eb
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
|