From 0c95644fe932eb0ce2d3474ddba88092dbe85344 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Sun, 6 Aug 2017 21:40:49 +0000
Subject: [PATCH] core/linux-aarch64 to 4.12.5-1

---
 core/linux-aarch64/99-linux.hook         | 11 +++++++++++
 core/linux-aarch64/PKGBUILD              | 16 +++++++++++-----
 core/linux-aarch64/config                | 24 ++++++++++++++----------
 core/linux-aarch64/linux-aarch64.install |  4 +---
 4 files changed, 37 insertions(+), 18 deletions(-)
 create mode 100644 core/linux-aarch64/99-linux.hook

diff --git a/core/linux-aarch64/99-linux.hook b/core/linux-aarch64/99-linux.hook
new file mode 100644
index 000000000..219e2d558
--- /dev/null
+++ b/core/linux-aarch64/99-linux.hook
@@ -0,0 +1,11 @@
+[Trigger]
+Type = File
+Operation = Install
+Operation = Upgrade
+Target = boot/Image
+Target = usr/lib/initcpio/*
+
+[Action]
+Description = Updating %PKGBASE% initcpios
+When = PostTransaction
+Exec = /usr/bin/mkinitcpio -p %PKGBASE%
diff --git a/core/linux-aarch64/PKGBUILD b/core/linux-aarch64/PKGBUILD
index dd59d9b19..a3570b488 100644
--- a/core/linux-aarch64/PKGBUILD
+++ b/core/linux-aarch64/PKGBUILD
@@ -7,7 +7,7 @@ pkgbase=linux-aarch64
 _srcname=linux-4.12
 _kernelname=${pkgbase#linux}
 _desc="AArch64 multi-platform"
-pkgver=4.12.4
+pkgver=4.12.5
 pkgrel=1
 arch=('aarch64')
 url="http://www.kernel.org/"
@@ -18,12 +18,14 @@ source=("http://www.kernel.org/pub/linux/kernel/v4.x/${_srcname}.tar.xz"
         "http://www.kernel.org/pub/linux/kernel/v4.x/patch-${pkgver}.xz"
         '0001-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch'
         'config'
-        'linux.preset')
+        'linux.preset'
+        '99-linux.hook')
 md5sums=('fc454157e2d024d401a60905d6481c6b'
-         '8b701bde9ab905f36c9917a6afdfb3e5'
+         '0993b69927d19e4f2b52d99670a95d07'
          '1d852d09fa6ec38017b3ebe631c02d32'
-         '4fa881c77f74764353778daa83642145'
-         'b5ef67d6086e20de7b82265f562f88b1')
+         '995088b1124c70637b550f9b489b0874'
+         'b5ef67d6086e20de7b82265f562f88b1'
+         '1d4477026533efaa0358a40855d50a83')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
@@ -111,6 +113,10 @@ _package() {
     -e "s|ALL_kver=.*|ALL_kver=\"${_kernver}\"|" \
     -i "${pkgdir}/etc/mkinitcpio.d/${pkgbase}.preset"
 
+  # install pacman hook for initramfs regeneration
+  sed "s|%PKGBASE%|${pkgbase}|g" "${srcdir}/99-linux.hook" |
+    install -D -m644 /dev/stdin "${pkgdir}/usr/share/libalpm/hooks/99-${pkgbase}.hook"
+
   # remove build and source links
   rm -f "${pkgdir}"/lib/modules/${_kernver}/{source,build}
   # remove the firmware
diff --git a/core/linux-aarch64/config b/core/linux-aarch64/config
index 83eca8d60..a559c21a3 100644
--- a/core/linux-aarch64/config
+++ b/core/linux-aarch64/config
@@ -1,16 +1,16 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.12.0-rc5-1 Kernel Configuration
+# Linux/arm64 4.12.5-1 Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
 CONFIG_ARCH_PHYS_ADDR_T_64BIT=y
 CONFIG_MMU=y
-CONFIG_ARM64_PAGE_SHIFT=16
-CONFIG_ARM64_CONT_SHIFT=5
-CONFIG_ARCH_MMAP_RND_BITS_MIN=14
-CONFIG_ARCH_MMAP_RND_BITS_MAX=29
-CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=7
+CONFIG_ARM64_PAGE_SHIFT=12
+CONFIG_ARM64_CONT_SHIFT=4
+CONFIG_ARCH_MMAP_RND_BITS_MIN=18
+CONFIG_ARCH_MMAP_RND_BITS_MAX=33
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
 CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
 CONFIG_STACKTRACE_SUPPORT=y
 CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
@@ -32,7 +32,7 @@ CONFIG_SWIOTLB=y
 CONFIG_IOMMU_HELPER=y
 CONFIG_KERNEL_MODE_NEON=y
 CONFIG_FIX_EARLYCON_MEM=y
-CONFIG_PGTABLE_LEVELS=3
+CONFIG_PGTABLE_LEVELS=4
 CONFIG_ARCH_SUPPORTS_UPROBES=y
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
 CONFIG_IRQ_WORK=y
@@ -490,10 +490,10 @@ CONFIG_CAVIUM_ERRATUM_27456=y
 CONFIG_QCOM_FALKOR_ERRATUM_1003=y
 CONFIG_QCOM_FALKOR_ERRATUM_1009=y
 CONFIG_QCOM_QDF2400_ERRATUM_0065=y
-# CONFIG_ARM64_4K_PAGES is not set
+CONFIG_ARM64_4K_PAGES=y
 # CONFIG_ARM64_16K_PAGES is not set
-CONFIG_ARM64_64K_PAGES=y
-# CONFIG_ARM64_VA_BITS_42 is not set
+# CONFIG_ARM64_64K_PAGES is not set
+# CONFIG_ARM64_VA_BITS_39 is not set
 CONFIG_ARM64_VA_BITS_48=y
 CONFIG_ARM64_VA_BITS=48
 # CONFIG_CPU_BIG_ENDIAN is not set
@@ -519,6 +519,7 @@ CONFIG_ARCH_SELECT_MEMORY_MODEL=y
 CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_HW_PERF_EVENTS=y
 CONFIG_SYS_SUPPORTS_HUGETLBFS=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
 CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
 CONFIG_SELECT_MEMORY_MODEL=y
 CONFIG_SPARSEMEM_MANUAL=y
@@ -2816,6 +2817,7 @@ CONFIG_IEEE802154_FAKELB=m
 CONFIG_IEEE802154_ATUSB=m
 # CONFIG_IEEE802154_ADF7242 is not set
 # CONFIG_IEEE802154_CA8210 is not set
+# CONFIG_VMXNET3 is not set
 # CONFIG_FUJITSU_ES is not set
 # CONFIG_ISDN is not set
 # CONFIG_NVM is not set
@@ -6935,6 +6937,7 @@ CONFIG_MTK_EFUSE=m
 CONFIG_QCOM_QFPROM=m
 CONFIG_ROCKCHIP_EFUSE=m
 CONFIG_NVMEM_SUNXI_SID=m
+CONFIG_MESON_EFUSE=m
 # CONFIG_STM is not set
 # CONFIG_INTEL_TH is not set
 
@@ -6980,6 +6983,7 @@ CONFIG_EFI_BOOTLOADER_CONTROL=y
 # CONFIG_EFI_CAPSULE_LOADER is not set
 # CONFIG_EFI_TEST is not set
 # CONFIG_EFI_DEV_PATH_PARSER is not set
+CONFIG_MESON_SM=y
 
 #
 # Tegra firmware driver
diff --git a/core/linux-aarch64/linux-aarch64.install b/core/linux-aarch64/linux-aarch64.install
index 0e6c5025b..51680c061 100644
--- a/core/linux-aarch64/linux-aarch64.install
+++ b/core/linux-aarch64/linux-aarch64.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-aarch64
-KERNEL_VERSION=4.3.0-1-ARCH
+KERNEL_VERSION=4.12.5-1-ARCH
 
 post_install () {
   # updating module dependencies
@@ -20,8 +20,6 @@ post_upgrade() {
   # updating module dependencies
   echo ">>> Updating module dependencies. Please wait ..."
   depmod ${KERNEL_VERSION}
-  echo ">>> Generating initial ramdisk, using mkinitcpio. Please wait..."
-  mkinitcpio -p linux${KERNEL_NAME}
 }
 
 post_remove() {