linux56/57-tkg: Remove tp smapi ec support. The driver seems to be abandonned and creates a memory leak on at least 5.6 and 5.7 that I couldn't fix. The dkms driver seems to have the same issue so let's get rid of it, even if only temporarily.

master
Tk-Glitch 2020-05-14 00:11:44 +07:00
parent 92d56d64fa
commit b5a68b293b
8 changed files with 3 additions and 4867 deletions

@ -89,7 +89,7 @@ pkgname=("${pkgbase}" "${pkgbase}-headers")
_basekernel=5.6 _basekernel=5.6
_sub=12 _sub=12
pkgver="${_basekernel}"."${_sub}" pkgver="${_basekernel}"."${_sub}"
pkgrel=28 pkgrel=29
pkgdesc='Linux-tkg' pkgdesc='Linux-tkg'
arch=('x86_64') # no i686 in here arch=('x86_64') # no i686 in here
url="http://www.kernel.org/" url="http://www.kernel.org/"
@ -123,7 +123,6 @@ source=("https://www.kernel.org/pub/linux/kernel/v5.x/linux-${_basekernel}.tar.x
0009-bmq_v5.6-r4.patch 0009-bmq_v5.6-r4.patch
0011-ZFS-fix.patch 0011-ZFS-fix.patch
0012-linux-hardened.patch # https://github.com/anthraxx/linux-hardened 0012-linux-hardened.patch # https://github.com/anthraxx/linux-hardened
0013-tp_smapi_ec.patch
) )
sha256sums=('e342b04a2aa63808ea0ef1baab28fc520bd031ef8cf93d9ee4a31d4058fcb622' sha256sums=('e342b04a2aa63808ea0ef1baab28fc520bd031ef8cf93d9ee4a31d4058fcb622'
'ef84dbd5f9e7879a5b53d26ab766614775c22343ecf2ddd6beb969dcde1f20a6' 'ef84dbd5f9e7879a5b53d26ab766614775c22343ecf2ddd6beb969dcde1f20a6'
@ -148,8 +147,7 @@ sha256sums=('e342b04a2aa63808ea0ef1baab28fc520bd031ef8cf93d9ee4a31d4058fcb622'
'965a517a283f265a012545fbb5cc9e516efc9f6166d2aa1baf7293a32a1086b7' '965a517a283f265a012545fbb5cc9e516efc9f6166d2aa1baf7293a32a1086b7'
'1b95d36635c7dc48ce45a33d6b1f4eb6d34f51600901395d28fd22f28daee8e9' '1b95d36635c7dc48ce45a33d6b1f4eb6d34f51600901395d28fd22f28daee8e9'
'49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104' '49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104'
'573914ae79eb564032dce7e0c805fd59440696c148037b77013c8a4d5c4bd3b6' '573914ae79eb564032dce7e0c805fd59440696c148037b77013c8a4d5c4bd3b6')
'5f55c825586955e7330c74acc39d3b1a7fa15333e474d85820f46727f3922e87')
export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase export KBUILD_BUILD_USER=$pkgbase
@ -230,10 +228,6 @@ prepare() {
patch -Np1 -i ../0003-glitched-base.patch patch -Np1 -i ../0003-glitched-base.patch
if [ "${_tp_smapi_ec}" != "false" ]; then
patch -Np1 -i ../0013-tp_smapi_ec.patch
fi
if [ "${_cpusched}" == "MuQSS" ]; then if [ "${_cpusched}" == "MuQSS" ]; then
# MuQSS # MuQSS
patch -Np1 -i ../0004-5.6-ck2.patch patch -Np1 -i ../0004-5.6-ck2.patch
@ -270,7 +264,6 @@ prepare() {
sed -i -e 's/CONFIG_DEFAULT_FQ_CODEL=y/# CONFIG_DEFAULT_FQ_CODEL is not set/' ./.config sed -i -e 's/CONFIG_DEFAULT_FQ_CODEL=y/# CONFIG_DEFAULT_FQ_CODEL is not set/' ./.config
echo "CONFIG_DEFAULT_CAKE=y" >> ./.config echo "CONFIG_DEFAULT_CAKE=y" >> ./.config
echo "CONFIG_NR_TTY_DEVICES=63" >> ./.config echo "CONFIG_NR_TTY_DEVICES=63" >> ./.config
echo "CONFIG_TP_SMAPI=m" >> ./.config
echo "CONFIG_RAID6_USE_PREFER_GEN=y" >> ./.config echo "CONFIG_RAID6_USE_PREFER_GEN=y" >> ./.config
echo "# CONFIG_NTP_PPS is not set" >> ./.config echo "# CONFIG_NTP_PPS is not set" >> ./.config
sed -i -e 's/CONFIG_CRYPTO_LZ4=m/CONFIG_CRYPTO_LZ4=y/' ./.config sed -i -e 's/CONFIG_CRYPTO_LZ4=m/CONFIG_CRYPTO_LZ4=y/' ./.config
@ -1096,11 +1089,6 @@ function exit_cleanup {
rm -f "$srcdir"/linux-${_basekernel}/mm/prfile.c rm -f "$srcdir"/linux-${_basekernel}/mm/prfile.c
rm -f "$srcdir"/linux-${_basekernel}/block/bfq* rm -f "$srcdir"/linux-${_basekernel}/block/bfq*
rm -f "$srcdir"/linux-${_basekernel}/Documentation/tp_smapi.txt
rm -f "$srcdir"/linux-${_basekernel}/drivers/platform/x86/thinkpad_ec.c
rm -f "$srcdir"/linux-${_basekernel}/include/linux/thinkpad_ec.h
rm -f "$srcdir"/linux-${_basekernel}/drivers/platform/x86/tp_smapi.c
rm -rf "$srcdir"/linux-${_basekernel}/drivers/scsi/vhba/* rm -rf "$srcdir"/linux-${_basekernel}/drivers/scsi/vhba/*

@ -24,7 +24,6 @@ You can enable support for it at the beginning of the PKGBUILD file. Make sure t
- scheduling tweaks - scheduling tweaks
- using prefered raid6 gen function directly - using prefered raid6 gen function directly
- using lz4 algo for zswap by default - using lz4 algo for zswap by default
- built-in Thinkpad hardware functions driver / embedded controller LPC3 functions / SMAPI support
- optional "Zenify" patchset using core blk, mm and scheduler tweaks from Zen - optional "Zenify" patchset using core blk, mm and scheduler tweaks from Zen
- CFS tweaks - CFS tweaks
- using yeah TCP congestion algo by default - using yeah TCP congestion algo by default

@ -93,9 +93,6 @@ _acs_override=""
# Set to "true" to add Bcache filesystem support. You'll have to install bcachefs-tools-git from AUR for utilities - https://bcachefs.org/ - If in doubt, set to "false" # Set to "true" to add Bcache filesystem support. You'll have to install bcachefs-tools-git from AUR for utilities - https://bcachefs.org/ - If in doubt, set to "false"
_bcachefs="" _bcachefs=""
# Enable builtin Thinkpad series absolute trackpad as well as SMAPI and EC support drivers, for features such as battery charging control. For more information about this driver see http://www.thinkwiki.org/wiki/tp_smapi
_tp_smapi_ec="false"
# Set to "true" to add back missing symbol for AES-NI/AVX support on ZFS - https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions.patch - Kernel default is "false" # Set to "true" to add back missing symbol for AES-NI/AVX support on ZFS - https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions.patch - Kernel default is "false"
_zfsfix="" _zfsfix=""

File diff suppressed because it is too large Load Diff

@ -118,7 +118,6 @@ source=("https://git.kernel.org/torvalds/t/linux-${_basekernel}-${_sub}.tar.gz"
0009-bmq_v5.7-r0.patch 0009-bmq_v5.7-r0.patch
0011-ZFS-fix.patch 0011-ZFS-fix.patch
#0012-linux-hardened.patch #0012-linux-hardened.patch
0013-tp_smapi_ec.patch
) )
sha256sums=('0bed1c1d79abff19045870e93bdf8930e848502d25464ff01fd3b8d01de88a41' sha256sums=('0bed1c1d79abff19045870e93bdf8930e848502d25464ff01fd3b8d01de88a41'
'0352c5ef2030d6bbdeae2325454d20575339917411c646004e5c7b7b5794db60' '0352c5ef2030d6bbdeae2325454d20575339917411c646004e5c7b7b5794db60'
@ -136,8 +135,7 @@ sha256sums=('0bed1c1d79abff19045870e93bdf8930e848502d25464ff01fd3b8d01de88a41'
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
'965a517a283f265a012545fbb5cc9e516efc9f6166d2aa1baf7293a32a1086b7' '965a517a283f265a012545fbb5cc9e516efc9f6166d2aa1baf7293a32a1086b7'
'70c729750e115bc50a61c3ebed20fa7c81867003064470f592084aae8718fe80' '70c729750e115bc50a61c3ebed20fa7c81867003064470f592084aae8718fe80'
'49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104' '49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104')
'7ba451d95d2bc07d983661a7e9602a9b239522c98d42197c706c01905f0efba2')
export KBUILD_BUILD_HOST=archlinux export KBUILD_BUILD_HOST=archlinux
export KBUILD_BUILD_USER=$pkgbase export KBUILD_BUILD_USER=$pkgbase
@ -218,10 +216,6 @@ prepare() {
patch -Np1 -i ../0003-glitched-base.patch patch -Np1 -i ../0003-glitched-base.patch
if [ "${_tp_smapi_ec}" != "false" ]; then
patch -Np1 -i ../0013-tp_smapi_ec.patch
fi
if [ "${_cpusched}" == "MuQSS" ]; then if [ "${_cpusched}" == "MuQSS" ]; then
# MuQSS # MuQSS
patch -Np1 -i ../0004-5.7-ck1.patch patch -Np1 -i ../0004-5.7-ck1.patch
@ -258,7 +252,6 @@ prepare() {
sed -i -e 's/CONFIG_DEFAULT_FQ_CODEL=y/# CONFIG_DEFAULT_FQ_CODEL is not set/' ./.config sed -i -e 's/CONFIG_DEFAULT_FQ_CODEL=y/# CONFIG_DEFAULT_FQ_CODEL is not set/' ./.config
echo "CONFIG_DEFAULT_CAKE=y" >> ./.config echo "CONFIG_DEFAULT_CAKE=y" >> ./.config
echo "CONFIG_NR_TTY_DEVICES=63" >> ./.config echo "CONFIG_NR_TTY_DEVICES=63" >> ./.config
echo "CONFIG_TP_SMAPI=m" >> ./.config
echo "# CONFIG_NTP_PPS is not set" >> ./.config echo "# CONFIG_NTP_PPS is not set" >> ./.config
sed -i -e 's/CONFIG_CRYPTO_LZ4=m/CONFIG_CRYPTO_LZ4=y/' ./.config sed -i -e 's/CONFIG_CRYPTO_LZ4=m/CONFIG_CRYPTO_LZ4=y/' ./.config
sed -i -e 's/CONFIG_CRYPTO_LZ4HC=m/CONFIG_CRYPTO_LZ4HC=y/' ./.config sed -i -e 's/CONFIG_CRYPTO_LZ4HC=m/CONFIG_CRYPTO_LZ4HC=y/' ./.config
@ -1086,11 +1079,6 @@ function exit_cleanup {
rm -f "$srcdir"/linux-${_basekernel}/mm/prfile.c rm -f "$srcdir"/linux-${_basekernel}/mm/prfile.c
rm -f "$srcdir"/linux-${_basekernel}/block/bfq* rm -f "$srcdir"/linux-${_basekernel}/block/bfq*
rm -f "$srcdir"/linux-${_basekernel}/Documentation/tp_smapi.txt
rm -f "$srcdir"/linux-${_basekernel}/drivers/platform/x86/thinkpad_ec.c
rm -f "$srcdir"/linux-${_basekernel}/include/linux/thinkpad_ec.h
rm -f "$srcdir"/linux-${_basekernel}/drivers/platform/x86/tp_smapi.c
rm -rf "$srcdir"/linux-${_basekernel}/drivers/scsi/vhba/* rm -rf "$srcdir"/linux-${_basekernel}/drivers/scsi/vhba/*

@ -22,7 +22,6 @@ You can enable support for it at the beginning of the PKGBUILD file. Make sure t
- Per-CPU-arch native optimizations - Per-CPU-arch native optimizations
- memory management and swapping tweaks - memory management and swapping tweaks
- scheduling tweaks - scheduling tweaks
- optional built-in Thinkpad hardware functions driver / embedded controller LPC3 functions / SMAPI support
- optional "Zenify" patchset using core blk, mm and scheduler tweaks from Zen - optional "Zenify" patchset using core blk, mm and scheduler tweaks from Zen
- CFS tweaks - CFS tweaks
- using yeah TCP congestion algo by default - using yeah TCP congestion algo by default

@ -87,9 +87,6 @@ _OFenable="false"
# Set to "true" to use ACS override patch - https://wiki.archlinux.org/index.php/PCI_passthrough_via_OVMF#Bypassing_the_IOMMU_groups_.28ACS_override_patch.29 - Kernel default is "false" # Set to "true" to use ACS override patch - https://wiki.archlinux.org/index.php/PCI_passthrough_via_OVMF#Bypassing_the_IOMMU_groups_.28ACS_override_patch.29 - Kernel default is "false"
_acs_override="" _acs_override=""
# Enable builtin Thinkpad series absolute trackpad as well as SMAPI and EC support drivers, for features such as battery charging control. For more information about this driver see http://www.thinkwiki.org/wiki/tp_smapi
_tp_smapi_ec="false"
# Set to "true" to add back missing symbol for AES-NI/AVX support on ZFS - https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions.patch - Kernel default is "false" # Set to "true" to add back missing symbol for AES-NI/AVX support on ZFS - https://github.com/NixOS/nixpkgs/blob/master/pkgs/os-specific/linux/kernel/export_kernel_fpu_functions.patch - Kernel default is "false"
_zfsfix="" _zfsfix=""

File diff suppressed because it is too large Load Diff