From patchwork Wed Dec 13 17:07:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kristina Martsenko X-Patchwork-Id: 10110435 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 C070A602B3 for ; Wed, 13 Dec 2017 17:12:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A943628A19 for ; Wed, 13 Dec 2017 17:12:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9E24E28D04; Wed, 13 Dec 2017 17:12:50 +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 246A328A19 for ; Wed, 13 Dec 2017 17:12:50 +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=NVruOysCpVSiUP9yi5h3pPCMnksfSnmspcQmfcCgDPI=; b=DhaZ0rBblnQ8zJu40FPsNs5blJ TaJSLZR523jDDL0XvSX3v3uSBOgAKDWKwvNRsybC7hi4W/gATKReNUnBuctxpKM9ZQrVlmK3GOFXc F7NjgDjNU+vq4XJoZ0T4BWqv/0VPVL/bTm9aN1WsT7Ae374XTVw44r1FbVXLTA5wrlGtJur0d2At7 ukAyg5Zz/hvgG5MUkl8dLiE8guIM50BrdW5dzKEaUYAx5g5dIYk1QjHt/5bIqbW3wxJag+OQTBqqU kqUjCLPEI6mQsiPxiHl0aP9zg63Z2AQkJ7s0RwF0U+8DPsHEt1I4GRSSCiVEDG9399FQmQ7SZ19RJ 7VTKuYMQ==; 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 1ePAaP-0005NJ-4U; Wed, 13 Dec 2017 17:12:49 +0000 Received: from foss.arm.com ([217.140.101.70]) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1ePAXO-0000ys-El for linux-arm-kernel@lists.infradead.org; Wed, 13 Dec 2017 17:10:02 +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 77FBF1650; Wed, 13 Dec 2017 09:09: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 227FA3F246; Wed, 13 Dec 2017 09:09:10 -0800 (PST) From: Kristina Martsenko To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 07/10] arm64: increase PHYS_MASK to 52 bits Date: Wed, 13 Dec 2017 17:07:22 +0000 Message-Id: <1513184845-8711-8-git-send-email-kristina.martsenko@arm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1513184845-8711-1-git-send-email-kristina.martsenko@arm.com> References: <1513184845-8711-1-git-send-email-kristina.martsenko@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20171213_090943_277138_FBEC2923 X-CRM114-Status: UNSURE ( 7.61 ) 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: Steve Capper , Marc Zyngier , Catalin Marinas , Suzuki K Poulose , 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. (The kconfig option to set ARM64_PA_BITS to 52 will be added in a later patch.) Signed-off-by: Kristina Martsenko Reviewed-by: Suzuki K Poulose --- 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 60e0432df559..03fe82057bd1 100644 --- a/arch/arm64/include/asm/pgtable-hwdef.h +++ b/arch/arm64/include/asm/pgtable-hwdef.h @@ -206,7 +206,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) /*