Skip to content

Commit a134741

Browse files
reformat with latest settings
Reformat with the latest settings from openbmc-build-scripts (and copy latest config files where appropriate). Fix a few minor markdownlint issues. Signed-off-by: Patrick Williams <[email protected]> Change-Id: I55205817c29dc3f182a165ddf9cd5d4e07b90063
1 parent 3c7b858 commit a134741

File tree

197 files changed

+1679
-1735
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

197 files changed

+1679
-1735
lines changed

.editorconfig

-6
This file was deleted.

.markdownlint.yaml

-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
default: true
22
MD024:
33
siblings_only: true
4-
MD013:
5-
stern: true

.prettierrc.yaml

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1-
tabWidth: 2
1+
tabWidth: 4
2+
printWidth: 80
3+
proseWrap: "always"
24
overrides:
3-
- { "files": "*.yaml", "options": { "tabWidth": 4 } }
5+
- files: "*.md"
6+
options:
7+
tabWidth: 2

README.md

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# phosphor-dbus-interfaces
22

3-
YAML descriptors of standard D-Bus interfaces.
4-
The format is described by the [sdbusplus binding generation tool sdbus++][].
3+
YAML descriptors of standard D-Bus interfaces. The format is described by the
4+
[sdbusplus binding generation tool sdbus++][].
55

66
Before defining a new D-Bus interface or modifying an existing one, please read
77
through the documented set of the common [requirements and expectations][].
@@ -11,10 +11,10 @@ through the documented set of the common [requirements and expectations][].
1111
This project can be built with `meson`. The typical `meson` workflow is:
1212
`meson builddir && ninja -C builddir`.
1313

14-
The meson files used to handle the YAML files are automatically generated
15-
and found under the `gen` subdirectory. When adding or removing YAML files,
16-
this must be regenerated. This can be done with the helper script found
17-
in the `gen` subdirectory: `cd gen && ./regenerate-meson`.
14+
The meson files used to handle the YAML files are automatically generated and
15+
found under the `gen` subdirectory. When adding or removing YAML files, this
16+
must be regenerated. This can be done with the helper script found in the `gen`
17+
subdirectory: `cd gen && ./regenerate-meson`.
1818

1919
## Configuration
2020

@@ -28,5 +28,6 @@ Example: `meson builddir -Ddata_com_ibm=true && ninja -C builddir`
2828

2929
## References
3030

31-
[sdbusplus binding generation tool sdbus++]: https://github.com/openbmc/sdbusplus/blob/master/README.md#binding-generation-tool
31+
[sdbusplus binding generation tool sdbus++]:
32+
https://github.com/openbmc/sdbusplus/blob/master/README.md#binding-generation-tool
3233
[requirements and expectations]: requirements.md

requirements.md

+31-29
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Requirements and Expectations for dbus interfaces
22

3-
This document outlines requirements and expectations for dbus interfaces.
4-
These are usually specified as requirements due to our dbus architecture
5-
or for consistency in implementations.
3+
This document outlines requirements and expectations for dbus interfaces. These
4+
are usually specified as requirements due to our dbus architecture or for
5+
consistency in implementations.
66

77
## General
88

@@ -13,30 +13,32 @@ unless there is a strong basis for it (usually driven by hardware or another
1313
protocol's specification).
1414

1515
For countable entities always prefer `size`, which are an sdbusplus implemented
16-
type that maps to the C equivalent of `size_t` on the architecture. For
16+
type that maps to the C equivalent of `size_t` on the architecture. For
1717
non-countable values prefer `uint64` or `int64`.
1818

1919
### Avoid use of arbitrary strings
2020

21-
Arbitrary strings should only be utilized for human consumption and never
22-
parsed by code. Any arbitrary string is typically expected to have a
23-
description such as "... can be shown in user interfaces but this field should
24-
not be used for any programmatic interrogation of an object".
21+
Arbitrary strings should only be utilized for human consumption and never parsed
22+
by code. Any arbitrary string is typically expected to have a description such
23+
as "... can be shown in user interfaces but this field should not be used for
24+
any programmatic interrogation of an object".
2525

2626
### Leverage enumerations instead of strings or magic values
2727

28-
The sdbusplus implementation has built-in support for enumerations, which
29-
flow across the dbus as uniquely encoded string values but has support in the
28+
The sdbusplus implementation has built-in support for enumerations, which flow
29+
across the dbus as uniquely encoded string values but has support in the
3030
bindings for automatically converting to a C++ enum type.
3131

3232
In some cases it is useful to have hardware-specific or OEM values for
33-
enumerations. In those cases a property may be a string, but should specify
34-
that the values contained within are to be sdbusplus-enumerations of a specific
35-
pattern. See the [software compatiblity][software-compat] and
36-
[dump interface][dump-interface] as two current examples of this.
33+
enumerations. In those cases a property may be a string, but should specify that
34+
the values contained within are to be sdbusplus-enumerations of a specific
35+
pattern. See the [software compatiblity][software-compat] and [dump
36+
interface][dump-interface] as two current examples of this.
3737

38-
[software-compat]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Software/README.md#compatibility
39-
[dump-interface]: https://github.com/openbmc/phosphor-dbus-interfaces/blob/991b2b8bdbc950f2a85aebfc29d1b34ea3264686/yaml/xyz/openbmc_project/Dump/Create.interface.yaml#L25
38+
[software-compat]:
39+
https://github.com/openbmc/phosphor-dbus-interfaces/blob/master/yaml/xyz/openbmc_project/Software/README.md#compatibility
40+
[dump-interface]:
41+
https://github.com/openbmc/phosphor-dbus-interfaces/blob/991b2b8bdbc950f2a85aebfc29d1b34ea3264686/yaml/xyz/openbmc_project/Dump/Create.interface.yaml#L25
4042

4143
## Interfaces
4244

@@ -58,24 +60,24 @@ required to be represented in different dbus path hierarchies due to some
5860
overriding aspect of the dbus design.
5961

6062
Directed associations are more common and are used to show a relationship
61-
between two different entities. Though it may at times feel contrived,
62-
directed associations should be considered to have a "primary" and "secondary"
63-
end, which helps establish a pattern for naming consistency. For example, a
64-
chassis might be "containing" (primary) any number of other inventory objects
65-
which are "contained_by" (secondary) the chassis.
63+
between two different entities. Though it may at times feel contrived, directed
64+
associations should be considered to have a "primary" and "secondary" end, which
65+
helps establish a pattern for naming consistency. For example, a chassis might
66+
be "containing" (primary) any number of other inventory objects which are
67+
"contained_by" (secondary) the chassis.
6668

6769
### Peer associations should be named with hierarchy names
6870

6971
Consider an entity which is contained at `/.../foo/entity` and
70-
`/.../bar/entity`. The association is what links the `foo` and `bar` aspects
71-
of the entity in the dbus path hierarchy. Accordingly, the association should
72-
be named with end-points "foo" and "bar".
72+
`/.../bar/entity`. The association is what links the `foo` and `bar` aspects of
73+
the entity in the dbus path hierarchy. Accordingly, the association should be
74+
named with end-points "foo" and "bar".
7375

7476
A made-up example of a peer association might be a `Inventory.Processor`,
7577
located under the `.../inventory` hierarchy, and a `Control.Power.Cap` for that
76-
processor, located under the `.../control` hierarchy. The peer association
77-
allows traversal between the `inventory` and `control` namespaces for the
78-
single Processor entity.
78+
processor, located under the `.../control` hierarchy. The peer association
79+
allows traversal between the `inventory` and `control` namespaces for the single
80+
Processor entity.
7981

8082
### Directed associations should not codify type
8183

@@ -91,8 +93,8 @@ The primary relationship should be a verb with a Present Participle tense
9193
(ending in '-ing'). The secondary relationship should be a verb with a Past
9294
Participle tense (typically ending in '-ed').
9395

94-
The association end-points should be named in a way that the following
95-
sentences are grammatically correct:
96+
The association end-points should be named in a way that the following sentences
97+
are grammatically correct:
9698

9799
- The `{primary element}` is `{primary association}` the `{secondary element}`.
98100
- The `{secondary element}` is `{secondary association}` the

yaml/com/google/gbmc/Hoth.errors.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
- name: FirmwareFailure
66
description: Failed to send firmware update to Hoth.
77
- name: ResponseNotFound
8-
description: Could not find a response. The command may not have completed yet.
8+
description:
9+
Could not find a response. The command may not have completed yet.
910
- name: InterfaceError
1011
description: A system error occured with the Hoth interface.
1112
- name: ExpectedInfoNotFound

yaml/com/google/gbmc/Hoth.interface.yaml

+23-23
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ description: >
44
methods:
55
- name: SendHostCommand
66
description: >
7-
Send a host command to Hoth and return the response.
8-
This will block on Hoth completing its internal operations.
9-
Critical host commands like LoadTokens are banned.
10-
This method should be called from the IPMI HostCommand passthrough.
7+
Send a host command to Hoth and return the response. This will block
8+
on Hoth completing its internal operations. Critical host commands
9+
like LoadTokens are banned. This method should be called from the IPMI
10+
HostCommand passthrough.
1111
parameters:
1212
- name: Command
1313
type: array[byte]
@@ -26,10 +26,10 @@ methods:
2626

2727
- name: SendTrustedHostCommand
2828
description: >
29-
Send a host command to Hoth and return the response.
30-
This will block on Hoth completing its internal operations.
31-
Critical host commands like LoadTokens are allowed.
32-
This method should be called from the BMC.
29+
Send a host command to Hoth and return the response. This will block
30+
on Hoth completing its internal operations. Critical host commands
31+
like LoadTokens are allowed. This method should be called from the
32+
BMC.
3333
parameters:
3434
- name: Command
3535
type: array[byte]
@@ -104,9 +104,9 @@ methods:
104104
105105
- name: InitiatePayload
106106
description: >
107-
Initiates erasure of the EEPROM staging area. Note that this will lock up
108-
access to Hoth for an extended time and may go over the kernel's SPI
109-
write timeout. Calling multiple small ErasePayload is recommended.
107+
Initiates erasure of the EEPROM staging area. Note that this will lock
108+
up access to Hoth for an extended time and may go over the kernel's
109+
SPI write timeout. Calling multiple small ErasePayload is recommended.
110110
errors:
111111
- self.Error.CommandFailure
112112
- self.Error.ResponseFailure
@@ -177,14 +177,14 @@ methods:
177177
178178
- name: ActivatePayload
179179
description: >
180-
Activates the staging area as persistent or non-persistent for next boot
181-
if verification was successful.
180+
Activates the staging area as persistent or non-persistent for next
181+
boot if verification was successful.
182182
parameters:
183183
- name: MakePersistent
184184
type: boolean
185185
description: >
186-
Flag to determine whether to activate the staged image as persistent
187-
or non-persistent for next boot.
186+
Flag to determine whether to activate the staged image as
187+
persistent or non-persistent for next boot.
188188
errors:
189189
- self.Error.CommandFailure
190190
- self.Error.ResponseFailure
@@ -205,8 +205,8 @@ methods:
205205

206206
- name: Confirm
207207
description: >
208-
Prevents hoth from rolling back and using the previous image.
209-
When an image can be comfirmed to be working well, this command is given,
208+
Prevents hoth from rolling back and using the previous image. When an
209+
image can be comfirmed to be working well, this command is given,
210210
which disarms the hoth watchdog.
211211
errors:
212212
- self.Error.CommandFailure
@@ -227,8 +227,8 @@ methods:
227227

228228
- name: GetFirmwareUpdateTime
229229
description: >
230-
Get time spending in the self update routine. Since a proper self update
231-
involves a reset, this time is always expected to be low.
230+
Get time spending in the self update routine. Since a proper self
231+
update involves a reset, this time is always expected to be low.
232232
returns:
233233
- name: Time
234234
type: uint32
@@ -240,8 +240,8 @@ methods:
240240

241241
- name: GetFirmwareMirroringTime
242242
description: >
243-
Get time spending in mirroing the self-update. This time is a reasonable
244-
proxy for the total self update time.
243+
Get time spending in mirroing the self-update. This time is a
244+
reasonable proxy for the total self update time.
245245
returns:
246246
- name: Time
247247
type: uint32
@@ -253,8 +253,8 @@ methods:
253253

254254
- name: GetPayloadValidationTime
255255
description: >
256-
Get time spending in validating the payload, copying mutable regions and/or
257-
dealing with failsafe fallback.
256+
Get time spending in validating the payload, copying mutable regions
257+
and/or dealing with failsafe fallback.
258258
returns:
259259
- name: Time
260260
type: uint32

yaml/com/ibm/Dump/Create.interface.yaml

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
description: >
2-
Implement this to pass additional parameters to the create dump.
3-
Each required parameter for the dump in the ibm domain should be added
4-
here as an enum.
2+
Implement this to pass additional parameters to the create dump. Each
3+
required parameter for the dump in the ibm domain should be added here as an
4+
enum.
55
66
enumerations:
77
- name: CreateParameters
@@ -10,11 +10,10 @@ enumerations:
1010
values:
1111
- name: "VSPString"
1212
description: >
13-
The resouce dump is collected from various host resources.
14-
The resource to collect the dump is indicated by using the
15-
resource selector.
16-
The resource selector string needs to be passed to host to
17-
generate a resource dump.
13+
The resouce dump is collected from various host resources. The
14+
resource to collect the dump is indicated by using the resource
15+
selector. The resource selector string needs to be passed to
16+
host to generate a resource dump.
1817
- name: "Password"
1918
description: >
2019
The password for authenticating the resource dump request.
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
description: >
22
Implement this to add Hardware dump management.
33
4-
Hardware dump is a collection hardware state information,
5-
including various registers, and it is used for debugging
6-
system checkstop. checkstop is the descriptive term for
7-
entire system termination by the hardware due to a detected error.
4+
Hardware dump is a collection hardware state information, including various
5+
registers, and it is used for debugging system checkstop. checkstop is the
6+
descriptive term for entire system termination by the hardware due to a
7+
detected error.
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
description: >
22
Implement this to add Hostboot dump management.
33
4-
Hostboot dump collects memory and hardware states
5-
in the case of a failure during hostboot booting
6-
phase.
4+
Hostboot dump collects memory and hardware states in the case of a failure
5+
during hostboot booting phase.

yaml/com/ibm/Dump/Entry/Resource.interface.yaml

+8-9
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,19 @@
11
description: >
22
Implement this to add Resource dump management.
33
4-
The resource dumps are special types of dumps
5-
generated by host hypervisor. The dump is generated
6-
based on the resource selector. Hyperviosr needs
7-
a password to validate the request before creating the dump.
4+
The resource dumps are special types of dumps generated by host hypervisor.
5+
The dump is generated based on the resource selector. Hyperviosr needs a
6+
password to validate the request before creating the dump.
87
98
properties:
109
- name: SourceDumpId
1110
type: uint32
1211
description: >
13-
The dump id provided by the source of the dump.
14-
There are dumps which get generated outside the BMC, like a
15-
resource dump which gets generated and stored in the host memory.
16-
All dumps will have a unique id but when communicating
17-
to the source of the dump the SourceDumpId will be used.
12+
The dump id provided by the source of the dump. There are dumps which
13+
get generated outside the BMC, like a resource dump which gets
14+
generated and stored in the host memory. All dumps will have a unique
15+
id but when communicating to the source of the dump the SourceDumpId
16+
will be used.
1817
- name: VSPString
1918
type: string
2019
description: >

yaml/com/ibm/Logging/Policy.interface.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ properties:
44
- name: EventID
55
type: string
66
description: >
7-
This ID is defined by IBM service to uniquely identify an error
8-
in the service documentation.
7+
This ID is defined by IBM service to uniquely identify an error in the
8+
service documentation.
99
- name: Description
1010
type: string
1111
description: >

yaml/com/ibm/VPD.errors.yaml

+5-7
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,14 @@
99
- name: KeywordNotFound
1010
description: Keyword is not found.
1111
- name: BlankSystemVPD
12-
description: System VPD is blank on both hardware and cache.
13-
On IBM systems, certain VPD data must be available
14-
for the system to boot. This error is used to
12+
description:
13+
System VPD is blank on both hardware and cache. On IBM systems, certain
14+
VPD data must be available for the system to boot. This error is used to
1515
indicate that no valid data was found by the BMC.
1616
- name: InvalidEepromPath
17-
description: EEPROM path is invalid. Parser failed to access the
18-
path.
17+
description: EEPROM path is invalid. Parser failed to access the path.
1918
- name: InvalidVPD
20-
description: VPD file is not valid. Mandatory records are missing
21-
in VPD file.
19+
description: VPD file is not valid. Mandatory records are missing in VPD file.
2220
- name: EccCheckFailed
2321
desciption: Invalid VPD data. Ecc check for the data failed.
2422
- name: InvalidJson

0 commit comments

Comments
 (0)