From nobody Sun Apr 19 12:15:33 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 BA9C0C43334 for ; Fri, 1 Jul 2022 05:38:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233508AbiGAFiY (ORCPT ); Fri, 1 Jul 2022 01:38:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47646 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230145AbiGAFiV (ORCPT ); Fri, 1 Jul 2022 01:38:21 -0400 Received: from smtpbguseast1.qq.com (smtpbguseast1.qq.com [54.204.34.129]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A451213D42 for ; Thu, 30 Jun 2022 22:38:15 -0700 (PDT) X-QQ-mid: bizesmtp82t1656653886tas9yn4g Received: from localhost.localdomain ( [113.57.152.160]) by bizesmtp.qq.com (ESMTP) with id ; Fri, 01 Jul 2022 13:38:05 +0800 (CST) X-QQ-SSF: 0140000000200030E000B00A0000000 X-QQ-FEAT: NTY7odTD9S8eJmyIzlgWU+gO64fV4JWkdyCSwSeoGxiwH93mqtBnMse1UzN6w ItPCOk0cUCob25ONj8cT2VksNdth3vmhHtQ7HDDX1EIFKY8qqJYcb0x8kQdQySyYViwdz+7 uR1Nv92Dmm3sH1Iyqrh6KsNaHxuPPyuGyheGK5rFsrQD0zPpsGuxbI3IM71iOkCe9YTDJcT sbRvCSzHIRv+SUciszEu9lT1gKsCuoM7gqqQ0Ve53RVP9LHgwY0GCKKrQqAJCuIsI9mTxuy ICDMDsvdU2vhRzO18n7jOH9fEVhAyo6GOE6zCQSdZ/7KwsiPaf3z2CGyJv5N8WY6QANJVlm v/9Ja/hbQtE6/ddrZY= 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: Fri, 1 Jul 2022 13:38:03 +0800 Message-Id: <20220701053803.26165-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:qybgforeign9 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..5a289712c8fb 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -1162,6 +1162,7 @@ int __init early_init_dt_scan_chosen(char *cmdline) const char *p; const void *rng_seed; const void *fdt =3D initial_boot_params; + char *q __maybe_unused; =20 node =3D fdt_path_offset(fdt, "/chosen"); if (node < 0) @@ -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