6 files changed, 79 insertions, 0 deletions
diff --git a/extra/linux-olpc-xo1/acpi-c3.patch b/extra/linux-olpc-xo1/acpi-c3.patch
new file mode 100644
index 00000000..a5b79972
--- /dev/null
+++ b/extra/linux-olpc-xo1/acpi-c3.patch
@@ -0,0 +1,12 @@
+diff -rauN a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
+--- a/drivers/acpi/processor_idle.c	2022-05-02 21:01:51.302162225 +0200
++++ b/drivers/acpi/processor_idle.c	2022-05-02 21:04:58.169438104 +0200
+@@ -796,6 +796,8 @@
+ 		    cx->type == ACPI_STATE_C3) {
+ 			state->enter_dead = acpi_idle_play_dead;
+ 			drv->safe_state_index = count;
++			if (cx->type != ACPI_STATE_C3)
++				drv->safe_state_index = count;
+ 		}
+ 		/*
+ 		 * Halt-induced C1 is not good for ->enter_s2idle, because it
diff --git a/extra/linux-olpc-xo1/no-ultra-zstd.patch b/extra/linux-olpc-xo1/no-ultra-zstd.patch
new file mode 100644
index 00000000..8bab0c2c
--- /dev/null
+++ b/extra/linux-olpc-xo1/no-ultra-zstd.patch
@@ -0,0 +1,15 @@
+diff -rauN a/scripts/Makefile.lib b/scripts/Makefile.lib
+--- a/scripts/Makefile.lib	2020-11-11 06:45:51.375133819 +0100
++++ b/scripts/Makefile.lib	2020-11-11 06:46:12.058448322 +0100
+@@ -499,9 +499,9 @@
+       cmd_zstd = cat $(real-prereqs) | $(ZSTD) -19 > $@
+ 
+ quiet_cmd_zstd22 = ZSTD22  $@
+-      cmd_zstd22 = cat $(real-prereqs) | $(ZSTD) -22 --ultra > $@
++      cmd_zstd22 = cat $(real-prereqs) | $(ZSTD) -19 > $@
+ 
+ quiet_cmd_zstd22_with_size = ZSTD22  $@
+-      cmd_zstd22_with_size = { cat $(real-prereqs) | $(ZSTD) -22 --ultra; $(size_append); } > $@
++      cmd_zstd22_with_size = { cat $(real-prereqs) | $(ZSTD) -19; $(size_append); } > $@
+ 
+ # ASM offsets
diff --git a/extra/linux-pae/PKGBUILD b/extra/linux-pae/PKGBUILD
index 00448631..5da48508 100644
--- a/extra/linux-pae/PKGBUILD
+++ b/extra/linux-pae/PKGBUILD
@@ -219,6 +219,16 @@ done
 
 # vim:set ts=8 sts=2 sw=2 et:
 
+# avoid using zstd compression in ultra mode (exhausts virtual memory)
+source+=('no-ultra-zstd.patch')
+sha256sums+=('d32270be5fd9c3e3ba50f3aef33f6cfcb85be0c8216f03b777287cc621fdff28')
+eval "$(
+  declare -f prepare | \
+    sed '
+      /cd/ a patch -Np1 -i $srcdir/no-ultra-zstd.patch
+    '
+)"
+
 # https://bbs.archlinux32.org/viewtopic.php?pid=9109#p9109
 # avoid "sleepy" VIA C7 CPUs (and possibly others)
 source+=('acpi-c3.patch')
diff --git a/extra/linux-pae/no-ultra-zstd.patch b/extra/linux-pae/no-ultra-zstd.patch
new file mode 100644
index 00000000..8bab0c2c
--- /dev/null
+++ b/extra/linux-pae/no-ultra-zstd.patch
@@ -0,0 +1,15 @@
+diff -rauN a/scripts/Makefile.lib b/scripts/Makefile.lib
+--- a/scripts/Makefile.lib	2020-11-11 06:45:51.375133819 +0100
++++ b/scripts/Makefile.lib	2020-11-11 06:46:12.058448322 +0100
+@@ -499,9 +499,9 @@
+       cmd_zstd = cat $(real-prereqs) | $(ZSTD) -19 > $@
+ 
+ quiet_cmd_zstd22 = ZSTD22  $@
+-      cmd_zstd22 = cat $(real-prereqs) | $(ZSTD) -22 --ultra > $@
++      cmd_zstd22 = cat $(real-prereqs) | $(ZSTD) -19 > $@
+ 
+ quiet_cmd_zstd22_with_size = ZSTD22  $@
+-      cmd_zstd22_with_size = { cat $(real-prereqs) | $(ZSTD) -22 --ultra; $(size_append); } > $@
++      cmd_zstd22_with_size = { cat $(real-prereqs) | $(ZSTD) -19; $(size_append); } > $@
+ 
+ # ASM offsets
diff --git a/extra/linux-zen/acpi-c3.patch b/extra/linux-zen/acpi-c3.patch
new file mode 100644
index 00000000..a5b79972
--- /dev/null
+++ b/extra/linux-zen/acpi-c3.patch
@@ -0,0 +1,12 @@
+diff -rauN a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
+--- a/drivers/acpi/processor_idle.c	2022-05-02 21:01:51.302162225 +0200
++++ b/drivers/acpi/processor_idle.c	2022-05-02 21:04:58.169438104 +0200
+@@ -796,6 +796,8 @@
+ 		    cx->type == ACPI_STATE_C3) {
+ 			state->enter_dead = acpi_idle_play_dead;
+ 			drv->safe_state_index = count;
++			if (cx->type != ACPI_STATE_C3)
++				drv->safe_state_index = count;
+ 		}
+ 		/*
+ 		 * Halt-induced C1 is not good for ->enter_s2idle, because it
diff --git a/extra/linux-zen/no-ultra-zstd.patch b/extra/linux-zen/no-ultra-zstd.patch
new file mode 100644
index 00000000..8bab0c2c
--- /dev/null
+++ b/extra/linux-zen/no-ultra-zstd.patch
@@ -0,0 +1,15 @@
+diff -rauN a/scripts/Makefile.lib b/scripts/Makefile.lib
+--- a/scripts/Makefile.lib	2020-11-11 06:45:51.375133819 +0100
++++ b/scripts/Makefile.lib	2020-11-11 06:46:12.058448322 +0100
+@@ -499,9 +499,9 @@
+       cmd_zstd = cat $(real-prereqs) | $(ZSTD) -19 > $@
+ 
+ quiet_cmd_zstd22 = ZSTD22  $@
+-      cmd_zstd22 = cat $(real-prereqs) | $(ZSTD) -22 --ultra > $@
++      cmd_zstd22 = cat $(real-prereqs) | $(ZSTD) -19 > $@
+ 
+ quiet_cmd_zstd22_with_size = ZSTD22  $@
+-      cmd_zstd22_with_size = { cat $(real-prereqs) | $(ZSTD) -22 --ultra; $(size_append); } > $@
++      cmd_zstd22_with_size = { cat $(real-prereqs) | $(ZSTD) -19; $(size_append); } > $@
+ 
+ # ASM offsets