From patchwork Tue Sep 29 08:46:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matija Glavinic Pecotic X-Patchwork-Id: 11805289 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4D336139A for ; Tue, 29 Sep 2020 08:48:03 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0B0202067D for ; Tue, 29 Sep 2020 08:48:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="WHPoTZfZ"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=nokia.onmicrosoft.com header.i=@nokia.onmicrosoft.com header.b="WGErbmAw" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0B0202067D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=nokia.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:List-Subscribe:List-Help:List-Post:List-Archive:List-Unsubscribe :List-Id:MIME-Version:Date:Message-ID:Subject:From:To:Reply-To:Cc:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Owner; bh=+vjW34ChEcHbv8spQvul0BSG/GDtoX7OOiq37qWc64c=; b=WHPoTZfZYC3kXNqQCd+dI3S3rC LLsxh/wy//v6H8hIf37FJ65Pnv6xZmNrmfmdV3fK+LKqfLT58aOAzJL1czPI+1sJ1XviG8jlehhc5 IzxN3hzn5lLOGX2wIh3z0N7DHf4WV99r5vQZ9uY1WWSe2nPgV5DyfKPKTkvVFWeX8ye0cP+ryQfeg UUeaciwJCK1J1EYXn2KiksvdHgfZHm+GV/FTnny8HrI6sEdlV8iauQrHXcb2vxQoHvKpKMeO2vNg9 4fpnVEDXb0iK98zXwW8CoQacOwGIpVKe21afqL2vZH6WD+bmI4Clngt15ZSqnk4A32EamWdmSKIpx ZwQ2ksxQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kNBHL-0001Xj-ME; Tue, 29 Sep 2020 08:46:32 +0000 Received: from mail-vi1eur04on0725.outbound.protection.outlook.com ([2a01:111:f400:fe0e::725] helo=EUR04-VI1-obe.outbound.protection.outlook.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kNBHC-0001TC-JX for linux-arm-kernel@lists.infradead.org; Tue, 29 Sep 2020 08:46:29 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aJ3CyAlsoRbhk4pKpHutd609On0LdeFpAUamLoYZz+HgiVzWqxyCcxWJ8Mtj/H1REPZZA3puGXXGVxaNAamgjSEisR1c0YiaCXqLt1OPY6KpCaVvsP8fjFDxmtap9CKrjW4uQ65GJ3vsdJeAhG8Rh/oY/cfUQMIlZVoo/royzHfo1NFRayN5olNr4PMaFWUfr4vJUPfbOckywfSNYBCcnIYn51ta0e0JDucHlG6lFIT/ByIBxSPKW69uS7MYDiCsptkg5OKLdJ016BYa5uTKbip+SbEKZumgY3wggeg91Pkz9SkGPTEo1E8J+Y7Z4PetGYlm51Aut4TNfJbm6B6eiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dLMf466xqK7VxDinSqKo275mudMjFgAX+PN+cZoNo/8=; b=egWEcSngUN2KdeO8xsvLSpvbOlNbaaUs3I2hchAzZer4IsFQC/gbybfHCoK7z1iNmw24twraMpq8LKIYI6XSHNiiXtiQI8q8f+g8MQRIyntdNp9HMz3bp58pDwdTG0vLA63+Cct2cjL5aKWocMWgBJd6VxgWKvG/1VmUETWf4EoyfD17Jl+a7pg75CBZUZp9VSnSeyk9COptE7SrghX0BE1d8aMe0lzbM/qT+kBYQS3VBfDI6eVzRzZEGrgzimX92wbPdEG8CUZ6DUN0NR+XJ9hQ3+gq9iwHJBtGmlinHjwFX8ohq5eoAhflJDiSgb0KqasWhdeuWCJILVCiG0z0Jw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nokia.com; dmarc=pass action=none header.from=nokia.com; dkim=pass header.d=nokia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia.onmicrosoft.com; s=selector1-nokia-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=dLMf466xqK7VxDinSqKo275mudMjFgAX+PN+cZoNo/8=; b=WGErbmAwyWawdWxPo/fcrLSPOLbzkU1MkBaYkeB8pQancXii6ANWNLSJ8DZt2OgzrNcUQztOjKcHSJu6wWgIEpjgZwKXXpckf7q2zDVoH4iNwdOx8gMKWOpqUIy0mEQFdDF47jRn4icK7j8E3mpVPHjtN/2RmFFXPMGJsBh8nmY= Authentication-Results: nokia.com; dkim=none (message not signed) header.d=none;nokia.com; dmarc=none action=none header.from=nokia.com; Received: from VI1PR07MB5216.eurprd07.prod.outlook.com (2603:10a6:803:b0::15) by VI1PR0702MB3805.eurprd07.prod.outlook.com (2603:10a6:803:8::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3433.23; Tue, 29 Sep 2020 08:46:17 +0000 Received: from VI1PR07MB5216.eurprd07.prod.outlook.com ([fe80::4d01:44de:bd25:b64a]) by VI1PR07MB5216.eurprd07.prod.outlook.com ([fe80::4d01:44de:bd25:b64a%6]) with mapi id 15.20.3433.031; Tue, 29 Sep 2020 08:46:17 +0000 To: linux-arm-kernel@lists.infradead.org, "Sverdlin, Alexander (Nokia - DE/Ulm)" From: Matija Glavinic Pecotic Subject: [PATCH] arm64: Make CONFIG_CMDLINE behavior configurable Message-ID: <55be67bb-338c-afa1-d863-7a82f9ba803f@nokia.com> Date: Tue, 29 Sep 2020 10:46:09 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.4.0 X-Originating-IP: [131.228.32.166] X-ClientProxiedBy: CH2PR16CA0014.namprd16.prod.outlook.com (2603:10b6:610:50::24) To VI1PR07MB5216.eurprd07.prod.outlook.com (2603:10a6:803:b0::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from [172.30.9.6] (131.228.32.166) by CH2PR16CA0014.namprd16.prod.outlook.com (2603:10b6:610:50::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.20.3412.20 via Frontend Transport; Tue, 29 Sep 2020 08:46:16 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 5b169465-205a-486e-bc0e-08d864542198 X-MS-TrafficTypeDiagnostic: VI1PR0702MB3805: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 22cJC9MNe+bnZ/YBnxpkRqmemhhdwcw8r+dtRlDrF6ygjUi5pn/D5rZ+GrSxCP04FjtHaYN/2DEZCJKX5A1Ye2TVqITamuc1FWN2AchPhiP3ERPkc20EL7AV3S4ZnRhVwRHuAFe5jqmpMGLnLYUJDcYKDilWYlanE/SH33xzGNwusA5dJx11h+SfZSTx935zzMfOusLZBBN+Hdeu7VLJPr7bgrnDiEdox88irMdP6HQxNob0k3YusjBQLX3lOw10iG+agRsAI/0ONmJJV1EIJMpOg8MMqkeZjd2+bIDoN43JTnl9/VyU0JziLfhLnnHn09zZZ1XdpE/4q3AdDz9iK0GT00rXlGze+rHt4CDyApPd3EnYjV+BVcSiYgVQuIDY X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR07MB5216.eurprd07.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(366004)(346002)(136003)(39860400002)(376002)(37006003)(5660300002)(6486002)(16576012)(66556008)(186003)(16526019)(2906002)(36756003)(83380400001)(26005)(66476007)(316002)(956004)(8676002)(6666004)(86362001)(2616005)(66946007)(52116002)(31696002)(6862004)(31686004)(478600001)(8936002)(6636002)(43740500002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: bRovAa3/mn1xcStt53rJ/DC9ujjIeETLTk3Op2PY+ng3VW66rRuL7HaTbA/1M0Ut8geA9gFSCXP+4dE7470fjSl3gnxDpl+3ChZJ719dwHDtTUzO9+qfmnqT+gQcfFOWcWmd1zbHsMIGaNw7MYOv7TmtB887VLpKkCR0i8lsyxtZdawVzgTk71C/hJg9ydnIQWNoh2dnMtLIwJ8+r+wpkGcTgaclaHKVrNTFfgdzmKBie+/7feJWbjyGzlN6fibpDU5ULUhfP1PHLit7GuVnxMpMZQSmsWfAONjLirsHk5XmkEMnFAT3m/CoHxzSV7xCbFeKHJ4McaZZZqLwwPSS1zclyqlLMQKavDxmAIQaAj0RTuO9tgae1MBePf+JFn3cndRJC+Pcva+0z+fKvs2BGVvOYPC7qTnK4rYNzODg12LOOjTEvbTGouzZgYpX8jaBcBJvi/snlD1hKbMtJwyZPSt7yd60VhTuYkZhMKJ/fcMWe0m9LeNCgBSznFeFAcmToCHQX3En19hbXf9nmJsdvBeP8VAoDDFlmtYrhNbJT/A0saUSbrL7LPhlFStWQ4lI8R7ZLve0c4oNkSlZPlqHdRTZQKLshz/xeIqUstGLokz1gzRxLzFqY9vPS4U0mty5W7XR1a/cLmYzXaS/FINrSQ== X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 5b169465-205a-486e-bc0e-08d864542198 X-MS-Exchange-CrossTenant-AuthSource: VI1PR07MB5216.eurprd07.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 29 Sep 2020 08:46:17.7512 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: zBWfwooWu25hyiUDZs59r2dvjcvYhdPf1h6cuBOeNvvL29Ia7wqgYP07fG2qlHjUnGqqjmcqJwK3RBBUyYD5KvKdZYmVNDvxe67IAit8zrf0JnqFjWkWge8mkQ5pmk4b X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0702MB3805 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200929_044622_673573_88F0D4A4 X-CRM114-Status: GOOD ( 16.20 ) X-Spam-Score: -1.4 (-) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-1.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [2a01:111:f400:fe0e:0:0:0:725 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.0 MSGID_FROM_MTA_HEADER Message-Id was added by a relay -0.7 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org arm64 has no means to define behavior if CONFIG_CMDLINE is set as e.g. arm32 has. Parts of the kernel will ignore CMDLINE if behavior on how to treat is not specified, e.g.: drivers/of/fdt.c:early_init_dt_scan_chosen: #ifdef CONFIG_CMDLINE #if defined(CONFIG_CMDLINE_EXTEND) strlcat(data, " ", COMMAND_LINE_SIZE); strlcat(data, CONFIG_CMDLINE, COMMAND_LINE_SIZE); #elif defined(CONFIG_CMDLINE_FORCE) strlcpy(data, CONFIG_CMDLINE, COMMAND_LINE_SIZE); #else /* No arguments from boot loader, use kernel's cmdl*/ if (!((char *)data)[0]) strlcpy(data, CONFIG_CMDLINE, COMMAND_LINE_SIZE); #endif #endif /* CONFIG_CMDLINE */ Sync behavior of arm64 with arm32 (and other platforms). Signed-off-by: Matija Glavinic Pecotic --- arch/arm64/Kconfig | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 6d232837cbee..0a03db76aa5a 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1824,14 +1824,32 @@ config CMDLINE entering them here. As a minimum, you should specify the the root device (e.g. root=/dev/nfs). +choice + prompt "Kernel command line type" if CMDLINE != "" + default CMDLINE_FROM_BOOTLOADER + depends on ATAGS + +config CMDLINE_FROM_BOOTLOADER + bool "Use bootloader kernel arguments if available" + help + Uses the command-line options passed by the boot loader. If + the boot loader doesn't provide any, the default kernel command + string provided in CMDLINE will be used. + +config CMDLINE_EXTEND + bool "Extend bootloader kernel arguments" + help + The command-line arguments provided by the boot loader will be + appended to the default kernel command string. + config CMDLINE_FORCE bool "Always use the default kernel command string" - depends on CMDLINE != "" help Always use the default kernel command string, even if the boot loader passes other arguments to the kernel. This is useful if you cannot or don't want to change the command-line options your boot loader passes to the kernel. +endchoice config EFI_STUB bool