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

nan/core/inc/nan_public_structs.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2017-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -44,6 +44,8 @@ struct wlan_objmgr_vdev;
 
 #define NAN_PSEUDO_VDEV_ID CFG_TGT_NUM_VDEV
 
+#define NAN_SER_CMD_TIMEOUT 4000
+
 /**
  * enum nan_discovery_msg_type - NAN msg type
  * @NAN_GENERIC_REQ: Type for all the NAN requests other than enable/disable

nan/core/src/nan_main.c

@@ -278,7 +278,7 @@ QDF_STATUS nan_scheduled_msg_handler(struct scheduler_msg *msg)
 	cmd.umac_cmd = msg->bodyptr;
 	cmd.source = WLAN_UMAC_COMP_NAN;
 	cmd.is_high_priority = false;
-	cmd.cmd_timeout_duration = 30000 /* 30 sec for now. TBD */;
+	cmd.cmd_timeout_duration = NAN_SER_CMD_TIMEOUT;
 	nan_debug("cmd_type: %d", cmd.cmd_type);
 	cmd.is_blocking = true;
 

tdls/dispatcher/inc/wlan_tdls_public_structs.h

@@ -51,8 +51,8 @@ struct wlan_objmgr_psoc;
 
 #define AC_PRIORITY_NUM                 4
 
-/* default tdls serialize timeout is set to 10 secs */
-#define TDLS_DEFAULT_SERIALIZE_CMD_TIMEOUT 10000
+/* default tdls serialize timeout is set to 4 secs */
+#define TDLS_DEFAULT_SERIALIZE_CMD_TIMEOUT 4000
 
 /** Maximum time(ms) to wait for tdls add sta to complete **/
 #define WAIT_TIME_TDLS_ADD_STA  (TDLS_DEFAULT_SERIALIZE_CMD_TIMEOUT + 1000)