Skip to contentSkip to conversation

conf: machine: k3: remove the ttyS0 definition

PATCH In review [email protected] 2 participants 3 messages Jun 6, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 conf: machine: k3: remove the ttyS0 definition

From: Randolph Sapp <[email protected]>

Adding serial consoles to this variable makes systemd attempt to start a Getty instance on them. Getty has no retry limit and no retry timout. I'm sure you can guess where this is going.

This fixes the endless start / stop Getty on ttyS0/ttyS3 messages that will flood the log until it's full.

In the case of Jailhouse demos, the getty systemd service should be invoked upon demo start and stopped upon end of the demo. It should not be listed as a system serial interface since it will not be present during normal device operation.

Before anyone asks, SERIAL_CONSOLES_CHECK only works on the sysVinit script so it's not worth discussing as a solution here.

---
 meta-ti-bsp/conf/machine/include/am62xx.inc | 3 ---
 meta-ti-bsp/conf/machine/include/k3.inc     | 2 +-
 2 files changed, 1 insertion(+), 4 deletions(-)
meta-ti-bsp/conf/machine/include/am62xx.inc +0 -3
index c98da5f5..1274d3b5 100644
@@ -25,6 +25,3 @@ TFA_BOARD = "lite"
 TFA_K3_SYSTEM_SUSPEND = "1"
 
 OPTEEMACHINE = "k3-am62x"
-
-# Normally AM62 boards use ttyS2, but our Jailhouse inmate may use ttyS3, so try both
-SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
meta-ti-bsp/conf/machine/include/k3.inc +1 -1
index c6b55239..97c6da94 100644
@@ -55,5 +55,5 @@ WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.
 do_image_wic[depends] += "virtual/bootloader:do_deploy"
 do_image_complete[mcdepends] += "mc::k3r5:ti-sci-fw:do_deploy"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
+SERIAL_CONSOLES = "115200;ttyS2"
 SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
Signature · 1 line
2.40.1
#1 lore raw
Quoted 9 lines · On 6/6/23 2:33 PM, [email protected] wrote:

From: Randolph Sapp <[email protected]>

Adding serial consoles to this variable makes systemd attempt to start a Getty instance on them. Getty has no retry limit and no retry timout. I'm sure you can guess where this is going.

This fixes the endless start / stop Getty on ttyS0/ttyS3 messages that will flood the log until it's full.

Quoted 8 lines

In the case of Jailhouse demos, the getty systemd service should be invoked upon demo start and stopped upon end of the demo. It should not be listed as a system serial interface since it will not be present during normal device operation.

Before anyone asks, SERIAL_CONSOLES_CHECK only works on the sysVinit script so it's not worth discussing as a solution here.

serial-getty-generator does work on Kirkstone, lets just go with that:

meta-arago-distro/recipes-core/systemd/systemd_%.bbappend +1 -1
index 9e49ac69..1f2513c4 100644
@@ -2,7 +2,7 @@ PR:append = ".arago6"
 
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-PACKAGECONFIG:append = " networkd resolved"
+PACKAGECONFIG:append = " networkd resolved serial-getty-generator"
 USERADD_PARAM:${PN} += "--system -d / -M --shell /bin/nologin systemd-network;"
 USERADD_PARAM:${PN} += "--system -d / -M --shell /bin/nologin systemd-resolve;"
 

Andrew

Quoted 28 lines
---
  meta-ti-bsp/conf/machine/include/am62xx.inc | 3 ---
  meta-ti-bsp/conf/machine/include/k3.inc     | 2 +-
  2 files changed, 1 insertion(+), 4 deletions(-)
meta-ti-bsp/conf/machine/include/am62xx.inc +0 -3
index c98da5f5..1274d3b5 100644
@@ -25,6 +25,3 @@ TFA_BOARD = "lite"
  TFA_K3_SYSTEM_SUSPEND = "1"
 
  OPTEEMACHINE = "k3-am62x"
-
-# Normally AM62 boards use ttyS2, but our Jailhouse inmate may use ttyS3, so try both
-SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
meta-ti-bsp/conf/machine/include/k3.inc +1 -1
index c6b55239..97c6da94 100644
@@ -55,5 +55,5 @@ WKS_FILE ?= "${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi.
  do_image_wic[depends] += "virtual/bootloader:do_deploy"
  do_image_complete[mcdepends] += "mc::k3r5:ti-sci-fw:do_deploy"
 
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
+SERIAL_CONSOLES = "115200;ttyS2"
  SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
#2 lore raw
Quoted 36 lines · Andrew Davis
Quoted 9 lines · On 6/6/23 2:33 PM, [email protected] wrote:

From: Randolph Sapp <[email protected]>

Adding serial consoles to this variable makes systemd attempt to start a Getty instance on them. Getty has no retry limit and no retry timout. I'm sure you can guess where this is going.

This fixes the endless start / stop Getty on ttyS0/ttyS3 messages that will flood the log until it's full.

Quoted 8 lines

In the case of Jailhouse demos, the getty systemd service should be invoked upon demo start and stopped upon end of the demo. It should not be listed as a system serial interface since it will not be present during normal device operation.

Before anyone asks, SERIAL_CONSOLES_CHECK only works on the sysVinit script so it's not worth discussing as a solution here.

serial-getty-generator does work on Kirkstone, lets just go with that:

meta-arago-distro/recipes-core/systemd/systemd_%.bbappend +1 -1
index 9e49ac69..1f2513c4 100644
@@ -2,7 +2,7 @@ PR:append = ".arago6"
 
  FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-PACKAGECONFIG:append = " networkd resolved"
+PACKAGECONFIG:append = " networkd resolved serial-getty-generator"
  USERADD_PARAM:${PN} += "--system -d / -M --shell /bin/nologin 

systemd-network;"
 USERADD_PARAM:${PN} += "--system -d / -M --shell /bin/nologin
systemd-resolve;"

Quoted 2 lines

Andrew

Yeah, I've got a patch to enable it and revert all serial definitions to sysVinit only fields. Didn't mean to send this again, was on the wrong branch when I invoked git send-email.

Quoted 28 lines
Quoted 28 lines

---
  meta-ti-bsp/conf/machine/include/am62xx.inc | 3 --- meta-ti-bsp/conf/machine/include/k3.inc     | 2 +-

  2 files changed, 1 insertion(+), 4 deletions(-)
meta-ti-bsp/conf/machine/include/am62xx.inc +0 -0
index c98da5f5..1274d3b5 100644
@@ -25,6 +25,3 @@ TFA_BOARD = "lite"

  TFA_K3_SYSTEM_SUSPEND = "1"
  OPTEEMACHINE = "k3-am62x"

meta-ti-bsp/conf/machine/include/am62xx.inc +0 -2
-
-# Normally AM62 boards use ttyS2, but our Jailhouse inmate may use 

ttyS3, so try both

meta-ti-bsp/conf/machine/include/am62xx.inc +0 -1
-SERIAL_CONSOLES = "115200;ttyS2 115200;ttyS3"
meta-ti-bsp/conf/machine/include/k3.inc +0 -0
index c6b55239..97c6da94 100644
@@ -55,5 +55,5 @@ WKS_FILE ?= 

"${@bb.utils.contains("MACHINE_FEATURES", "efi", "sdimage-2part-efi. do_image_wic[depends] += "virtual/bootloader:do_deploy" do_image_complete[mcdepends] += "mc::k3r5:ti-sci-fw:do_deploy"

meta-ti-bsp/conf/machine/include/k3.inc +1 -1
-SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS2"
+SERIAL_CONSOLES = "115200;ttyS2"

  SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"