Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Oliver Smith
|
4edda35e3f | ||
|
Oliver Smith
|
ebe40dd9fb | ||
|
Oliver Smith
|
4f069af49a |
No files matched your search
@@ -6,7 +6,7 @@
|
||||
# Co-Maintainer: Dylan Van Assche <me@dylanvanassche.be>
|
||||
pkgname=device-pine64-pinephone
|
||||
pkgver=0.39
|
||||
pkgrel=0
|
||||
pkgrel=1
|
||||
pkgdesc="PINE64 PinePhone"
|
||||
url="https://postmarketos.org"
|
||||
license="MIT"
|
||||
@@ -221,7 +221,7 @@ d66ecef1fa5481ff138fe4e12b194903ceacab9d0649e716049f32e56ec6d9be09b97e2ff769ebc5
|
||||
967e3a43c7e91ed37fc932a7c580cd168ca11d8ec7f60ff60ece7f286e5144f27faead95162fa7d571a2317ed0da970fd86f5bc9ed0235a25c0be9182d42d64d 90-pinephone.conf
|
||||
8e362f48fc5db58dc37d035f80f5ab0b09a20c82e6859e9662affdc192e2aa0bc7a259a9b0c63db330b3873d8b1f22af3f9193a0b7d79068354d1a788391376c primaryuse.conf
|
||||
420ee1d7522d4d56c2909580fd6ba7580483ca5455b13eb6d22e700063ce0c1a5c6d2f5b161dfce0d777636fe9a712aa82f38a0585f2feabea3785b02bae7515 setup-modem.sh
|
||||
24b241b6a30ecde8ec66b45f08d09d17d8ab0753cc5e8c75142b850af21d829d1f45e83e6b892f5cbad40f4fa3550de23e2b4d21f7727ada0e79751b0b0a1010 uboot-script.cmd
|
||||
315ea10f9bc1ef8fdbedfb0966b234492f912f3b57b9d13d5ed8d797e4473f63d051ef760425d024b406ee12a69b6b8060ce26efe5842e01d207930b11c307b6 uboot-script.cmd
|
||||
f28902517bebe16f7ddbdbf9f4c52d5c97319e3b5ba7326ba96ed0e094d3d2a39c87061326893cdc34336bbfd56de084b2f217918ebba7ca6a080088cd0bd409 uboot-user.cmd
|
||||
f963898fa2ce66bc830e56feeec6ffc9888834e14cc1591d72908ef45ad82532bc3ef5fb32413e07b6722749c9d03e7cf92f06f1fcb859c38b9297cf58e5cedd HiFi.conf
|
||||
4b0c51ab169aebe8177c5c43eba41afa90370098a5a54e710d17e97ec1651869a20cb5d780a6132028c864916609e3b4f4a13158835310d0441bdb4915872372 PinePhone.conf
|
||||
|
||||
@@ -9,7 +9,7 @@ else
|
||||
setenv bootdev 2;
|
||||
fi;
|
||||
|
||||
setenv bootargs init=/init.sh rw console=tty0 console=ttyS0,115200 earlycon=uart,mmio32,0x01c28000 panic=10 consoleblank=0 loglevel=1 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE pmos_boot=/dev/mmcblk${bootdev}p1 pmos_root=/dev/mmcblk${bootdev}p2
|
||||
setenv bootargs init=/init.sh rw console=tty0 console=ttyS0,115200 earlycon=uart,mmio32,0x01c28000 panic=10 consoleblank=0 loglevel=1 PMOS_NO_OUTPUT_REDIRECT PMOS_FORCE_PARTITION_RESIZE pmos_boot=/dev/mmcblk${bootdev}p1 pmos_root=/dev/mmcblk${bootdev}p2 lima.sched_timeout_ms=2000
|
||||
|
||||
printenv
|
||||
|
||||
|
||||
@@ -0,0 +1,46 @@
|
||||
From 89db962b4e0644aacf24d75d4c5b1f173f9c445f Mon Sep 17 00:00:00 2001
|
||||
From: Ondrej Jirman <megi@xff.cz>
|
||||
Date: Thu, 31 Mar 2022 20:59:28 +0200
|
||||
Subject: [PATCH] usb: musb: add loop blocker
|
||||
|
||||
Signed-off-by: Ondrej Jirman <megi@xff.cz>
|
||||
Co-Authored-By: Oliver Smith <ollieparanoid@postmarketos.org>
|
||||
Related: pmaports issue 1478
|
||||
---
|
||||
drivers/usb/musb/musb_host.c | 13 +++++++++++++
|
||||
1 file changed, 13 insertions(+)
|
||||
|
||||
diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
|
||||
index 9ff7d891b4b7..c8d6e094562a 100644
|
||||
--- a/drivers/usb/musb/musb_host.c
|
||||
+++ b/drivers/usb/musb/musb_host.c
|
||||
@@ -2488,6 +2488,8 @@ static void musb_h_stop(struct usb_hcd *hcd)
|
||||
hcd->state = HC_STATE_HALT;
|
||||
}
|
||||
|
||||
+static int loop_limit = 0;
|
||||
+
|
||||
static int musb_bus_suspend(struct usb_hcd *hcd)
|
||||
{
|
||||
struct musb *musb = hcd_to_musb(hcd);
|
||||
@@ -2520,6 +2522,17 @@ static int musb_bus_suspend(struct usb_hcd *hcd)
|
||||
if (musb->is_active) {
|
||||
WARNING("trying to suspend as %s while active\n",
|
||||
usb_otg_state_string(musb->xceiv->otg->state));
|
||||
+
|
||||
+ // the code here tends to loop in some situations, prevent
|
||||
+ // endless loop by reporting success after 20 failures
|
||||
+ if (loop_limit < 20) {
|
||||
+ loop_limit++;
|
||||
+ } else {
|
||||
+ WARNING("loop prevented\n");
|
||||
+ loop_limit = 0;
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
return -EBUSY;
|
||||
} else
|
||||
return 0;
|
||||
--
|
||||
2.30.2
|
||||
|
||||
+26
@@ -0,0 +1,26 @@
|
||||
From d0b94f660ac503f7fcc79a03134da2f0c2853eb6 Mon Sep 17 00:00:00 2001
|
||||
From: Oliver Smith <osmith@sysmocom.de>
|
||||
Date: Sun, 10 Apr 2022 14:16:05 +0200
|
||||
Subject: [PATCH] usb: musb: direct musb debug output to kernel log
|
||||
|
||||
Megi recommended we apply this patch to make getting a trace easier, now
|
||||
it's all in dmesg.
|
||||
---
|
||||
drivers/usb/musb/musb_trace.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/drivers/usb/musb/musb_trace.c b/drivers/usb/musb/musb_trace.c
|
||||
index 476872adce80..6bbbaa137608 100644
|
||||
--- a/drivers/usb/musb/musb_trace.c
|
||||
+++ b/drivers/usb/musb/musb_trace.c
|
||||
@@ -19,6 +19,7 @@ void musb_dbg(struct musb *musb, const char *fmt, ...)
|
||||
vaf.fmt = fmt;
|
||||
vaf.va = &args;
|
||||
|
||||
+ vprintk(fmt, args);
|
||||
trace_musb_log(musb, &vaf);
|
||||
|
||||
va_end(args);
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@@ -6,9 +6,9 @@
|
||||
_flavor=postmarketos-allwinner
|
||||
_config="config-$_flavor.$CARCH"
|
||||
pkgname=linux-$_flavor
|
||||
pkgver=5.17.0_git20220313
|
||||
pkgver=5.17.2_git20220409
|
||||
pkgrel=1
|
||||
_tag="orange-pi-5.17-20220313-2345"
|
||||
_tag="orange-pi-5.17-20220409-0454"
|
||||
pkgdesc="Kernel fork with Pine64 patches (megi's tree, slightly patched)"
|
||||
arch="aarch64 armv7"
|
||||
url="https://megous.com/git/linux/"
|
||||
@@ -50,6 +50,8 @@ source="$pkgname-$_tag.tar.gz::https://github.com/megous/linux/archive/$_tag.tar
|
||||
0010-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
|
||||
0011-eMMC-workaround.patch
|
||||
0012-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
|
||||
0013-usb-musb-add-loop-blocker.patch
|
||||
0014-usb-musb-direct-musb-debug-output-to-kernel-log.patch
|
||||
"
|
||||
subpackages="$pkgname-dev"
|
||||
builddir="$srcdir/linux-$_tag"
|
||||
@@ -97,7 +99,7 @@ dev() {
|
||||
INSTALL_HDR_PATH="$subpkgdir"/usr
|
||||
}
|
||||
sha512sums="
|
||||
b24b34e9a8ef66d37891c1d21eb71f9de83e0fde167ac08d776ac3e7b6262e9911908b453b598eb2e01658ec141d4d08337e4cc20f77af298e639ef9119edb61 linux-postmarketos-allwinner-orange-pi-5.17-20220313-2345.tar.gz
|
||||
a2d8f509d995c9b13b0cae3466ba35942821e1082c533e6187048ce3b4ca855a71f4f90831897298117c22d6bb3d498ae05fb3540dfb87bb40ef134fa7a144f5 linux-postmarketos-allwinner-orange-pi-5.17-20220409-0454.tar.gz
|
||||
049a18de2758e390368450073dee9bf7d3a7aa6099901d128818c49d2bb2bba13ebcfe0458597c68b0fc350e7d1f30b531a66de4590e8308482a1e458f56a61a config-postmarketos-allwinner.aarch64
|
||||
18738214275280f45375de9ccff83df7c9f37eb66dfd0834780e6b155d95a7d39c55f00fd66be4dde4a8b85accd285b6ef10285b41f75618ad7f44ddcdd0b9a9 config-postmarketos-allwinner.armv7
|
||||
244d2c1356f5de77a5d05ba16d10e0d19915f634b3b1b96259857b1a3d57a023027a94622ffb56d5c72aeaeb7a9a220d629d51cfbb24225a7eca0140eb1ba19b 0001-dts-add-dontbeevil-pinephone-devkit.patch
|
||||
@@ -112,4 +114,6 @@ e9897068210edd3295fb813390b263ccc146541f4bc89e66fea4a48ce9114ac0ac0b2ef584943fbc
|
||||
f1e4658bc699cfb3f0e0eba7833a7e09da266b8817c427de6312c270379d9d8c6cc55d4a270984c5b95cd04cf3be85c36f0d1127abe513698f874b8cde0b1a95 0010-ARM-dts-sun6i-Add-Lark-FreeMe-70.2S-tablet.patch
|
||||
6235d08a6a90ca2234cee4d092a4314cb8efdbe7d68fb9c954abe9a6921c93e160db3f680a408210755ed71c429171919320592ea1f6769f74f55b70b7dbf22e 0011-eMMC-workaround.patch
|
||||
9ac8d531fe25365c6d1d1bf2903febc573746abde80b54852f31160a98bd31bb8ac29f6a0b7883706ef0bafbd4e0696a0a9f30bede5b211fae98cd93f453e8a3 0012-arm64-dts-allwinner-orangepi-3-fix-ethernet.patch
|
||||
fea99629725d6388f095f6c34dcf7a5f01acc2ddfff68912363ade32d4b07148039218cce085ba44e489e3a569fbb2225eeae82d053668cf050243724cc372a4 0013-usb-musb-add-loop-blocker.patch
|
||||
9560bcf1f1be5f715d5733312f3aadac60426d76c00c2bb9019708f9e2e77f4f21836c5cc28a04f9382e480eb23d32d2a85bec97c97cabd84a9d1eed9c7a634b 0014-usb-musb-direct-musb-debug-output-to-kernel-log.patch
|
||||
"
|
||||
Reference in new issue
Block a user