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;
From:   Dong Zhihong <donmor3000@hotmail.com>
To:     chenhuacai@kernel.org, kernel@xen0n.name
Cc:     ardb@kernel.org, tangyouling@loongson.cn, zhoubinbin@loongson.cn,
        yangtiezhu@loongson.cn, donmor3000@hotmail.com, tglx@linutronix.de,
        loongarch@lists.linux.dev, linux-kernel@vger.kernel.org
Subject: [PATCH v3] LoongArch: Make CONFIG_CMDLINE work with CONFIG_CMDLINE_EXTEND and CONFIG_CMDLINE_BOOTLOADER
Date:   Tue, 11 Jul 2023 21:45:41 +0800
Message-ID: <MEYP282MB2597B4BD3CDA1ED340691C9CD931A@MEYP282MB2597.AUSP282.PROD.OUTLOOK.COM>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: MEYP282MB2597:EE_|MEYP282MB4155:EE_
X-MS-Office365-Filtering-Correlation-Id: 4e30e647-c0ff-4cbe-878e-08db821548fa
X-MS-Exchange-SLBlob-MailProps: YfhX3sd/0TX0vpKMQo3yIkRA/xfh+JfFsx6TQdTdyDvaa/qFOUmlJbm+/gVVwi2XmoVhQ+vdAK6h753C3kYd0G+UlfuyWscPk97VNf/2FSZhNL06YpxgoE+puZKiz3Vw6aR0XbEjQZtLK+6LfvArU5fTrfiz2ND4wQIFl7j1QttrmcahUu+fN1nWd2tZPFf0HSZbQ9UTZHmPdKMNJipRDleA7/ODHSDbU7gnweefE3CflJPbd3hZHZMfs5b0CvHB4lwATJz4WND17gVGOEKp1fe6pxttH/PmleMTaBtDIzn9pqcbp4rDX3pBlXX0Gzw8chhZ9gjxEXDqxbo3PuuVdaDFKLXotZL2JWdhTFOVmUJ0V1IlZc3UhnOim7eZ8V/flmXpyfjsIdFY2iexjeUyPsHJb1dYx2qIBPK6+8Y/kwtvGU/iZvn3NPUK/f+th6oh9nMM+8qaUWL63eX0qrZvg3dm9FTK6ZIUhs/ayOKdgN6EWcCyAzJaVxayD1PXS1y0n8NxO4bKLKqgzDyfA9yp2JegqRoBa1YbrU+x9E92X49vPmd2HgFECFvjLBOBh8mdsKYGgWRN287BUn0i3l2MYrQM8vrqj/vW7IPPsjnqT4hKs4EClOFeR8k5pgIZ4eqyR+hZBWaRloP3n1NzluFkSRr+02/UfeyuqnXqMMKWY/hZHjhG5GYe94Qb/ym36kfLktDrlWZ/ULPXapxM27WS//veb0OSGzk6hpyXjJS8LlwW0/Qb2LDKkzyQQvXAkyWWY0aKgwgpbk6QOmwYE+ZLFTO5PwbOZ7IIHPn8y1PBNuM=
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: RzAWoI8YBZRt+9AYNfNOo2lxvWo6sMkx3P3OnWKVIrAHwtbvEhe3fOhcGhd40i0D7BnrukgLosf9oCweO8a+4BaLLrTYu6VTmFJDAqKZ71UgO0eiHgGzXdJ4pWYf6+EyVO/UUBGx9GLqFvafYLeWFvMlUjfLtLJymdVcfsMCKLahlAAafKF1swXREifUV9QVg2WkENdgULj04tfCV3s/i3CDWzFh/QpAozTw9fpkKtbk73El81bwqMUtRrhLaIQCF5ISClKtgacj5s5CwUFWSs/53CISExDndcdfm+S6opqdyh5H9EvTFvmstVy4PY0NOTQ24oyRVGCN1l8QRVJfWioMD+2wLvv85YHbxyO2CGK0QjChWeKKvelNGKqd8tQfURcX76lQyBzU6EuixpSdHhyRjR1AINeIuKf8vurwg7NdEktOynC6j7+ub5z7ps1Ri2mIVB4LZ8aMGUt75IQ3mUpRrhn2TqfUYrKKh/iG9OEZk1yesQnbb2A81yGc5pVlXU+BRfDYbM0LDAPe+TclHFDs1Yuqdhd2gys8LJ1Rsi//tynltGxUC+Z5sjyeHf3YBH2SfzeEftHMBEhfQvz8Dfn07xpr9tr3WynSxa6M7cYgrFHzH0JQIZWriqeZQ+zv
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?3Zop6i99p4R3/1uInj6RUcX2a0ZHchMDCWWHgWKfasXC4TQ9AO15+HbJopTr?=
 =?us-ascii?Q?YAbmSM3wBzFhtJ10JZiq0N6NHSqUFM8qJ5rTrHGbDdQUIgh3D7S7v+WNmzpr?=
 =?us-ascii?Q?gWeS5LKYZWAKhFmJR1e0fMKIg1fsOFAEBzIClhH8xLZIa2UXRrVkA1VjDyRV?=
 =?us-ascii?Q?o2RHr00eo+mAWf/NlzrgkZMmvTsXWv6idlo/BwUFLJO4awGxjlJwEytDakRE?=
 =?us-ascii?Q?L8PMeH2u+JAnf8ewqEsIWycm8lWC3qbghVVyEE25dshrLY4lPfhwmhBfwAEE?=
 =?us-ascii?Q?3aYoMWEhGz+40/aBG0Rh52QG9qbEa6zO/z0DIP8RzPUwtWgMlyuXSSewkNii?=
 =?us-ascii?Q?hAjYqAp5Xjf0lkbkzg0KhuNznq0VG/8AppX+squy+kF0aqQxc2Pjd1R8HXdv?=
 =?us-ascii?Q?Yn8VXMP9VT1298wSFb8dSoyr74LMivwkwvggzWuTnlAmTehYdyd91M8oCzar?=
 =?us-ascii?Q?sto54oIOmnHIHwNwTHCXqm5pNRAAQe5xzKYJuVK8HFSFowL3771HTXdcanH+?=
 =?us-ascii?Q?ozQKIujVvMmgDDn+qlQpSGKPo+w8DOqGpBzghBK8laIppMNO3jMGitwaDzq1?=
 =?us-ascii?Q?0l7XGaiE4ymJ5YXJxi1HA6vFR7bEWfLrSodC8LPEnFWuFsqQHE6P9WkWVOQ+?=
 =?us-ascii?Q?ysgQvySs4AZtxXpYZIIEqXXSwjQHx16xg2cMONoBzjYEh/dKT2dl+AyeJ0Sj?=
 =?us-ascii?Q?uPva3u06aKre5k1stDOX1i8w264ynctIDJWlwzuQy5+IJeFL2ZdWAXUgVJE6?=
 =?us-ascii?Q?0l1qmXHw0HPGxuxkh7Z/VXDkQuvIEm3d4kl2+/d1sxajYTLjCHamY4J1iKFh?=
 =?us-ascii?Q?kYaFnxzLrNyDG68k/nHWgsjUFpH0SaZOuzNJusBNLU9PemWsep7ugVrocgr7?=
 =?us-ascii?Q?eEEEmH6QAtbGlYzDh0V4eVD8XC1DGFKQb8aLmbRbCmx9pxxTlbkNYy4ShgzB?=
 =?us-ascii?Q?joM96pRKwLoUjU1SWlD9Bg2Yy89cXIL/azsHBS6Tikyg64EcOjPZsV9wP0/c?=
 =?us-ascii?Q?dxGDK8kWoxvjoizxjuSu7/Osvj26kQ+Xcbmgs9ez6VXgmmTr10MifIWwT0W/?=
 =?us-ascii?Q?MFoKUDdUjQhs4QgQAFt8RL9n3YzVx1+15J3e2jC3cCTBJvXOJoAfyxuZhlcS?=
 =?us-ascii?Q?2ymNVg5mN7Q4alZXRv0JqaQLYnqwRJ6GY6GK8/9I8xbwSZSWvVX0seizBcn/?=
 =?us-ascii?Q?svpYiNgNXDJtAZbEzdtsKAaMr467dzCTpZ+tlE9szqDxvg3l0bEvDZvCi5ko?=
 =?us-ascii?Q?hbtkmVQj8TJ/vwZHb9mtzIGNb2Xi1dSCYx/eTbt2iY5l3CYeMgsfLYJLCumN?=
 =?us-ascii?Q?VWs=3D?=
X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-746f3.templateTenant
X-MS-Exchange-CrossTenant-Network-Message-Id: 4e30e647-c0ff-4cbe-878e-08db821548fa
X-MS-Exchange-CrossTenant-AuthSource: MEYP282MB2597.AUSP282.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jul 2023 13:46:53.7963
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MEYP282MB4155
X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_ENVFROM_END_DIGIT,
        FREEMAIL_FROM,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,
        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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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_BOOTLOADER,
so some code is added after OF_FLATTREE part to handle them.

Signed-off-by: Dong Zhihong <donmor3000@hotmail.com>
---

v3 -> v2: Reworded the commit message again to make it imperative (Ruoyao)
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/setup.c
index 78a00359bde3..3cafda1a409e 100644
--- a/arch/loongarch/kernel/setup.c
+++ b/arch/loongarch/kernel/setup.c
@@ -332,7 +332,24 @@ static void __init bootcmdline_init(char **cmdline_p)
 			strlcat(boot_command_line, " ", COMMAND_LINE_SIZE);
 
 		strlcat(boot_command_line, init_command_line, COMMAND_LINE_SIZE);
+		goto out;
+	}
+#endif
+
+#ifdef CONFIG_CMDLINE
+	/*
+	 * If CONFIG_CMDLINE_BOOTLOADER is enabled then we use thei built-in
+	 * command line if no command line given, or we append given command
+	 * line to the built-in one if CONFIG_CMDLINE_EXTEND is enabled.
+	 */
+	if (IS_ENABLED(CONFIG_CMDLINE_EXTEND)) {
+		strscpy(boot_command_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
+		strlcat(boot_command_line, " ", COMMAND_LINE_SIZE);
+		strlcat(boot_command_line, init_command_line, COMMAND_LINE_SIZE);
 	}
+
+	if (IS_ENABLED(CONFIG_CMDLINE_BOOTLOADER) && !boot_command_line[0])
+		strscpy(boot_command_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);
 #endif
 
 out:
-- 
2.25.1