Received: by 2002:a05:6358:3188:b0:123:57c1:9b43 with SMTP id q8csp37682940rwd; Tue, 11 Jul 2023 18:42:47 -0700 (PDT) X-Google-Smtp-Source: APBJJlFKZM4QgI7nPCsBdEQWlLUTzqOsWbwNw0Gf9i4mk2riZbMByL08ew2g3oA2dIXX9OegHH1N X-Received: by 2002:a05:6358:4291:b0:134:d1ff:8c97 with SMTP id s17-20020a056358429100b00134d1ff8c97mr12420397rwc.3.1689126166845; Tue, 11 Jul 2023 18:42:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689126166; cv=none; d=google.com; s=arc-20160816; b=EF9fiBQekdJM0f56IJU8tDeK9nNkmy5XcRQ16hgDyxoZ1neSv/r0PaVC2obOlXCiaM Tfd2BM1e9WD2pYXVjoEx3vGtquSMd/mill0CuMlr4RpyXGslIETlSL0biT+aSQfMCQKX Sp8xBPTx1oJw9/7qaKAJHJIDwobXqI4GgGtw7+gxMUK91Wei6kjZ1WKftQYvPrH00FSy KjGGM8OlVHdLxJv+I6yq5btykXq7FnWcMitowwmQJWClR4MmCrpJXTi1IoAGJgt2Idzw w+w6LDxnyduDPuhPHyuDfxwCYEste/eWsdbuSfbmYOczGg2X/AjzugmJJtsK80yYSIef mNKA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:cc:to:subject :message-id:date:from:in-reply-to:references:mime-version :dkim-signature; bh=yp1yeRb+PSlZsal3A/cWeWb9Bzo5OORHEJBb4nCaGD4=; fh=/93Sn+1Y0Su15k8ciEeVId0m+9XxP0zNNxLvTfvjEec=; b=Z1SYvw4G6tkXNrbLhJAf2FIWITi7YPN4uMXhfxn4rnJ6A/dub1jUeBkswjbsbkfB8P 22P8uqREPeAB16CUPhhWUmTmsz/9gaGkibaIP+o6zA+ccEE9I39mPMw+dBtSNpVRx2tB 8o0iya+QDTeZJAESYJMgpsUHHDGbOowzK851/ta7KSyo5n2N3XWvlvIPPTl7Zefg7u0i EH2nO63UPs2A7TrDKU2UU3SXlU30ZUSi/AH4DNEfNjZeb1BA29YM35PBoJmchhhPqqgG bO7VJ4i5ik3zhduT7TNFvpVN3Po9MaIbtpz3OXNoCtSLwjJHozrkASb6FrsHC/B4xbxp EcMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=KogWyRn2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id s69-20020a632c48000000b005539d3ab914si2313170pgs.694.2023.07.11.18.42.32; Tue, 11 Jul 2023 18:42:46 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=KogWyRn2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229640AbjGLBTo (ORCPT + 99 others); Tue, 11 Jul 2023 21:19:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229551AbjGLBTn (ORCPT ); Tue, 11 Jul 2023 21:19:43 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7FA3D127 for ; Tue, 11 Jul 2023 18:19:42 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 1C61F61691 for ; Wed, 12 Jul 2023 01:19:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7D452C433D9 for ; Wed, 12 Jul 2023 01:19:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1689124781; bh=OM7jgID5+nDTdQR28+4xIcEawoenyRWnAs3OJMJYetA=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=KogWyRn2VV5EZhXGlejNpBZVugdnvEr9ROeC4CRSSSEYKuuGFz6Q3eKZBWxlbfC7Q xKynDGGP9yuWUJrf5EJunAhtgDUwFyPPJI0nAdhO7RzAXluhsgqEDWZZwSaSob5aOD 2PVtaK/wBMqAVqtxWitUn4aaCzZ2uf42yDh26ZCgR36pqxPgz6SAvLSVWRgYAHVqui 8ABLk16iWwNecceSWo9JPrF2a/E3nwbqgO4YV26BoJKh3/JO9hAH3npJFY8lq+QVEL wrjdTcdrUtdMKFs7/hZZ7BajJ/L/K+UGu62Rg0SgZ1yhouMfSfHk4TEq9Okc0AWI6J 824m10wJFUDxA== Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-307d58b3efbso6335589f8f.0 for ; Tue, 11 Jul 2023 18:19:41 -0700 (PDT) X-Gm-Message-State: ABy/qLaxd6AIr3Dth1wU+DZxLXeNladOEgZNaEnnMk6xURHeXUipMMXs RCyEUiCJBixXt6cr3tIwxL3zy04H74h5TjqPJJY= X-Received: by 2002:a05:6000:1106:b0:315:a1f9:8667 with SMTP id z6-20020a056000110600b00315a1f98667mr4599399wrw.23.1689124779730; Tue, 11 Jul 2023 18:19:39 -0700 (PDT) MIME-Version: 1.0 References: <3310eb5b3c944434b6e3b53750f1801f510811f2.camel@hotmail.com> In-Reply-To: <3310eb5b3c944434b6e3b53750f1801f510811f2.camel@hotmail.com> From: Huacai Chen Date: Wed, 12 Jul 2023 09:19:28 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v3] LoongArch: Make CONFIG_CMDLINE work with CONFIG_CMDLINE_EXTEND and CONFIG_CMDLINE_BOOTLOADER To: donmor Cc: "loongarch@lists.linux.dev" , "kernel@xen0n.name" , "yangtiezhu@loongson.cn" , "zhoubinbin@loongson.cn" , "linux-kernel@vger.kernel.org" , "tglx@linutronix.de" , "ardb@kernel.org" , "tangyouling@loongson.cn" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Jul 11, 2023 at 11:27=E2=80=AFPM =E2=80=8E donmor wrote: > > =E5=9C=A8 2023-07-11=E6=98=9F=E6=9C=9F=E4=BA=8C=E7=9A=84 22:26 +0800=EF= =BC=8CHuacai Chen=E5=86=99=E9=81=93=EF=BC=9A > > ... > > + if (IS_ENABLED(CONFIG_CMDLINE_EXTEND)) { > > > + strscpy(boot_command_line, CONFIG_CMDLINE, COMMAND_LI= NE_SIZE); > > > + strlcat(boot_command_line, " ", COMMAND_LINE_SIZE); > > > + strlcat(boot_command_line, init_command_line, COMMAND= _LINE_SIZE); > > You can simply the logic: > > strlcat(boot_command_line, " ", COMMAND_LINE_SIZE); > > strlcat(boot_command_line, CONFIG_CMDLINE, COMMAND_LINE_= SIZE); > > And then modify the comments because you are appending built-in parts > > to bootloader parts. > > > I think the command line retrieved from bootloader should be placed after= the > built-in one so that it can override params in the latter. config CMDLINE_EXTEND bool "Use built-in to extend bootloader kernel arguments" The fdt version also uses this logic, but you are using bootloader parts to extend built-in parts. > > > > } > > > + > > > + if (IS_ENABLED(CONFIG_CMDLINE_BOOTLOADER) && !boot_command_li= ne[0]) > > > + strscpy(boot_command_line, CONFIG_CMDLINE, COMMAND_LI= NE_SIZE); > > This should be removed if you want to keep the exact meaning of > > CONFIG_CMDLINE_BOOTLOADER. > > > > Huacai > > > Do you mean 'IS_ENABLED(CONFIG_CMDLINE_BOOTLOADER) && ' is not necessary?= And I > think the rest of this part should be here, because CONFIG_CMDLINE_BOOTLO= ADER > won't append anything to boot_command_line unless it is empty, according = to its > description. OK, you are right here. Huacai