commit e1749602e413d6b050abaf6e8a16a2d0337a140d
author Andy Duan <fugang.duan@nxp.com> Tue May 15 10:45:21 2018 +0800
committer Tom Hochstein <tom.hochstein@nxp.com> Thu Dec 13 13:13:49 2018 -0600
tree 85d37d3e196c63a4bd77c413ebe43bb944a24f15
parent ef347acb42e34bddb1a6650bcf059d62b29e0de5

CORE: add timeout when BMI request/response transaction are not completed

Add timeout when BMI request/response transaction are not completed.

Signed-off-by: Fugang Duan <fugang.duan@nxp.com>

CORE/SERVICES/COMMON/adf/adf_os_lock.h

diff --git a/CORE/SERVICES/COMMON/adf/adf_os_lock.h b/CORE/SERVICES/COMMON/adf/adf_os_lock.h
index 9e0a733..a634ea3 100644
--- a/CORE/SERVICES/COMMON/adf/adf_os_lock.h
+++ b/CORE/SERVICES/COMMON/adf/adf_os_lock.h
@@ -72,6 +72,16 @@
 }
 
 /**
+ * @brief Take the mutex
+ *
+ * @param[in] m mutex to take
+ */
+static inline int adf_os_mutex_acquire_timeout(adf_os_device_t osdev, adf_os_mutex_t *m, long timeout)
+{
+    return (__adf_os_mutex_acquire_timeout(osdev, m, timeout));
+}
+
+/**
  * @brief Give the mutex
  *
  * @param[in] m mutex to give

CORE/SERVICES/COMMON/adf/linux/adf_os_lock_pvt.h

diff --git a/CORE/SERVICES/COMMON/adf/linux/adf_os_lock_pvt.h b/CORE/SERVICES/COMMON/adf/linux/adf_os_lock_pvt.h
index 9bfdb50..36c847e 100644
--- a/CORE/SERVICES/COMMON/adf/linux/adf_os_lock_pvt.h
+++ b/CORE/SERVICES/COMMON/adf/linux/adf_os_lock_pvt.h
@@ -70,6 +70,12 @@
     return 0;
 }
 
+static inline int
+__adf_os_mutex_acquire_timeout(adf_os_device_t osdev, struct semaphore *m, long timeout)
+{
+    return down_timeout(m, timeout);
+}
+
 static inline void
 __adf_os_mutex_release(adf_os_device_t osdev, struct semaphore *m)
 {

CORE/SERVICES/HIF/PCIe/hif_pci.c

diff --git a/CORE/SERVICES/HIF/PCIe/hif_pci.c b/CORE/SERVICES/HIF/PCIe/hif_pci.c
index 508aac9..1496f08 100644
--- a/CORE/SERVICES/HIF/PCIe/hif_pci.c
+++ b/CORE/SERVICES/HIF/PCIe/hif_pci.c
@@ -2033,9 +2033,9 @@
     struct CE_handle *ce_recv = recv_pipe_info->ce_hdl;
 
 #ifdef BMI_RSP_POLLING
+    int i;
     CE_addr_t buf;
     unsigned int completed_nbytes, id, flags;
-    int i;
 #endif
 
     AR_DEBUG_PRINTF(ATH_DEBUG_TRC, (" %s\n",__FUNCTION__));
@@ -2092,8 +2092,9 @@
 
     /* Wait for BMI request/response transaction to complete */
     /* Always just wait for BMI request here if BMI_RSP_POLLING is defined */
-    while (adf_os_mutex_acquire(scn->adf_dev, &transaction->bmi_transaction_sem)) {
-        /*need some break out condition(time out?)*/
+    if (adf_os_mutex_acquire_timeout(scn->adf_dev, &transaction->bmi_transaction_sem, HZ)) {
+	printk("%s:error, can't get bmi response\n", __func__);
+	status = A_EBUSY;
     }
 
     if (bmi_response) {