From d535b170e294bfe692008c8d0afd222e7fd4be1f Mon Sep 17 00:00:00 2001 From: Minecrell Date: Sat, 18 Sep 2021 20:29:09 +0200 Subject: [PATCH] main/linux-postmarketos-qcom-msm8916: upgrade to 5.14 (MR 2535) - Update to Linux 5.14 - Enable new RPMSG WWAN CTRL driver that is now used to communicate with the modem through the new WWAN subsystem in Linux - Minor fixes for ARM32 - Enable some additional options in kernel config (F2FS, UHID, LED triggers) - Add TravMurav as second maintainer --- main/linux-postmarketos-qcom-msm8916/APKBUILD | 11 ++-- .../config-postmarketos-qcom-msm8916.aarch64 | 45 +++++++++++------ .../config-postmarketos-qcom-msm8916.armv7 | 50 +++++++++++-------- 3 files changed, 64 insertions(+), 42 deletions(-) diff --git a/main/linux-postmarketos-qcom-msm8916/APKBUILD b/main/linux-postmarketos-qcom-msm8916/APKBUILD index fe9220b64..3171a4ec9 100644 --- a/main/linux-postmarketos-qcom-msm8916/APKBUILD +++ b/main/linux-postmarketos-qcom-msm8916/APKBUILD @@ -1,10 +1,11 @@ # Maintainer: Minecrell +# Co-Maintainer: Nikita Travkin # Kernel config based on: arch/arm64/configs/msm8916_defconfig _flavor="postmarketos-qcom-msm8916" pkgname=linux-$_flavor -pkgver=5.14_rc7 -pkgrel=1 +pkgver=5.14 +pkgrel=0 pkgdesc="Mainline kernel fork for Qualcomm MSM8916 devices" arch="aarch64 armv7" url="https://github.com/msm8916-mainline/linux" @@ -54,7 +55,7 @@ package() { } sha512sums=" -32049a56278777abefd9107cac1d0e36db99c1ee73e55ec5eac89047c0f53985ba9807944a624ceab1df15dac2ac01100519231a44c4d164a86ea278a3c9858c linux-postmarketos-qcom-msm8916-v5.14-rc7-msm8916.tar.gz -50ffe6f21ec5d009bca5bae29c8c2e9c2def69b0479bc6bdb179fc76d856c6a222bd4bcd4c96163aec305d8b5a2f00b97f58f217fe7f49aaa6262f3a2a88133e config-postmarketos-qcom-msm8916.aarch64 -10a79edffcbec1fbb3442986deb9a2ee394999790f6f23505bb0d17b69fb0e2e934dd5de653e7e24ffff457da517a8a6c4aa5c1bc5c906c4f203160607bd8a07 config-postmarketos-qcom-msm8916.armv7 +af9cc096f15e5de2ea9d5173ddc004713e801916abad3024616c7fa842288523ec8eca9d424de3fd61fdf2a3c9468690d28f0eea3c0d46ea0e9b5a1f12721dd8 linux-postmarketos-qcom-msm8916-v5.14-msm8916.tar.gz +37828d0cf0b4ccf3e0838dbfa029a47efcef7b4d01b71e592204ca09d652d7c4502e280a40c3f8d821df3a39f78852f93d1a30da70609e5fe8d0a3737660adce config-postmarketos-qcom-msm8916.aarch64 +446225394786bc02b3a800a4f1b6d34e763508d3c6d9da72dbe220e493bf18925e33b59ba7d36683d5325c73f9d5aa6da564457e6521493c0c564bd27a34a71c config-postmarketos-qcom-msm8916.armv7 " diff --git a/main/linux-postmarketos-qcom-msm8916/config-postmarketos-qcom-msm8916.aarch64 b/main/linux-postmarketos-qcom-msm8916/config-postmarketos-qcom-msm8916.aarch64 index 99825ca76..cbd55b428 100644 --- a/main/linux-postmarketos-qcom-msm8916/config-postmarketos-qcom-msm8916.aarch64 +++ b/main/linux-postmarketos-qcom-msm8916/config-postmarketos-qcom-msm8916.aarch64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 5.14.0-rc7 Kernel Configuration +# Linux/arm64 5.14.0 Kernel Configuration # CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 10.3.1_git20210625) 10.3.1 20210625" CONFIG_CC_IS_GCC=y @@ -706,6 +706,7 @@ CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y # CONFIG_LOCK_EVENT_COUNTS is not set CONFIG_ARCH_HAS_RELR=y CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y +CONFIG_HAVE_ARCH_PFN_VALID=y CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y # @@ -1847,7 +1848,7 @@ CONFIG_WLAN_VENDOR_QUANTENNA=y CONFIG_WWAN=y # CONFIG_WWAN_HWSIM is not set CONFIG_QCOM_BAM_DMUX=m -# CONFIG_RPMSG_WWAN_CTRL is not set +CONFIG_RPMSG_WWAN_CTRL=m # end of Wireless WAN # CONFIG_NETDEVSIM is not set @@ -3535,7 +3536,7 @@ CONFIG_SND_SOC_TFA989X=m CONFIG_HID=y # CONFIG_HID_BATTERY_STRENGTH is not set # CONFIG_HIDRAW is not set -# CONFIG_UHID is not set +CONFIG_UHID=m CONFIG_HID_GENERIC=y # @@ -3966,24 +3967,24 @@ CONFIG_LEDS_SGM3140=m # CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y -# CONFIG_LEDS_TRIGGER_ONESHOT is not set +CONFIG_LEDS_TRIGGER_ONESHOT=m CONFIG_LEDS_TRIGGER_HEARTBEAT=y -# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set +CONFIG_LEDS_TRIGGER_BACKLIGHT=m CONFIG_LEDS_TRIGGER_CPU=y -# CONFIG_LEDS_TRIGGER_ACTIVITY is not set -# CONFIG_LEDS_TRIGGER_GPIO is not set +CONFIG_LEDS_TRIGGER_ACTIVITY=m +CONFIG_LEDS_TRIGGER_GPIO=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=y # # iptables trigger is under Netfilter config (LED target) # -# CONFIG_LEDS_TRIGGER_TRANSIENT is not set -# CONFIG_LEDS_TRIGGER_CAMERA is not set +CONFIG_LEDS_TRIGGER_TRANSIENT=m +CONFIG_LEDS_TRIGGER_CAMERA=m CONFIG_LEDS_TRIGGER_PANIC=y -# CONFIG_LEDS_TRIGGER_NETDEV is not set -# CONFIG_LEDS_TRIGGER_PATTERN is not set -# CONFIG_LEDS_TRIGGER_AUDIO is not set -# CONFIG_LEDS_TRIGGER_TTY is not set +CONFIG_LEDS_TRIGGER_NETDEV=m +CONFIG_LEDS_TRIGGER_PATTERN=m +CONFIG_LEDS_TRIGGER_AUDIO=m +CONFIG_LEDS_TRIGGER_TTY=m # CONFIG_ACCESSIBILITY is not set # CONFIG_INFINIBAND is not set CONFIG_EDAC_SUPPORT=y @@ -5041,7 +5042,6 @@ CONFIG_PARTITION_PERCPU=y # CONFIG_IPACK_BUS is not set CONFIG_RESET_CONTROLLER=y -# CONFIG_RESET_MCHP_SPARX5 is not set # CONFIG_RESET_QCOM_AOSS is not set # CONFIG_RESET_QCOM_PDC is not set # CONFIG_RESET_TI_SYSCON is not set @@ -5154,7 +5154,19 @@ CONFIG_FS_MBCACHE=y # CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set # CONFIG_NILFS2_FS is not set -# CONFIG_F2FS_FS is not set +CONFIG_F2FS_FS=m +CONFIG_F2FS_STAT_FS=y +CONFIG_F2FS_FS_XATTR=y +CONFIG_F2FS_FS_POSIX_ACL=y +# CONFIG_F2FS_FS_SECURITY is not set +# CONFIG_F2FS_CHECK_FS is not set +# CONFIG_F2FS_FAULT_INJECTION is not set +CONFIG_F2FS_FS_COMPRESSION=y +CONFIG_F2FS_FS_LZO=y +CONFIG_F2FS_FS_LZ4=y +CONFIG_F2FS_FS_LZ4HC=y +CONFIG_F2FS_FS_ZSTD=y +CONFIG_F2FS_FS_LZORLE=y # CONFIG_FS_DAX is not set CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=y @@ -5487,7 +5499,7 @@ CONFIG_CRYPTO_HMAC=y # Digest # CONFIG_CRYPTO_CRC32C=y -# CONFIG_CRYPTO_CRC32 is not set +CONFIG_CRYPTO_CRC32=m # CONFIG_CRYPTO_XXHASH is not set # CONFIG_CRYPTO_BLAKE2B is not set # CONFIG_CRYPTO_BLAKE2S is not set @@ -5647,6 +5659,7 @@ CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_LZ4_COMPRESS=y +CONFIG_LZ4HC_COMPRESS=m CONFIG_LZ4_DECOMPRESS=y CONFIG_ZSTD_COMPRESS=y CONFIG_ZSTD_DECOMPRESS=y diff --git a/main/linux-postmarketos-qcom-msm8916/config-postmarketos-qcom-msm8916.armv7 b/main/linux-postmarketos-qcom-msm8916/config-postmarketos-qcom-msm8916.armv7 index 774f6def7..79b05dcb1 100644 --- a/main/linux-postmarketos-qcom-msm8916/config-postmarketos-qcom-msm8916.armv7 +++ b/main/linux-postmarketos-qcom-msm8916/config-postmarketos-qcom-msm8916.armv7 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 5.14.0-rc7 Kernel Configuration +# Linux/arm 5.14.0 Kernel Configuration # CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 10.3.1_git20210625) 10.3.1 20210625" CONFIG_CC_IS_GCC=y @@ -255,8 +255,6 @@ CONFIG_PROFILING=y CONFIG_ARM=y CONFIG_ARM_HAS_SG_CHAIN=y -CONFIG_ARM_DMA_USE_IOMMU=y -CONFIG_ARM_DMA_IOMMU_ALIGNMENT=8 CONFIG_SYS_SUPPORTS_APM_EMULATION=y CONFIG_HAVE_PROC_CPU=y CONFIG_STACKTRACE_SUPPORT=y @@ -1809,7 +1807,7 @@ CONFIG_WLAN_VENDOR_QUANTENNA=y CONFIG_WWAN=y # CONFIG_WWAN_HWSIM is not set CONFIG_QCOM_BAM_DMUX=m -# CONFIG_RPMSG_WWAN_CTRL is not set +CONFIG_RPMSG_WWAN_CTRL=m # end of Wireless WAN # CONFIG_NETDEVSIM is not set @@ -3513,7 +3511,7 @@ CONFIG_SND_SOC_TFA989X=m CONFIG_HID=y # CONFIG_HID_BATTERY_STRENGTH is not set # CONFIG_HIDRAW is not set -# CONFIG_UHID is not set +CONFIG_UHID=m CONFIG_HID_GENERIC=y # @@ -3945,24 +3943,24 @@ CONFIG_LEDS_SGM3140=m # CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y -# CONFIG_LEDS_TRIGGER_ONESHOT is not set +CONFIG_LEDS_TRIGGER_ONESHOT=m CONFIG_LEDS_TRIGGER_HEARTBEAT=y -# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set +CONFIG_LEDS_TRIGGER_BACKLIGHT=m CONFIG_LEDS_TRIGGER_CPU=y -# CONFIG_LEDS_TRIGGER_ACTIVITY is not set -# CONFIG_LEDS_TRIGGER_GPIO is not set +CONFIG_LEDS_TRIGGER_ACTIVITY=m +CONFIG_LEDS_TRIGGER_GPIO=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=y # # iptables trigger is under Netfilter config (LED target) # -# CONFIG_LEDS_TRIGGER_TRANSIENT is not set -# CONFIG_LEDS_TRIGGER_CAMERA is not set +CONFIG_LEDS_TRIGGER_TRANSIENT=m +CONFIG_LEDS_TRIGGER_CAMERA=m CONFIG_LEDS_TRIGGER_PANIC=y -# CONFIG_LEDS_TRIGGER_NETDEV is not set -# CONFIG_LEDS_TRIGGER_PATTERN is not set -# CONFIG_LEDS_TRIGGER_AUDIO is not set -# CONFIG_LEDS_TRIGGER_TTY is not set +CONFIG_LEDS_TRIGGER_NETDEV=m +CONFIG_LEDS_TRIGGER_PATTERN=m +CONFIG_LEDS_TRIGGER_AUDIO=m +CONFIG_LEDS_TRIGGER_TTY=m # CONFIG_ACCESSIBILITY is not set # CONFIG_INFINIBAND is not set CONFIG_EDAC_ATOMIC_SCRUB=y @@ -4366,9 +4364,7 @@ CONFIG_IOMMU_IO_PGTABLE_LPAE=y # CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set CONFIG_OF_IOMMU=y CONFIG_IOMMU_DMA=y -CONFIG_ARM_SMMU=y -# CONFIG_ARM_SMMU_LEGACY_DT_BINDINGS is not set -CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=y +# CONFIG_ARM_SMMU is not set CONFIG_QCOM_IOMMU=y # @@ -5011,7 +5007,6 @@ CONFIG_ARM_GIC_MAX_NR=1 # CONFIG_IPACK_BUS is not set CONFIG_RESET_CONTROLLER=y -# CONFIG_RESET_MCHP_SPARX5 is not set # CONFIG_RESET_QCOM_AOSS is not set # CONFIG_RESET_QCOM_PDC is not set # CONFIG_RESET_TI_SYSCON is not set @@ -5119,7 +5114,19 @@ CONFIG_FS_MBCACHE=y # CONFIG_OCFS2_FS is not set # CONFIG_BTRFS_FS is not set # CONFIG_NILFS2_FS is not set -# CONFIG_F2FS_FS is not set +CONFIG_F2FS_FS=m +CONFIG_F2FS_STAT_FS=y +CONFIG_F2FS_FS_XATTR=y +CONFIG_F2FS_FS_POSIX_ACL=y +# CONFIG_F2FS_FS_SECURITY is not set +# CONFIG_F2FS_CHECK_FS is not set +# CONFIG_F2FS_FAULT_INJECTION is not set +CONFIG_F2FS_FS_COMPRESSION=y +CONFIG_F2FS_FS_LZO=y +CONFIG_F2FS_FS_LZ4=y +CONFIG_F2FS_FS_LZ4HC=y +CONFIG_F2FS_FS_ZSTD=y +CONFIG_F2FS_FS_LZORLE=y CONFIG_FS_POSIX_ACL=y CONFIG_EXPORTFS=y # CONFIG_EXPORTFS_BLOCK_OPS is not set @@ -5443,7 +5450,7 @@ CONFIG_CRYPTO_HMAC=y # Digest # CONFIG_CRYPTO_CRC32C=y -# CONFIG_CRYPTO_CRC32 is not set +CONFIG_CRYPTO_CRC32=m # CONFIG_CRYPTO_XXHASH is not set # CONFIG_CRYPTO_BLAKE2B is not set # CONFIG_CRYPTO_BLAKE2S is not set @@ -5595,6 +5602,7 @@ CONFIG_ZLIB_DEFLATE=y CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_LZ4_COMPRESS=y +CONFIG_LZ4HC_COMPRESS=m CONFIG_LZ4_DECOMPRESS=y CONFIG_ZSTD_COMPRESS=y CONFIG_ZSTD_DECOMPRESS=y