qcacld-3.0: Refactor firmware, serialization and HDD CMD timeouts
Refactor firmware, serialization and command timeouts so that
HDD timeout are greater than serialization is greater than firmware
timeout.
The timeouts are defined considering below worst case delay in
firmware.
WMI_VDEV_START_REQUEST_CMDID 6 sec
WMI_VDEV_RESTART_REQUEST_CMDID 6 sec
WMI_VDEV_STOP_CMDID 2 sec
WMI_PEER_DELETE_CMDID 2 sec
WMI_PEER_ASSOC_CMDID 2 sec
WMI_PDEV_SET_HW_MODE_CMDID 2 sec
WMI_PDEV_SET_MAC_CONFIG_CMDID 2 sec
Change-Id: I270e980ed1cf2aee55a1fa4e88ff8ddc845a203b
CRs-Fixed: 2384389
diff --git a/core/wma/inc/wma.h b/core/wma/inc/wma.h
index 055bf9b..7db2d1b 100644
--- a/core/wma/inc/wma.h
+++ b/core/wma/inc/wma.h
@@ -190,10 +190,10 @@
#define WMA_TARGET_REQ_TYPE_VDEV_DEL 0x3
#define WMA_PEER_ASSOC_CNF_START 0x01
-#define WMA_PEER_ASSOC_TIMEOUT (6000) /* 6 seconds */
+#define WMA_PEER_ASSOC_TIMEOUT SIR_PEER_ASSOC_TIMEOUT
#define WMA_DELETE_STA_RSP_START 0x02
-#define WMA_DELETE_STA_TIMEOUT (6000) /* 6 seconds */
+#define WMA_DELETE_STA_TIMEOUT SIR_DELETE_STA_TIMEOUT
#define WMA_DEL_P2P_SELF_STA_RSP_START 0x03
#define WMA_SET_LINK_PEER_RSP 0x04
@@ -203,11 +203,14 @@
#define WMA_PDEV_MAC_CFG_RESP 0x07
/* FW response timeout values in milli seconds */
-#define WMA_VDEV_START_REQUEST_TIMEOUT (6000)
-#define WMA_VDEV_STOP_REQUEST_TIMEOUT (6000)
-#define WMA_VDEV_HW_MODE_REQUEST_TIMEOUT (6000)
-#define WMA_VDEV_PLCY_MGR_CMD_TIMEOUT (6000)
-#define WMA_VDEV_DUAL_MAC_CFG_TIMEOUT (5000)
+#define WMA_VDEV_START_REQUEST_TIMEOUT SIR_VDEV_START_REQUEST_TIMEOUT
+#define WMA_VDEV_STOP_REQUEST_TIMEOUT SIR_VDEV_STOP_REQUEST_TIMEOUT
+#define WMA_VDEV_PLCY_MGR_TIMEOUT SIR_VDEV_PLCY_MGR_TIMEOUT
+#define WMA_VDEV_HW_MODE_REQUEST_TIMEOUT WMA_VDEV_PLCY_MGR_TIMEOUT
+#define WMA_VDEV_DUAL_MAC_CFG_TIMEOUT WMA_VDEV_PLCY_MGR_TIMEOUT
+#define WMA_VDEV_PLCY_MGR_WAKE_LOCK_TIMEOUT \
+ (WMA_VDEV_PLCY_MGR_TIMEOUT + 500)
+
#define WMA_VDEV_SET_KEY_WAKELOCK_TIMEOUT WAKELOCK_DURATION_RECOMMENDED