HSD #14012726917: Replaced __udelay inline function with __socfpga_udelay inline function

The udelay function is used by both uboot proper and PSCI code for timeout handling.The __udelay inline function was not included in '__secure' section which causes random error when called by PSCI code that run in '__secure' section. The solution is replaced the __udelay inline function with __socfpga_udelay inline function in timer.h, so that the code can be included in '__secure' section. Signed-off-by: Siew Chin Lim <elly.siew.chin.lim@intel.com>

Author: siclim

arch/arm/mach-socfpga/include/mach/timer.h

@@ -6,6 +6,8 @@
 #ifndef _SOCFPGA_TIMER_H_
 #define _SOCFPGA_TIMER_H_
 
+#include <div64.h>
+
 struct socfpga_timer {
 u32load_val;
 u32curr_val;
@@ -14,4 +16,32 @@ struct socfpga_timer {
 u32int_stat;
 };
 
+static __always_inline u64 __socfpga_get_time_stamp(void)
+{
+u64 cntpct;
+
+isb();
+asm volatile("mrs %0, cntpct_el0" : "=r" (cntpct));
+return cntpct;
+}
+
+static __always_inline u64 __socfpga_usec_to_tick(u64 usec)
+{
+u64 tick = usec;
+u64 cntfrq;
+
+asm volatile("mrs %0, cntfrq_el0" : "=r" (cntfrq));
+tick *= cntfrq;
+do_div(tick, 1000000);
+return tick;
+}
+
+static __always_inline void __socfpga_udelay(u64 usec)
+{
+u64 tmp = __socfpga_get_time_stamp() + __socfpga_usec_to_tick(usec);
+
+while (__socfpga_get_time_stamp() < tmp + 1)
+;
+}
+
 #endif

arch/arm/mach-socfpga/mailbox_s10.c

@@ -11,6 +11,7 @@
 #include <asm/arch/mailbox_s10.h>
 #include <asm/arch/smc_api.h>
 #include <asm/arch/system_manager.h>
+#include <asm/arch/timer.h>
 #include <asm/arch/rsu.h>
 #include <asm/secure.h>
 #include <asm/system.h>
@@ -39,7 +40,7 @@ static __always_inline int mbox_polling_resp(u32 rout)
 if (rout != rin)
 return 0;
 
-__udelay(1000);
+__socfpga_udelay(1000);
 i--;
 }
 
@@ -63,7 +64,7 @@ static __always_inline int mbox_wait_for_cmdbuf_empty(u32 cin)
 while (timeout) {
 if (mbox_is_cmdbuf_empty(cin))
 return 0;
-__udelay(1000);
+__socfpga_udelay(1000);
 timeout--;
 }
 
@@ -83,7 +84,7 @@ static __always_inline int mbox_write_cmd_buffer(u32 *cin, u32 data,
 MBOX_WRITEL(1, MBOX_DOORBELL_TO_SDM);
 *is_cmdbuf_overflow = 1;
 }
-__udelay(1000);
+__socfpga_udelay(1000);
 } else {
 /* write header to circular buffer */
 MBOX_WRITE_CMD_BUF(data, (*cin)++);
@@ -229,7 +230,7 @@ static __always_inline int mbox_send_cmd_common(u8 id, u32 cmd, u8 is_indirect,
 do {
 if (MBOX_READL(MBOX_DOORBELL_FROM_SDM))
 break;
-__udelay(1000);
+__socfpga_udelay(1000);
 } while (--ret);
 
 if (!ret)
@@ -318,7 +319,7 @@ static __always_inline int mbox_send_cmd_common_retry(u8 id, u32 cmd,
 ret = mbox_send_cmd_common(id, cmd, is_indirect, len, arg,
  urgent, resp_buf_len, resp_buf);
 if (ret == MBOX_RESP_TIMEOUT || ret == MBOX_RESP_DEVICE_BUSY)
-__udelay(2000); /* wait for 2ms before resend */
+__socfpga_udelay(2000); /* wait for 2ms before resend */
 else
 break;
 }

arch/arm/mach-socfpga/reset_manager_s10.c

@@ -11,6 +11,7 @@
 #include <asm/arch/reset_manager.h>
 #include <asm/arch/smc_api.h>
 #include <asm/arch/system_manager.h>
+#include <asm/arch/timer.h>
 #include <dt-bindings/reset/altr,rst-mgr-s10.h>
 #include <exports.h>
 #include <linux/intel-smc.h>
@@ -24,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR;
 if (!timeout)	\
 break;	\
 timeout--;	\
-__udelay(1000);\
+__socfpga_udelay(1000);	\
 }	\
 }
 

arch/arm/mach-socfpga/timer_s10.c

@@ -5,10 +5,7 @@
  */
 
 #include <common.h>
-#include <init.h>
-#include <div64.h>
 #include <asm/io.h>
-#include <asm/arch/timer.h>
 
 /*
  * Timer initialization
@@ -28,33 +25,3 @@ int timer_init(void)
 return 0;
 }
 
-__always_inline u64 __get_time_stamp(void)
-{
-u64 cntpct;
-
-isb();
-asm volatile("mrs %0, cntpct_el0" : "=r" (cntpct));
-
-return cntpct;
-}
-
-__always_inline uint64_t __usec_to_tick(unsigned long usec)
-{
-u64 tick = usec;
-u64 cntfrq;
-
-asm volatile("mrs %0, cntfrq_el0" : "=r" (cntfrq));
-tick *= cntfrq;
-do_div(tick, 1000000);
-
-return tick;
-}
-
-__always_inline void __udelay(unsigned long usec)
-{
-/* get current timestamp */
-u64 tmp = __get_time_stamp() + __usec_to_tick(usec);
-
-while (__get_time_stamp() < tmp + 1)/* loop till event */
-;
-}