From patchwork Wed May 3 12:33:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Catalin Marinas X-Patchwork-Id: 13230139 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 9B43FC7EE23 for ; Wed, 3 May 2023 12:34:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :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=CVH3srMZldXoIKzTunXIR7IbjXSz6+ASvvoyQ/yhOLY=; b=NdYod5+gYtoVKu bInl9saBl7M3QUEHt/I9C4n6IWaCi37vO+aSBcYfNWQDzUv4WGGzDHaP7Entp8hVxN92WVHWQH+gz 8T+dasiEVI/KGZoiS3aMq2lqP3hzB4WCaK3oA5l+EciLRbztUqKzPtPCoiTG5PIm32srUjfZ8ez2S H4MnQmRFY+QeS9pRXA/whTw+EwEv4UYcdy4n88Eimjo2XsxbZEeXejR6u3lwE7qZao9S1I1bt5bDG e04np3Lu/I0Fs0ZafoOMm2yPhssgB+gOY+zgN4VfNd62w+f+l3wvszincRLDIu3MBLS7W3P+ZoXn2 oqnugiX5lHoAdmgfIKug==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1puBg5-004ZWd-2M; Wed, 03 May 2023 12:33:49 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1puBg3-004ZVW-0P for linux-arm-kernel@lists.infradead.org; Wed, 03 May 2023 12:33:48 +0000 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 7EDD962C5A; Wed, 3 May 2023 12:33:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C5337C433EF; Wed, 3 May 2023 12:33:44 +0000 (UTC) From: Catalin Marinas To: Will Deacon Cc: linux-arm-kernel@lists.infradead.org, "Justin M . Forbes" , Mike Rapoport , Andrew Morton Subject: [PATCH] arm64: Make the ARCH_FORCE_MAX_ORDER config input prompt unconditional Date: Wed, 3 May 2023 13:33:42 +0100 Message-Id: <20230503123342.90538-1-catalin.marinas@arm.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230503_053347_201350_82389D95 X-CRM114-Status: GOOD ( 14.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Commit 34affcd7577a ("arm64: drop ranges in definition of ARCH_FORCE_MAX_ORDER") dropped the ranges from the config entry and introduced an EXPERT condition on the input prompt instead. This change may affect some distro kernels that change ARCH_FORCE_MAX_ORDER but do not want to enable EXPERT. Drop EXPERT from the input prompt together with the (ARM64_4K_PAGES || ARM64_16K_PAGES) condition as the latter no longer makes sense after the ranges were removed. The latter makes all the page size configurations consistent w.r.t. ARCH_FORCE_MAX_ORDER. Fixes: 34affcd7577a ("arm64: drop ranges in definition of ARCH_FORCE_MAX_ORDER") Signed-off-by: Catalin Marinas Reported-by: Justin M. Forbes Cc: Will Deacon Cc: Mike Rapoport Cc: Andrew Morton Acked-by: Mike Rapoport (IBM) Acked-by: Justin M. Forbes --- arch/arm64/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index b1201d25a8a4..1867aba83ba3 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1516,7 +1516,7 @@ config XEN # 16K | 27 | 14 | 13 | 11 | # 64K | 29 | 16 | 13 | 13 | config ARCH_FORCE_MAX_ORDER - int "Order of maximal physically contiguous allocations" if EXPERT && (ARM64_4K_PAGES || ARM64_16K_PAGES) + int "Order of maximal physically contiguous allocations" default "13" if ARM64_64K_PAGES default "11" if ARM64_16K_PAGES default "10"