From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 52DADC3F2CE for ; Tue, 17 Mar 2020 11:11:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 29BFF20769 for ; Tue, 17 Mar 2020 11:11:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584443505; bh=CtFChaZy2GO3I0OiYW2OxCA1vTzF4bPl0CXFS3Z8Gu0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RvF1kvY38C/SJGFwkSVqKp03LlBdVqwM9xA4OIS/53KqTQlEbDiy0VtGNSNYBt563 pytTzQsfBXZpIGaa7whbzh3tVDxPptLfU21HnKiHM3YxC+yVTvQft4hIdraB25OYMG 1hgIyBmGYttxMtVvWnXJIgYtYph63cpX6HUUVKZs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729324AbgCQLLo (ORCPT ); Tue, 17 Mar 2020 07:11:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:55130 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729318AbgCQLLo (ORCPT ); Tue, 17 Mar 2020 07:11:44 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 13850206EC; Tue, 17 Mar 2020 11:11:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584443502; bh=CtFChaZy2GO3I0OiYW2OxCA1vTzF4bPl0CXFS3Z8Gu0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KxKvainIx6M/XgMekmdAPmVG683AQULlluXaLMo6YnJz2iqmrg+JQhiZX0TduHx0b Mwew4kHdO5NNleYL9s1dSrPHqJoCV1ZjQuROBjFK4GO0atj3EhZVLpt/oziEurCVwz n8rcvGo5AIv58ORwg6l4YB43vIvrkouNQtksYwXk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Paul Cercueil , Thomas Bogendoerfer Subject: [PATCH 5.5 104/151] MIPS: Fix CONFIG_MIPS_CMDLINE_DTB_EXTEND handling Date: Tue, 17 Mar 2020 11:55:14 +0100 Message-Id: <20200317103333.847496173@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200317103326.593639086@linuxfoundation.org> References: <20200317103326.593639086@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Paul Cercueil commit 8e029eb0bcd6a7fab6dc9191152c085784c31ee6 upstream. The CONFIG_MIPS_CMDLINE_DTB_EXTEND option is used so that the kernel arguments provided in the 'bootargs' property in devicetree are extended with the kernel arguments provided by the bootloader. The code was broken, as it didn't actually take any of the kernel arguments provided in devicetree when that option was set. Fixes: 7784cac69735 ("MIPS: cmdline: Clean up boot_command_line initialization") Cc: stable@vger.kernel.org Signed-off-by: Paul Cercueil Signed-off-by: Thomas Bogendoerfer Signed-off-by: Greg Kroah-Hartman --- arch/mips/kernel/setup.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -606,7 +606,8 @@ static void __init bootcmdline_init(char * If we're configured to take boot arguments from DT, look for those * now. */ - if (IS_ENABLED(CONFIG_MIPS_CMDLINE_FROM_DTB)) + if (IS_ENABLED(CONFIG_MIPS_CMDLINE_FROM_DTB) || + IS_ENABLED(CONFIG_MIPS_CMDLINE_DTB_EXTEND)) of_scan_flat_dt(bootcmdline_scan_chosen, &dt_bootargs); #endif