From patchwork Tue Dec 11 14:08:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 10723873 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7291115A6 for ; Tue, 11 Dec 2018 14:08:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5B9562A8BB for ; Tue, 11 Dec 2018 14:08:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4A9DA2A915; Tue, 11 Dec 2018 14:08:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E01902A8BB for ; Tue, 11 Dec 2018 14:08:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.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=92UZmTkejHAJ1abKwvNi5zckCebBY+9gTMeaDof4bWg=; b=Uf73BoSk8DYPvE YMm9DdtRxkIkgw3kMio0EsBEPvytsmWF/lGS+otgjqDsHHlGb3xt9uLjucjIeMDrS6i23CHPFHCWO I7nmTGqikGRyFUbyKZLaigjK7npbS0uXj/JYSbB/wdXKkc179bT7p5FdnB95FZHohHkhozSRSGx4Z OIwvJ1fHofnN0EdAI3jvmz8Dz++CiBNIwn2/WQgpXJDUwH2FFqs0fctg+l+E8eesmlsJfeDB5x9PR UaF6uaUCnKHbFpERuqX0989CjAMqOS00J+FFT+YiGDkzENCmjdpkQuyArpbkztfc5Yd/j5WMHb8jr ky1TxG/js0KxQ8+uA/HQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gWiiQ-0003RY-OW; Tue, 11 Dec 2018 14:08:50 +0000 Received: from mout.kundenserver.de ([212.227.17.24]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gWiiM-0003Qt-W3 for linux-arm-kernel@lists.infradead.org; Tue, 11 Dec 2018 14:08:48 +0000 Received: from wuerfel.lan ([109.192.41.194]) by mrelayeu.kundenserver.de (mreue108 [212.227.15.145]) with ESMTPA (Nemesis) id 1MBDrM-1gbi7L3ghq-00Chw4; Tue, 11 Dec 2018 15:08:34 +0100 From: Arnd Bergmann To: Catalin Marinas , Will Deacon Subject: [PATCH] arm64: fix ARM64_USER_VA_BITS_52 builds Date: Tue, 11 Dec 2018 15:08:10 +0100 Message-Id: <20181211140832.567893-1-arnd@arndb.de> X-Mailer: git-send-email 2.20.0 MIME-Version: 1.0 X-Provags-ID: V03:K1:W8udSShYvyH2j34sw3w7eYzyrXFcmW0ipO2ab2+4cFO+lUFO9yo 4vEbNhJVXBnPirMSNGxF751ms+Suxfl+yOtttZuU5MELGbWxgbWM2CrtN0x0qNMTZo5WXvv axMny95TG9XcnYKiDdvtTCxgrO/HPPrhf+28pI/V1UIDDFhZAlliyNALydz2NcdWKowgibs GJ2IiBly6lUU0aRqchL8Q== X-UI-Out-Filterresults: notjunk:1;V03:K0:N1Qpeb7539s=:8xA3AuLjgt8wwTfIBajXLl vnJtF7/Q4d5RLcKyEy1IUiQKxudnhmgjGJ+GzTLGgA1FWJrYHPu/TGEygNWugRDdDRVswc2i2 SJzxmdzg59rTxyBpNZZCXiu6X9tRdL2g3P7rLvnWVPWwtRpxI5FGTovyEicHTnVB9W18BwGqW 2zPCnD47e8JOzKxUZ3ZWeSBYNwGzH7yOwysMvCGQzr9Jj4XgDui2QJFtHyEGbw3R916xsKab4 k+MrjpcnKlA4wfJACRS2yPSEzBZhwpO7rfxZcqdDLwVpD+xXGx6BWaXXrLsQ9zpgmQyDvAGXU pQX6u0flb8d37zeB5WyMY87Pwj2hXXX6gHUIRdz6s3kJdegY7eTWraJ/tRYdXjWDWNqnTEaS/ TkVfPUN+V6lv6iEYeiwYEoPIGC/NMEMZJ/Vaolxilcy5zNVVls+RQc7ZzlNyS/jub+xw1cv19 41drbp2H8aIRdLuyTYUtMnhu3lmh3g0eVfhzMEWgCr2uDURP98wq91p/5oPExBTPaRS4kpSP+ 4tdeW5U9xRvYB2aHepNJkdjSxseICkaQPbQkwK09rt3phB96K946Yn4fFFyOFRoHKAW9LKUUn GceU417td5P+UJG6QW+kuMK3WICqxVqh42v5ezh+KxTYZnGiwcZNFB9LW3oabW6H2dBmwZhGv gzYJmyXwRLNsXPHoNuuPJySK2LmWCN2F4/JXKQhOaCw0fBI+OTfq7+f/2HxX7Ir0/Yy6HEevg PXj1AKT32QBZYeLklYKnG9JjUjBlQShW4YNL7A== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181211_060847_334545_8DED3B34 X-CRM114-Status: GOOD ( 12.22 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-arm-kernel@lists.infradead.org, Kristina Martsenko , Arnd Bergmann , linux-kernel@vger.kernel.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP In some randconfig builds, the new CONFIG_ARM64_USER_VA_BITS_52 triggered a build failure: arch/arm64/mm/proc.S:287: Error: immediate out of range As it turns out, we were incorrectly setting PGTABLE_LEVELS here, lacking any other default value. This fixes the calculation of CONFIG_PGTABLE_LEVELS to consider all combinations again. Fixes: 68d23da4373a ("arm64: Kconfig: Re-jig CONFIG options for 52-bit VA") Signed-off-by: Arnd Bergmann --- arch/arm64/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index df201d93697d..a0f3b921b6e6 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -278,7 +278,7 @@ config PGTABLE_LEVELS int default 2 if ARM64_16K_PAGES && ARM64_VA_BITS_36 default 2 if ARM64_64K_PAGES && ARM64_VA_BITS_42 - default 3 if ARM64_64K_PAGES && ARM64_VA_BITS_48 + default 3 if ARM64_64K_PAGES && (ARM64_VA_BITS_48 || ARM64_USER_VA_BITS_52) default 3 if ARM64_4K_PAGES && ARM64_VA_BITS_39 default 3 if ARM64_16K_PAGES && ARM64_VA_BITS_47 default 4 if !ARM64_64K_PAGES && ARM64_VA_BITS_48