stv0g/embeddedsw
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

sw_apps:zynqmp_fsbl: Added watchdog support

Browse source 
This patch adds System Watchdog Timer support

Signed-off-by: Sarat Chand Savitala <saratcha@xilinx.com>
Acked-by: Krishna Chaitanya Patakamuri <kpataka@xilinx.com>
This commit is contained in:
Sarat Chand Savitala 2015-07-30 20:30:55 +05:30 • committed by Nava kishore Manne
parent 4ceb19f1ae
commit dff2a597f9
8 changed files with 79 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/sw_apps/zynqmp_fsbl/src/xfsbl_config.h
View file

@ -123,6 +123,7 @@ extern "C" {
* - FSBL_BS_EXCLUDE PL bitstream code will be excluded
* - FSBL_SHA2_EXCLUDE SHA2 code will be excluded
* - FSBL_EARLY_HANDOFF_EXCLUDE Early handoff related code will be excluded
* - FSBL_WDT_EXCLUDE WDT code will be excluded
*/
#define FSBL_NAND_EXCLUDE_VAL (0U)
#define FSBL_QSPI_EXCLUDE_VAL (0U)
@ -132,6 +133,7 @@ extern "C" {
#define FSBL_BS_EXCLUDE_VAL (0U)
#define FSBL_SHA2_EXCLUDE_VAL (1U)
#define FSBL_EARLY_HANDOFF_EXCLUDE_VAL (0U)
#define FSBL_WDT_EXCLUDE_VAL (0U)
#if FSBL_NAND_EXCLUDE_VAL
#define FSBL_NAND_EXCLUDE
@ -165,6 +167,9 @@ extern "C" {
#define FSBL_EARLY_HANDOFF_EXCLUDE
#endif
#if FSBL_WDT_EXCLUDE_VAL
#define FSBL_WDT_EXCLUDE
#endif
/************************** Function Prototypes ******************************/

5
lib/sw_apps/zynqmp_fsbl/src/xfsbl_handoff.c
View file

@ -538,6 +538,11 @@ END:
void XFsbl_HandoffExit(u64 HandoffAddress, u32 Flags)
{
#ifdef XFSBL_WDT_PRESENT
/* Stop WDT as we are exiting FSBL */
XFsbl_StopWdt();
#endif
/**
* Flush the L1 data cache and L2 cache, Disable Data Cache
*/

23
lib/sw_apps/zynqmp_fsbl/src/xfsbl_hw.h
View file

@ -237,6 +237,10 @@ extern "C" {
#define CRL_APB_PCAP_CTRL_DIVISOR0_MASK 0X00003F00U
#define CRL_APB_PCAP_CTRL_CLKACT_MASK 0X01000000U
/* Register: CRL_APB_RESET_REASON */
#define CRL_APB_RESET_REASON ( ( CRL_APB_BASEADDR ) + 0X00000220U )
#define CRL_APB_RESET_REASON_PMU_SYS_RESET_MASK 0X00000004U
/* apu */
/**
@ -342,6 +346,21 @@ extern "C" {
#define PMU_GLOBAL_PWR_STATE_ACPU1_MASK 0X00000002U
#define PMU_GLOBAL_PWR_STATE_ACPU0_MASK 0X00000001U
/* Register: PMU_GLOBAL_ERROR_STATUS_1 */
#define PMU_GLOBAL_ERROR_STATUS_1 ( ( PMU_GLOBAL_BASEADDR ) + 0X00000530U )
#define PMU_GLOBAL_ERROR_STATUS_1_LPD_SWDT_MASK 0X00001000U
/* Register: PMU_GLOBAL_ERROR_SRST_EN_1 */
#define PMU_GLOBAL_ERROR_SRST_EN_1 ( ( PMU_GLOBAL_BASEADDR ) + 0X0000056CU )
#define PMU_GLOBAL_ERROR_SRST_EN_1_LPD_SWDT_MASK 0X00001000U
/* Register: PMU_GLOBAL_ERROR_SRST_DIS_1 */
#define PMU_GLOBAL_ERROR_SRST_DIS_1 ( ( PMU_GLOBAL_BASEADDR ) + 0X00000570U )
#define PMU_GLOBAL_ERROR_SRST_DIS_1_LPD_SWDT_MASK 0X00001000U
/* Register: PMU_GLOBAL_ERROR_EN_1 */
#define PMU_GLOBAL_ERROR_EN_1 ( ( PMU_GLOBAL_BASEADDR ) + 0X000005A0U )
#define PMU_GLOBAL_ERROR_EN_1_LPD_SWDT_MASK 0X00001000U
/* rpu */
@ -503,8 +522,8 @@ extern "C" {
/**
* Definition for WDT to be included
*/
#ifdef XPAR_XWDTPS_0_DEVICE_ID
/*#define XFSBL_WDT_PRESENT*/
#if (!defined(FSBL_WDT_EXCLUDE) && defined(XPAR_XWDTPS_0_DEVICE_ID))
#define XFSBL_WDT_PRESENT
#endif
/**

19
lib/sw_apps/zynqmp_fsbl/src/xfsbl_initialization.c
View file

@ -308,9 +308,9 @@ static u32 XFsbl_ProcessorInit(XFsblPs * FsblInstancePtr)
static u32 XFsbl_ResetValidation(XFsblPs * FsblInstancePtr)
{
u32 Status = XFSBL_SUCCESS;
#if 0
u32 FsblErrorStatus=0U;
u32 ResetReasonValue=0U;
u32 ErrStatusRegValue;
/**
* Read the Error Status register
@ -319,15 +319,16 @@ static u32 XFsbl_ResetValidation(XFsblPs * FsblInstancePtr)
FsblErrorStatus = XFsbl_In32(XFSBL_ERROR_STATUS_REGISTER_OFFSET);
ResetReasonValue = XFsbl_In32(CRL_APB_RESET_REASON);
ErrStatusRegValue = XFsbl_In32(PMU_GLOBAL_ERROR_STATUS_1);
/**
* Add LPD_SWDT for r5
* check if the reset is due to system WDT during
* Check if the reset is due to system WDT during
* previous FSBL execution
*/
/* WDT reset is missing in reset reason */
if (((ResetReasonValue & CRL_APB_RESET_REASON_FPD_SWDT_MASK)
== CRL_APB_RESET_REASON_FPD_SWDT_MASK) &&
if (((ResetReasonValue & CRL_APB_RESET_REASON_PMU_SYS_RESET_MASK)
== CRL_APB_RESET_REASON_PMU_SYS_RESET_MASK) &&
((ErrStatusRegValue & PMU_GLOBAL_ERROR_STATUS_1_LPD_SWDT_MASK)
== PMU_GLOBAL_ERROR_STATUS_1_LPD_SWDT_MASK) &&
(FsblErrorStatus == XFSBL_RUNNING)) {
/**
* reset is due to System WDT.
@ -353,7 +354,6 @@ static u32 XFsbl_ResetValidation(XFsblPs * FsblInstancePtr)
*/
END:
#endif
return Status;
}
@ -457,6 +457,11 @@ static u32 XFsbl_PrimaryBootDeviceInit(XFsblPs * FsblInstancePtr)
{
XFsbl_Printf(DEBUG_GENERAL,"In JTAG Boot Mode \n\r");
Status = XFSBL_STATUS_JTAG;
#ifdef XFSBL_WDT_PRESENT
/* Stop WDT as we are in JTAG boot mode */
XFsbl_StopWdt();
#endif
}
break;

5
lib/sw_apps/zynqmp_fsbl/src/xfsbl_main.c
View file

@ -408,6 +408,11 @@ void XFsbl_FallBack(void)
{
u32 RegValue;
#ifdef XFSBL_WDT_PRESENT
/* Stop WDT as we are restarting */
XFsbl_StopWdt();
#endif
/* Hook before FSBL Fallback */
XFsbl_HookBeforeFallback();

24
lib/sw_apps/zynqmp_fsbl/src/xfsbl_misc_drivers.c
View file

@ -99,6 +99,8 @@ u32 XFsbl_InitWdt()
u32 Status = XFSBL_SUCCESS;
XWdtPs_Config *ConfigPtr; /* Config structure of the WatchDog Timer */
u32 CounterValue = 1;
u32 RegValue;
/**
* Initialize the WDT timer
@ -135,6 +137,16 @@ u32 XFsbl_InitWdt()
*/
XWdtPs_EnableOutput(&Watchdog, XWDTPS_RESET_SIGNAL);
/* Enable generation of system reset by PMU due to LPD SWDT */
RegValue = XFsbl_In32(PMU_GLOBAL_ERROR_SRST_EN_1);
RegValue |= PMU_GLOBAL_ERROR_SRST_EN_1_LPD_SWDT_MASK;
XFsbl_Out32(PMU_GLOBAL_ERROR_SRST_EN_1, RegValue);
/* Enable LPD System Watchdog Timer Error */
RegValue = XFsbl_In32(PMU_GLOBAL_ERROR_EN_1);
RegValue |= PMU_GLOBAL_ERROR_EN_1_LPD_SWDT_MASK;
XFsbl_Out32(PMU_GLOBAL_ERROR_EN_1, RegValue);
/**
* Start the Watchdog timer
*/
@ -216,7 +228,19 @@ void XFsbl_RestartWdt()
*******************************************************************************/
void XFsbl_StopWdt()
{
u32 RegValue;
XWdtPs_Stop(&Watchdog);
/* Disable LPD System Watchdog Timer Error */
RegValue = XFsbl_In32(PMU_GLOBAL_ERROR_EN_1);
RegValue &= ~(PMU_GLOBAL_ERROR_EN_1_LPD_SWDT_MASK);
XFsbl_Out32(PMU_GLOBAL_ERROR_EN_1, RegValue);
/* Disable generation of system reset by PMU due to LPD SWDT */
RegValue = XFsbl_In32(PMU_GLOBAL_ERROR_SRST_DIS_1);
RegValue |= PMU_GLOBAL_ERROR_SRST_DIS_1_LPD_SWDT_MASK;
XFsbl_Out32(PMU_GLOBAL_ERROR_SRST_DIS_1, RegValue);
}
#endif /** end of WDT wrapper code */

2
lib/sw_apps/zynqmp_fsbl/src/xfsbl_misc_drivers.h
View file

@ -77,6 +77,8 @@ extern "C" {
#ifdef XFSBL_WDT_PRESENT
u32 XFsbl_InitWdt();
u32 XFsbl_ConvertTime_WdtCounter(u32 seconds);
void XFsbl_StopWdt();
void XFsbl_RestartWdt();
#endif
/************************** Variable Definitions *****************************/

5
lib/sw_apps/zynqmp_fsbl/src/xfsbl_partition_load.c
View file

@ -113,6 +113,11 @@ u32 XFsbl_PartitionLoad(XFsblPs * FsblInstancePtr, u32 PartitionNum)
{
u32 Status=XFSBL_SUCCESS;
#ifdef XFSBL_WDT_PRESENT
/* Restart WDT as partition copy can take more time */
XFsbl_RestartWdt();
#endif
/**
* Load and validate the partition
*/