diff mbox series

[SRU,G/aws,1/1] UBUNTU: [Config] [aws] set default nr_uarts back to 4 on amd64

Message ID 20200924105321.283171-2-andrea.righi@canonical.com
State New
Headers show
Series fix broken /dev/console on i3.metal | expand

Commit Message

Andrea Righi Sept. 24, 2020, 10:53 a.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1896604

Starting with kernel 5.8 the default nr_uarts has been changed from 4 to
32 for amd64, but this seems to affect i3.metal instances in AWS,
because ttyS0 is now remapped to ttyS4 and this is breaking tools
like cloud-init (and probably something else).

Make sure to restore the previous behavior (nr_uarts=4) and avoid
breaking the user-space.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
---
 debian.aws/config/amd64/config.common.amd64 | 1 +
 debian.aws/config/annotations               | 2 +-
 debian.aws/config/arm64/config.common.arm64 | 1 +
 debian.aws/config/config.common.ubuntu      | 1 -
 4 files changed, 3 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/debian.aws/config/amd64/config.common.amd64 b/debian.aws/config/amd64/config.common.amd64
index da9ee988b737..57443200c10e 100644
--- a/debian.aws/config/amd64/config.common.amd64
+++ b/debian.aws/config/amd64/config.common.amd64
@@ -36,6 +36,7 @@  CONFIG_PCMCIA=m
 CONFIG_PGTABLE_LEVELS=5
 CONFIG_PMIC_OPREGION=y
 CONFIG_SERIAL_8250_DW=m
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SND_HDA_PREALLOC_SIZE=0
 # CONFIG_SPI_ROCKCHIP is not set
 # CONFIG_STANDALONE is not set
diff --git a/debian.aws/config/annotations b/debian.aws/config/annotations
index b0b45f728e30..a3633da74c68 100644
--- a/debian.aws/config/annotations
+++ b/debian.aws/config/annotations
@@ -834,7 +834,7 @@  CONFIG_SERIAL_8250_EXAR                         policy<{'amd64': 'm', 'arm64': '
 CONFIG_SERIAL_8250_CS                           policy<{'amd64': 'm'}>
 CONFIG_SERIAL_8250_MEN_MCB                      policy<{'amd64': 'm', 'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_SERIAL_8250_NR_UARTS                     policy<{'amd64': '48', 'arm64': '48', 'armhf': '48', 'ppc64el': '48'}>
-CONFIG_SERIAL_8250_RUNTIME_UARTS                policy<{'amd64': '32', 'arm64': '32', 'armhf': '32', 'ppc64el': '32'}>
+CONFIG_SERIAL_8250_RUNTIME_UARTS                policy<{'amd64': '4', 'arm64': '32'}>
 CONFIG_SERIAL_8250_ASPEED_VUART                 policy<{'arm64': 'm', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_SERIAL_8250_DW                           policy<{'amd64': 'm', 'arm64': 'y', 'armhf': 'm', 'ppc64el': 'm'}>
 CONFIG_SERIAL_8250_EM                           policy<{'armhf': 'n'}>
diff --git a/debian.aws/config/arm64/config.common.arm64 b/debian.aws/config/arm64/config.common.arm64
index 170afc5fdd66..41786f45f55d 100644
--- a/debian.aws/config/arm64/config.common.arm64
+++ b/debian.aws/config/arm64/config.common.arm64
@@ -36,6 +36,7 @@  CONFIG_PATA_SIS=m
 CONFIG_PGTABLE_LEVELS=4
 # CONFIG_PMIC_OPREGION is not set
 CONFIG_SERIAL_8250_DW=y
+CONFIG_SERIAL_8250_RUNTIME_UARTS=32
 CONFIG_SND_HDA_PREALLOC_SIZE=64
 CONFIG_SPI_ROCKCHIP=m
 CONFIG_STANDALONE=y
diff --git a/debian.aws/config/config.common.ubuntu b/debian.aws/config/config.common.ubuntu
index 2875e45b6f0f..e0fa5cfd0a44 100644
--- a/debian.aws/config/config.common.ubuntu
+++ b/debian.aws/config/config.common.ubuntu
@@ -8509,7 +8509,6 @@  CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_PNP=y
 CONFIG_SERIAL_8250_RSA=y
 CONFIG_SERIAL_8250_RT288X=y
-CONFIG_SERIAL_8250_RUNTIME_UARTS=32
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 CONFIG_SERIAL_ALTERA_JTAGUART=m
 CONFIG_SERIAL_ALTERA_UART=m