Improving error behavior

Improving error behavior

Author: Catherine Garabedian

common/autoboot.c

@@ -359,6 +359,18 @@ void autoboot_command(const char *s)
 #if defined(CONFIG_AUTOBOOT_KEYED) && !defined(CONFIG_AUTOBOOT_KEYED_CTRLC)
 		disable_ctrlc(prev);	/* restore Control C checking */
 #endif
+
+		/*
+		 * We failed to run commands for some reason.
+		 * There are two conceivable reasons:
+		 * - Someone coded bad boot commands
+		 * - The envar section of RAM got hit with an SEU
+		 *
+		 * We want to try to handle the latter by just doing a system reset so
+		 * that RAM gets reloaded
+		 */
+
+		do_reset(cmdtp, flag, argc, argv);
 	}
 
 #ifdef CONFIG_MENUKEY

common/bootm.c

@@ -612,11 +612,21 @@ int do_bootm_states(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
 
 #ifdef CONFIG_UPDATE_KUBOS
 	/* Check the boot counter. If it's too high, we need to try and recover */
-	if(bootcount_load() > 2)
+	unsigned long bootcount = bootcount_load();
+	if(bootcount > 2)
 	{
-		ret = BOOTM_ERR_OTHER;
-		printf("ERROR: Failed to boot too many times, triggering recovery\n");
-		goto err;
+		/*
+		 * If the bootlimit has been reached, then we're trying to execute the
+		 * alternate boot logic. It's entirely possible that we're still using
+		 * a `bootm` command to load an alternate OS, so don't automatically
+		 * fall into the recovery logic
+		 */
+		unsigned long bootlimit = getenv_ulong("bootlimit", 10, 0);
+		if(bootcount <= bootlimit) {
+			ret = BOOTM_ERR_OTHER;
+			printf("ERROR: Failed to boot too many times, triggering recovery\n");
+			goto err;
+		}
 	}
 #endif
 
@@ -789,10 +799,7 @@ int do_bootm_states(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[],
 	 * can track the failure and run the altbootcmd instead, if it's available.
 	 */
 	printf("Boot failed. No rollback could be completed\n");
-	if (getenv_yesno("recovery_available"))
-	{
-		do_reset(cmdtp, flag, argc, argv);
-	}
+	do_reset(cmdtp, flag, argc, argv);
 
 #endif
 

include/configs/kubos-common.h

@@ -44,7 +44,7 @@
 #define KUBOS_UPDATE_FILE  "kubos_updatefile"
 
 #define KUBOS_UPDATE_ARGS \
-	"altbootcmd=setenv recovery_available 0; setenv bootcmd; saveenv\0" \
+	"altbootcmd=run bootcmd\0" \
 	"recovery_available=1\0" \
     "bootlimit=3\0" \
 	KUBOS_CURR_VERSION "=" KUBOS_BASE "\0" \