From patchwork Thu Sep 24 10:53:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrea Righi X-Patchwork-Id: 1370608 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BxsNL3fpYz9sS8; Thu, 24 Sep 2020 20:53:38 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kLOsW-0006jO-Uy; Thu, 24 Sep 2020 10:53:32 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kLOsS-0006iu-L9 for kernel-team@lists.ubuntu.com; Thu, 24 Sep 2020 10:53:28 +0000 Received: from mail-wm1-f69.google.com ([209.85.128.69]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kLOsS-0002zu-9Z for kernel-team@lists.ubuntu.com; Thu, 24 Sep 2020 10:53:28 +0000 Received: by mail-wm1-f69.google.com with SMTP id b14so732080wmj.3 for ; Thu, 24 Sep 2020 03:53:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SNXMTgGqjVJOihZXnN1WMcV1+Yq9sm256xp+qGKm/9A=; b=pw2O6xpL49fVFpZe7gFA9kD7FZedUuKRibAyiPRZiMpjAt0PY/5AtgqLkvlcRthf0Y RRxGMDtoSBHv1my19CWdtM49DlBi6AuadjP/ISJHzTog0DJJm9L7ySzHHfRurEht17dO v2HiLpXv5vv4jUopYX5DfmNWMqLe6LJqRIsiLFaOT9g52UBNiwqZOPRHjNnXA6fLdb5L dzNjjY8n4kUxBFCQ11zU7iMNoMhiq3LnUUJMvT8zrKqq17Ejcx0BjT5HZODHg7+hYTes YRNHwJIA467+0OzCkGFnZlWnn+UCU0mGyFAICM2bjbdRGjvnqXWBnRMUxpEtiyaVG/9y ZdYg== X-Gm-Message-State: AOAM532BVnUe8w1L/VlzkqgERLm8cADGF+VJ8ZMPTnke5KedlyrVK768 AvjFkDFT8u1PUWc53uyJZ/mGF6QzETyOZbeEO/B9VnSbTYFSoIkP81snBhtCXUh4A8nXiwZjESf dYxI1DEbEJZdm/k+c0vaaFGod+veoNMk0NJU0kBLLug== X-Received: by 2002:a5d:55c8:: with SMTP id i8mr4471786wrw.331.1600944807733; Thu, 24 Sep 2020 03:53:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzBx0Ijt5kIMGInfTIDMSTRrvyRXtu9C/0F4zY7X3YjdWDEBxqAYBTLwfnT47rdieP0uaushw== X-Received: by 2002:a5d:55c8:: with SMTP id i8mr4471771wrw.331.1600944807492; Thu, 24 Sep 2020 03:53:27 -0700 (PDT) Received: from xps-13.homenet.telecomitalia.it (host-79-50-195-5.retail.telecomitalia.it. [79.50.195.5]) by smtp.gmail.com with ESMTPSA id e13sm3610772wre.60.2020.09.24.03.53.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Sep 2020 03:53:27 -0700 (PDT) From: Andrea Righi To: kernel-team@lists.ubuntu.com Subject: [SRU][G/aws][PATCH 1/1] UBUNTU: [Config] [aws] set default nr_uarts back to 4 on amd64 Date: Thu, 24 Sep 2020 12:53:21 +0200 Message-Id: <20200924105321.283171-2-andrea.righi@canonical.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200924105321.283171-1-andrea.righi@canonical.com> References: <20200924105321.283171-1-andrea.righi@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" 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 --- 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 --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