From patchwork Thu Sep 24 08:41:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Juerg Haefliger X-Patchwork-Id: 1370437 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4BxpVb4Jdkz9sTN; Thu, 24 Sep 2020 18:43:51 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1kLMqx-0007jx-PK; Thu, 24 Sep 2020 08:43:47 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kLMoK-0007VM-Ke for kernel-team@lists.ubuntu.com; Thu, 24 Sep 2020 08:41:04 +0000 Received: from mail-ej1-f71.google.com ([209.85.218.71]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1kLMoK-000177-Ct for kernel-team@lists.ubuntu.com; Thu, 24 Sep 2020 08:41:04 +0000 Received: by mail-ej1-f71.google.com with SMTP id b17so1013367ejb.20 for ; Thu, 24 Sep 2020 01:41:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=axA6xEtZM/a8DFuICBY234ZIJJ8AiOM+0tANugP1qkc=; b=VRj8cWSUvC25dkAX8dhOpP642GcstQDhSTSqVJpq3jzVlfRAtaCTjXo5Ax9kBybUNx m4NzjAUwwQ78RiP/4HhChVik2rq/ds/flxq+amGMNMm+RghvGURcnJeu7KuJB1yDpUsg LJXt3EzJV3ctUazk6lgqqpR4rZNxF4zPg6R1YDBG10V//FP2Lkyqk2ZVYQ9kKm6rqNSB Xu+bFN++a0LOLdbqz04J2YZ/Suh/xB2UlQrIkexy8513kJnWSKS5+QxRxLAQ5SGcTI3E hIi7/ZyK4xZMFcapSGAfLXk3iwJx6HsF5o2mf/BHv7LDl5Zap+UqzDmsC7lzO6hJGGX/ BXEw== X-Gm-Message-State: AOAM532PoFNbTXXsqMlHgZrhsKIZ/sJNsYa+1F1a0wL67OjLvPw8yavm jcGjLvHnM1/qRY2eUKzufgticayYD39QZaAPVtE0wahmiOs4nfLeq2eLxdpBF6qTddMl5NJGGTJ aWEYhHiWGJp73Ms+/D4fquu3AXAggvc0I/5VpFHcGPw== X-Received: by 2002:a50:d64f:: with SMTP id c15mr3450256edj.248.1600936863791; Thu, 24 Sep 2020 01:41:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyR9XI0bxqb9c+m9HhoDioW0u5a3ZRyHiNzkkaua2bZG97XTX0QmHpMNPo1tOHXk4n2voImAA== X-Received: by 2002:a50:d64f:: with SMTP id c15mr3450243edj.248.1600936863563; Thu, 24 Sep 2020 01:41:03 -0700 (PDT) Received: from gollum.fritz.box ([194.191.244.86]) by smtp.gmail.com with ESMTPSA id r10sm1921146edm.94.2020.09.24.01.41.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Sep 2020 01:41:03 -0700 (PDT) From: Juerg Haefliger X-Google-Original-From: Juerg Haefliger To: kernel-team@lists.ubuntu.com Subject: [SRU][G/raspi][PATCH 2/2] UBUNTU: [Config] raspi: Disable LPAE and HIGHMEM and set VMSPLIT_2G=y Date: Thu, 24 Sep 2020 10:41:00 +0200 Message-Id: <20200924084100.154538-3-juergh@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200924084100.154538-1-juergh@canonical.com> References: <20200924084100.154538-1-juergh@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 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" BugLink: https://bugs.launchpad.net/bugs/1896761 Disable LPAE and HIGHMEM for the new armhf raspi-nolpae flavor. In order to recoup the high memory, VM splitting needs to be changed to 2G/2G. Signed-off-by: Juerg Haefliger --- debian.raspi/config/arm64/config.common.arm64 | 2 +- debian.raspi/config/armhf/config.common.armhf | 4 +--- debian.raspi/config/armhf/config.flavour.raspi | 7 +++++++ debian.raspi/config/armhf/config.flavour.raspi-nolpae | 7 +++++++ debian.raspi/config/config.common.ubuntu | 9 ++++----- 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/debian.raspi/config/arm64/config.common.arm64 b/debian.raspi/config/arm64/config.common.arm64 index 5d425584285e..5e4f8d7e7175 100644 --- a/debian.raspi/config/arm64/config.common.arm64 +++ b/debian.raspi/config/arm64/config.common.arm64 @@ -5,7 +5,7 @@ CONFIG_ARCH_MMAP_RND_BITS=18 CONFIG_ARCH_MMAP_RND_BITS_MAX=33 CONFIG_ARCH_MMAP_RND_BITS_MIN=18 # CONFIG_BCM_VC_SM is not set -CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 10.2.0-3ubuntu1) 10.2.0" +CONFIG_CC_VERSION_TEXT="aarch64-linux-gnu-gcc (Ubuntu 10.2.0-8ubuntu1) 10.2.0" # CONFIG_FLATMEM_MANUAL is not set CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1 # CONFIG_PAGE_EXTENSION is not set diff --git a/debian.raspi/config/armhf/config.common.armhf b/debian.raspi/config/armhf/config.common.armhf index 8e0b4792b2da..3df201ef8b51 100644 --- a/debian.raspi/config/armhf/config.common.armhf +++ b/debian.raspi/config/armhf/config.common.armhf @@ -2,13 +2,11 @@ # Config options for config.common.armhf automatically generated by splitconfig.pl # CONFIG_ARCH_MMAP_RND_BITS=8 -CONFIG_ARCH_MMAP_RND_BITS_MAX=16 CONFIG_ARCH_MMAP_RND_BITS_MIN=8 CONFIG_BCM_VC_SM=y -CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (Ubuntu 10.2.0-3ubuntu1) 10.2.0" +CONFIG_CC_VERSION_TEXT="arm-linux-gnueabihf-gcc (Ubuntu 10.2.0-8ubuntu1) 10.2.0" CONFIG_FLATMEM_MANUAL=y CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6 CONFIG_PAGE_EXTENSION=y -CONFIG_PGTABLE_LEVELS=3 # CONFIG_RSI_DEBUGFS is not set # CONFIG_SPARSEMEM_MANUAL is not set diff --git a/debian.raspi/config/armhf/config.flavour.raspi b/debian.raspi/config/armhf/config.flavour.raspi index b5067dfa6252..512bbf3a1ac1 100644 --- a/debian.raspi/config/armhf/config.flavour.raspi +++ b/debian.raspi/config/armhf/config.flavour.raspi @@ -1,3 +1,10 @@ # # Config options for config.flavour.raspi automatically generated by splitconfig.pl # +CONFIG_ARCH_MMAP_RND_BITS_MAX=16 +CONFIG_ARM_LPAE=y +CONFIG_HIGHMEM=y +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_PGTABLE_LEVELS=3 +# CONFIG_VMSPLIT_2G is not set +CONFIG_VMSPLIT_3G=y diff --git a/debian.raspi/config/armhf/config.flavour.raspi-nolpae b/debian.raspi/config/armhf/config.flavour.raspi-nolpae index c1018162d0b9..90d69b8223e7 100644 --- a/debian.raspi/config/armhf/config.flavour.raspi-nolpae +++ b/debian.raspi/config/armhf/config.flavour.raspi-nolpae @@ -1,3 +1,10 @@ # # Config options for config.flavour.raspi-nolpae automatically generated by splitconfig.pl # +CONFIG_ARCH_MMAP_RND_BITS_MAX=15 +# CONFIG_ARM_LPAE is not set +# CONFIG_HIGHMEM is not set +CONFIG_PAGE_OFFSET=0x80000000 +CONFIG_PGTABLE_LEVELS=2 +CONFIG_VMSPLIT_2G=y +# CONFIG_VMSPLIT_3G is not set diff --git a/debian.raspi/config/config.common.ubuntu b/debian.raspi/config/config.common.ubuntu index 04f67c0f4460..8e86d22d0169 100644 --- a/debian.raspi/config/config.common.ubuntu +++ b/debian.raspi/config/config.common.ubuntu @@ -456,7 +456,6 @@ CONFIG_ARM_HAS_SG_CHAIN=y CONFIG_ARM_KPROBES_TEST=m CONFIG_ARM_L1_CACHE_SHIFT=6 CONFIG_ARM_L1_CACHE_SHIFT_6=y -CONFIG_ARM_LPAE=y CONFIG_ARM_MHU=m # CONFIG_ARM_MODULE_PLTS is not set CONFIG_ARM_PATCH_IDIV=y @@ -1358,6 +1357,7 @@ CONFIG_CPU_PABRT_V7=y CONFIG_CPU_PM=y CONFIG_CPU_RMAP=y CONFIG_CPU_SPECTRE=y +CONFIG_CPU_SW_DOMAIN_PAN=y CONFIG_CPU_THERMAL=y CONFIG_CPU_THUMB_CAPABLE=y CONFIG_CPU_TLB_V7=y @@ -1464,6 +1464,7 @@ CONFIG_CRYPTO_DEV_CCP_CRYPTO=m CONFIG_CRYPTO_DEV_CCP_DD=m # CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set CONFIG_CRYPTO_DEV_CCREE=m +# CONFIG_CRYPTO_DEV_HIFN_795X is not set # CONFIG_CRYPTO_DEV_HISI_SEC is not set # CONFIG_CRYPTO_DEV_NITROX_CNN55XX is not set # CONFIG_CRYPTO_DEV_SAFEXCEL is not set @@ -2902,7 +2903,6 @@ CONFIG_HID_WIIMOTE=m CONFIG_HID_XINMO=m CONFIG_HID_ZEROPLUS=m CONFIG_HID_ZYDACRON=m -CONFIG_HIGHMEM=y CONFIG_HIGHPTE=y CONFIG_HIGH_RES_TIMERS=y # CONFIG_HINIC is not set @@ -5208,7 +5208,6 @@ CONFIG_PACKET_DIAG=m CONFIG_PACKING=y CONFIG_PADATA=y CONFIG_PAGE_COUNTER=y -CONFIG_PAGE_OFFSET=0xC0000000 # CONFIG_PAGE_OWNER is not set CONFIG_PAGE_POISONING=y CONFIG_PAGE_POISONING_NO_SANITY=y @@ -7595,6 +7594,7 @@ CONFIG_USB_FOTG210_HCD=m # CONFIG_USB_FOTG210_UDC is not set CONFIG_USB_FTDI_ELAN=m # CONFIG_USB_FUNCTIONFS is not set +# CONFIG_USB_FUSB300 is not set CONFIG_USB_F_ACM=m CONFIG_USB_F_ECM=m CONFIG_USB_F_HID=m @@ -8177,8 +8177,7 @@ CONFIG_VLAN_8021Q_MVRP=y CONFIG_VMAP_STACK=y # CONFIG_VME_BUS is not set # CONFIG_VMSPLIT_1G is not set -# CONFIG_VMSPLIT_2G is not set -CONFIG_VMSPLIT_3G=y +# CONFIG_VMSPLIT_3G_OPT is not set # CONFIG_VMXNET3 is not set CONFIG_VM_EVENT_COUNTERS=y # CONFIG_VOP_BUS is not set