From patchwork Wed Feb 14 12:29:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 13556556 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 EF234C48BED for ; Wed, 14 Feb 2024 13:46:09 +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=2enxzlDlrDDJx/F606k3xT1h1yorPzHkZbsyP93R/tY=; b=0yFb8s3SIZB9RfCioGIefx8S5w l/Uw6/iLFRqFJPK09BiIzjvz5F2DYD5tdNhLUe1p6bTsl3n3J5yCMqU5ybImYUXpL99xaZc29nvjv 4Ig3vkmpSdTlIzXCBCO4KiVHm9WZr+giZVrY3jfA97ARIpIo0HwU0/yYtanUhSYapJ16fcD/xgqDN OQdlj0Li48hzyGi4S2A4qbXvwGsWqCqiawXr6YduofH2ESgIqNdwhWMbm3vZMuf453P5it8cHRGOT lRVSYxWbK9gnNiMVpX95CtSvuNpIypQdFYmyHAsevzOqMa34C31eoJRx1bNzHlLJDnsEAh/SlZCLw ya0ercVQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1raFaF-0000000D3ms-166U; Wed, 14 Feb 2024 13:45:55 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1raEQ4-0000000CpB8-02Tz for linux-arm-kernel@bombadil.infradead.org; Wed, 14 Feb 2024 12:31:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Type:Cc:To:From:Subject: Message-ID:References:Mime-Version:In-Reply-To:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=ClhD0NSsYlTr7bluMBx07QxrI8tCVIrAUfifP//bQl8=; b=ImXd9t15Mvz6s+L1w3qqgsbOub YZh9d6qh6MLSXlGvwt2q+qlOOfd8n9gWHLzzoQsDrSZHawRTBi6mhI8/szFPLoXIVJ66321jBrOOx c3p58fpFKc2ssko/RXyjOebjA6fDKEkslSqDP6EuWqMMIz+ETg8BijH14qOMC7Qh3jISkh3FSbbsn H8kGC3EzTpbvDXLW3KuksWLvKhw2990v/CIiPTfX8ETofJ/wV2B/2MKTJuuyF2D1eUkSGs0t1HY05 bXocc5VZ9i5P9/CgFkztxLPsoNPkWnh/0/ljNlSWjNXprJRTi0BsDVGABgPh1DROxK/2CxwzyT1lx axG9GiGg==; Received: from mail-wm1-x349.google.com ([2a00:1450:4864:20::349]) by desiato.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1raEPz-0000000GEGT-0U8l for linux-arm-kernel@lists.infradead.org; Wed, 14 Feb 2024 12:31:18 +0000 Received: by mail-wm1-x349.google.com with SMTP id 5b1f17b1804b1-41082621642so25910045e9.1 for ; Wed, 14 Feb 2024 04:31:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1707913873; x=1708518673; 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=ClhD0NSsYlTr7bluMBx07QxrI8tCVIrAUfifP//bQl8=; b=1FYhyCkmPbzuV7JzmxmGqytUT+2b6Lqx/trvFNyfQP1gQGde7Bd2wVND2RWSLAtqus cb3RrRXOzaqFotCJj+sUk5cNbyJsGGrA68nkOGKCqF6zR18Jxp5L4FuY7QMt7DjIq9XR tQ/XzZA9T6qgWKkMuSn3UsfMbNhlixQHgr7IebY9/I7otF5Hqhbx8xCbijLvo2FaVZER zNIGqhBtluimEyeyRr0rMkmTJbVbmcqXLfPAI6aPsMF7k+Un4u9m0C++YNmvLVAulHTJ G2cZrZlESLPNv+ouGrt/LXxHKb1r3BCXhaIYvk+2fK3G7D3kDHN9YZh9SNNHN2u6ZmS3 esfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707913873; x=1708518673; 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=ClhD0NSsYlTr7bluMBx07QxrI8tCVIrAUfifP//bQl8=; b=Ag0AF+xMtZAiGgdwWG8YHaX1B5GR2j314hCpwKNNKjieZ1vpjdLKT4iIkWcMhdfS50 4emQKGPDDlwVOGcdaHMFpxYdMuMzQbK2PDeSYGdnFQ7c4YqT2Oc9q0XM0FctCprtm9TT sGYJm1IoFTDiQBdYj4jJp+QOGNk1wFwdPwK23ibNa0xWq7hXVZMmXtpe3Hia+erywd2H TgOeWHbuusIm69tl18721ktcWILuWF5XJzlUtlbDlKlZTHb0E9WeZXvSs73AQbaE3jLz HuDoGHD6D0lZBy1sDgvIaihkBYpCO25se5ryYEmdvqkjt05jHyFxSj2i/UR7qVKtTxdp ErHg== X-Gm-Message-State: AOJu0Yz6qSwY0/L8fNJvKe27G37xr3rxqq8H16e8CEvQTF0npcZoTuJi 8JNVS2uNLYI8pzy/tiGUlP6ZZ6U+jYebh9HNXw6upPv6+R8S1d3uZpMNjzxr4SRrNWHS77MmMAa Dfc4ypic4cwpK4mG3yY1U7AIsUnQ58zGiFtgfG+UuTSyoQEe7BnCSytJSp0aWX3kU+DD/nrZN0R 9Q/+i3UQ/x6PV8pt4OHinxTcMaqCatYYXu3/SQvAx8 X-Google-Smtp-Source: AGHT+IHXEdG7RNcKBM/G+uiitJHWqc0uB6b3odQk/nfzrZKZOb4B0Ix8//zcNsVrEZG/bEUuuAPRoDp1 X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:adf:9d86:0:b0:33b:572e:f3e9 with SMTP id p6-20020adf9d86000000b0033b572ef3e9mr4422wre.11.1707913873035; Wed, 14 Feb 2024 04:31:13 -0800 (PST) Date: Wed, 14 Feb 2024 13:29:27 +0100 In-Reply-To: <20240214122845.2033971-45-ardb+git@google.com> Mime-Version: 1.0 References: <20240214122845.2033971-45-ardb+git@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=1817; i=ardb@kernel.org; h=from:subject; bh=wSCVJMsF5sIMH/ZpkCQee+AWR9d+TwJvuhMzvHxCsfU=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JIfXMJq2VMpJn74f8mBlxznTf+anfzATbH+SZfgkr5jDeJ 9Uy+Wh0RykLgxgHg6yYIovA7L/vdp6eKFXrPEsWZg4rE8gQBi5OAZiIsysjw5efN4Wmci1QetG2 M4lf0WPKuzf//8avvRAZJri17tF8sf0Mf4XSFjFUfG3xvhOvU5jnebnuue0sLcZX2Y1hd97e11O dyQUA X-Mailer: git-send-email 2.43.0.687.g38aa6559b0-goog Message-ID: <20240214122845.2033971-86-ardb+git@google.com> Subject: [PATCH v8 41/43] arm64: defconfig: Enable LPA2 support 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-20240214_123115_359669_9869B369 X-CRM114-Status: GOOD ( 12.64 ) 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: Ard Biesheuvel We typically enable support in defconfig for all architectural features for which we can detect at runtime if the hardware actually supports them. Now that we have implemented support for LPA2 based 52-bit virtual addressing in a way that should not impact 48-bit operation on non-LPA2 CPU, we can do the same, and enable 52-bit virtual addressing by default. Catalin adds: 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 48 bits. Set the new default in Kconfig and remove the defconfig line. [ardb: squash follow-up fix from Catalin] Signed-off-by: Ard Biesheuvel --- 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 eed8fef08a10..160856de9bbb 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 e6cf3e5d63c3..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_48=y CONFIG_SCHED_MC=y CONFIG_SCHED_SMT=y CONFIG_NUMA=y