From 8ee46d309af05e8af0ca9b861b5edf0948cfeecc Mon Sep 17 00:00:00 2001 From: Andrew Jeffery Date: Thu, 11 May 2023 17:42:13 +0930 Subject: Revert "Add socket-id for the first console" This reverts commit ec7cab9378f548e94ee4af83946b2583d1fc7194. ec7cab9378f5 ("Add socket-id for the first console") was only a partial fixup of the obmc-console configurations found in the tree. For historical reasons not all platforms that support multiple consoles install a client configuration file for all consoles. Instead they relied on some default behaviour that was removed in obmc-console's 4e7186918599 ("Fixed broken dbus interface for multiple consoles"). Applying the configuration changes in the manner of ec7cab9378f5 ("Add socket-id for the first console") resulted in an asymmetric configuration between the client and server, breaking some SSH SOL instances. As of ae2460d0b8e8 ("obmc-console: Provide a default value for `console-id`.") in obmc-console the requirement to specify `socket-id`[^1] is lifted. Instead, the configuration can choose to override a default value. This restores the original behaviour and unbreaks SSH SOL. [^1]: Now an alias of the `console-id` configuration key Websocket and IPMI consoles remain broken. A fix is under development that also takes a proper approach to supporting multiple consoles in bmcweb, and the same solution pattern can be applied in ipmid. More discussion of the problems involved can be found here: https://amboar.github.io/notes/2023/05/08/happenings-in-obmc-console.html Change-Id: I274284c791758f336da6d6301dc523bac2b5dd69 Signed-off-by: Andrew Jeffery --- .../console/obmc-console/daytonax/server.ttyVUART0.conf | 1 - .../recipes-phosphor/console/obmc-console/ethanolx/server.ttyS0.conf | 1 - .../meta-jade/recipes-phosphor/console/obmc-console/server.ttyS0.conf | 2 +- .../recipes-phosphor/console/obmc-console/server.ttyS0.conf | 2 +- .../recipes-phosphor/console/obmc-console/obmc-console.conf | 1 - .../recipes-phosphor/console/obmc-console/obmc-console.conf | 1 - .../meta-g220a/recipes-phosphor/console/obmc-console/obmc-console.conf | 1 - .../console/obmc-console/fb-compute-singlehost/server.ttyS2.conf | 1 - .../meta-mori/recipes-phosphor/console/obmc-console/server.ttyS1.conf | 1 - .../recipes-phosphor/console/obmc-console/obmc-console.conf | 1 - .../recipes-phosphor/console/obmc-console/obmc-console.conf | 1 - .../console/obmc-console/ibm-ac-server/server.ttyVUART0.conf | 1 - .../recipes-phosphor/console/obmc-console/p10bmc/server.ttyVUART0.conf | 1 - .../console/obmc-console/witherspoon-tacoma/server.ttyVUART0.conf | 1 - .../meta-zaius/recipes-phosphor/console/obmc-console/obmc-console.conf | 1 - .../recipes-phosphor/console/obmc-console/obmc-console.conf | 1 - meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console.conf | 1 - .../recipes-phosphor/console/obmc-console/obmc-console.conf | 1 - .../meta-common/recipes-phosphor/console/obmc-console/obmc-console.conf | 1 - .../recipes-phosphor/console/obmc-console/obmc-console.conf | 1 - .../meta-nicole/recipes-phosphor/console/obmc-console/obmc-console.conf | 1 - .../meta-vegman/recipes-phosphor/console/obmc-console/obmc-console.conf | 1 - 22 files changed, 2 insertions(+), 22 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 78dc7fa2f3..8dc694362a 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,4 +1,3 @@ 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 e4e1af47df..666e66aac0 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,2 +1 @@ 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 04ca8f1a50..2d80850416 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 04ca8f1a50..2d80850416 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 bbe9c14756..8cd204bd91 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,4 +1,3 @@ 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 bbe9c14756..8cd204bd91 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,4 +1,3 @@ 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 54a2d4fdb9..8491f53653 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,4 +1,3 @@ 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 5c84b81884..94f1dff853 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,3 +1,2 @@ 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 b07f1a4173..e93f0781d8 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,4 +1,3 @@ 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 32ef1aad08..a5ba3f3284 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,4 +2,3 @@ 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 32ef1aad08..a5ba3f3284 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,4 +2,3 @@ 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 519202bb28..638ae7e5d9 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,4 +3,3 @@ 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 5d81673f76..638ae7e5d9 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,4 +3,3 @@ 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 cec90812a4..010d824684 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,4 +1,3 @@ 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 32ef1aad08..a5ba3f3284 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,4 +2,3 @@ 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 5d81673f76..638ae7e5d9 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,4 +3,3 @@ 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 46340efa06..d42caa9355 100644 --- a/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console.conf +++ b/meta-phosphor/recipes-phosphor/console/obmc-console/obmc-console.conf @@ -1,3 +1,2 @@ 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 aa9a7f2937..f99eaff470 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,2 +1 @@ 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 54a2d4fdb9..8491f53653 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,4 +1,3 @@ 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 e4e1af47df..666e66aac0 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,2 +1 @@ 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 32ef1aad08..a5ba3f3284 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,4 +2,3 @@ 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 54a2d4fdb9..8491f53653 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,4 +1,3 @@ baud = 115200 local-tty = ttyS3 local-tty-baud = 115200 -socket-id = console0 -- cgit v1.2.3