After leaving the Partial-IO mode or other deep sleep states, the IO isolation needs to be removed. This routine is shared by at least am62, am62a and am62p.
The original function for testing was developed by Akashdeep Kaur <[email protected]> Signed-off-by: Markus Schneider-Pargmann (TI.com) <[email protected]> --- arch/arm/mach-k3/am62ax/am62a7_init.c | 4 +++ arch/arm/mach-k3/am62px/am62p5_init.c | 4 +++ arch/arm/mach-k3/am62x/am625_init.c | 4 +++ arch/arm/mach-k3/common.c | 59 ++++++++++++++++++++++++++++++++ arch/arm/mach-k3/common.h | 1 + arch/arm/mach-k3/include/mach/hardware.h | 26 ++++++++++++++ 6 files changed, 98 insertions(+) diff --git a/arch/arm/mach-k3/am62ax/am62a7_init.c b/arch/arm/mach-k3/am62ax/am62a7_init.c index 7de234611639d119db5c7a718738a02cedf8028c..24fdfdd7f1d9146f0cb6dde333d2bb54df96700d 100644 --- a/arch/arm/mach-k3/am62ax/am62a7_init.c +++ b/arch/arm/mach-k3/am62ax/am62a7_init.c @@ -101,6 +101,10 @@ void board_init_f(ulong dummy) /* Init DM early */ spl_early_init(); + ret = wkup_ctrl_remove_can_io_isolation_if_set(); + if (ret) + panic("Failed to remove can IO isolation when set %d\n", ret); + /* * Process pinctrl for the serial0 and serial3, aka WKUP_UART0 and * MAIN_UART1 modules and continue regardless of the result of pinctrl. diff --git a/arch/arm/mach-k3/am62px/am62p5_init.c b/arch/arm/mach-k3/am62px/am62p5_init.c index 4c215d5cebed5930bce70bdc975fe31c437ce82b..976bbbeb8747f9ddddd78b3f8d7f3787c5bfd576 100644 --- a/arch/arm/mach-k3/am62px/am62p5_init.c +++ b/arch/arm/mach-k3/am62px/am62p5_init.c @@ -160,6 +160,10 @@ void board_init_f(ulong dummy) if (ret) panic("spl_early_init() failed: %d\n", ret); + ret = wkup_ctrl_remove_can_io_isolation_if_set(); + if (ret) + panic("Failed to remove can IO isolation when set %d\n", ret); + /* * Process pinctrl for the serial0 and serial3, aka WKUP_UART0 and * MAIN_UART1 modules and continue regardless of the result of pinctrl. diff --git a/arch/arm/mach-k3/am62x/am625_init.c b/arch/arm/mach-k3/am62x/am625_init.c index 02b7414e21cd56faab795fe7b39eefcc67cb044a..318159147b08f682082e9c5cb69a3c124659730f 100644 --- a/arch/arm/mach-k3/am62x/am625_init.c +++ b/arch/arm/mach-k3/am62x/am625_init.c @@ -201,6 +201,10 @@ void board_init_f(ulong dummy) /* Init DM early */ spl_early_init(); + ret = wkup_ctrl_remove_can_io_isolation_if_set(); + if (ret) + panic("Failed to remove can IO isolation when set %d\n", ret); + /* * Process pinctrl for the serial0 and serial3, aka WKUP_UART0 and * MAIN_UART1 modules and continue regardless of the result of pinctrl. diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c index a80cf87ce65a44c386539ade17c0f435e09de841..81e180c8706445c270cfecb0500015eee7547f98 100644 --- a/arch/arm/mach-k3/common.c +++ b/arch/arm/mach-k3/common.c @@ -33,6 +33,9 @@ #include <asm/armv8/mmu.h> #include <mach/k3-common-fdt.h> #include <mach/k3-ddr.h> +#include <wait_bit.h> + +#define CLKSTOP_TRANSITION_TIMEOUT_MS 10 #define PROC_BOOT_CTRL_FLAG_R5_CORE_HALT 0x00000001 #define PROC_BOOT_STATUS_FLAG_R5_WFI 0x00000002 @@ -115,6 +118,55 @@ void mmr_unlock(uintptr_t base, u32 partition) writel(CTRLMMR_LOCK_KICK1_UNLOCK_VAL, part_base + CTRLMMR_LOCK_KICK1); } +static int wkup_ctrl_remove_can_io_isolation(void) +{ + const void *wait_reg = (const void *)(WKUP_CTRL_MMR0_BASE + + WKUP_CTRL_MMR_CANUART_WAKE_STAT1); + int ret; + u32 reg = 0; + + /* Program magic word */ + reg = readl(WKUP_CTRL_MMR0_BASE + WKUP_CTRL_MMR_CANUART_WAKE_CTRL); + reg |= WKUP_CTRL_MMR_CANUART_WAKE_CTRL_MW << WKUP_CTRL_MMR_CANUART_WAKE_CTRL_MW_SHIFT; + writel(reg, WKUP_CTRL_MMR0_BASE + WKUP_CTRL_MMR_CANUART_WAKE_CTRL); + + /* Set enable bit. */ + reg |= WKUP_CTRL_MMR_CANUART_WAKE_CTRL_MW_LOAD_EN; + writel(reg, WKUP_CTRL_MMR0_BASE + WKUP_CTRL_MMR_CANUART_WAKE_CTRL); + + /* Clear enable bit. */ + reg &= ~WKUP_CTRL_MMR_CANUART_WAKE_CTRL_MW_LOAD_EN; + writel(reg, WKUP_CTRL_MMR0_BASE + WKUP_CTRL_MMR_CANUART_WAKE_CTRL); + + /* wait for CAN_ONLY_IO signal to be 0 */ + ret = wait_for_bit_32(wait_reg, + WKUP_CTRL_MMR_CANUART_WAKE_STAT1_CANUART_IO_MODE, + false, + CLKSTOP_TRANSITION_TIMEOUT_MS, + false); + if (ret < 0) + return ret; + + /* Reset magic word */ + writel(0, WKUP_CTRL_MMR0_BASE + WKUP_CTRL_MMR_CANUART_WAKE_CTRL); + + /* Remove WKUP IO isolation */ + reg = readl(WKUP_CTRL_MMR0_BASE + WKUP_CTRL_MMR_PMCTRL_IO_0); + reg = reg & WKUP_CTRL_MMR_PMCTRL_IO_0_WRITE_MASK & ~WKUP_CTRL_MMR_PMCTRL_IO_0_GLOBAL_WUEN_0; + writel(reg, WKUP_CTRL_MMR0_BASE + WKUP_CTRL_MMR_PMCTRL_IO_0); + + /* clear global IO isolation */ + reg = readl(WKUP_CTRL_MMR0_BASE + WKUP_CTRL_MMR_PMCTRL_IO_0); + reg = reg & WKUP_CTRL_MMR_PMCTRL_IO_0_WRITE_MASK & ~WKUP_CTRL_MMR_PMCTRL_IO_0_IO_ISO_CTRL_0; + writel(reg, WKUP_CTRL_MMR0_BASE + WKUP_CTRL_MMR_PMCTRL_IO_0); + + /* Release all IOs from deepsleep mode and clear IO daisy chain control */ + writel(0, WKUP_CTRL_MMR0_BASE + WKUP_CTRL_MMR_DEEPSLEEP_CTRL); + writel(0, WKUP_CTRL_MMR0_BASE + WKUP_CTRL_MMR_PMCTRL_IO_GLB); + + return 0; +} + static bool wkup_ctrl_canuart_wakeup_active(void) { return !!(readl(WKUP_CTRL_MMR0_BASE + WKUP_CTRL_MMR_CANUART_WAKE_STAT1) & @@ -134,6 +186,13 @@ bool wkup_ctrl_is_lpm_exit(void) wkup_ctrl_canuart_magic_word_set(); } +int __maybe_unused wkup_ctrl_remove_can_io_isolation_if_set(void) +{ + if (wkup_ctrl_canuart_wakeup_active() && !wkup_ctrl_canuart_magic_word_set()) + return wkup_ctrl_remove_can_io_isolation(); + return 0; +} + bool is_rom_loaded_sysfw(struct rom_extended_boot_data *data) { if (strncmp(data->header, K3_ROM_BOOT_HEADER_MAGIC, 7)) diff --git a/arch/arm/mach-k3/common.h b/arch/arm/mach-k3/common.h index 55fe1f06d8b04a0bc27a88bb63a1fdc0b1eb383f..a68924a2123961642b63401f3600ac825fb62da5 100644 --- a/arch/arm/mach-k3/common.h +++ b/arch/arm/mach-k3/common.h @@ -52,6 +52,7 @@ void do_board_detect(void); void ti_secure_image_check_binary(void **p_image, size_t *p_size); int shutdown_mcu_r5_core1(void); bool wkup_ctrl_is_lpm_exit(void); +int wkup_ctrl_remove_can_io_isolation_if_set(void); #if IS_ENABLED(CONFIG_SPL_OS_BOOT_SECURE) && !IS_ENABLED(CONFIG_ARM64) int k3_r5_falcon_bootmode(void); diff --git a/arch/arm/mach-k3/include/mach/hardware.h b/arch/arm/mach-k3/include/mach/hardware.h index 6f425d03be5d9cbc03a0daac5e9b10fadd176335..8b5698ba8e99e32d9b41e8e476ed433481726b8a 100644 --- a/arch/arm/mach-k3/include/mach/hardware.h +++ b/arch/arm/mach-k3/include/mach/hardware.h @@ -117,6 +117,32 @@ K3_SOC_ID(j722s, J722S) #define CTRLMMR_LOCK_KICK1 0x100c #define CTRLMMR_LOCK_KICK1_UNLOCK_VAL 0xd172bc5a +/* + * Shared WKUP_CTRL_MMR0 definitions used to remove IO isolation + */ +#define WKUP_CTRL_MMR_PMCTRL_IO_0 0x18084 +#define WKUP_CTRL_MMR_PMCTRL_IO_0_ISOCLK_OVRD_0 BIT(0) +#define WKUP_CTRL_MMR_PMCTRL_IO_0_ISOOVR_EXTEND_0 BIT(4) +#define WKUP_CTRL_MMR_PMCTRL_IO_0_ISO_BYPASS_OVR_0 BIT(6) +#define WKUP_CTRL_MMR_PMCTRL_IO_0_WUCLK_CTRL_0 BIT(8) +#define WKUP_CTRL_MMR_PMCTRL_IO_0_GLOBAL_WUEN_0 BIT(16) +#define WKUP_CTRL_MMR_PMCTRL_IO_0_IO_ISO_CTRL_0 BIT(24) +#define WKUP_CTRL_MMR_PMCTRL_IO_0_WRITE_MASK ( \ + WKUP_CTRL_MMR_PMCTRL_IO_0_ISOCLK_OVRD_0 | \ + WKUP_CTRL_MMR_PMCTRL_IO_0_ISOOVR_EXTEND_0 | \ + WKUP_CTRL_MMR_PMCTRL_IO_0_ISO_BYPASS_OVR_0 | \ + WKUP_CTRL_MMR_PMCTRL_IO_0_WUCLK_CTRL_0 | \ + WKUP_CTRL_MMR_PMCTRL_IO_0_GLOBAL_WUEN_0 | \ + WKUP_CTRL_MMR_PMCTRL_IO_0_IO_ISO_CTRL_0) + +#define WKUP_CTRL_MMR_PMCTRL_IO_GLB 0x1809c +#define WKUP_CTRL_MMR_DEEPSLEEP_CTRL 0x18160 + +#define WKUP_CTRL_MMR_CANUART_WAKE_CTRL 0x18300 +#define WKUP_CTRL_MMR_CANUART_WAKE_CTRL_MW 0x2aaaaaaa +#define WKUP_CTRL_MMR_CANUART_WAKE_CTRL_MW_SHIFT 1 +#define WKUP_CTRL_MMR_CANUART_WAKE_CTRL_MW_LOAD_EN BIT(0) + #define WKUP_CTRL_MMR_CANUART_WAKE_STAT1 0x1830c #define WKUP_CTRL_MMR_CANUART_WAKE_STAT1_CANUART_IO_MODE BIT(0) -- 2.51.0
