From patchwork Tue Nov 21 11:58:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Kristina_Mart=C5=A1enko?= X-Patchwork-Id: 10067993 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id B9365602B7 for ; Tue, 21 Nov 2017 12:01:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id AA64E292D0 for ; Tue, 21 Nov 2017 12:01:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9F1382932D; Tue, 21 Nov 2017 12:01:28 +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=-4.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 36CF5292D0 for ; Tue, 21 Nov 2017 12:01:28 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To: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:List-Owner; bh=c6PDW7WVbwNbEO1HskaYuRHrvkvXFyVL+pZzaZRM/Vs=; b=KtNr7EVOjMuPP7023uB4/2inTn RjJhzlecX1U7EnaAcRfr235QFIrRaNwCh55J+NaV7zjNLlNdodUCTyM979mUhQd8RHi7KEWY3Tsit ps/IknewK99o5zsyMn8dSUbJqZ8ep4Vkq9M+yHQSYDYDy8AqD+CCXU8v7xU4YWgxJDEaEAON3U6Nw GIPT16z+FN3gq/DQlTZKIkyaxAjx1QUFYxuTb0tJDybYBgLYlrfIt+P5VYhRVIq1AOe8YiroxGWiS 1V5YNNKRcz4wUrKYSp+LTJRp+9lAa8ynijPvaR+ZEgc4LLJ6dzSsfcxHyS9gsS+up1rUbTU/SYOEU dm0Jvdxg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eH7F1-0007RT-6L; Tue, 21 Nov 2017 12:01:27 +0000 Received: from foss.arm.com ([217.140.101.70]) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1eH7DG-0004O6-H8 for linux-arm-kernel@lists.infradead.org; Tue, 21 Nov 2017 11:59:46 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 869371682; Tue, 21 Nov 2017 03:59:12 -0800 (PST) Received: from moonbear.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.72.51.249]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 303AB3F236; Tue, 21 Nov 2017 03:59:11 -0800 (PST) From: Kristina Martsenko To: linux-arm-kernel@lists.infradead.org Subject: [RFC 7/9] arm64: increase PHYS_MASK to 52 bits Date: Tue, 21 Nov 2017 11:58:03 +0000 Message-Id: <1511265485-27163-8-git-send-email-kristina.martsenko@arm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1511265485-27163-1-git-send-email-kristina.martsenko@arm.com> References: <1511265485-27163-1-git-send-email-kristina.martsenko@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171121_035939_565440_3F03419C X-CRM114-Status: UNSURE ( 7.59 ) X-CRM114-Notice: Please train this message. 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: Suzuki K Poulose , Marc Zyngier , Catalin Marinas , Steve Capper , Will Deacon , Robin Murphy MIME-Version: 1.0 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 PHYS_MASK_SHIFT represents the highest possible physical address supported by the kernel, and is used in a number of places. In order to support 52-bit physical memory, increase PHYS_MASK_SHIFT to 52 when 52-bit physical memory is configured, and retain 48 if it is not, to e.g. keep IDMAP_PGTABLE_LEVELS accurate. Signed-off-by: Kristina Martsenko --- arch/arm64/include/asm/pgtable-hwdef.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h index 69cc40695164..ab3eddb2e21b 100644 --- a/arch/arm64/include/asm/pgtable-hwdef.h +++ b/arch/arm64/include/asm/pgtable-hwdef.h @@ -199,7 +199,7 @@ /* * Highest possible physical address supported. */ -#define PHYS_MASK_SHIFT (48) +#define PHYS_MASK_SHIFT (CONFIG_ARM64_PA_BITS) #define PHYS_MASK ((UL(1) << PHYS_MASK_SHIFT) - 1) /*