From nobody Tue Apr 21 16:07:42 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5EBE2C433EF for ; Thu, 30 Jun 2022 11:43:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231895AbiF3LnX (ORCPT ); Thu, 30 Jun 2022 07:43:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233845AbiF3LnV (ORCPT ); Thu, 30 Jun 2022 07:43:21 -0400 X-Greylist: delayed 25469 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Thu, 30 Jun 2022 04:43:18 PDT Received: from smtpbguseast2.qq.com (smtpbguseast2.qq.com [54.204.34.130]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C56C51573B for ; Thu, 30 Jun 2022 04:43:18 -0700 (PDT) X-QQ-mid: bizesmtp69t1656589393ts5bmp7u Received: from localhost.localdomain ( [113.57.152.160]) by bizesmtp.qq.com (ESMTP) with id ; Thu, 30 Jun 2022 19:43:12 +0800 (CST) X-QQ-SSF: 0140000000200030E000B00A0000000 X-QQ-FEAT: Z953UCsBqO6kN67F+E0XhFu5sDv3aADX0KOi6NhRcYFQf6ThkFEWH3os3Xw57 2GDt8n6vjXIoOOjYLh+YneA5hLjfw/hSlF154Z5tnTkPEXtsQ0BVVkPYXGe77e/W6ujyzpS SPqAy7Aoj90m5kKk4L9Pik2W2YfvereRIF2coVnzT3KapiN0X/xs4VRUhbctMhwScRKBjaG OvPHG/9r2mJ+DRjNzsjCIS+h8rBw171rKpMggmJTOUhtsF/FaX8Oufs62MUDZFBvjvWHKIg XD/xjweyR2rDoKlY+j7OL/Y97FW1mYYxqAkaU3SzoWXQqAypJ0pdqfa0Qsf/0Gi71EkX96k OOaVPjx6xZ2cD0YLrmBiKafBKDuw1e6c5gifm9/ X-QQ-GoodBg: 2 From: hmy To: robh+dt@kernel.org Cc: linux-kernel@vger.kernel.org, hmy Subject: [PATCH] of/fdt: extend cmdline is not avail when kernel grub config ends with "--" Date: Thu, 30 Jun 2022 19:43:10 +0800 Message-Id: <20220630114310.830-1-huanglin@uniontech.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:uniontech.com:qybgforeign:qybgforeign4 X-QQ-Bgrelay: 1 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" when boot_command_line =3D boot-command "--" CONFIG_CMDLINE, parse_args() will exit and without parsing the contents of CONFIG_CMDLINE Signed-off-by: hmy --- drivers/of/fdt.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index a8f5b6532165..4a71acc172ef 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -1160,6 +1160,7 @@ int __init early_init_dt_scan_chosen(char *cmdline) { int l, node; const char *p; + char *q; const void *rng_seed; const void *fdt =3D initial_boot_params; =20 @@ -1186,6 +1187,9 @@ int __init early_init_dt_scan_chosen(char *cmdline) */ #ifdef CONFIG_CMDLINE #if defined(CONFIG_CMDLINE_EXTEND) + q =3D strstr(cmdline, "--"); + if (q) + *q =3D '\0'; strlcat(cmdline, " ", COMMAND_LINE_SIZE); strlcat(cmdline, CONFIG_CMDLINE, COMMAND_LINE_SIZE); #elif defined(CONFIG_CMDLINE_FORCE) --=20 2.20.1