From patchwork Tue Jan 23 14:53:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 13527567 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 C1ED6C47DDF for ; Tue, 23 Jan 2024 14:58:45 +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:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=bw5TRtLuT6DbHWroTajIAKCahrYx6Z2lhcZa5gp/42Y=; b=MXnTC9G60gsWgHCQZh+fyT1YYQ 04BZ0dud8mD/0sV2zZV2PstYt1XSSSArYMyMQDgGWiPEVMuvPqztJS0TsY6nPJDdpXxfu9fnRCWFc Yfhc0xEoBAMov1GQeNqhqljmjXpwQzdh4VFpMwPpLeuA3hpaK/Vp1zm3WbNoQxGzfzMLXdh07NqDO q9Tz2DppbPOc+y89I3GZlug1ourDkxhMthdahwiYTBojkUt4WNpLDJ9PCZ7NAgEPPH54W2U4Lmw/K zuTD3CNF80TBTxeGybM+jbIaXXshJ9q1eOdVmtyNHy1X80SZafvz45f07NVX23+007Fys/Koc2DMf gCHtu+UQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rSIEG-00GvlB-31; Tue, 23 Jan 2024 14:58:20 +0000 Received: from mail-wm1-x34a.google.com ([2a00:1450:4864:20::34a]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rSICK-00GuZ7-02 for linux-arm-kernel@lists.infradead.org; Tue, 23 Jan 2024 14:56:29 +0000 Received: by mail-wm1-x34a.google.com with SMTP id 5b1f17b1804b1-40eba1f0aa7so7406835e9.1 for ; Tue, 23 Jan 2024 06:56:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1706021778; x=1706626578; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=YAtMtSzzHj/aOMSOynry5N3eY6xWLMEJNhIxiRZ9cZY=; b=3WBYlA5raDan83m8CZB4oTiq/RB56kBNWfR6p9WzXM2ZMomUf56JzDqWCIY0hE4GoA +NbyLczZJ43lGrFpx6ygfxlG5xUGJQo5fSb8CB2u7oc+hhqqIr/QaJ9t6zPxTRkY3hCp tcsGtEom5Kl9iEHrXcSqV8W6Kb57deo1net9NkWLddEi/rr7SiSZ6UdG3pz2lgoeR0tc ZCvGB+xCMZf9HoSlQXmhQW6nypoOe+ORM6vR+PwIZoHLNhBqWDoEzRPRGZ2l6R/kU4jx aG9s7/tCAwOYQhkjSzcZCLCWSFzZ0vMwkjs7PrikuSq029WlPN1afA8f0+/lJevqHuFz Sg7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706021778; x=1706626578; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=YAtMtSzzHj/aOMSOynry5N3eY6xWLMEJNhIxiRZ9cZY=; b=SMs30Joal5bs0V8RdT1LDS3dLDS3H7P4C73TIiH01rNzVrdpJ+Mo41JIG4bldU+9/C IqhCwwXO/Zs9QtL/HXaJ/u5OhpLZ7BR9VTpY0mek6AYXfmuujV/zBX5keBW+m5YUzDVp 6HfKealty5d5Ph/3+2xDiYWtsL0pPwFL3tN91JmH0P1KbhbEhmE8TyIloDBOx8PbrtLA ni5ZFl0WgeUWBRnTFr/jRVtPvIm0N+gHluO0tNkcWfMv/KOc3ihEHOApcff/7smFvSuZ FCxbnwOJ86ybLQ719pIzEUO6IBsCTDjCgZ5Nw3vzrZ1tWvxerbg21urSBqoTsimT/pxs lewQ== X-Gm-Message-State: AOJu0YwSJ7bj1Zs7fUYotcZoSouo6zhUg/uchP9VgkPaqDFEeva0mmyr LvUYPxUOGxz+f1+4E8NY6+7XlSaSDu4vPJR3weJJp5JvP7RqTH8KMcwAa4pDQQAPl0CHFJcQIjU QX6SxGdtGCBbsiaSdg7PNXUVR8SiR1D9zYX61fBK1wenbnxKea4EcSB2N0wh51f0nc4xkcH6vy4 Wa8Jw0N4Q4F5+3eeFfqfFA0Bqimuxc+5A7s2GDMMqe X-Google-Smtp-Source: AGHT+IGiRlShTgiobv2CyzoXtIgq0D8ahIT750HaszdPHUtSxMWL5vA6rES5zgduY39jqub1mG2ILawm X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a05:600c:4f03:b0:40e:9d0e:afb9 with SMTP id l3-20020a05600c4f0300b0040e9d0eafb9mr58564wmq.8.1706021778073; Tue, 23 Jan 2024 06:56:18 -0800 (PST) Date: Tue, 23 Jan 2024 15:53:49 +0100 In-Reply-To: <20240123145258.1462979-52-ardb+git@google.com> Mime-Version: 1.0 References: <20240123145258.1462979-52-ardb+git@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=1389; i=ardb@kernel.org; h=from:subject; bh=Nt8HrrLf++z1DB/ZA+SeVw3ieMM9IjuVCi2o2T++cu0=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JIXX9ZUbfMwceXzDbxD/78qTkaV945SzOvllT9SxnpvSKi BtdTG1rO0pZGMQ4GGTFFFkEZv99t/P0RKla51myMHNYmUCGMHBxCsBE2iwY/ud/fcHnvqUyZs/Z m7Mc9dPrZp51zfJI/r+4+eIzN/UFIl8ZGfavWK7HuW7+pEC91ZwR3x++0Vnv55nhOn/+dKO/Z8K fejIBAA== X-Mailer: git-send-email 2.43.0.429.g432eaa2c6b-goog Message-ID: <20240123145258.1462979-102-ardb+git@google.com> Subject: [PATCH v7 50/50] arm64: Set the default CONFIG_ARM64_VA_BITS_52 in Kconfig rather than defconfig From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Cc: Ard Biesheuvel , Catalin Marinas , Will Deacon , Marc Zyngier , Mark Rutland , Ryan Roberts , Anshuman Khandual , Kees Cook X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240123_065620_072453_737BB905 X-CRM114-Status: GOOD ( 11.27 ) 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 From: Catalin Marinas Currently the "Virtual address space size" arch/arm64/Kconfig menu entry sets different defaults for each page size. However, all are overridden by the defconfig to 52-bit. Set the actual default in Kconfig and remove the defconfig line. Signed-off-by: Catalin Marinas --- arch/arm64/Kconfig | 4 +--- arch/arm64/configs/defconfig | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 403fc2707700..7761ffc6dbcf 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -1283,9 +1283,7 @@ endchoice choice prompt "Virtual address space size" - default ARM64_VA_BITS_39 if ARM64_4K_PAGES - default ARM64_VA_BITS_47 if ARM64_16K_PAGES - default ARM64_VA_BITS_42 if ARM64_64K_PAGES + default ARM64_VA_BITS_52 help Allows choosing one of multiple possible virtual address space sizes. The level of translation table is determined by diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index c5919a762109..f086b0624ec8 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -76,7 +76,6 @@ CONFIG_ARCH_VEXPRESS=y CONFIG_ARCH_VISCONTI=y CONFIG_ARCH_XGENE=y CONFIG_ARCH_ZYNQMP=y -CONFIG_ARM64_VA_BITS_52=y CONFIG_SCHED_MC=y CONFIG_SCHED_SMT=y CONFIG_NUMA=y