qcacld-3.0: Refactor lpass notify APIs

Modify the following APIs to take link info pointer
as function argument to notify LPASS on per link.
1) hdd_lpass_notify_disconnect()
2) hdd_lpass_notify_mode_change()
3) hdd_lpass_notify_start()
4) hdd_lpass_notify_connect()
5) wlan_hdd_send_status_pkg()
6) wlan_hdd_send_scan_intf_info()

Change-Id: I645fb35418aba31e32fc6d5ea2e409904b76db25
CRs-Fixed: 3522899

core/hdd/src/wlan_hdd_cfg80211.c

@@ -21387,7 +21387,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy,
 
 	if (hdd_is_client_mode(adapter->device_mode)) {
 		if (adapter->device_mode == QDF_STA_MODE)
-			hdd_cleanup_conn_info(adapter->deflink);
+			hdd_cleanup_conn_info(link_info);
 
 		if (hdd_is_client_mode(new_mode)) {
 			errno = hdd_change_adapter_mode(adapter, new_mode);
@@ -21498,7 +21498,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy,
 	}
 
 	ndev->ieee80211_ptr->iftype = type;
-	hdd_lpass_notify_mode_change(adapter);
+	hdd_lpass_notify_mode_change(link_info);
 err:
 	/* Set bitmask based on updated value */
 	policy_mgr_set_concurrency_mode(hdd_ctx->psoc, adapter->device_mode);

core/hdd/src/wlan_hdd_cm_disconnect.c

@@ -74,7 +74,7 @@ void hdd_handle_disassociation_event(struct wlan_hdd_link_info *link_info,
 						link_info->vdev_id, NULL,
 						adapter->device_mode);
 
-	hdd_lpass_notify_disconnect(adapter);
+	hdd_lpass_notify_disconnect(link_info);
 
 	vdev = hdd_objmgr_get_vdev_by_user(link_info, WLAN_DP_ID);
 	if (vdev) {

core/hdd/src/wlan_hdd_lpass.c

@@ -70,7 +70,7 @@ static void wlan_hdd_get_channel_info(struct hdd_context *hdd_ctx,
 /**
  * wlan_hdd_gen_wlan_status_pack() - Create lpass adapter status package
  * @data: Status data record to be created
- * @adapter: Adapter whose status is to being packaged
+ * @link_info: Link info pointer in HDD adapter
  * @sta_ctx: Station-specific context of @adapter
  * @is_on: Is wlan driver loaded?
  * @is_connected: Is @adapter connected to an AP?
@@ -81,7 +81,7 @@ static void wlan_hdd_get_channel_info(struct hdd_context *hdd_ctx,
  * Return: 0 if package was created, otherwise a negative errno
  */
 static int wlan_hdd_gen_wlan_status_pack(struct wlan_status_data *data,
-					 struct hdd_adapter *adapter,
+					 struct wlan_hdd_link_info *link_info,
 					 struct hdd_station_ctx *sta_ctx,
 					 uint8_t is_on, uint8_t is_connected)
 {
@@ -92,12 +92,13 @@ static int wlan_hdd_gen_wlan_status_pack(struct wlan_status_data *data,
 	struct svc_channel_info *chan_info;
 	bool lpass_support, wls_6ghz_capable = false;
 	QDF_STATUS status;
+	struct hdd_adapter *adapter;
 
 	if (!data) {
 		hdd_err("invalid data pointer");
 		return -EINVAL;
 	}
-	if (!adapter) {
+	if (!link_info) {
 		if (is_on) {
 			/* no active interface */
 			data->lpss_support = 0;
@@ -108,9 +109,10 @@ static int wlan_hdd_gen_wlan_status_pack(struct wlan_status_data *data,
 		return -EINVAL;
 	}
 
-	if (wlan_hdd_validate_vdev_id(adapter->deflink->vdev_id))
+	if (wlan_hdd_validate_vdev_id(link_info->vdev_id))
 		return -EINVAL;
 
+	adapter = link_info->adapter;
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 
 	status = ucfg_mlme_get_lpass_support(hdd_ctx->psoc, &lpass_support);
@@ -156,11 +158,11 @@ static int wlan_hdd_gen_wlan_status_pack(struct wlan_status_data *data,
 
 	wlan_reg_get_cc_and_src(hdd_ctx->psoc, data->country_code);
 	data->is_on = is_on;
-	data->vdev_id = adapter->deflink->vdev_id;
+	data->vdev_id = link_info->vdev_id;
 	data->vdev_mode = adapter->device_mode;
 	if (sta_ctx) {
 		data->is_connected = is_connected;
-		data->rssi = adapter->deflink->rssi;
+		data->rssi = link_info->rssi;
 		data->freq = sta_ctx->conn_info.chan_freq;
 		if (WLAN_SVC_MAX_SSID_LEN >=
 		    sta_ctx->conn_info.ssid.SSID.length) {
@@ -215,7 +217,7 @@ static int wlan_hdd_gen_wlan_version_pack(struct wlan_version_data *data,
 
 /**
  * wlan_hdd_send_status_pkg() - Send adapter status to lpass
- * @adapter: Adapter whose status is to be sent to lpass
+ * @link_info: Link info pointer in HDD adapter
  * @sta_ctx: Station-specific context of @adapter
  * @is_on: Is @adapter enabled
  * @is_connected: Is @adapter connected
@@ -225,7 +227,7 @@ static int wlan_hdd_gen_wlan_version_pack(struct wlan_version_data *data,
  *
  * Return: none
  */
-static void wlan_hdd_send_status_pkg(struct hdd_adapter *adapter,
+static void wlan_hdd_send_status_pkg(struct wlan_hdd_link_info *link_info,
 				     struct hdd_station_ctx *sta_ctx,
 				     uint8_t is_on, uint8_t is_connected)
 {
@@ -244,8 +246,9 @@ static void wlan_hdd_send_status_pkg(struct hdd_adapter *adapter,
 		return;
 
 	if (is_on)
-		ret = wlan_hdd_gen_wlan_status_pack(data, adapter, sta_ctx,
-						    is_on, is_connected);
+		ret = wlan_hdd_gen_wlan_status_pack(data, link_info,
+						    sta_ctx, is_on,
+						    is_connected);
 
 	if (!ret)
 		wlan_hdd_send_svc_nlink_msg(hdd_ctx->radio_index,
@@ -290,27 +293,16 @@ static void wlan_hdd_send_version_pkg(uint32_t fw_version,
 
 /**
  * wlan_hdd_send_scan_intf_info() - report scan interfaces to lpass
- * @hdd_ctx: The global HDD context
- * @adapter: Adapter that supports scanning.
+ * @link_info: Link info pointer in HDD adapter
  *
  * This function indicates adapter that supports scanning to lpass.
  *
  * Return: none
  */
-static void wlan_hdd_send_scan_intf_info(struct hdd_context *hdd_ctx,
-					 struct hdd_adapter *adapter)
+static inline void
+wlan_hdd_send_scan_intf_info(struct wlan_hdd_link_info *link_info)
 {
-	if (!hdd_ctx) {
-		hdd_err("NULL pointer for hdd_ctx");
-		return;
-	}
-
-	if (!adapter) {
-		hdd_err("Adapter is Null");
-		return;
-	}
-
-	wlan_hdd_send_status_pkg(adapter, NULL, 1, 0);
+	wlan_hdd_send_status_pkg(link_info, NULL, 1, 0);
 }
 
 /*
@@ -357,51 +349,40 @@ void hdd_lpass_populate_pmo_config(struct pmo_psoc_cfg *pmo_config,
 	pmo_config->lpass_enable = lpass_support;
 }
 
-/*
- * hdd_lpass_notify_connect() - Notify LPASS of interface connect
- * (public function documented in wlan_hdd_lpass.h)
- */
-void hdd_lpass_notify_connect(struct hdd_adapter *adapter)
+void hdd_lpass_notify_connect(struct wlan_hdd_link_info *link_info)
 {
 	struct hdd_station_ctx *sta_ctx;
 
 	/* only send once per connection */
-	if (adapter->deflink->rssi_send)
+	if (link_info->rssi_send)
 		return;
 
 	/* don't send if driver is unloading */
 	if (cds_is_driver_unloading())
 		return;
 
-	adapter->deflink->rssi_send = true;
-	sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter->deflink);
-	wlan_hdd_send_status_pkg(adapter, sta_ctx, 1, 1);
+	link_info->rssi_send = true;
+	sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(link_info);
+	wlan_hdd_send_status_pkg(link_info, sta_ctx, 1, 1);
 }
 
-/*
- * hdd_lpass_notify_disconnect() - Notify LPASS of interface disconnect
- * (public function documented in wlan_hdd_lpass.h)
- */
-void hdd_lpass_notify_disconnect(struct hdd_adapter *adapter)
+void hdd_lpass_notify_disconnect(struct wlan_hdd_link_info *link_info)
 {
 	struct hdd_station_ctx *sta_ctx;
 
-	adapter->deflink->rssi_send = false;
-	sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter->deflink);
-	wlan_hdd_send_status_pkg(adapter, sta_ctx, 1, 0);
+	link_info->rssi_send = false;
+	sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(link_info);
+	wlan_hdd_send_status_pkg(link_info, sta_ctx, 1, 0);
 }
 
-void hdd_lpass_notify_mode_change(struct hdd_adapter *adapter)
+void hdd_lpass_notify_mode_change(struct wlan_hdd_link_info *link_info)
 {
-	struct hdd_context *hdd_ctx;
-
-	if (!adapter || adapter->device_mode != QDF_STA_MODE)
+	if (link_info->adapter->device_mode != QDF_STA_MODE)
 		return;
 
 	hdd_debug("Sending Lpass mode change notification");
 
-	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
-	wlan_hdd_send_scan_intf_info(hdd_ctx, adapter);
+	wlan_hdd_send_scan_intf_info(link_info);
 }
 
 /*
@@ -420,17 +401,16 @@ void hdd_lpass_notify_wlan_version(struct hdd_context *hdd_ctx)
 	hdd_exit();
 }
 
-void hdd_lpass_notify_start(struct hdd_context *hdd_ctx,
-			    struct hdd_adapter *adapter)
+void hdd_lpass_notify_start(struct wlan_hdd_link_info *link_info)
 {
 	hdd_enter();
 
-	if (!adapter || adapter->device_mode != QDF_STA_MODE)
+	if (link_info->adapter->device_mode != QDF_STA_MODE)
 		return;
 
 	hdd_debug("Sending Start Lpass notification");
 
-	wlan_hdd_send_scan_intf_info(hdd_ctx, adapter);
+	wlan_hdd_send_scan_intf_info(link_info);
 
 	hdd_exit();
 }

core/hdd/src/wlan_hdd_lpass.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. 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
@@ -66,49 +67,47 @@ void hdd_lpass_populate_pmo_config(struct pmo_psoc_cfg *pmo_config,
 
 /**
  * hdd_lpass_notify_connect() - Notify LPASS of interface connect
- * @adapter: The adapter that connected
+ * @link_info: Link info pointer in HDD adapter
  *
  * This function is used to notify the LPASS feature that an adapter
  * has connected.
  *
  * Return: none
  */
-void hdd_lpass_notify_connect(struct hdd_adapter *adapter);
+void hdd_lpass_notify_connect(struct wlan_hdd_link_info *link_info);
 
 /**
  * hdd_lpass_notify_disconnect() - Notify LPASS of interface disconnect
- * @adapter: The adapter that connected
+ * @link_info: Link info pointer in HDD adapter
  *
  * This function is used to notify the LPASS feature that an adapter
  * has disconnected.
  *
  * Return: none
  */
-void hdd_lpass_notify_disconnect(struct hdd_adapter *adapter);
+void hdd_lpass_notify_disconnect(struct wlan_hdd_link_info *link_info);
 
 /**
  * hdd_lpass_notify_mode_change() - Notify LPASS of interface mode change
- * @adapter: The adapter whose mode was changed
+ * @link_info: Link info pointer in HDD adapter
  *
  * This function is used to notify the LPASS feature that an adapter
  * had its mode changed.
  *
  * Return: none
  */
-void hdd_lpass_notify_mode_change(struct hdd_adapter *adapter);
+void hdd_lpass_notify_mode_change(struct wlan_hdd_link_info *link_info);
 
 /**
  * hdd_lpass_notify_start() - Notify LPASS of driver start
- * @hdd_ctx: The global HDD context
- * @adapter: adapter for which notification is send
+ * @link_info: Link info pointer in HDD adapter
  *
  * This function is used to notify the LPASS feature that the wlan
  * driver has (re-)started.
  *
  * Return: none
  */
-void hdd_lpass_notify_start(struct hdd_context *hdd_ctx,
-			    struct hdd_adapter *adapter);
+void hdd_lpass_notify_start(struct wlan_hdd_link_info *link_info);
 
 /**
  * hdd_lpass_notify_stop() - Notify LPASS of driver stop
@@ -156,18 +155,23 @@ void hdd_lpass_populate_pmo_config(struct pmo_psoc_cfg *pmo_config,
 {
 }
 
-static inline void hdd_lpass_notify_connect(struct hdd_adapter *adapter)
+static inline void
+hdd_lpass_notify_connect(struct wlan_hdd_link_info *link_info)
 {
 }
-static inline void hdd_lpass_notify_disconnect(struct hdd_adapter *adapter)
+
+static inline void
+hdd_lpass_notify_disconnect(struct wlan_hdd_link_info *link_info)
 {
 }
-static inline void hdd_lpass_notify_mode_change(struct hdd_adapter *adapter)
+
+static inline void
+hdd_lpass_notify_mode_change(struct wlan_hdd_link_info *link_info)
 {
 }
 
-static inline void hdd_lpass_notify_start(struct hdd_context *hdd_ctx,
-					  struct hdd_adapter *adapter)
+static inline void
+hdd_lpass_notify_start(struct wlan_hdd_link_info *link_info)
 {
 }
 

core/hdd/src/wlan_hdd_main.c

@@ -5198,12 +5198,13 @@ static int __hdd_open(struct net_device *dev)
 	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	int ret;
+	struct wlan_hdd_link_info *link_info = adapter->deflink;
 
 	hdd_enter_dev(dev);
 
 	qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
 		   TRACE_CODE_HDD_OPEN_REQUEST,
-		   adapter->deflink->vdev_id, adapter->device_mode);
+		   link_info->vdev_id, adapter->device_mode);
 
 	/* Nothing to be done if device is unloading */
 	if (cds_is_driver_unloading()) {
@@ -5240,7 +5241,7 @@ static int __hdd_open(struct net_device *dev)
 		return ret;
 	}
 
-	if (!test_bit(SME_SESSION_OPENED, &adapter->deflink->link_flags)) {
+	if (!test_bit(SME_SESSION_OPENED, &link_info->link_flags)) {
 		ret = hdd_start_adapter(adapter);
 		if (ret) {
 			hdd_err("Failed to start adapter :%d",
@@ -5250,7 +5251,7 @@ static int __hdd_open(struct net_device *dev)
 	}
 
 	set_bit(DEVICE_IFACE_OPENED, &adapter->event_flags);
-	if (hdd_cm_is_vdev_associated(adapter->deflink)) {
+	if (hdd_cm_is_vdev_associated(link_info)) {
 		hdd_debug("Enabling Tx Queues");
 		/* Enable TX queues only when we are connected */
 		wlan_hdd_netif_queue_control(adapter,
@@ -5267,7 +5268,7 @@ static int __hdd_open(struct net_device *dev)
 	}
 
 	hdd_populate_wifi_pos_cfg(hdd_ctx);
-	hdd_lpass_notify_start(hdd_ctx, adapter);
+	hdd_lpass_notify_start(link_info);
 
 	if (ucfg_pkt_capture_get_mode(hdd_ctx->psoc) !=
 				      PACKET_CAPTURE_MODE_DISABLE)
@@ -9634,7 +9635,7 @@ QDF_STATUS hdd_start_all_adapters(struct hdd_context *hdd_ctx)
 					adapter,
 					hdd_tx_resume_timer_expired_handler);
 
-			hdd_lpass_notify_start(hdd_ctx, adapter);
+			hdd_lpass_notify_start(adapter->deflink);
 			break;
 
 		case QDF_SAP_MODE:

core/hdd/src/wlan_hdd_stats.c

@@ -6586,7 +6586,7 @@ static int wlan_hdd_get_sta_stats(struct wlan_hdd_link_info *link_info,
 	 * actual connection.  lpass will ensure the notification is
 	 * only processed once per association.
 	 */
-	hdd_lpass_notify_connect(adapter);
+	hdd_lpass_notify_connect(link_info);
 
 	if (wlan_hdd_update_rate_info(link_info, sinfo))
 		/* Keep GUI happy */