Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230707191721.1.Id08823b2f848237ae90ce5c5fa7e027e97c33ad3@changeid>
 <b32ae8af-7950-c725-5632-6ec13420bf77@infradead.org> <6101a3bb-30eb-97fc-3a8e-6d15afc4efb5@amd.com>
 <3de1ff24-3970-6e22-a73c-70446b8de4bd@infradead.org>
In-Reply-To: <3de1ff24-3970-6e22-a73c-70446b8de4bd@infradead.org>
From:   Raul Rangel <rrangel@chromium.org>
Date:   Mon, 10 Jul 2023 09:30:19 -0600
Message-ID: <CAHQZ30BLb13Mz5+3MCgV30eG-LiU-6-4F7AEinGQmsgiyzD-yA@mail.gmail.com>
Subject: Re: [PATCH] init: Don't proxy console= to earlycon
To:     Randy Dunlap <rdunlap@infradead.org>
Cc:     Mario Limonciello <mario.limonciello@amd.com>,
        linux-kernel@vger.kernel.org,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Petr Mladek <pmladek@suse.com>, kramasub@chromium.org,
        Alexander Potapenko <glider@google.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        Ard Biesheuvel <ardb@kernel.org>,
        "Jason A. Donenfeld" <Jason@zx2c4.com>,
        Li Zhe <lizhe.67@bytedance.com>,
        "Liam R. Howlett" <Liam.Howlett@oracle.com>,
        Mark Rutland <mark.rutland@arm.com>,
        Will Deacon <will@kernel.org>,
        Wolfram Sang <wsa+renesas@sang-engineering.com>,
        Zhou jie <zhoujie@nfschina.com>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Sun, Jul 9, 2023 at 8:43=E2=80=AFPM Randy Dunlap <rdunlap@infradead.org>=
 wrote:
>
>
>
> On 7/9/23 18:15, Mario Limonciello wrote:
> > On 7/9/23 18:46, Randy Dunlap wrote:
> >>
> >>
> >> On 7/7/23 18:17, Raul E Rangel wrote:
> >>> Right now we are proxying the `console=3DXXX` command line args to th=
e
> >>> param_setup_earlycon. This is done because the following are
> >>> equivalent:
> >>>
> >>>      console=3Duart[8250],mmio,<addr>[,options]
> >>>      earlycon=3Duart[8250],mmio,<addr>[,options]
> >>>
> >>> In addition, when `earlycon=3D` or just `earlycon` is specified on th=
e
> >>> command line, we look at the SPCR table or the DT to extract the devi=
ce
> >>> options.
> >>>
> >>> When `console=3D` is specified on the command line, it's intention is=
 to
> >>> disable the console. Right now since we are proxying the `console=3D`
> >>
> >> How do you figure this (its intention is to disable the console)?
> >

https://www.kernel.org/doc/html/v6.1/admin-guide/kernel-parameters.html
says the following:
console=3D
    { null | "" }
            Use to disable console output, i.e., to have kernel
            console messages discarded.
            This must be the only console=3D parameter used on the
            kernel command line.

        earlycon=3D       [KNL] Output early console device and options.

            When used with no options, the early console is
            determined by stdout-path property in device tree's
            chosen node or the ACPI SPCR table if supported by
            the platform.

The reason this bug showed up is that ChromeOS has set `console=3D` for a
very long time:
https://chromium.googlesource.com/chromiumos/platform/crosutils/+/main/buil=
d_kernel_image.sh#282
I'm not sure on the exact history, but AFAIK, we don't have the ttyX device=
s.

Coreboot recently added support for the ACPI SPCR table which in
combination with the
`console=3D` arg, we are now seeing earlycon enabled when it shouldn't be.

> > I read that as "it's intention is to disable the default console (tty0)=
".
>
> Yes, that "default" word should be there IMO.
>
> Does this patch affect behavior if someone uses
>         console=3Dtty0
> i.e., the default?
>

No, it shouldn't. This change makes it so that the
param_setup_earlycon function gets
skipped if there is no value.
See https://chromium.googlesource.com/chromiumos/third_party/kernel/+/v6.1/=
drivers/tty/serial/earlycon.c#223

> >
> > IE if I add console=3DttyS0,115200,n8 to my kernel command line then I =
don't get the output on tty0 anymore.  If I want it on both then I do
> >
> > console=3DttyS0,115200,n8 console=3Dtty0.
> >
> >>
> >>> flag to the earlycon handler, we enable the earlycon_acpi_spcr_enable
> >>> variable when an SPCR table is present. This means that we
> >>> inadvertently enable the earlycon.
> >>>
> >>> This change makes it so we only proxy the console=3D command if it's
> >>> value is not empty. This way we can correctly handle both cases.
> >>>
> >>> Signed-off-by: Raul E Rangel <rrangel@chromium.org>
> >>> ---
> >>>
> >>>   init/main.c | 3 +--
> >>>   1 file changed, 1 insertion(+), 2 deletions(-)
> >>>
> >>> diff --git a/init/main.c b/init/main.c
> >>> index aa21add5f7c54..f72bf644910c1 100644
> >>> --- a/init/main.c
> >>> +++ b/init/main.c
> >>> @@ -738,8 +738,7 @@ static int __init do_early_param(char *param, cha=
r *val,
> >>>       for (p =3D __setup_start; p < __setup_end; p++) {
> >>>           if ((p->early && parameq(param, p->str)) ||
> >>>               (strcmp(param, "console") =3D=3D 0 &&
> >>> -             strcmp(p->str, "earlycon") =3D=3D 0)
> >>> -        ) {
> >>> +             strcmp(p->str, "earlycon") =3D=3D 0 && val && val[0])) =
{
> >>>               if (p->setup_func(val) !=3D 0)
> >>>                   pr_warn("Malformed early option '%s'\n", param);
> >>>           }
> >>
> >
>
> --
> ~Randy