[PATCH v1 09/11] arm: meson: a1: ADNL protocol support

[Arseniy Krasnov]

During ADNL protocol operations, BootROM may request to enter
ADNL mode after boot. So to support this, let's check for values
in sticky registers after boot (such registers could be updated
earlier by boot ROM, telling U-boot to enter ADNL mode.

Signed-off-by: Arseniy Krasnov <avkrasnov at salutedevices.com>
---
 arch/arm/include/asm/arch-meson/a1.h | 13 +++++++++++
 arch/arm/mach-meson/board-a1.c       | 32 +++++++++++++++++++++++++++-
 arch/arm/mach-meson/board-common.c   | 17 +++++++++++++++
 3 files changed, 61 insertions(+), 1 deletion(-)

diff --git a/arch/arm/include/asm/arch-meson/a1.h b/arch/arm/include/asm/arch-meson/a1.h
index 16e209ed932..4a22aaf5627 100644
--- a/arch/arm/include/asm/arch-meson/a1.h
+++ b/arch/arm/include/asm/arch-meson/a1.h
@@ -12,6 +12,7 @@
 /* SYSCTRL registers */
 #define A1_SYSCTRL_ADDR(off)		(A1_SYSCTRL_BASE + ((off) << 2))
 
+#define A1_SYSCTRL_SEC_STATUS_REG1	A1_SYSCTRL_ADDR(0xc1)
 #define A1_SYSCTRL_SEC_STATUS_REG4	A1_SYSCTRL_ADDR(0xc4)
 /*
  * Checked during boot. Tells, that previous code, e.g.
@@ -20,7 +21,19 @@
  */
 #define A1_SYSCTRL_SEC_STICKY_REG2	A1_SYSCTRL_ADDR(0xe2)
 
+#define A1_AO_BOOT_DEVICE		0xF
 #define A1_SYSCTRL_MEM_SIZE_MASK	0xFFFF0000
 #define A1_SYSCTRL_MEM_SIZE_SHIFT	16
 
+#if CONFIG_IS_ENABLED(ADNL)
+/**
+ * is_tpl_loaded_from_usb - Checks, that this instance of U-boot was
+ *                          loaded from USB during firmware update
+ *                          process.
+ *
+ * returns: true, if so.
+ */
+int is_tpl_loaded_from_usb(void);
+#endif
+
 #endif /* __MESON_A1_H__ */
diff --git a/arch/arm/mach-meson/board-a1.c b/arch/arm/mach-meson/board-a1.c
index f848c0f068e..9cc410f1e57 100644
--- a/arch/arm/mach-meson/board-a1.c
+++ b/arch/arm/mach-meson/board-a1.c
@@ -3,6 +3,7 @@
  * (C) Copyright 2023 SberDevices, Inc.
  */
 
+#include <command.h>
 #include <asm/arch/a1.h>
 #include <asm/arch/boot.h>
 #include <asm/armv8/mmu.h>
@@ -23,9 +24,38 @@ void meson_init_reserved_memory(__maybe_unused void *fdt)
 
 int meson_get_boot_device(void)
 {
-	return -ENOSYS;
+	return readl(A1_SYSCTRL_SEC_STATUS_REG4) & A1_AO_BOOT_DEVICE;
 }
 
+#if CONFIG_IS_ENABLED(ADNL)
+
+static bool is_boot_device_usb(void)
+{
+	return meson_get_boot_device() == BOOT_DEVICE_USB;
+}
+
+#define MESON_ADNL_BL1_USB_PROTO_DNL_BIT	BIT(12)
+
+static bool is_bl1_usb_protocol_DNL(void)
+{
+	u32 val = readl(A1_SYSCTRL_SEC_STATUS_REG1);
+
+	return !(val & MESON_ADNL_BL1_USB_PROTO_DNL_BIT);
+}
+
+int is_tpl_loaded_from_usb(void)
+{
+	if (!is_boot_device_usb())
+		return false;
+
+	if (!is_bl1_usb_protocol_DNL())
+		return false;
+
+	return true;
+}
+
+#endif
+
 static struct mm_region a1_mem_map[] = {
 	{
 		.virt = 0x00000000UL,
diff --git a/arch/arm/mach-meson/board-common.c b/arch/arm/mach-meson/board-common.c
index 39774c43049..0624d557e40 100644
--- a/arch/arm/mach-meson/board-common.c
+++ b/arch/arm/mach-meson/board-common.c
@@ -3,6 +3,7 @@
  * (C) Copyright 2016 Beniamino Galvani <b.galvani at gmail.com>
  */
 
+#include <command.h>
 #include <cpu_func.h>
 #include <fastboot.h>
 #include <init.h>
@@ -14,9 +15,11 @@
 #include <asm/ptrace.h>
 #include <linux/libfdt.h>
 #include <linux/err.h>
+#include <asm/arch/a1.h>
 #include <asm/arch/mem.h>
 #include <asm/arch/sm.h>
 #include <asm/armv8/mmu.h>
+#include <asm/io.h>
 #include <asm/unaligned.h>
 #include <efi_loader.h>
 #include <u-boot/crc.h>
@@ -141,10 +144,24 @@ __weak int meson_board_late_init(void)
 	return 0;
 }
 
+static void meson_board_try_enter_adnl(void)
+{
+#if (IS_ENABLED(CONFIG_CMD_ADNL))
+	if (!is_tpl_loaded_from_usb())
+		return;
+
+	meson_sm_set_bl1_first_boot_source(SCPI_CMD_CLEAR_BOOT);
+
+	run_command("adnl", 0);
+#endif
+}
+
 int board_late_init(void)
 {
 	meson_set_boot_source();
 
+	meson_board_try_enter_adnl();
+
 	return meson_board_late_init();
 }
 
-- 
2.30.1