From patchwork Wed Oct 19 08:22:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 4545 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp204247wrs; Wed, 19 Oct 2022 01:45:34 -0700 (PDT) X-Google-Smtp-Source: AMsMyM77PBcibUnTd4o68fJyY3EVHIicp5DmJVvesvpt861aACcHhyEwqdVNAD/HvC9dUERk8oMX X-Received: by 2002:a17:902:da92:b0:17f:9148:9b8c with SMTP id j18-20020a170902da9200b0017f91489b8cmr7568201plx.117.1666169134436; Wed, 19 Oct 2022 01:45:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666169134; cv=none; d=google.com; s=arc-20160816; b=AzYvOcidEG4FP7Gdy0/siLkcTvAZQqwgYV03ikWfP7Ofw5mvUsd461M6jYHzncl3lo oA/DvDYFBCBw981BIoK0d0m1AE1tlR2yKht2yFeqLX5u9i6D4USSjPEwPMwvhvKO9AG7 sNVFpaq4PObOztJS/H+DQvTbpB07VE0vJCT9Tu0D4eFIVT5VBe8VtKbxLB+W8DRurePj KEmYaeZrZ41WZJL6kaNJ+rEypHcBP3HKI0f3VP/gsVMrgJ+fqPHywFSj9G0x1uuGcrHR CA8razQb89JO1SsiPgX0X+itVkuRicJN8ntDxlPrbvr71u58Bg3+8dwdmlZwliBu3gRM ZtMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Qx2SvrouxxznJevAd90aK51pDeV9j8TIkca2rWLQ2a8=; b=oEJmzxa9H958mH1yl2SUCxLUtSRrq7wfbxwsqYOQkCyhvx8fW1YxySLO9ggE3WyaWr btGvRSpnTDUU5KxndWUlgKgxT02F5IXc7XkofuryEsigA0Ck994Hl8XvHfe6r/VELDHs NlEHxXM3Px3Q8le4Sd5u9ZFnZqA2WUklGvvstswAXxvbJiIfjIXJWmIsfz+3/HbxhE1Z JcXennr1qRDMxiZP0Nve8bb10uU6Dv39/pD2JiHkSaaz/r0sV6xLNvNMyEiFS3+JiS0U jbUU6oFGENT7grOViD8NaelgrqGlImpKevanorUqetijcYRO3UHfwqOXBceeLmT5epf+ tffg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=a+37mUAF; 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=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i9-20020a17090332c900b0017f7de32cb0si19634219plr.85.2022.10.19.01.45.20; Wed, 19 Oct 2022 01:45:34 -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=@linuxfoundation.org header.s=korg header.b=a+37mUAF; 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=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231262AbiJSIor (ORCPT + 99 others); Wed, 19 Oct 2022 04:44:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42642 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231308AbiJSInl (ORCPT ); Wed, 19 Oct 2022 04:43:41 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D55589806; Wed, 19 Oct 2022 01:41:40 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 27855617EF; Wed, 19 Oct 2022 08:40:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3C848C433C1; Wed, 19 Oct 2022 08:40:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666168823; bh=Nyd1WCddx4v9hzlBKLS7JQchgIUTsyH8TfhTYvZVeQc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a+37mUAFB6Azjhh5GNnamujL2Y54b6ITFFbt7w548O4vAHNE7mLulJkQ5xHKSEcFq +4ePXIJDRkTpxj2yPGs++u+zkiIgsZw6yXCC2bAUoxVBpXvMmtM18Q5/pED8zCPNVC mS6ZH0ABpUzTpULl2zFGdOVMbc9dANoTCRWrcoBM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wenting Zhang , =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= , Conor Dooley , Palmer Dabbelt Subject: [PATCH 6.0 064/862] riscv: always honor the CONFIG_CMDLINE_FORCE when parsing dtb Date: Wed, 19 Oct 2022 10:22:31 +0200 Message-Id: <20221019083252.766502213@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747104966043269638?= X-GMAIL-MSGID: =?utf-8?q?1747104966043269638?= From: Wenting Zhang commit 10f6913c548b32ecb73801a16b120e761c6957ea upstream. When CONFIG_CMDLINE_FORCE is enabled, cmdline provided by CONFIG_CMDLINE are always used. This allows CONFIG_CMDLINE to be used regardless of the result of device tree scanning. This especially fixes the case where a device tree without the chosen node is supplied to the kernel. In such cases, early_init_dt_scan would return true. But inside early_init_dt_scan_chosen, the cmdline won't be updated as there is no chosen node in the device tree. As a result, CONFIG_CMDLINE is not copied into boot_command_line even if CONFIG_CMDLINE_FORCE is enabled. This commit allows properly update boot_command_line in this situation. Fixes: 8fd6e05c7463 ("arch: riscv: support kernel command line forcing when no DTB passed") Signed-off-by: Wenting Zhang Reviewed-by: Björn Töpel Reviewed-by: Conor Dooley Link: https://lore.kernel.org/r/PSBPR04MB399135DFC54928AB958D0638B1829@PSBPR04MB3991.apcprd04.prod.outlook.com Cc: stable@vger.kernel.org Signed-off-by: Palmer Dabbelt Signed-off-by: Greg Kroah-Hartman --- arch/riscv/kernel/setup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/arch/riscv/kernel/setup.c +++ b/arch/riscv/kernel/setup.c @@ -252,10 +252,10 @@ static void __init parse_dtb(void) pr_info("Machine model: %s\n", name); dump_stack_set_arch_desc("%s (DT)", name); } - return; + } else { + pr_err("No DTB passed to the kernel\n"); } - pr_err("No DTB passed to the kernel\n"); #ifdef CONFIG_CMDLINE_FORCE strscpy(boot_command_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE); pr_info("Forcing kernel command line to: %s\n", boot_command_line);