bootcount: Add function wrappers to handle bootcount increment and error checking

Those two functions can be used to provide easy bootcount management.

Signed-off-by: Lukasz Majewski <lukma@denx.de>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Stefan Roese <sr@denx.de>

diff --git a/include/bootcount.h b/include/bootcount.h
index c0a6b6e0e26c2e934cf317549b1bb84f71db4c5b..671adcc4101adb7c192fb0cb2ab7898f60e25b31 100644 (file)
--- a/include/bootcount.h
+++ b/include/bootcount.h
@@ -10,6 +10,8 @@
 #include <asm/io.h>
 #include <asm/byteorder.h>
 
+#if defined(CONFIG_SPL_BOOTCOUNT_LIMIT) || defined(CONFIG_BOOTCOUNT_LIMIT)
+
 #if !defined(CONFIG_SYS_BOOTCOUNT_LE) && !defined(CONFIG_SYS_BOOTCOUNT_BE)
 # if __BYTE_ORDER == __LITTLE_ENDIAN
 #  define CONFIG_SYS_BOOTCOUNT_LE
@@ -39,4 +41,49 @@ static inline u32 raw_bootcount_load(volatile u32 *addr)
        return in_be32(addr);
 }
 #endif
+
+DECLARE_GLOBAL_DATA_PTR;
+static inline int bootcount_error(void)
+{
+       unsigned long bootcount = bootcount_load();
+       unsigned long bootlimit = env_get_ulong("bootlimit", 10, 0);
+
+       if (bootlimit && bootcount > bootlimit) {
+               printf("Warning: Bootlimit (%lu) exceeded.", bootlimit);
+               if (!(gd->flags & GD_FLG_SPL_INIT))
+                       printf(" Using altbootcmd.");
+               printf("\n");
+
+               return 1;
+       }
+
+       return 0;
+}
+
+static inline void bootcount_inc(void)
+{
+       unsigned long bootcount = bootcount_load();
+
+       if (gd->flags & GD_FLG_SPL_INIT) {
+               bootcount_store(++bootcount);
+               return;
+       }
+
+#ifndef CONFIG_SPL_BUILD
+       /* Only increment bootcount when no bootcount support in SPL */
+#ifndef CONFIG_SPL_BOOTCOUNT_LIMIT
+       bootcount_store(++bootcount);
+#endif
+       env_set_ulong("bootcount", bootcount);
+#endif /* !CONFIG_SPL_BUILD */
+}
+
+#if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_BOOTCOUNT_LIMIT)
+void bootcount_store(ulong a) {};
+ulong bootcount_load(void) { return 0; }
+#endif /* CONFIG_SPL_BUILD && !CONFIG_SPL_BOOTCOUNT_LIMIT */
+#else
+static inline int bootcount_error(void) { return 0; }
+static inline void bootcount_inc(void) {}
+#endif /* CONFIG_SPL_BOOTCOUNT_LIMIT || CONFIG_BOOTCOUNT_LIMIT */
 #endif /* _BOOTCOUNT_H__ */