Ver código fonte

qcacld-3.0: Remove SSR protect (psoc)

As part of DSC integration cleanup, remove SSR protection from SSR
protection wrappers where psoc op start/stop protection is also in
place.

Change-Id: If9f901a764ec975a16fa911e4d74db919982101d
CRs-Fixed: 2404906
Dustin Brown 6 anos atrás
pai
commit
0d17e0107a

+ 0 - 38
core/hdd/src/wlan_hdd_cfg80211.c

@@ -822,10 +822,8 @@ wlan_hdd_cfg80211_get_tdls_capabilities(struct wiphy *wiphy,
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	errno = __wlan_hdd_cfg80211_get_tdls_capabilities(wiphy, wdev,
 	errno = __wlan_hdd_cfg80211_get_tdls_capabilities(wiphy, wdev,
 							  data, data_len);
 							  data, data_len);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 
 
@@ -1581,9 +1579,7 @@ static int is_driver_dfs_capable(struct wiphy *wiphy,
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	errno = __is_driver_dfs_capable(wiphy, wdev, data, data_len);
 	errno = __is_driver_dfs_capable(wiphy, wdev, data, data_len);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 
 
@@ -3273,10 +3269,8 @@ wlan_hdd_cfg80211_get_supported_features(struct wiphy *wiphy,
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	errno = __wlan_hdd_cfg80211_get_supported_features(wiphy, wdev,
 	errno = __wlan_hdd_cfg80211_get_supported_features(wiphy, wdev,
 							   data, data_len);
 							   data, data_len);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 
 
@@ -3585,9 +3579,7 @@ wlan_hdd_cfg80211_get_features(struct wiphy *wiphy,
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	errno = __wlan_hdd_cfg80211_get_features(wiphy, wdev, data, data_len);
 	errno = __wlan_hdd_cfg80211_get_features(wiphy, wdev, data, data_len);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 
 
@@ -4422,10 +4414,8 @@ static int wlan_hdd_cfg80211_disable_dfs_chan_scan(struct wiphy *wiphy,
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	errno = __wlan_hdd_cfg80211_disable_dfs_chan_scan(wiphy, wdev,
 	errno = __wlan_hdd_cfg80211_disable_dfs_chan_scan(wiphy, wdev,
 							  data, data_len);
 							  data, data_len);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 
 
@@ -4833,9 +4823,7 @@ wlan_hdd_cfg80211_get_wifi_info(struct wiphy *wiphy,
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	errno = __wlan_hdd_cfg80211_get_wifi_info(wiphy, wdev, data, data_len);
 	errno = __wlan_hdd_cfg80211_get_wifi_info(wiphy, wdev, data, data_len);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 
 
@@ -4923,10 +4911,8 @@ wlan_hdd_cfg80211_get_logger_supp_feature(struct wiphy *wiphy,
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	errno = __wlan_hdd_cfg80211_get_logger_supp_feature(wiphy, wdev,
 	errno = __wlan_hdd_cfg80211_get_logger_supp_feature(wiphy, wdev,
 							    data, data_len);
 							    data, data_len);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 
 
@@ -7258,10 +7244,8 @@ static int wlan_hdd_cfg80211_wifi_logger_start(struct wiphy *wiphy,
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	errno = __wlan_hdd_cfg80211_wifi_logger_start(wiphy, wdev,
 	errno = __wlan_hdd_cfg80211_wifi_logger_start(wiphy, wdev,
 						      data, data_len);
 						      data, data_len);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 
 
@@ -7378,10 +7362,8 @@ static int wlan_hdd_cfg80211_wifi_logger_get_ring_data(struct wiphy *wiphy,
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	errno = __wlan_hdd_cfg80211_wifi_logger_get_ring_data(wiphy, wdev,
 	errno = __wlan_hdd_cfg80211_wifi_logger_get_ring_data(wiphy, wdev,
 							      data, data_len);
 							      data, data_len);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 
 
@@ -8014,10 +7996,8 @@ static int wlan_hdd_cfg80211_get_preferred_freq_list(struct wiphy *wiphy,
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	errno = __wlan_hdd_cfg80211_get_preferred_freq_list(wiphy, wdev,
 	errno = __wlan_hdd_cfg80211_get_preferred_freq_list(wiphy, wdev,
 							    data, data_len);
 							    data, data_len);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 
 
@@ -8454,9 +8434,7 @@ static int wlan_hdd_cfg80211_acs_dfs_mode(struct wiphy *wiphy,
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	errno = __wlan_hdd_cfg80211_acs_dfs_mode(wiphy, wdev, data, data_len);
 	errno = __wlan_hdd_cfg80211_acs_dfs_mode(wiphy, wdev, data, data_len);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 
 
@@ -8827,9 +8805,7 @@ static int wlan_hdd_cfg80211_avoid_freq(struct wiphy *wiphy,
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	errno = __wlan_hdd_cfg80211_avoid_freq(wiphy, wdev, data, data_len);
 	errno = __wlan_hdd_cfg80211_avoid_freq(wiphy, wdev, data, data_len);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 
 
@@ -9261,10 +9237,8 @@ static int wlan_hdd_cfg80211_get_wakelock_stats(struct wiphy *wiphy,
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	errno = __wlan_hdd_cfg80211_get_wakelock_stats(wiphy, wdev,
 	errno = __wlan_hdd_cfg80211_get_wakelock_stats(wiphy, wdev,
 						       data, data_len);
 						       data, data_len);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 
 
@@ -9351,9 +9325,7 @@ static int wlan_hdd_cfg80211_get_bus_size(struct wiphy *wiphy,
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	errno = __wlan_hdd_cfg80211_get_bus_size(wiphy, wdev, data, data_len);
 	errno = __wlan_hdd_cfg80211_get_bus_size(wiphy, wdev, data, data_len);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 
 
@@ -10179,9 +10151,7 @@ static int wlan_hdd_cfg80211_set_sar_power_limits(struct wiphy *wiphy,
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	errno = __wlan_hdd_set_sar_power_limits(wiphy, wdev, data, data_len);
 	errno = __wlan_hdd_set_sar_power_limits(wiphy, wdev, data, data_len);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 
 
@@ -10762,10 +10732,8 @@ static int wlan_hdd_cfg80211_set_trace_level(struct wiphy *wiphy,
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	errno = __wlan_hdd_cfg80211_set_trace_level(wiphy, wdev,
 	errno = __wlan_hdd_cfg80211_set_trace_level(wiphy, wdev,
 						    data, data_len);
 						    data, data_len);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 
 
@@ -18806,9 +18774,7 @@ static int wlan_hdd_cfg80211_set_wiphy_params(struct wiphy *wiphy, u32 changed)
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	errno = __wlan_hdd_cfg80211_set_wiphy_params(wiphy, changed);
 	errno = __wlan_hdd_cfg80211_set_wiphy_params(wiphy, changed);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 
 
@@ -20213,9 +20179,7 @@ static int wlan_hdd_cfg80211_testmode(struct wiphy *wiphy,
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	errno = __wlan_hdd_cfg80211_testmode(wiphy, data, len);
 	errno = __wlan_hdd_cfg80211_testmode(wiphy, data, len);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 
 
@@ -20539,9 +20503,7 @@ static int wlan_hdd_cfg80211_set_mon_ch(struct wiphy *wiphy,
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	errno = __wlan_hdd_cfg80211_set_mon_ch(wiphy, chandef);
 	errno = __wlan_hdd_cfg80211_set_mon_ch(wiphy, chandef);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 
 

+ 0 - 2
core/hdd/src/wlan_hdd_ext_scan.c

@@ -2514,10 +2514,8 @@ int wlan_hdd_cfg80211_extscan_get_valid_channels(struct wiphy *wiphy,
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	errno = __wlan_hdd_cfg80211_extscan_get_valid_channels(wiphy, wdev,
 	errno = __wlan_hdd_cfg80211_extscan_get_valid_channels(wiphy, wdev,
 							       data, data_len);
 							       data, data_len);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 
 

+ 0 - 2
core/hdd/src/wlan_hdd_he.c

@@ -209,9 +209,7 @@ int wlan_hdd_cfg80211_get_he_cap(struct wiphy *wiphy,
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	errno = __wlan_hdd_cfg80211_get_he_cap(wiphy, wdev, data, data_len);
 	errno = __wlan_hdd_cfg80211_get_he_cap(wiphy, wdev, data, data_len);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 
 

+ 0 - 2
core/hdd/src/wlan_hdd_nan.c

@@ -102,9 +102,7 @@ int wlan_hdd_cfg80211_nan_request(struct wiphy *wiphy,
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	errno = __wlan_hdd_cfg80211_nan_request(wiphy, wdev, data, data_len);
 	errno = __wlan_hdd_cfg80211_nan_request(wiphy, wdev, data, data_len);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 
 

+ 7 - 9
core/hdd/src/wlan_hdd_nan_datapath.c

@@ -406,16 +406,14 @@ static int __wlan_hdd_cfg80211_process_ndp_cmd(struct wiphy *wiphy,
  * Return: 0 on success, negative errno on failure
  * Return: 0 on success, negative errno on failure
  */
  */
 int wlan_hdd_cfg80211_process_ndp_cmd(struct wiphy *wiphy,
 int wlan_hdd_cfg80211_process_ndp_cmd(struct wiphy *wiphy,
-	struct wireless_dev *wdev, const void *data, int data_len)
+				      struct wireless_dev *wdev,
+				      const void *data, int data_len)
 {
 {
-	int errno;
-
-	cds_ssr_protect(__func__);
-	errno = __wlan_hdd_cfg80211_process_ndp_cmd(wiphy, wdev,
-						    data, data_len);
-	cds_ssr_unprotect(__func__);
-
-	return errno;
+	/* This call is intentionally not protected by op_start/op_stop, due to
+	 * the various protection needs of the callbacks dispatched within.
+	 */
+	return __wlan_hdd_cfg80211_process_ndp_cmd(wiphy, wdev,
+						   data, data_len);
 }
 }
 
 
 static int update_ndi_state(struct hdd_adapter *adapter, uint32_t state)
 static int update_ndi_state(struct hdd_adapter *adapter, uint32_t state)

+ 0 - 8
core/hdd/src/wlan_hdd_power.c

@@ -1666,9 +1666,7 @@ int wlan_hdd_cfg80211_resume_wlan(struct wiphy *wiphy)
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	errno = __wlan_hdd_cfg80211_resume_wlan(wiphy);
 	errno = __wlan_hdd_cfg80211_resume_wlan(wiphy);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 
 
@@ -1868,9 +1866,7 @@ int wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy,
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	errno = __wlan_hdd_cfg80211_suspend_wlan(wiphy, wow);
 	errno = __wlan_hdd_cfg80211_suspend_wlan(wiphy, wow);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 
 
@@ -2097,9 +2093,7 @@ int wlan_hdd_cfg80211_set_txpower(struct wiphy *wiphy,
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	errno = __wlan_hdd_cfg80211_set_txpower(wiphy, wdev, type, mbm);
 	errno = __wlan_hdd_cfg80211_set_txpower(wiphy, wdev, type, mbm);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 
 
@@ -2196,9 +2190,7 @@ int wlan_hdd_cfg80211_get_txpower(struct wiphy *wiphy,
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	errno = __wlan_hdd_cfg80211_get_txpower(wiphy, wdev, dbm);
 	errno = __wlan_hdd_cfg80211_get_txpower(wiphy, wdev, dbm);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 
 

+ 0 - 2
core/hdd/src/wlan_hdd_scan.c

@@ -1548,9 +1548,7 @@ void wlan_hdd_cfg80211_abort_scan(struct wiphy *wiphy,
 	if (errno)
 	if (errno)
 		return;
 		return;
 
 
-	cds_ssr_protect(__func__);
 	__wlan_hdd_cfg80211_abort_scan(wiphy, wdev);
 	__wlan_hdd_cfg80211_abort_scan(wiphy, wdev);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 }
 }

+ 0 - 6
core/hdd/src/wlan_hdd_sysfs.c

@@ -71,9 +71,7 @@ static ssize_t show_driver_version(struct kobject *kobj,
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	length = __show_driver_version(buf);
 	length = __show_driver_version(buf);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 
 
@@ -119,9 +117,7 @@ static ssize_t show_fw_version(struct kobject *kobj,
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	length = __show_fw_version(hdd_ctx, buf);
 	length = __show_fw_version(hdd_ctx, buf);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);
 
 
@@ -272,9 +268,7 @@ static ssize_t show_device_power_stats(struct kobject *kobj,
 	if (errno)
 	if (errno)
 		return errno;
 		return errno;
 
 
-	cds_ssr_protect(__func__);
 	length = __show_device_power_stats(hdd_ctx, buf);
 	length = __show_device_power_stats(hdd_ctx, buf);
-	cds_ssr_unprotect(__func__);
 
 
 	osif_psoc_sync_op_stop(psoc_sync);
 	osif_psoc_sync_op_stop(psoc_sync);