forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

sxmo/sxmo-utils: workaround for kernel bug on suspend (MR 1676)

Browse source 
Removed 2 actions cause future suspends to trigger a kernel bug that
ends up spamming the kernel log with "ehci-platform 1c1b000.usb: port 1
resume error -110" and eventually makes the device not respond to any
input or hang in shutdown/reboot.

Workaround for issue: #848
Co-Authored-By: Oliver Smith <ollieparanoid@postmarketos.org>
This commit is contained in:
Pedro Moreno 2020-11-03 02:20:50 +00:00 committed by Oliver Smith
parent a853105c74
commit 687b669477
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 52 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
sxmo/sxmo-utils/0001-enable-bluetooth-and-modem-drivers-during-crust-susp.patch Normal file
View file

@ -0,0 +1,46 @@
Upstream: yes
https://lists.sr.ht/~mil/sxmo-devel/patches/14544
From a0c6e4c2e293cc2d663c35c4798b2e53462ca54b Mon Sep 17 00:00:00 2001
From: Anjandev Momi <anjan@momi.ca>
Date: Tue, 27 Oct 2020 16:14:49 -0400
Subject: [PATCH] enable bluetooth and modem drivers during crust suspend
With the megi 5.9 kernel and other suspend-related merge requests in
postmarketos, disabling these drivers is no longer needed. All of this
should result in a more reliable suspending system.
Source: https://gitlab.com/postmarketOS/pmaports/-/merge_requests/1651
Signed-off-by: Miles Alan <m@milesalan.com>
---
programs/sxmo_screenlock.c | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/programs/sxmo_screenlock.c b/programs/sxmo_screenlock.c
index 791511f..34ed5e7 100644
--- a/programs/sxmo_screenlock.c
+++ b/programs/sxmo_screenlock.c
@@ -169,20 +169,6 @@ configuresuspendsettingsandwakeupsources()
//set RTC wake
if (wakeinterval > 0) setup_rtc_wakeup();
- // Temporary hack to disable USB driver that doesn't suspend
- fprintf(stderr, "Disabling buggy USB driver\n");
- writefile(
- "/sys/devices/platform/soc/1c19000.usb/driver/unbind",
- "1c19000.usb"
- );
-
- // Temporary hack to disable Bluetooth driver that crashes on suspend 1/5th the time
- fprintf(stderr, "Disabling buggy Bluetooth driver\n");
- writefile(
- "/sys/bus/serial/drivers/hci_uart_h5/unbind",
- "serial0-0"
- );
-
// E.g. make sure we're using CRUST
fprintf(stderr, "Flip mem_sleep setting to use crust\n");
writefile("/sys/power/mem_sleep", "deep");
--
2.20.1

9
sxmo/sxmo-utils/APKBUILD
View file

@ -1,7 +1,7 @@
# Maintainer: Miles Alan <m@milesalan.com> # Maintainer: Miles Alan <m@milesalan.com>
pkgname=sxmo-utils pkgname=sxmo-utils
pkgver=1.1.11 pkgver=1.1.11
pkgrel=0 pkgrel=1
pkgdesc="Utility scripts, programs, and configs that hold the Sxmo UI environment together" pkgdesc="Utility scripts, programs, and configs that hold the Sxmo UI environment together"
url="https://git.sr.ht/~mil/sxmo-utils" url="https://git.sr.ht/~mil/sxmo-utils"
arch="all" arch="all"
@ -53,7 +53,9 @@ depends="
" "
options="suid !check" # has no tests options="suid !check" # has no tests
source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~mil/sxmo-utils/archive/$pkgver.tar.gz" source="$pkgname-$pkgver.tar.gz::https://git.sr.ht/~mil/sxmo-utils/archive/$pkgver.tar.gz
0001-enable-bluetooth-and-modem-drivers-during-crust-susp.patch
"
install="$pkgname.post-install $pkgname.pre-deinstall" install="$pkgname.post-install $pkgname.pre-deinstall"
package() { package() {
@ -68,4 +70,5 @@ package() {
chmod u+s $pkgdir/usr/bin/sxmo_screenlock chmod u+s $pkgdir/usr/bin/sxmo_screenlock
} }
sha512sums="e1a23a0899f5a6bc25a3fe0d20401ccb218b6f0150f3cc06dda822c81075af9b08d59b310acf1310844c44b0adc0f1973c3d0a74ea53c4e7d8e1ab2132eb1684 sxmo-utils-1.1.11.tar.gz" sha512sums="e1a23a0899f5a6bc25a3fe0d20401ccb218b6f0150f3cc06dda822c81075af9b08d59b310acf1310844c44b0adc0f1973c3d0a74ea53c4e7d8e1ab2132eb1684 sxmo-utils-1.1.11.tar.gz
7afe015b5f7a0c6fb644f0268d5558e02ee4d141d0c7f6167ce262c42e2ca767d7b4cdd9fc5cc52ca516bbbbb513d720fec5fd70269ef93f1511d5b6e6017fbd 0001-enable-bluetooth-and-modem-drivers-during-crust-susp.patch"