diff options
author | Ninad Palsule <ninadpalsule@us.ibm.com> | 2023-04-20 06:25:25 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2023-04-21 16:57:53 +0300 |
commit | ec7cab9378f548e94ee4af83946b2583d1fc7194 (patch) | |
tree | b7bd5355254c78dd34f0fb3938132ca3f0f5560c | |
parent | d6b4d059fbfbff4c672b3b65266f667548494fb2 (diff) | |
download | openbmc-ec7cab9378f548e94ee4af83946b2583d1fc7194.tar.xz |
Add socket-id for the first console
This drop adds socket-id for first console. This was left out before
but with the new design this parameter is required and enforced by
obmc-console code. It is decided to set "socket-id = console0"
initially because that is the current path used by bmcweb but in future
you can change this value to whatever is appropriate.
The console information is now available through the DBUS interface.
Each console server register it's object path on DBUS. The leaf node of
the object path is used to create a console path. For example in the
following console0 the leaf node "console0" is used to make up the
console path and the GUI will use console path "/console/console0" to
connect to the console.
busctl tree xyz.openbmc_project.Console.console0
`-/xyz
`-/xyz/openbmc_project
`-/xyz/openbmc_project/console
`-/xyz/openbmc_project/console/console0
Here is a discord thread where new design was discussed.
https://discord.com/channels/775381525260664832/1083551792094249051
Tested:
Tested on the rainier system.
Related commits:
1) phosphor-dbus-interface: https://gerrit.openbmc.org/c/openbmc/phosphor-dbus-interfaces/+/61486
2) obmc-console: https://gerrit.openbmc.org/c/openbmc/obmc-console/+/62496
3) bmcweb: https://gerrit.openbmc.org/c/openbmc/bmcweb/+/62525
Change-Id: I5fd06f3aac69872a3e5032d592a9b59711795cfe
Signed-off-by: Ninad Palsule <ninadpalsule@us.ibm.com>
22 files changed, 22 insertions, 2 deletions
diff --git a/meta-amd/recipes-phosphor/console/obmc-console/daytonax/server.ttyVUART0.conf b/meta-amd/recipes-phosphor/console/obmc-console/daytonax/server.ttyVUART0.conf index 8dc694362a..78dc7fa2f3 100644 --- a/meta-amd/recipes-phosphor/console/obmc-console/daytonax/server.ttyVUART0.conf +++ b/meta-amd/recipes-phosphor/console/obmc-console/daytonax/server.ttyVUART0.conf @@ -1,3 +1,4 @@ lpc-address = 0x3f8 sirq = 4 baud = 115200 +socket-id = console0 diff --git a/meta-amd/recipes-phosphor/console/obmc-console/ethanolx/server.ttyS0.conf b/meta-amd/recipes-phosphor/console/obmc-console/ethanolx/server.ttyS0.conf index 666e66aac0..e4e1af47df 100644 --- a/meta-amd/recipes-phosphor/console/obmc-console/ethanolx/server.ttyS0.conf +++ b/meta-amd/recipes-phosphor/console/obmc-console/ethanolx/server.ttyS0.conf @@ -1 +1,2 @@ baud = 115200 +socket-id = console0 diff --git a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS0.conf b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS0.conf index 2d80850416..04ca8f1a50 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS0.conf +++ b/meta-ampere/meta-jade/recipes-phosphor/console/obmc-console/server.ttyS0.conf @@ -1,3 +1,3 @@ -# socket-id is default to obmc-console local-tty = ttyS0 local-tty-baud = 115200 +socket-id = console0 diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS0.conf b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS0.conf index 2d80850416..04ca8f1a50 100644 --- a/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS0.conf +++ b/meta-ampere/meta-mitchell/recipes-phosphor/console/obmc-console/server.ttyS0.conf @@ -1,3 +1,3 @@ -# socket-id is default to obmc-console local-tty = ttyS0 local-tty-baud = 115200 +socket-id = console0 diff --git a/meta-asrock/meta-e3c246d4i/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-asrock/meta-e3c246d4i/recipes-phosphor/console/obmc-console/obmc-console.conf index 8cd204bd91..bbe9c14756 100644 --- a/meta-asrock/meta-e3c246d4i/recipes-phosphor/console/obmc-console/obmc-console.conf +++ b/meta-asrock/meta-e3c246d4i/recipes-phosphor/console/obmc-console/obmc-console.conf @@ -1,3 +1,4 @@ lpc-address = 0x2f8 sirq = 3 baud = 115200 +socket-id = console0 diff --git a/meta-asrock/meta-romed8hm3/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-asrock/meta-romed8hm3/recipes-phosphor/console/obmc-console/obmc-console.conf index 8cd204bd91..bbe9c14756 100644 --- a/meta-asrock/meta-romed8hm3/recipes-phosphor/console/obmc-console/obmc-console.conf +++ b/meta-asrock/meta-romed8hm3/recipes-phosphor/console/obmc-console/obmc-console.conf @@ -1,3 +1,4 @@ lpc-address = 0x2f8 sirq = 3 baud = 115200 +socket-id = console0 diff --git a/meta-bytedance/meta-g220a/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-bytedance/meta-g220a/recipes-phosphor/console/obmc-console/obmc-console.conf index 8491f53653..54a2d4fdb9 100644 --- a/meta-bytedance/meta-g220a/recipes-phosphor/console/obmc-console/obmc-console.conf +++ b/meta-bytedance/meta-g220a/recipes-phosphor/console/obmc-console/obmc-console.conf @@ -1,3 +1,4 @@ baud = 115200 local-tty = ttyS3 local-tty-baud = 115200 +socket-id = console0 diff --git a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-singlehost/server.ttyS2.conf b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-singlehost/server.ttyS2.conf index 94f1dff853..5c84b81884 100644 --- a/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-singlehost/server.ttyS2.conf +++ b/meta-facebook/recipes-phosphor/console/obmc-console/fb-compute-singlehost/server.ttyS2.conf @@ -1,2 +1,3 @@ local-tty = ttyS2 baud = 57600 +socket-id = console0 diff --git a/meta-fii/meta-mori/recipes-phosphor/console/obmc-console/server.ttyS1.conf b/meta-fii/meta-mori/recipes-phosphor/console/obmc-console/server.ttyS1.conf index e93f0781d8..b07f1a4173 100644 --- a/meta-fii/meta-mori/recipes-phosphor/console/obmc-console/server.ttyS1.conf +++ b/meta-fii/meta-mori/recipes-phosphor/console/obmc-console/server.ttyS1.conf @@ -1,3 +1,4 @@ baud = 115200 logfile = /var/log/obmc-console-cpu.log logsize = 1M +socket-id = console0 diff --git a/meta-ibm/meta-palmetto/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-ibm/meta-palmetto/recipes-phosphor/console/obmc-console/obmc-console.conf index a5ba3f3284..32ef1aad08 100644 --- a/meta-ibm/meta-palmetto/recipes-phosphor/console/obmc-console/obmc-console.conf +++ b/meta-ibm/meta-palmetto/recipes-phosphor/console/obmc-console/obmc-console.conf @@ -2,3 +2,4 @@ lpc-address = 0x3f8 sirq = 4 local-tty = ttyS0 local-tty-baud = 115200 +socket-id = console0 diff --git a/meta-ibm/meta-romulus/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-ibm/meta-romulus/recipes-phosphor/console/obmc-console/obmc-console.conf index a5ba3f3284..32ef1aad08 100644 --- a/meta-ibm/meta-romulus/recipes-phosphor/console/obmc-console/obmc-console.conf +++ b/meta-ibm/meta-romulus/recipes-phosphor/console/obmc-console/obmc-console.conf @@ -2,3 +2,4 @@ lpc-address = 0x3f8 sirq = 4 local-tty = ttyS0 local-tty-baud = 115200 +socket-id = console0 diff --git a/meta-ibm/recipes-phosphor/console/obmc-console/ibm-ac-server/server.ttyVUART0.conf b/meta-ibm/recipes-phosphor/console/obmc-console/ibm-ac-server/server.ttyVUART0.conf index 638ae7e5d9..519202bb28 100644 --- a/meta-ibm/recipes-phosphor/console/obmc-console/ibm-ac-server/server.ttyVUART0.conf +++ b/meta-ibm/recipes-phosphor/console/obmc-console/ibm-ac-server/server.ttyVUART0.conf @@ -3,3 +3,4 @@ sirq = 4 local-tty = ttyS0 local-tty-baud = 115200 logsize = 256k +socket-id=console0 diff --git a/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART0.conf b/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART0.conf index 638ae7e5d9..5d81673f76 100644 --- a/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART0.conf +++ b/meta-ibm/recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART0.conf @@ -3,3 +3,4 @@ sirq = 4 local-tty = ttyS0 local-tty-baud = 115200 logsize = 256k +socket-id = console0 diff --git a/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART0.conf b/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART0.conf index 010d824684..cec90812a4 100644 --- a/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART0.conf +++ b/meta-ibm/recipes-phosphor/console/obmc-console/witherspoon-tacoma/server.ttyVUART0.conf @@ -1,3 +1,4 @@ lpc-address = 0x3f8 sirq = 4 logsize = 256k +socket-id = console0 diff --git a/meta-ingrasys/meta-zaius/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-ingrasys/meta-zaius/recipes-phosphor/console/obmc-console/obmc-console.conf index a5ba3f3284..32ef1aad08 100644 --- a/meta-ingrasys/meta-zaius/recipes-phosphor/console/obmc-console/obmc-console.conf +++ b/meta-ingrasys/meta-zaius/recipes-phosphor/console/obmc-console/obmc-console.conf @@ -2,3 +2,4 @@ lpc-address = 0x3f8 sirq = 4 local-tty = ttyS0 local-tty-baud = 115200 +socket-id = console0 diff --git a/meta-inspur/meta-fp5280g2/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-inspur/meta-fp5280g2/recipes-phosphor/console/obmc-console/obmc-console.conf index 638ae7e5d9..5d81673f76 100644 --- a/meta-inspur/meta-fp5280g2/recipes-phosphor/console/obmc-console/obmc-console.conf +++ b/meta-inspur/meta-fp5280g2/recipes-phosphor/console/obmc-console/obmc-console.conf @@ -3,3 +3,4 @@ sirq = 4 local-tty = ttyS0 local-tty-baud = 115200 logsize = 256k +socket-id = console0 diff --git a/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console.conf index d42caa9355..46340efa06 100644 --- a/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console.conf +++ b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console.conf @@ -1,2 +1,3 @@ lpc-address = 0x3f8 sirq = 4 +socket-id = console0 diff --git a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console/obmc-console.conf index f99eaff470..aa9a7f2937 100644 --- a/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console/obmc-console.conf +++ b/meta-quanta/meta-olympus-nuvoton/recipes-phosphor/console/obmc-console/obmc-console.conf @@ -1 +1,2 @@ baud = 57600 +socket-id = console0 diff --git a/meta-tyan/meta-common/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-tyan/meta-common/recipes-phosphor/console/obmc-console/obmc-console.conf index 8491f53653..54a2d4fdb9 100644 --- a/meta-tyan/meta-common/recipes-phosphor/console/obmc-console/obmc-console.conf +++ b/meta-tyan/meta-common/recipes-phosphor/console/obmc-console/obmc-console.conf @@ -1,3 +1,4 @@ baud = 115200 local-tty = ttyS3 local-tty-baud = 115200 +socket-id = console0 diff --git a/meta-ufispace/meta-ncplite/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-ufispace/meta-ncplite/recipes-phosphor/console/obmc-console/obmc-console.conf index 666e66aac0..e4e1af47df 100644 --- a/meta-ufispace/meta-ncplite/recipes-phosphor/console/obmc-console/obmc-console.conf +++ b/meta-ufispace/meta-ncplite/recipes-phosphor/console/obmc-console/obmc-console.conf @@ -1 +1,2 @@ baud = 115200 +socket-id = console0 diff --git a/meta-yadro/meta-nicole/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-yadro/meta-nicole/recipes-phosphor/console/obmc-console/obmc-console.conf index a5ba3f3284..32ef1aad08 100644 --- a/meta-yadro/meta-nicole/recipes-phosphor/console/obmc-console/obmc-console.conf +++ b/meta-yadro/meta-nicole/recipes-phosphor/console/obmc-console/obmc-console.conf @@ -2,3 +2,4 @@ lpc-address = 0x3f8 sirq = 4 local-tty = ttyS0 local-tty-baud = 115200 +socket-id = console0 diff --git a/meta-yadro/meta-vegman/recipes-phosphor/console/obmc-console/obmc-console.conf b/meta-yadro/meta-vegman/recipes-phosphor/console/obmc-console/obmc-console.conf index 8491f53653..54a2d4fdb9 100644 --- a/meta-yadro/meta-vegman/recipes-phosphor/console/obmc-console/obmc-console.conf +++ b/meta-yadro/meta-vegman/recipes-phosphor/console/obmc-console/obmc-console.conf @@ -1,3 +1,4 @@ baud = 115200 local-tty = ttyS3 local-tty-baud = 115200 +socket-id = console0 |