Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8d17dbe authored by Thirupathi Reddy R's avatar Thirupathi Reddy R
Browse files

Merge commit 'aa555765' into wlan-cld3.driver.lnx.2.0.r11-rel 

Change-Id: If7979079542c4ea97d9f03d76950e90a4d6593e0
parents 1014f377 aa555765

Kbuild

+9 −1
Original line number Diff line number Diff line
@@ -2664,7 +2664,6 @@ cppflags-$(CONFIG_FEATURE_MOTION_DETECTION) += -DWLAN_FEATURE_MOTION_DETECTION 
cppflags-$(CONFIG_WLAN_FW_OFFLOAD) += -DWLAN_FW_OFFLOAD

cppflags-$(CONFIG_WLAN_FEATURE_ELNA) += -DWLAN_FEATURE_ELNA

cppflags-$(CONFIG_FEATURE_COEX) += -DFEATURE_COEX

cppflags-y += -DROAM_OFFLOAD_V1

cppflags-$(CONFIG_INTERFACE_MGR) += -DWLAN_FEATURE_INTERFACE_MGR

cppflags-$(CONFIG_HOST_WAKEUP_OVER_QMI) += -DHOST_WAKEUP_OVER_QMI
@@ -2954,6 +2953,7 @@ cppflags-$(CONFIG_HL_DP_SUPPORT) += -DQCA_COMPUTE_TX_DELAY 
cppflags-$(CONFIG_HL_DP_SUPPORT) += -DQCA_COMPUTE_TX_DELAY_PER_TID

cppflags-$(CONFIG_LL_DP_SUPPORT) += -DCONFIG_LL_DP_SUPPORT

cppflags-$(CONFIG_LL_DP_SUPPORT) += -DWLAN_FULL_REORDER_OFFLOAD

cppflags-$(CONFIG_WLAN_FEATURE_BIG_DATA_STATS) += -DWLAN_FEATURE_BIG_DATA_STATS



# For PCIe GEN switch

cppflags-$(CONFIG_PCIE_GEN_SWITCH) += -DPCIE_GEN_SWITCH
@@ -3734,6 +3734,14 @@ cppflags-$(CONFIG_DP_FT_LOCK_HISTORY) += -DDP_FT_LOCK_HISTORY 


ccflags-$(CONFIG_GET_DRIVER_MODE) += -DFEATURE_GET_DRIVER_MODE



ifeq ($(CONFIG_SMP), y)

ifeq ($(CONFIG_HIF_DETECTION_LATENCY_ENABLE), y)

cppflags-y += -DHIF_DETECTION_LATENCY_ENABLE

cppflags-y += -DDETECTION_TIMER_TIMEOUT=2000

cppflags-y += -DDETECTION_LATENCY_THRESHOLD=1900

endif

endif



KBUILD_CPPFLAGS += $(cppflags-y)



# Currently, for versions of gcc which support it, the kernel Makefile

components/cmn_services/policy_mgr/inc/wlan_policy_mgr_cfg.h

+3 −0
Original line number Diff line number Diff line
@@ -395,6 +395,9 @@ CFG_INI_UINT("gDualMacFeatureDisable", 0, 6, 6, CFG_VALUE_OR_DEFAULT, \ 
 * support disabled, the value is defined by enum PM_AP_DFS_MASTER_MODE.

 * 0 - Disallow STA+SAP SCC on DFS channel

 * 1 - Allow STA+SAP SCC on DFS channel with master mode disabled

 *       This needs gEnableDFSMasterCap enabled to allow SAP SCC with

 *       STA on DFS but dfs master mode disabled. Single SAP is not allowed

 *       on DFS.

 * 2 - enhance "1" with below requirement

 *	 a. Allow single SAP (GO) start on DFS channel.

 *	 b. Allow CAC process on DFS channel in single SAP (GO) mode

components/cmn_services/policy_mgr/src/wlan_policy_mgr_core.c

+11 −4
Original line number Diff line number Diff line
@@ -1552,6 +1552,7 @@ static uint32_t pm_get_vdev_id_of_first_conn_idx(struct wlan_objmgr_psoc *psoc) 
{

	uint32_t conn_index = 0, vdev_id = 0;

	struct policy_mgr_psoc_priv_obj *pm_ctx;

	struct wlan_objmgr_vdev *vdev;



	pm_ctx = policy_mgr_get_context(psoc);

	if (!pm_ctx) {
@@ -1563,16 +1564,22 @@ static uint32_t pm_get_vdev_id_of_first_conn_idx(struct wlan_objmgr_psoc *psoc) 
	     conn_index++)  {

		if (pm_conc_connection_list[conn_index].in_use) {

			vdev_id = pm_conc_connection_list[conn_index].vdev_id;

			policy_mgr_debug("Use vdev_id:%d for opportunistic upgrade",

					 vdev_id);

			break;

		}

	}

	qdf_mutex_release(&pm_ctx->qdf_conc_list_lock);

	if (conn_index == MAX_NUMBER_OF_CONC_CONNECTIONS)

	if (conn_index == MAX_NUMBER_OF_CONC_CONNECTIONS) {

		vdev = wlan_objmgr_pdev_get_first_vdev(pm_ctx->pdev,

						       WLAN_POLICY_MGR_ID);

		if (vdev) {

			vdev_id = wlan_vdev_get_id(vdev);

			wlan_objmgr_vdev_release_ref(vdev, WLAN_POLICY_MGR_ID);

		}

		policy_mgr_debug("Use default vdev_id:%d for opportunistic upgrade",

				 vdev_id);

	else

		policy_mgr_debug("Use vdev_id:%d for opportunistic upgrade",

				 vdev_id);

	}



	return vdev_id;

}

components/cmn_services/policy_mgr/src/wlan_policy_mgr_ucfg.c

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ static QDF_STATUS policy_mgr_init_cfg(struct wlan_objmgr_psoc *psoc) 
	 */

	if (cfg->sta_sap_scc_on_dfs_chnl == 2 &&

	    !cfg_get(psoc, CFG_ENABLE_DFS_MASTER_CAPABILITY))

		cfg->sta_sap_scc_on_dfs_chnl = 1;

		cfg->sta_sap_scc_on_dfs_chnl = 0;

	cfg->nan_sap_scc_on_lte_coex_chnl =

		cfg_get(psoc, CFG_NAN_SAP_SCC_ON_LTE_COEX_CHAN);

	cfg->sta_sap_scc_on_lte_coex_chnl =

components/cp_stats/dispatcher/inc/wlan_cp_stats_mc_defs.h

+30 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
 * @TYPE_PEER_STATS: peer stats was requested

 * @TYPE_MIB_STATS: MIB stats was requested

 * @TYPE_PEER_STATS_INFO_EXT: peer stats info ext was requested

 * @TYPE_BIG_DATA_STATS: big data stats was requested

 */

enum stats_req_type {

	TYPE_CONNECTION_TX_POWER = 0,
@@ -67,6 +68,7 @@ enum stats_req_type { 
	TYPE_PEER_STATS,

	TYPE_MIB_STATS,

	TYPE_PEER_STATS_INFO_EXT,

	TYPE_BIG_DATA_STATS,

	TYPE_MAX,

};
@@ -134,6 +136,7 @@ enum txrate_gi { 
 * @pno_match_wake_up_count:    pno match wakeup count

 * @oem_response_wake_up_count: oem response wakeup count

 * @uc_drop_wake_up_count:      local data uc drop wakeup count

 * @fatal_event_wake_up_count:  fatal event wakeup count

 * @pwr_save_fail_detected:     pwr save fail detected wakeup count

 * @scan_11d                    11d scan wakeup count

 * @mgmt_assoc: association request management frame
@@ -162,6 +165,7 @@ struct wake_lock_stats { 
	uint32_t pno_match_wake_up_count;

	uint32_t oem_response_wake_up_count;

	uint32_t uc_drop_wake_up_count;

	uint32_t fatal_event_wake_up_count;

	uint32_t pwr_save_fail_detected;

	uint32_t scan_11d;

	uint32_t mgmt_assoc;
@@ -176,6 +180,28 @@ struct wake_lock_stats { 


struct stats_event;



/**

 * struct big_data_stats_event - big data stats event param

 * @vdev_id:               vdev id

 * @tsf_out_of_sync:       tsf out of sync

 * @ani_level:             ani level

 * @last_data_tx_pwr:  tx pwr last data frm

 * @target_power_dsss:  tx power dsss

 * @target_power_ofdm:  target power ofdm

 * @last_tx_data_rix:     rx lateset data frame

 * @last_tx_data_rate_kbps: tx latest data frame

 */

struct big_data_stats_event {

	uint32_t vdev_id;

	uint32_t tsf_out_of_sync;

	int32_t ani_level;

	uint32_t last_data_tx_pwr;

	uint32_t target_power_dsss;

	uint32_t target_power_ofdm;

	uint32_t last_tx_data_rix;

	uint32_t last_tx_data_rate_kbps;

};



/**

 * struct request_info: details of each request

 * @cookie: identifier for os_if request
@@ -196,6 +222,10 @@ struct request_info { 
					 void *cookie);

		void (*get_peer_stats_cb)(struct stats_event *ev,

					  void *cookie);

#ifdef WLAN_FEATURE_BIG_DATA_STATS

		void (*get_big_data_stats_cb)(struct big_data_stats_event *ev,

					      void *cookie);

#endif

	} u;

	uint32_t vdev_id;

	uint32_t pdev_id;