From patchwork Thu Feb 25 12:59:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 12104077 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=-12.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,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 EA70CC433DB for ; Thu, 25 Feb 2021 13:01: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 A783F64EB7 for ; Thu, 25 Feb 2021 13:01:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A783F64EB7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.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:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=/+I3tATRosvi/z3Ea9976WWkOqX3Lmsp+2BozG9Kwoo=; b=h/AQxQBELbN38770SqmgPOXi6I uZMH1URQXgMazNCi0xLPJfRZ2nQv1OM+mXa6GQeV2vRIBHUJb9hP+jO06GfNR+Ybp17JYANbr4EC9 d7ecJhD6S+TN/UOrQpSQ/AXXm1PzycxcpE8mnYz4fUMEbuq+rp6FTPdR+UTMMoZGpc2tmMrP1o8Kp C/iWcKsvk5/o/K4EyawNbdUq/KqG3h1YRWkTK2WHZOeKmD3hD9ZBLjITYT+zw4vMJyhFaWACj6Hbk BYCuSdYcxJoBBWlmsPLyQXyrT3jk/w5Bj801OtkL2blbRFdEYQsvw8dPgJ3yZI4WG+v75ak56w5Gp jvFPCauQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lFGEx-0007Of-V9; Thu, 25 Feb 2021 12:59:35 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lFGEv-0007OK-3K for linux-arm-kernel@lists.infradead.org; Thu, 25 Feb 2021 12:59:34 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 6A01764EFA; Thu, 25 Feb 2021 12:59:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1614257972; bh=sVUg7LiguqcAc8O/ICFWYVfi3WzvdjvcCH+R66oxjlk=; h=From:To:Cc:Subject:Date:From; b=lC9MrLm/fRZoB0WLRNBw/KxUmlpZgIY8aDrybkAQuCAHogZHj5NKB4MZ4fkRPZEN8 kZfN8GEMe0l80eC1zj+/kDnKvIZaDIdOukn0640F1YTbeusEFccn1IU67uiF4BK9mY 7qwv04zcrXkLFhgx8fZ7HpFSD68c7URzRttq29JNf+aK17lNWyiwhrrMq2s7zaz246 sQxuTNqXDM6gYAObki0QGn4Gj+h25t6t6+6vt4kPwcWQCxaVb5JaTJ++2zTR3+6pn5 WxAeoXlCzLbN8vmcldJaRSUL9SR3dgl5LqAq4GSzWYITJko9ijyRTui/XB/FOZepoz ZrcSaMf4VWqXA== From: Will Deacon To: linux-kernel@vger.kernel.org Subject: [PATCH 0/2] Fix CMDLINE_EXTEND handling for FDT "bootargs" Date: Thu, 25 Feb 2021 12:59:19 +0000 Message-Id: <20210225125921.13147-1-will@kernel.org> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210225_075933_276114_E4BF1BAA X-CRM114-Status: GOOD ( 13.58 ) 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: , Cc: Rob Herring , kernel-team@android.com, Catalin Marinas , Arnd Bergmann , Frank Rowand , devicetree@vger.kernel.org, Marc Zyngier , Doug Anderson , Tyler Hicks , Palmer Dabbelt , Greg Kroah-Hartman , Max Uvarov , Will Deacon , Ard Biesheuvel , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi folks, We recently [1] enabled support for CMDLINE_EXTEND on arm64, however when I started looking at replacing Android's out-of-tree implementation [2] with the upstream version, I noticed that the two behave significantly differently: Android follows the Kconfig help text of appending the bootloader arguments to the kernel command line, whereas upstream appends the kernel command line to the bootloader arguments. That is, except for the EFI stub, which follows the documented behaviour. I think the documented behaviour is more useful, so this patch series reworks the FDT code to follow that and updates the very recently merged arm64 idreg early command-line parsing as well. I'd like to take the first patch as a fix via the arm64 tree. Cheers, Will [1] https://lore.kernel.org/r/160650434702.20875.12520970127987518808.b4-ty@arm.com [2] https://android-review.googlesource.com/c/kernel/common/+/841045 --->8 Cc: Max Uvarov Cc: Rob Herring Cc: Ard Biesheuvel Cc: Marc Zyngier Cc: Doug Anderson Cc: Tyler Hicks Cc: Frank Rowand Cc: Arnd Bergmann Cc: Palmer Dabbelt Cc: Greg Kroah-Hartman Cc: Catalin Marinas Cc: Cc: Cc: Will Deacon (2): arm64: cpufeatures: Fix handling of CONFIG_CMDLINE for idreg overrides of/fdt: Append bootloader arguments when CMDLINE_EXTEND=y arch/arm64/kernel/idreg-override.c | 44 +++++++++++--------- drivers/of/fdt.c | 64 ++++++++++++++++++------------ 2 files changed, 64 insertions(+), 44 deletions(-)