Switch to variable-size stacks

Increase stack size slightly for vboot hash task since the vboot
SHA256 function allocates ~300 bytes of stack data.  Reduce stack size
for watchdog, power LED, and a few other tasks with simple call trees
where we can be sure an error path isn't going to blow past the
reduced stack.

This frees up ~1KB of RAM on STM32.

BUG=chrome-os-partner:13814
BRANCH=all
TEST=boot system; shmem should show more unused RAM; taskinfo should show
tasks still have unused stack

Change-Id: I47d6b77564a0180d15d86667cc0566a8919b776e
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/32608
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>

16 files changed, 193 insertions, 128 deletions

diff --git a/test/charging.tasklist b/test/charging.tasklist
index ae93e63291..6ec7287373 100644
--- a/test/charging.tasklist
+++ b/test/charging.tasklist
@@ -8,20 +8,21 @@
  *
  * The first one has the lowest priority.
  *
- * For each task, use the macro TASK(n, r, d) where :
+ * For each task, use the macro TASK(n, r, d, s) where :
  * 'n' in the name of the task
  * 'r' in the main routine of the task
  * 'd' in an opaque parameter passed to the routine at startup
+ * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(WATCHDOG, watchdog_task, NULL) \
-	TASK(VBOOTHASH, vboot_hash_task, NULL) \
-	TASK(PWM, pwm_task, NULL) \
-	TASK(TYPEMATIC, keyboard_typematic_task, NULL) \
-	TASK(POWERSTATE, charge_state_machine_task, NULL) \
-	TASK(X86POWER, x86_power_task, NULL) \
-	TASK(I8042CMD, i8042_command_task, NULL) \
-	TASK(KEYSCAN, keyboard_scan_task, NULL) \
-	TASK(POWERBTN, power_button_task, NULL) \
-	TASK(HOSTCMD, host_command_task, NULL) \
-	TASK(CONSOLE, console_task, NULL)
+	TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
+	TASK(PWM, pwm_task, NULL, TASK_STACK_SIZE) \
+	TASK(TYPEMATIC, keyboard_typematic_task, NULL, TASK_STACK_SIZE) \
+	TASK(POWERSTATE, charge_state_machine_task, NULL, TASK_STACK_SIZE) \
+	TASK(X86POWER, x86_power_task, NULL, TASK_STACK_SIZE) \
+	TASK(I8042CMD, i8042_command_task, NULL, TASK_STACK_SIZE) \
+	TASK(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \
+	TASK(POWERBTN, power_button_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
+	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE)
diff --git a/test/flash_overwrite.tasklist b/test/flash_overwrite.tasklist
index 65a15ac498..df7abf767b 100644
--- a/test/flash_overwrite.tasklist
+++ b/test/flash_overwrite.tasklist
@@ -12,9 +12,10 @@
  * 'n' in the name of the task
  * 'r' in the main routine of the task
  * 'd' in an opaque parameter passed to the routine at startup
+ * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(WATCHDOG, watchdog_task, NULL) \
-	TASK(VBOOTHASH, vboot_hash_task, NULL) \
-	TASK(HOSTCMD, host_command_task, NULL) \
-	TASK(CONSOLE, console_task, NULL)
+	TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
+	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE)
diff --git a/test/flash_rw_erase.tasklist b/test/flash_rw_erase.tasklist
index 65a15ac498..993b172aad 100644
--- a/test/flash_rw_erase.tasklist
+++ b/test/flash_rw_erase.tasklist
@@ -8,13 +8,14 @@
  *
  * The first one has the lowest priority.
  *
- * For each task, use the macro TASK(n, r, d) where :
+ * For each task, use the macro TASK(n, r, d, s) where :
  * 'n' in the name of the task
  * 'r' in the main routine of the task
  * 'd' in an opaque parameter passed to the routine at startup
+ * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(WATCHDOG, watchdog_task, NULL) \
-	TASK(VBOOTHASH, vboot_hash_task, NULL) \
-	TASK(HOSTCMD, host_command_task, NULL) \
-	TASK(CONSOLE, console_task, NULL)
+	TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
+	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE)
diff --git a/test/hello.tasklist b/test/hello.tasklist
index 6c33988331..993b172aad 100644
--- a/test/hello.tasklist
+++ b/test/hello.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -8,13 +8,14 @@
  *
  * The first one has the lowest priority.
  *
- * For each task, use the macro TASK(n, r, d) where :
+ * For each task, use the macro TASK(n, r, d, s) where :
  * 'n' in the name of the task
  * 'r' in the main routine of the task
  * 'd' in an opaque parameter passed to the routine at startup
+ * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(WATCHDOG, watchdog_task, NULL) \
-	TASK(VBOOTHASH, vboot_hash_task, NULL) \
-	TASK(HOSTCMD, host_command_task, NULL) \
-	TASK(CONSOLE, console_task, NULL)
+	TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
+	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE)
diff --git a/test/kb_debounce.tasklist b/test/kb_debounce.tasklist
index 253871f365..84a627806a 100644
--- a/test/kb_debounce.tasklist
+++ b/test/kb_debounce.tasklist
@@ -14,13 +14,13 @@
  * 'd' in an opaque parameter passed to the routine at startup
  */
 #define CONFIG_TASK_LIST \
-	TASK(WATCHDOG, watchdog_task, NULL) \
-	TASK(VBOOTHASH, vboot_hash_task, NULL) \
-	TASK(PWM, pwm_task, NULL) \
-	TASK(TYPEMATIC, keyboard_typematic_task, NULL) \
-	TASK(X86POWER, x86_power_task, NULL) \
-	TASK(I8042CMD, i8042_command_task, NULL) \
-	TASK(KEYSCAN, keyboard_scan_task, NULL) \
-	TASK(POWERBTN, power_button_task, NULL) \
-	TASK(HOSTCMD, host_command_task, NULL) \
-	TASK(CONSOLE, console_task, NULL)
+	TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
+	TASK(PWM, pwm_task, NULL, TASK_STACK_SIZE) \
+	TASK(TYPEMATIC, keyboard_typematic_task, NULL, TASK_STACK_SIZE) \
+	TASK(X86POWER, x86_power_task, NULL, TASK_STACK_SIZE) \
+	TASK(I8042CMD, i8042_command_task, NULL, TASK_STACK_SIZE) \
+	TASK(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \
+	TASK(POWERBTN, power_button_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
+	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE)
diff --git a/test/kb_deghost.tasklist b/test/kb_deghost.tasklist
index 3bb24f5eb1..c17687e971 100644
--- a/test/kb_deghost.tasklist
+++ b/test/kb_deghost.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -8,19 +8,20 @@
  *
  * The first one has the lowest priority.
  *
- * For each task, use the macro TASK(n, r, d) where :
+ * For each task, use the macro TASK(n, r, d, s) where :
  * 'n' in the name of the task
  * 'r' in the main routine of the task
  * 'd' in an opaque parameter passed to the routine at startup
+ * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(WATCHDOG, watchdog_task, NULL) \
-	TASK(VBOOTHASH, vboot_hash_task, NULL) \
-	TASK(PWM, pwm_task, NULL) \
-	TASK(TYPEMATIC, keyboard_typematic_task, NULL) \
-	TASK(X86POWER, x86_power_task, NULL) \
-	TASK(I8042CMD, i8042_command_task, NULL) \
-	TASK(KEYSCAN, keyboard_scan_task, NULL) \
-	TASK(POWERBTN, power_button_task, NULL) \
-	TASK(HOSTCMD, host_command_task, NULL) \
-	TASK(CONSOLE, console_task, NULL)
+	TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
+	TASK(PWM, pwm_task, NULL, TASK_STACK_SIZE) \
+	TASK(TYPEMATIC, keyboard_typematic_task, NULL, TASK_STACK_SIZE) \
+	TASK(X86POWER, x86_power_task, NULL, TASK_STACK_SIZE) \
+	TASK(I8042CMD, i8042_command_task, NULL, TASK_STACK_SIZE) \
+	TASK(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \
+	TASK(POWERBTN, power_button_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
+	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE)
diff --git a/test/mutex.tasklist b/test/mutex.tasklist
index c617fc5387..44bfe8b664 100644
--- a/test/mutex.tasklist
+++ b/test/mutex.tasklist
@@ -1,16 +1,26 @@
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 /**
  * List of enabled tasks in the priority order
  *
  * The first one has the lowest priority.
+ *
+ * For each task, use the macro TASK(n, r, d, s) where :
+ * 'n' in the name of the task
+ * 'r' in the main routine of the task
+ * 'd' in an opaque parameter passed to the routine at startup
+ * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-  TASK(WATCHDOG, watchdog_task, NULL) \
-  TASK(VBOOTHASH, vboot_hash_task, NULL) \
-  TASK(HOSTCMD, host_command_task, NULL) \
-  TASK(CONSOLE, console_task, NULL) \
-  TASK(MTX3C, mutex_random_task, NULL) \
-  TASK(MTX3B, mutex_random_task, NULL) \
-  TASK(MTX3A, mutex_random_task, NULL) \
-  TASK(MTX2, mutex_second_task, NULL) \
-  TASK(MTX1, mutex_main_task, NULL)
+  TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+  TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
+  TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
+  TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \
+  TASK(MTX3C, mutex_random_task, NULL, TASK_STACK_SIZE) \
+  TASK(MTX3B, mutex_random_task, NULL, TASK_STACK_SIZE) \
+  TASK(MTX3A, mutex_random_task, NULL, TASK_STACK_SIZE) \
+  TASK(MTX2, mutex_second_task, NULL, TASK_STACK_SIZE) \
+  TASK(MTX1, mutex_main_task, NULL, TASK_STACK_SIZE)
diff --git a/test/pingpong.tasklist b/test/pingpong.tasklist
index ce8f7febd9..91719a0cd3 100644
--- a/test/pingpong.tasklist
+++ b/test/pingpong.tasklist
@@ -1,15 +1,25 @@
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 /**
  * List of enabled tasks in the priority order
  *
  * The first one has the lowest priority.
+ *
+ * For each task, use the macro TASK(n, r, d, s) where :
+ * 'n' in the name of the task
+ * 'r' in the main routine of the task
+ * 'd' in an opaque parameter passed to the routine at startup
+ * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-  TASK(WATCHDOG, watchdog_task, NULL) \
-  TASK(VBOOTHASH, vboot_hash_task, NULL) \
-  TASK(HOSTCMD, host_command_task, NULL) \
-  TASK(CONSOLE, console_task, NULL) \
-  TASK(TESTA, TaskAbc, (void *)'A') \
-  TASK(TESTB, TaskAbc, (void *)'B') \
-  TASK(TESTC, TaskAbc, (void *)'C') \
-  TASK(TESTT, TaskTick, (void *)'T')
+  TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+  TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
+  TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
+  TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \
+  TASK(TESTA, TaskAbc, (void *)'A', TASK_STACK_SIZE) \
+  TASK(TESTB, TaskAbc, (void *)'B', TASK_STACK_SIZE) \
+  TASK(TESTC, TaskAbc, (void *)'C', TASK_STACK_SIZE) \
+  TASK(TESTT, TaskTick, (void *)'T', TASK_STACK_SIZE)
diff --git a/test/power_button.tasklist b/test/power_button.tasklist
index b576e38f30..2651b581c2 100644
--- a/test/power_button.tasklist
+++ b/test/power_button.tasklist
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
@@ -8,19 +8,20 @@
  *
  * The first one has the lowest priority.
  *
- * For each task, use the macro TASK(n, r, d) where :
+ * For each task, use the macro TASK(n, r, d, s) where :
  * 'n' in the name of the task
  * 'r' in the main routine of the task
  * 'd' in an opaque parameter passed to the routine at startup
+ * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(WATCHDOG, watchdog_task, NULL) \
-	TASK(VBOOTHASH, vboot_hash_task, NULL) \
-	TASK(PWM, pwm_task, NULL) \
-	TASK(TYPEMATIC, keyboard_typematic_task, NULL) \
-	TASK(X86POWER, x86_power_task, NULL) \
-	TASK(I8042CMD, i8042_command_task, NULL) \
-	TASK(POWERBTN, power_button_task, NULL) \
-	TASK(KEYSCAN, keyboard_scan_task, NULL) \
-	TASK(HOSTCMD, host_command_task, NULL) \
-	TASK(CONSOLE, console_task, NULL)
+	TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
+	TASK(PWM, pwm_task, NULL, TASK_STACK_SIZE) \
+	TASK(TYPEMATIC, keyboard_typematic_task, NULL, TASK_STACK_SIZE) \
+	TASK(X86POWER, x86_power_task, NULL, TASK_STACK_SIZE) \
+	TASK(I8042CMD, i8042_command_task, NULL, TASK_STACK_SIZE) \
+	TASK(POWERBTN, power_button_task, NULL, TASK_STACK_SIZE) \
+	TASK(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
+	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE)
diff --git a/test/powerdemo.tasklist b/test/powerdemo.tasklist
index e0f7466954..27978e0b22 100644
--- a/test/powerdemo.tasklist
+++ b/test/powerdemo.tasklist
@@ -1,4 +1,19 @@
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
+/**
+ * List of enabled tasks in the priority order
+ *
+ * The first one has the lowest priority.
+ *
+ * For each task, use the macro TASK(n, r, d, s) where :
+ * 'n' in the name of the task
+ * 'r' in the main routine of the task
+ * 'd' in an opaque parameter passed to the routine at startup
+ * 's' is the stack size in bytes; must be a multiple of 8
+ */
 #define CONFIG_TASK_LIST \
-	TASK(CONSOLE, console_task, NULL) \
-	TASK(POWERDEMO, power_demo_task, NULL)
+	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \
+	TASK(POWERDEMO, power_demo_task, NULL, TASK_STACK_SIZE)
diff --git a/test/scancode.tasklist b/test/scancode.tasklist
index 253871f365..eaf7fcf7f5 100644
--- a/test/scancode.tasklist
+++ b/test/scancode.tasklist
@@ -12,15 +12,16 @@
  * 'n' in the name of the task
  * 'r' in the main routine of the task
  * 'd' in an opaque parameter passed to the routine at startup
+ * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(WATCHDOG, watchdog_task, NULL) \
-	TASK(VBOOTHASH, vboot_hash_task, NULL) \
-	TASK(PWM, pwm_task, NULL) \
-	TASK(TYPEMATIC, keyboard_typematic_task, NULL) \
-	TASK(X86POWER, x86_power_task, NULL) \
-	TASK(I8042CMD, i8042_command_task, NULL) \
-	TASK(KEYSCAN, keyboard_scan_task, NULL) \
-	TASK(POWERBTN, power_button_task, NULL) \
-	TASK(HOSTCMD, host_command_task, NULL) \
-	TASK(CONSOLE, console_task, NULL)
+	TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
+	TASK(PWM, pwm_task, NULL, TASK_STACK_SIZE) \
+	TASK(TYPEMATIC, keyboard_typematic_task, NULL, TASK_STACK_SIZE) \
+	TASK(X86POWER, x86_power_task, NULL, TASK_STACK_SIZE) \
+	TASK(I8042CMD, i8042_command_task, NULL, TASK_STACK_SIZE) \
+	TASK(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \
+	TASK(POWERBTN, power_button_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
+	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE)
diff --git a/test/thermal.tasklist b/test/thermal.tasklist
index fe620078e8..4037f3c773 100644
--- a/test/thermal.tasklist
+++ b/test/thermal.tasklist
@@ -8,17 +8,18 @@
  *
  * The first one has the lowest priority.
  *
- * For each task, use the macro TASK(n, r, d) where :
+ * For each task, use the macro TASK(n, r, d, s) where :
  * 'n' in the name of the task
  * 'r' in the main routine of the task
  * 'd' in an opaque parameter passed to the routine at startup
+ * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(WATCHDOG, watchdog_task, NULL) \
-	TASK(VBOOTHASH, vboot_hash_task, NULL) \
-	TASK(TEMPSENSOR, temp_sensor_task, NULL) \
-	TASK(THERMAL, thermal_task, NULL) \
-	TASK(PWM, pwm_task, NULL) \
-	TASK(X86POWER, x86_power_task, NULL) \
-	TASK(HOSTCMD, host_command_task, NULL) \
-	TASK(CONSOLE, console_task, NULL)
+	TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
+	TASK(TEMPSENSOR, temp_sensor_task, NULL, TASK_STACK_SIZE) \
+	TASK(THERMAL, thermal_task, NULL, TASK_STACK_SIZE) \
+	TASK(PWM, pwm_task, NULL, TASK_STACK_SIZE) \
+	TASK(X86POWER, x86_power_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
+	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE)
diff --git a/test/timer_calib.tasklist b/test/timer_calib.tasklist
index b17b961296..31302767c2 100644
--- a/test/timer_calib.tasklist
+++ b/test/timer_calib.tasklist
@@ -1,12 +1,22 @@
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 /**
  * List of enabled tasks in the priority order
  *
  * The first one has the lowest priority.
+ *
+ * For each task, use the macro TASK(n, r, d, s) where :
+ * 'n' in the name of the task
+ * 'r' in the main routine of the task
+ * 'd' in an opaque parameter passed to the routine at startup
+ * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-  TASK(WATCHDOG, watchdog_task, NULL) \
-  TASK(VBOOTHASH, vboot_hash_task, NULL) \
-  TASK(TESTTMR, timer_calib_task, (void *)'T')\
-  TASK(HOSTCMD, host_command_task, NULL) \
-  TASK(CONSOLE, console_task, NULL)
+  TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+  TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
+  TASK(TESTTMR, timer_calib_task, (void *)'T', TASK_STACK_SIZE) \
+  TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
+  TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE)
diff --git a/test/timer_dos.tasklist b/test/timer_dos.tasklist
index 1a19829cbb..0ee84ced4f 100644
--- a/test/timer_dos.tasklist
+++ b/test/timer_dos.tasklist
@@ -1,15 +1,25 @@
+/* Copyright (c) 2012 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 /**
  * List of enabled tasks in the priority order
  *
  * The first one has the lowest priority.
+ *
+ * For each task, use the macro TASK(n, r, d, s) where :
+ * 'n' in the name of the task
+ * 'r' in the main routine of the task
+ * 'd' in an opaque parameter passed to the routine at startup
+ * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-  TASK(WATCHDOG, watchdog_task, NULL) \
-  TASK(VBOOTHASH, vboot_hash_task, NULL) \
-  TASK(HOSTCMD, host_command_task, NULL) \
-  TASK(CONSOLE, console_task, NULL) \
-  TASK(TMRA, TaskTimer, (void *)1234) \
-  TASK(TMRB, TaskTimer, (void *)5678) \
-  TASK(TMRC, TaskTimer, (void *)8462) \
-  TASK(TMRD, TaskTimer, (void *)3719)
+  TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+  TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
+  TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
+  TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \
+  TASK(TMRA, TaskTimer, (void *)1234, TASK_STACK_SIZE) \
+  TASK(TMRB, TaskTimer, (void *)5678, TASK_STACK_SIZE) \
+  TASK(TMRC, TaskTimer, (void *)8462, TASK_STACK_SIZE) \
+  TASK(TMRD, TaskTimer, (void *)3719, TASK_STACK_SIZE)
diff --git a/test/timer_jump.tasklist b/test/timer_jump.tasklist
index 323ae2fe2d..163bf93887 100644
--- a/test/timer_jump.tasklist
+++ b/test/timer_jump.tasklist
@@ -8,13 +8,14 @@
  *
  * The first one has the lowest priority.
  *
- * For each task, use the macro TASK(n, r, d) where :
+ * For each task, use the macro TASK(n, r, d, s) where :
  * 'n' in the name of the task
  * 'r' in the main routine of the task
  * 'd' in an opaque parameter passed to the routine at startup
+ * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(WATCHDOG, watchdog_task, NULL) \
-	TASK(VBOOTHASH, vboot_hash_task, NULL) \
-	TASK(CONSOLE, console_task, NULL) \
-	TASK(HOSTCMD, host_command_task, NULL)
+	TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
+	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE)
diff --git a/test/typematic.tasklist b/test/typematic.tasklist
index 253871f365..c17687e971 100644
--- a/test/typematic.tasklist
+++ b/test/typematic.tasklist
@@ -8,19 +8,20 @@
  *
  * The first one has the lowest priority.
  *
- * For each task, use the macro TASK(n, r, d) where :
+ * For each task, use the macro TASK(n, r, d, s) where :
  * 'n' in the name of the task
  * 'r' in the main routine of the task
  * 'd' in an opaque parameter passed to the routine at startup
+ * 's' is the stack size in bytes; must be a multiple of 8
  */
 #define CONFIG_TASK_LIST \
-	TASK(WATCHDOG, watchdog_task, NULL) \
-	TASK(VBOOTHASH, vboot_hash_task, NULL) \
-	TASK(PWM, pwm_task, NULL) \
-	TASK(TYPEMATIC, keyboard_typematic_task, NULL) \
-	TASK(X86POWER, x86_power_task, NULL) \
-	TASK(I8042CMD, i8042_command_task, NULL) \
-	TASK(KEYSCAN, keyboard_scan_task, NULL) \
-	TASK(POWERBTN, power_button_task, NULL) \
-	TASK(HOSTCMD, host_command_task, NULL) \
-	TASK(CONSOLE, console_task, NULL)
+	TASK(WATCHDOG, watchdog_task, NULL, TASK_STACK_SIZE) \
+	TASK(VBOOTHASH, vboot_hash_task, NULL, TASK_STACK_SIZE) \
+	TASK(PWM, pwm_task, NULL, TASK_STACK_SIZE) \
+	TASK(TYPEMATIC, keyboard_typematic_task, NULL, TASK_STACK_SIZE) \
+	TASK(X86POWER, x86_power_task, NULL, TASK_STACK_SIZE) \
+	TASK(I8042CMD, i8042_command_task, NULL, TASK_STACK_SIZE) \
+	TASK(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE) \
+	TASK(POWERBTN, power_button_task, NULL, TASK_STACK_SIZE) \
+	TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
+	TASK(CONSOLE, console_task, NULL, TASK_STACK_SIZE)