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: <MEYP282MB259720FF3C1683A75881EF02D93BA@MEYP282MB2597.AUSP282.PROD.OUTLOOK.COM>
 <CAAhV-H6dn9iRxaGGoD+=7YHiDEmt_Be4_v8d1oY7+dmhrJBUMw@mail.gmail.com>
In-Reply-To: <CAAhV-H6dn9iRxaGGoD+=7YHiDEmt_Be4_v8d1oY7+dmhrJBUMw@mail.gmail.com>
From:   Huacai Chen <chenhuacai@kernel.org>
Date:   Tue, 18 Jul 2023 23:38:53 +0800
Message-ID: <CAAhV-H6hY=Y_DagrHJzNY5wn8JkCzheAR2JnjrOQf5DUHES1Tg@mail.gmail.com>
Subject: Re: [PATCH v4] LoongArch: Fix CONFIG_CMDLINE_EXTEND and
 CONFIG_CMDLINE_BOOTLOADER handling
To:     Dong Zhihong <donmor3000@hotmail.com>
Cc:     kernel@xen0n.name, ardb@kernel.org, tangyouling@loongson.cn,
        zhoubinbin@loongson.cn, yangtiezhu@loongson.cn, tglx@linutronix.de,
        loongarch@lists.linux.dev, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Hi, Zhihong,

On Mon, Jul 17, 2023 at 3:05=E2=80=AFPM Huacai Chen <chenhuacai@kernel.org>=
 wrote:
>
> On Mon, Jul 17, 2023 at 2:51=E2=80=AFPM Dong Zhihong <donmor3000@hotmail.=
com> wrote:
> >
> > Make CONFIG_CMDLINE work with CONFIG_CMDLINE_EXTEND and
> > CONFIG_CMDLINE_BOOTLOADER. The touched function is bootcmdline_init()`.
> > There's already code handling CONFIG_CMDLINE_FORCE, which replaces
> > `boot_command_line` with CONFIG_CMDLINE and immediately`goto out`. It'd=
 be
> > similar way to handle CONFIG_CMDLINE_EXTEND and CONFIG_CMDLINE_BOOTLOAD=
ER,
> > so some code is added after OF_FLATTREE part to handle them.
> >
> > Signed-off-by: Dong Zhihong <donmor3000@hotmail.com>
> > ---
> >
> > v4 -> v3: Make CONFIG_CMDLINE appended to the end of command line (Huac=
ai);
> >         Removed unnecessary #ifdef since CONFIG_CMDLINE is always a str=
ing on
> >         LoongArch
> >         Reworded comments
> >         Reworded the subject of commit message (Huacai)
> > v3 -> v2: Reworded the commit message again to make it imperative (Ruoy=
ao)
> > v2 -> v1: Reworded the commit message so it's more imperative (Markus);
> >         Added `goto out` to FDT part (Huacai)
> >
> >  arch/loongarch/kernel/setup.c | 17 +++++++++++++++++
> >  1 file changed, 17 insertions(+)
> >
> > diff --git a/arch/loongarch/kernel/setup.c b/arch/loongarch/kernel/setu=
p.c
> > index 78a00359bde3..a98f33553acf 100644
> > --- a/arch/loongarch/kernel/setup.c
> > +++ b/arch/loongarch/kernel/setup.c
> > @@ -332,9 +332,26 @@ static void __init bootcmdline_init(char **cmdline=
_p)
> >                         strlcat(boot_command_line, " ", COMMAND_LINE_SI=
ZE);
> >
> >                 strlcat(boot_command_line, init_command_line, COMMAND_L=
INE_SIZE);
> > +               goto out;
> >         }
> >  #endif
> >
> > +       /*
> > +        * Append built-in command to the retrieved one if
> > +        * CONFIG_CMDLINE_EXTEND is enabled.
> > +        */
> > +       if (IS_ENABLED(CONFIG_CMDLINE_EXTEND) && CONFIG_CMDLINE[0]) {
> Don't need to check CONFIG_CMDLINE[0], this simplifies the conditions.
>
> > +               strlcat(boot_command_line, " ", COMMAND_LINE_SIZE);
> > +               strlcat(boot_command_line, CONFIG_CMDLINE, COMMAND_LINE=
_SIZE);
> > +               goto out;
> Remove this line and in the next line using the old method
> (IS_ENABLED(CONFIG_CMDLINE_BOOTLOADER) && !boot_command_line[0]) is
> better.
To save everyone's time, I adjust the logic and send v5 [1]. If you
have no objections, I'll apply that one to loongarch-next.

[1] https://lore.kernel.org/loongarch/20230718153348.3340811-1-chenhuacai@l=
oongson.cn/T/#u

Huacai
>
> Huacai
> > +       }
> > +
> > +       /*
> > +        * Use built-in command line if nothing is retrieved from boot =
loader.
> > +        */
> > +       if (!boot_command_line[0])
> > +               strscpy(boot_command_line, CONFIG_CMDLINE, COMMAND_LINE=
_SIZE);
> > +
> >  out:
> >         *cmdline_p =3D boot_command_line;
> >  }
> > --
> > 2.25.1
> >