diff options
Diffstat (limited to 'arch/arm/mach-socfpga')
| -rw-r--r-- | arch/arm/mach-socfpga/include/mach/mailbox_s10.h | 218 | ||||
| -rw-r--r-- | arch/arm/mach-socfpga/include/mach/system_manager_soc64.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-socfpga/mailbox_s10.c | 16 |
3 files changed, 225 insertions, 11 deletions
diff --git a/arch/arm/mach-socfpga/include/mach/mailbox_s10.h b/arch/arm/mach-socfpga/include/mach/mailbox_s10.h index 2cc7c890449..45cc9912f94 100644 --- a/arch/arm/mach-socfpga/include/mach/mailbox_s10.h +++ b/arch/arm/mach-socfpga/include/mach/mailbox_s10.h @@ -8,6 +8,7 @@ #define _MAILBOX_S10_H_ /* user define Uboot ID */ +#include <linux/bitfield.h> #include <linux/bitops.h> #define MBOX_CLIENT_ID_UBOOT 0xB #define MBOX_ID_UBOOT 0x1 @@ -57,6 +58,9 @@ #define MBOX_RESP_CLIENT_GET(resp) \ (((resp) & MBOX_HDR_CLIENT_MSK) >> MBOX_HDR_CLIENT_LSB) +#define MBOX_CFG_STATUS_MAJOR_ERR_MSK GENMASK(31, 16) +#define MBOX_CFG_STATUS_MINOR_ERR_MSK GENMASK(15, 0) + /* Response error list */ enum ALT_SDM_MBOX_RESP_CODE { /* CMD completed successfully, but check resp ARGS for any errors */ @@ -162,6 +166,220 @@ enum ALT_SDM_MBOX_RESP_CODE { #define MBOX_CFGSTAT_STATE_ERROR_BOOT_INFO 0xf0000007 #define MBOX_CFGSTAT_STATE_ERROR_QSPI_ERROR 0xf0000008 +enum MBOX_CFGSTAT_MAJOR_ERR_CODE { + MBOX_CFGSTATE_MAJOR_ERR_UNK = -1, + MBOX_CFGSTATE_MAJOR_ERR_WRONG_BL31_VER = 0x0, + MBOX_CFGSTATE_MAJOR_ERR_STATE_CONFIG = 0x1000, + MBOX_CFGSTATE_MAJOR_ERR_BITSTREAM_ERR = 0xf001, + MBOX_CFGSTATE_MAJOR_ERR_EXT_HW_ACCESS_FAIL, + MBOX_CFGSTATE_MAJOR_ERR_BITSTREAM_CORRUPTION, + MBOX_CFGSTATE_MAJOR_ERR_INTERNAL_ERR, + MBOX_CFGSTATE_MAJOR_ERR_DEVICE_ERR, + MBOX_CFGSTATE_MAJOR_ERR_HPS_WDT, + MBOX_CFGSTATE_MAJOR_ERR_INTERNAL_UNKNOWN_ERR, + MBOX_CFGSTATE_MAJOR_ERR_SYSTEM_INIT_ERR, + MBOX_CFGSTATE_MAJOR_ERR_DECRYPTION_ERR, + MBOX_CFGSTATE_MAJOR_ERR_VERIFY_IMAGE_ERR = 0xf00b +}; + +enum MBOX_CFGSTAT_MINOR_ERR_CODE { + MBOX_CFGSTATE_MINOR_ERR_UNK = -1, + MBOX_CFGSTATE_MINOR_ERR_BASIC_ERR = 0x0, + MBOX_CFGSTATE_MINOR_ERR_CNT_RESP_ERR, + MBOX_CFGSTATE_MINOR_ERR_QSPI_DEV_ERR, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_INV, + MBOX_CFGSTATE_MINOR_ERR_BS_INCOMPATIBLE, + MBOX_CFGSTATE_MINOR_ERR_BS_INV_SHA, + MBOX_CFGSTATE_MINOR_ERR_ROUTE_FAIL, + MBOX_CFGSTATE_MINOR_ERR_GO_BIT_ALREADY_SET, + MBOX_CFGSTATE_MINOR_ERR_CPU_BLK_FAIL, + MBOX_CFGSTATE_MINOR_ERR_ACT_SKIP_FAIL, + MBOX_CFGSTATE_MINOR_ERR_ACT_MCAST_FAIL, + MBOX_CFGSTATE_MINOR_ERR_ACT_IND_SZ_FAIL, + MBOX_CFGSTATE_MINOR_ERR_ACT_IF_FAIL, + MBOX_CFGSTATE_MINOR_ERR_ACT_PIN_FAIL, + MBOX_CFGSTATE_MINOR_ERR_ACT_FUSEFLTR_FAIL, + MBOX_CFGSTATE_MINOR_ERR_ACT_GENERIC_FAIL, + MBOX_CFGSTATE_MINOR_ERR_DATA_STARVE_ERR, + MBOX_CFGSTATE_MINOR_ERR_CNT_RAM_INIT_FAIL, + MBOX_CFGSTATE_MINOR_ERR_ACT_SETUP_S4, + MBOX_CFGSTATE_MINOR_ERR_WIPE_DATA_STARVE, + MBOX_CFGSTATE_MINOR_ERR_FUSE_RD_FAIL, + MBOX_CFGSTATE_MINOR_ERR_AUTH_FAIL, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_SHA_FAIL, + MBOX_CFGSTATE_MINOR_ERR_SKIP_DATA_RAM_FAIL, + MBOX_CFGSTATE_MINOR_ERR_ACT_FIXED_FAIL, + MBOX_CFGSTATE_MINOR_ERR_ACT_MCAST_FLTR_FAIL, + MBOX_CFGSTATE_MINOR_ERR_ACT_SECTOR_FAIL, + MBOX_CFGSTATE_MINOR_ERR_ACT_HASH_FAIL, + MBOX_CFGSTATE_MINOR_ERR_ACT_DECOMP_SETUP_FAIL, + MBOX_CFGSTATE_MINOR_ERR_INTERNAL_OS_ERR, + MBOX_CFGSTATE_MINOR_ERR_WIPE_FAIL, + MBOX_CFGSTATE_MINOR_ERR_CNOC_ERR, + MBOX_CFGSTATE_MINOR_ERR_PMF_RESUME_FAIL, + MBOX_CFGSTATE_MINOR_ERR_PMF_RUN_FAIL, + MBOX_CFGSTATE_MINOR_ERR_PMF_PAUSE_FAIL, + MBOX_CFGSTATE_MINOR_ERR_RET_INT_ASSERT_FAIL, + MBOX_CFGSTATE_MINOR_ERR_STATE_MACHINE_ERR, + MBOX_CFGSTATE_MINOR_ERR_CMF_TRANSITION_FAIL, + MBOX_CFGSTATE_MINOR_ERR_SHA_SETUP_FAIL, + MBOX_CFGSTATE_MINOR_ERR_WR_DMA_TIMEOUT, + MBOX_CFGSTATE_MINOR_ERR_MEM_ALLOC_FAIL, + MBOX_CFGSTATE_MINOR_ERR_SYNC_RD_FAIL, + MBOX_CFGSTATE_MINOR_ERR_CHK_CFG_REQ_FAIL, + MBOX_CFGSTATE_MINOR_ERR_HPS_CFG_REQ_FAIL, + MBOX_CFGSTATE_MINOR_ERR_CFG_HANDLE_ERR, + MBOX_CFGSTATE_MINOR_ERR_INV_ACTION_ITEM, + MBOX_CFGSTATE_MINOR_ERR_SKIP_DATA_PREBUF_ERR, + MBOX_CFGSTATE_MINOR_ERR_MBOX_TIMEOUT, + MBOX_CFGSTATE_MINOR_ERR_AVST_FIFO_OVERFLOW_ERR, + MBOX_CFGSTATE_MINOR_ERR_RD_DMA_TIMEOUT, + MBOX_CFGSTATE_MINOR_ERR_PMF_INIT_ERR, + MBOX_CFGSTATE_MINOR_ERR_PMF_SHUTDOWN_ERR, + MBOX_CFGSTATE_MINOR_ERR_BITSTREAM_INTERRUPTED, + MBOX_CFGSTATE_MINOR_ERR_FPGA_MBOX_WIPE_TIMEOUT, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_TYPE_INV, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_VERSION_INV, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_DEVICE_TYPE_INV, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_DESIGN_HASH_ERR, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_EXT_REF_CLK_ERR, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_PWR_TBL_INV, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_PIN_TBL_OFST_ERR, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_PIN_TBL_INV, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_NO_PIN_TBL, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_CFG_CLK_PLL_FAILED, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_AS_CLK_FAILED, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_POF_ID_FAILED, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_PW_TBL_OFST_ERR, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_PP_TBL_OFST_ERR, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_PP_TBL_INV, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_SP_TBL_OFST_ERR, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_SP_TBL_INV, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_SU_TBL_OFST_ERR, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_SU_TBL_INV, + MBOX_CFGSTATE_MINOR_ERR_MBOX_TASK_CRYPTO_SRC_CLR_ERR, + MBOX_CFGSTATE_MINOR_ERR_MBOX_TASK_EVENT_GROUP_POST_ERR, + MBOX_CFGSTATE_MINOR_ERR_TRNG_TEST_FAIL, + MBOX_CFGSTATE_MINOR_ERR_MBOX_TASK_ANTI_DOS_TMR_INIT_ERR, + MBOX_CFGSTATE_MINOR_ERR_OS_STK_CHK_ERR, + MBOX_CFGSTATE_MINOR_ERR_MBOX_TASK_INIT, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_COMPAT_ID_MATCH_ERR, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_COMPAT_ID_INV, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_AES_ECRYPT_CHK_FAIL, + MBOX_CFGSTATE_MINOR_ERR_ACT_KEY_FAIL, + MBOX_CFGSTATE_MINOR_ERR_ACT_KEY_CHALLENGE_FAIL, + MBOX_CFGSTATE_MINOR_ERR_MBOX_TASK_MSGQ_DEQUEUE_FAIL, + MBOX_CFGSTATE_MINOR_ERR_SECT_COMPAT_CHK_ERR, + MBOX_CFGSTATE_MINOR_ERR_SECT_COMPAT_UPDATE_ERR, + MBOX_CFGSTATE_MINOR_ERR_SECT_SEC_CHK_FAILED, + MBOX_CFGSTATE_MINOR_ERR_CNT_RAM_ECC_ERR_UNRECOVERABLE, + MBOX_CFGSTATE_MINOR_ERR_MBOX_REFORMAT_INPUT_ERR, + MBOX_CFGSTATE_MINOR_ERR_MBOX_REFORMAT_OUTPUT_ERR, + MBOX_CFGSTATE_MINOR_ERR_MBOX_WLBL_ERR, + MBOX_CFGSTATE_MINOR_ERR_MBOX_HOOK_CB_ERR, + MBOX_CFGSTATE_MINOR_ERR_CMF_RLD_DECOMP_LOAD_ERR, + MBOX_CFGSTATE_MINOR_ERR_CMF_RLD_DECOMP_RUN_ERR, + MBOX_CFGSTATE_MINOR_ERR_CNT_PERIPH_ECC_ERR_UNRECOVERABLE, + MBOX_CFGSTATE_MINOR_ERR_MAIN_SECT_ADDR_ERR, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_SCRAMBLE_RATIO_CHK_FAIL, + MBOX_CFGSTATE_MINOR_ERR_TAMPER_EVENT_TRIGGERED, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_ANTI_TAMPER_TBL_INV, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_EXT_CLCK_MODE_DISALLOWED, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_SEC_OPTIONS_INIT_FAIL, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_EN_USR_CAN_FUSE_INV, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_AS_DEVICE_NO_SGX_ERR, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_POF_ID_LIMIT_EXCEED_ERR, + MBOX_CFGSTATE_MINOR_ERR_PROVISION_CMF_INV_STATE, + MBOX_CFGSTATE_MINOR_ERR_PROVISION_CMF_FATAL_ERR, + MBOX_CFGSTATE_MINOR_ERR_PROVISION_CMF_SM_EXIT_FAIL, + MBOX_CFGSTATE_MINOR_ERR_PROVISION_CMF_SM_ENTRY_FAIL, + MBOX_CFGSTATE_MINOR_ERR_ACTION_DATA_UNSUPPORTED_CTX, + MBOX_CFGSTATE_MINOR_ERR_CMF_EXCEPTION, + MBOX_CFGSTATE_MINOR_ERR_ECC_INIT_FAIL, + MBOX_CFGSTATE_MINOR_ERR_DEFAULT_UNREGISTERED_ISR, + MBOX_CFGSTATE_MINOR_ERR_GENERAL_TIMEOUT, + MBOX_CFGSTATE_MINOR_ERR_ACT_OPERATION_CLK_FAIL, + MBOX_CFGSTATE_MINOR_ERR_ACT_VERIFY_HASH_FAIL, + MBOX_CFGSTATE_MINOR_ERR_CFG_STATE_UPDATE_ERR, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_READ_DDR_HASH_FAIL, + MBOX_CFGSTATE_MINOR_ERR_CVP_FLOW_ERR, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_KEYED_HASH_ERR, + MBOX_CFGSTATE_MINOR_ERR_CMF_DESC_BAD_JTAG_ID = 0x7a, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_PMF_NOT_SUPPORTED = 0x7d, + MBOX_CFGSTATE_MINOR_ERR_MAIN_DESC_ANTI_TAMPER_NOT_SUPPORTED, + MBOX_CFGSTATE_MINOR_ERR_ACT_RECOVERY_FAIL = 0x80, + MBOX_CFGSTATE_MINOR_ERR_COLD_RESET_CMF_CORRUPTED, + MBOX_CFGSTATE_MINOR_ERR_COLD_RESET_IO_HPS_CORRUPTED, + MBOX_CFGSTATE_MINOR_ERR_COLD_RESET_FPGA_CORRUPTED, + MBOX_CFGSTATE_MINOR_ERR_CRC_CHK_FAIL, + MBOX_CFGSTATE_MINOR_ERR_COMPAT_TBL_SFIXED_VALUE_INV, + MBOX_CFGSTATE_MINOR_ERR_FEATURE_EN_FUSE_NOT_BLOWN = 0x87, + MBOX_CFGSTATE_MINOR_ERR_UIB_REFCLK_MISSING, + MBOX_CFGSTATE_MINOR_ERR_UIB_REFCLK_TIMEOUT, + MBOX_CFGSTATE_MINOR_ERR_UIB_REFCLK_TIMEOUT_MISSING, + MBOX_CFGSTATE_MINOR_ERR_TRAMP_SYNC_BLCK_ERR = 0xc001, + MBOX_CFGSTATE_MINOR_ERR_TRAMP_SSBL_SHA_ERR, + MBOX_CFGSTATE_MINOR_ERR_TRAMP_BLCK0_SHA_MISMATCH_ERR, + MBOX_CFGSTATE_MINOR_ERR_TRAMP_BLCK0_AUTH_ERR, + MBOX_CFGSTATE_MINOR_ERR_TRAMP_TRAMP_LOAD_ERR, + MBOX_CFGSTATE_MINOR_ERR_TRAMP_CMF_SIZE_ERR, + MBOX_CFGSTATE_MINOR_ERR_TRAMP_TRANSITION_ERR, + MBOX_CFGSTATE_MINOR_ERR_TRAMP_SYNC_ERR, + MBOX_CFGSTATE_MINOR_ERR_TRAMP_LOAD_CERT_ERR, + MBOX_CFGSTATE_MINOR_ERR_TRAMP_LOAD_NOT_ALLOWED_ERR, + MBOX_CFGSTATE_MINOR_ERR_TRAMP_FUSE_ERR, + MBOX_CFGSTATE_MINOR_ERR_TRAMP_INPUT_BUFFER_ERR = 0xc00d, + MBOX_CFGSTATE_MINOR_ERR_TRAMP_CMF_TYPE_ERR, + MBOX_CFGSTATE_MINOR_ERR_TRAMP_QSPI_INDR_READ_START_ERR, + MBOX_CFGSTATE_MINOR_ERR_PMF_I2C_COMM_ERR = 0xc801, + MBOX_CFGSTATE_MINOR_ERR_PMF_TARGET_VOLTAGE_ERR, + MBOX_CFGSTATE_MINOR_ERR_PMF_HANDSHAKE_ERR, + MBOX_CFGSTATE_MINOR_ERR_PMF_ITD_OUT_OF_RANGE_ERR, + MBOX_CFGSTATE_MINOR_ERR_PMF_PWR_TABLE_ERR, + MBOX_CFGSTATE_MINOR_ERR_PMF_EFUSE_DECODE_ERR, + MBOX_CFGSTATE_MINOR_ERR_PMF_VCCL_PWRGOOD_ERR, + MBOX_CFGSTATE_MINOR_ERR_PMF_CLR_FAULTS_ERR, + MBOX_CFGSTATE_MINOR_ERR_PMF_VOUT_MODE_ERR, + MBOX_CFGSTATE_MINOR_ERR_PMF_PAGE_COMMAND_ERR, + MBOX_CFGSTATE_MINOR_ERR_PMF_VOUT_COMMAND_ERR, + MBOX_CFGSTATE_MINOR_ERR_PMF_READ_VOUT_ERR, + MBOX_CFGSTATE_MINOR_ERR_PMF_LTM4677_DEFAULT_ADC_CTRL_ERR, + MBOX_CFGSTATE_MINOR_ERR_PMF_FIRST_I2C_CMD_FAILED_ERR, + MBOX_CFGSTATE_MINOR_ERR_RSU_CMF_AUTH_ERR = 0xd001, + MBOX_CFGSTATE_MINOR_ERR_RSU_USER_AUTH_ERR, + MBOX_CFGSTATE_MINOR_ERR_RSU_CMF_DESC_SHA_MISMATCH, + MBOX_CFGSTATE_MINOR_ERR_RSU_POINTERS_NOT_FOUND_ERR, + MBOX_CFGSTATE_MINOR_ERR_RSU_QSPI_FREQ_CHANGE, + MBOX_CFGSTATE_MINOR_ERR_RSU_FACTORY_IMG_FAILED, + MBOX_CFGSTATE_MINOR_ERR_RSU_CMF_TYPE_ERR, + MBOX_CFGSTATE_MINOR_ERR_RSU_UCMF_SIG_DESC_ERR, + MBOX_CFGSTATE_MINOR_ERR_RSU_UCMF_INTERNAL_AUTH_ERR, + MBOX_CFGSTATE_MINOR_ERR_RSU_UCMF_COPY_FAILED, + MBOX_CFGSTATE_MINOR_ERR_RSU_UCMF_ERASE_FAILED, + MBOX_CFGSTATE_MINOR_ERR_RSU_RM_UCMF_FROM_CPB_FAILED, + MBOX_CFGSTATE_MINOR_ERR_RSU_UCMF_COMBINED_APP_AUTH_ERR, + MBOX_CFGSTATE_MINOR_ERR_RSU_UCMF_FLASH_ACCESS_ERR, + MBOX_CFGSTATE_MINOR_ERR_RSU_DCMF_DCIO_CORRUPTED, + MBOX_CFGSTATE_MINOR_ERR_RSU_DCMF_CPB0_CORRUPTED, + MBOX_CFGSTATE_MINOR_ERR_RSU_DCMF_CPB1_CORRUPTED, + MBOX_CFGSTATE_MINOR_ERR_RSU_PROVISION_COMPLETE, + MBOX_CFGSTATE_MINOR_ERR_RSU_PROVISION_ERR, + MBOX_CFGSTATE_MINOR_ERR_SYSINIT_EFUSE_INIT_FAIL = 0xe001, + MBOX_CFGSTATE_MINOR_ERR_SYSINIT_SEC_PROT_ERR, + MBOX_CFGSTATE_MINOR_ERR_SYSINIT_EFUSE_LCK_ERR, + MBOX_CFGSTATE_MINOR_ERR_SYSINIT_SEC_BBRAM_CLEAN_ERR, + MBOX_CFGSTATE_MINOR_ERR_SYSINIT_ENG_LOAD_DIMK_ERR, + MBOX_CFGSTATE_MINOR_ERR_SYSINIT_SEC_UKV_CLEAN_ERR, + MBOX_CFGSTATE_MINOR_ERR_SYSINIT_EFUSE_ZERO_ERR, + MBOX_CFGSTATE_MINOR_ERR_SYSINIT_ENG_LOAD_ERR, + MBOX_CFGSTATE_MINOR_ERR_SYSINIT_PERST_INIT_FAIL, + MBOX_CFGSTATE_MINOR_ERR_SYSINIT_DIMK_INIT_FAIL, + MBOX_CFGSTATE_MINOR_ERR_SYSINIT_PERST_SECONDARY_INIT_FAIL, + MBOX_CFGSTATE_MINOR_ERR_SYSINIT_BR_INFO_INIT_FAIL, + MBOX_CFGSTATE_MINOR_ERR_SYSINIT_CMF_DESC_FAIL, + MBOX_CFGSTATE_MINOR_ERR_SYSINIT_DRNG_INIT_FAIL +}; + #define RCF_SOFTFUNC_STATUS_CONF_DONE BIT(0) #define RCF_SOFTFUNC_STATUS_INIT_DONE BIT(1) #define RCF_SOFTFUNC_STATUS_SEU_ERROR BIT(3) diff --git a/arch/arm/mach-socfpga/include/mach/system_manager_soc64.h b/arch/arm/mach-socfpga/include/mach/system_manager_soc64.h index a8009664fee..78eff247978 100644 --- a/arch/arm/mach-socfpga/include/mach/system_manager_soc64.h +++ b/arch/arm/mach-socfpga/include/mach/system_manager_soc64.h @@ -145,7 +145,7 @@ void populate_sysmgr_pinmux(void); #define SYSMGR_DMAPERIPH_ALL_NS 0xFFFFFFFF -#define SYSMGR_WDDBG_PAUSE_ALL_CPU 0x0F0F0F0F +#define SYSMGR_WDDBG_PAUSE_ALL_CPU 0xFF0F0F0F #if IS_ENABLED(CONFIG_TARGET_SOCFPGA_N5X) #define SYSMGR_SOC64_DDR_MODE_MSK BIT(0) diff --git a/arch/arm/mach-socfpga/mailbox_s10.c b/arch/arm/mach-socfpga/mailbox_s10.c index 2b4f26040fe..b69bd3e47ec 100644 --- a/arch/arm/mach-socfpga/mailbox_s10.c +++ b/arch/arm/mach-socfpga/mailbox_s10.c @@ -88,6 +88,8 @@ static __always_inline int mbox_write_cmd_buffer(u32 *cin, u32 data, MBOX_WRITE_CMD_BUF(data, (*cin)++); *cin %= MBOX_CMD_BUFFER_SIZE; MBOX_WRITEL(*cin, MBOX_CIN); + if (is_cmdbuf_overflow) + *is_cmdbuf_overflow = 0; break; } timeout--; @@ -96,10 +98,6 @@ static __always_inline int mbox_write_cmd_buffer(u32 *cin, u32 data, if (!timeout) return -ETIMEDOUT; - /* Wait for the SDM to drain the FIFO command buffer */ - if (is_cmdbuf_overflow && *is_cmdbuf_overflow) - return mbox_wait_for_cmdbuf_empty(*cin); - return 0; } @@ -125,13 +123,11 @@ static __always_inline int mbox_fill_cmd_circular_buff(u32 header, u32 len, return ret; } - /* If SDM doorbell is not triggered after the last data is - * written into mailbox FIFO command buffer, trigger the - * SDM doorbell again to ensure SDM able to read the remaining - * data. + /* + * Always trigger the SDM doorbell at the end to ensure SDM able to read + * the remaining data. */ - if (!is_cmdbuf_overflow) - MBOX_WRITEL(1, MBOX_DOORBELL_TO_SDM); + MBOX_WRITEL(1, MBOX_DOORBELL_TO_SDM); return 0; } |