From 8057db02c3164ff2b6c2bc4333992b47998c4cd5 Mon Sep 17 00:00:00 2001 From: Amit Kucheria Date: Tue, 14 Jun 2016 17:40:10 +0100 Subject: [PATCH 1/2] {noup} distro.config: Switch to 64K pages Required by CentOS[1] This might affect IO performance and use up more memory and isn't ideal for non-enterprise boards. In the future, this should be a ERP config only. [1] https://bugs.linaro.org/show_bug.cgi?id=2323 Signed-off-by: Amit Kucheria --- arch/arm64/configs/distro.config | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/arch/arm64/configs/distro.config b/arch/arm64/configs/distro.config index f8becea4a8dc4a..f33fbc099c765c 100644 --- a/arch/arm64/configs/distro.config +++ b/arch/arm64/configs/distro.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 4.4.8 Kernel Configuration +# Linux/arm64 4.4.11 Kernel Configuration # CONFIG_ARM64=y CONFIG_64BIT=y @@ -29,7 +29,7 @@ CONFIG_IOMMU_HELPER=y CONFIG_KERNEL_MODE_NEON=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_ARM64_INDIRECT_PIO=y -CONFIG_PGTABLE_LEVELS=3 +CONFIG_PGTABLE_LEVELS=2 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" CONFIG_IRQ_WORK=y CONFIG_BUILDTIME_EXTABLE_SORT=y @@ -410,12 +410,12 @@ CONFIG_ARM64_ERRATUM_845719=y CONFIG_ARM64_ERRATUM_843419=y CONFIG_CAVIUM_ERRATUM_22375=y CONFIG_CAVIUM_ERRATUM_23154=y -CONFIG_ARM64_4K_PAGES=y +# CONFIG_ARM64_4K_PAGES is not set # CONFIG_ARM64_16K_PAGES is not set -# CONFIG_ARM64_64K_PAGES is not set -CONFIG_ARM64_VA_BITS_39=y +CONFIG_ARM64_64K_PAGES=y +CONFIG_ARM64_VA_BITS_42=y # CONFIG_ARM64_VA_BITS_48 is not set -CONFIG_ARM64_VA_BITS=39 +CONFIG_ARM64_VA_BITS=42 # CONFIG_CPU_BIG_ENDIAN is not set CONFIG_SCHED_MC=y # CONFIG_SCHED_SMT is not set @@ -442,7 +442,6 @@ CONFIG_HAVE_ARCH_PFN_VALID=y CONFIG_HW_PERF_EVENTS=y CONFIG_SYS_SUPPORTS_HUGETLBFS=y CONFIG_ARCH_WANT_GENERAL_HUGETLB=y -CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_SELECT_MEMORY_MODEL=y CONFIG_SPARSEMEM_MANUAL=y @@ -489,7 +488,7 @@ CONFIG_FRAME_VECTOR=y CONFIG_SECCOMP=y CONFIG_XEN_DOM0=y CONFIG_XEN=y -CONFIG_FORCE_MAX_ZONEORDER=11 +CONFIG_FORCE_MAX_ZONEORDER=14 # CONFIG_ARMV8_DEPRECATED is not set # @@ -6499,7 +6498,6 @@ CONFIG_LUSTRE_FS=m CONFIG_LUSTRE_OBD_MAX_IOCTL_BUFFER=8192 # CONFIG_LUSTRE_DEBUG_EXPENSIVE_CHECK is not set CONFIG_LUSTRE_TRANSLATE_ERRNOS=y -CONFIG_LUSTRE_LLITE_LLOOP=m CONFIG_LNET=m CONFIG_LNET_MAX_PAYLOAD=1048576 CONFIG_LNET_SELFTEST=m @@ -7644,7 +7642,6 @@ CONFIG_STRICT_DEVMEM=y # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set CONFIG_DEBUG_SET_MODULE_RONX=y CONFIG_DEBUG_RODATA=y -# CONFIG_DEBUG_ALIGN_RODATA is not set CONFIG_CORESIGHT=y CONFIG_CORESIGHT_LINKS_AND_SINKS=y CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y From 25fbb734d73064de4384eca721108d95d2c84424 Mon Sep 17 00:00:00 2001 From: Amit Kucheria Date: Wed, 15 Jun 2016 17:01:51 +0100 Subject: [PATCH 2/2] {noup} distro.config: Enable the Hisilicon clock stub driver in order for thermal to work Signed-off-by: Amit Kucheria --- arch/arm64/configs/distro.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/configs/distro.config b/arch/arm64/configs/distro.config index f33fbc099c765c..60004b42eaf1c8 100644 --- a/arch/arm64/configs/distro.config +++ b/arch/arm64/configs/distro.config @@ -6573,7 +6573,7 @@ CONFIG_COMMON_CLK_PWM=m # CONFIG_COMMON_CLK_PXA is not set CONFIG_COMMON_CLK_CDCE706=m CONFIG_COMMON_CLK_HI6220=y -# CONFIG_STUB_CLK_HI6220 is not set +CONFIG_STUB_CLK_HI6220=y CONFIG_QCOM_GDSC=y CONFIG_QCOM_RPMCC=y CONFIG_COMMON_CLK_QCOM=y