From patchwork Sat Jan 30 01:23:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dann frazier X-Patchwork-Id: 575981 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 215C2140216; Sun, 31 Jan 2016 01:06:47 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1aPWAh-0001U0-1a; Sat, 30 Jan 2016 14:06:39 +0000 Received: from complete.lackof.org ([198.49.126.79]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1aPKGI-0001Ly-TH for kernel-team@lists.ubuntu.com; Sat, 30 Jan 2016 01:23:39 +0000 Received: from localhost (c-107-2-141-92.hsd1.co.comcast.net [107.2.141.92]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by complete.lackof.org (Postfix) with ESMTPSA id 98A4933E0044 for ; Fri, 29 Jan 2016 18:23:35 -0700 (MST) Date: Fri, 29 Jan 2016 18:23:35 -0700 From: dann frazier To: kernel-team@lists.ubuntu.com Subject: [PATCH][Xenial] UBUNTU: [Config] CONFIG_ARM64_VA_BITS=48 Message-ID: <20160130012335.GA27534@fluid.dannf> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.24 (2015-08-30) X-Spam-Status: No, score=0.0 required=5.0 tests=UNPARSEABLE_RELAY autolearn=unavailable version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on complete.lackof.org X-Mailman-Approved-At: Sat, 30 Jan 2016 14:06:37 +0000 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com On NUMA implementations of Cavium ThunderX, node1 memory addresses start with bit 40 set to 1, and therefore requires >= 41 bits of VA. Since we are using 4K pages, this also means moving from 3 to 4 level page tables. The alternative would be increasing our page size. Upstream supports 16K and 64K pages; 16K pages are not universally supported by ARM64 SoCs. 64K pages are pretty universal, but has issues of it's own: https://bugs.launchpad.net/skipper/+bug/1522204 https://lists.ubuntu.com/archives/ubuntu-devel/2014-December/038572.html (and not an ideal change to introduce before an LTS) Signed-off-by: dann frazier --- debian.master/config/arm64/config.common.arm64 | 2 +- debian.master/config/config.common.ubuntu | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian.master/config/arm64/config.common.arm64 b/debian.master/config/arm64/config.common.arm64 index 70ab3c0..e98bd48 100644 --- a/debian.master/config/arm64/config.common.arm64 +++ b/debian.master/config/arm64/config.common.arm64 @@ -272,7 +272,7 @@ CONFIG_PCIPCWATCHDOG=m CONFIG_PCI_PASID=y CONFIG_PCI_PRI=y CONFIG_PCI_QUIRKS=y -CONFIG_PGTABLE_LEVELS=3 +CONFIG_PGTABLE_LEVELS=4 CONFIG_PGTABLE_MAPPING=y CONFIG_PHANTOM=m CONFIG_PHONET=m diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index a7de418..163e7af 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -499,9 +499,9 @@ CONFIG_ARM64_HW_AFDBM=y CONFIG_ARM64_PAN=y # CONFIG_ARM64_PTDUMP is not set # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set -CONFIG_ARM64_VA_BITS=39 -CONFIG_ARM64_VA_BITS_39=y -# CONFIG_ARM64_VA_BITS_48 is not set +CONFIG_ARM64_VA_BITS=48 +# CONFIG_ARM64_VA_BITS_39 is not set +CONFIG_ARM64_VA_BITS_48=y CONFIG_ARMADA375_USBCLUSTER_PHY=y CONFIG_ARMADA_370_CLK=y CONFIG_ARMADA_370_XP_TIMER=y