Updated to v4.5.25.66 driver

Author: sc-marc

CORE/CLD_TXRX/HTT/htt_t2h.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2011-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -1230,7 +1231,7 @@ int8_t
 htt_rx_ind_noise_floor_chain(htt_pdev_handle pdev, adf_nbuf_t rx_ind_msg,
 			     int8_t chain)
 {
-	int8_t noise_floor;
+	int8_t noise_floor = HTT_NOISE_FLOOR_INVALID;
 	u_int32_t *msg_word;
 
 	/* only chain0/1 used with 11p DSRC */

CORE/CLD_TXRX/TLSHIM/tl_shim.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2013-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -989,9 +990,10 @@ static void tl_shim_flush_rx_frames(void *vos_ctx,
 	clear_bit(TLSHIM_FLUSH_CACHE_IN_PROGRESS, &sta_info->flags);
 }
 
-static void tlshim_data_rx_cb(struct txrx_tl_shim_ctx *tl_shim,
-			      adf_nbuf_t buf_list, u_int16_t staid)
+static void tlshim_data_rx_cb(void *context, void *rxpkt, u_int16_t staid)
 {
+	struct txrx_tl_shim_ctx *tl_shim = (struct txrx_tl_shim_ctx *)context;
+	adf_nbuf_t buf_list = (adf_nbuf_t)rxpkt;
 	void *vos_ctx = vos_get_global_context(VOS_MODULE_ID_TL, tl_shim);
 	struct tlshim_sta_info *sta_info;
 	adf_nbuf_t buf, next_buf;
@@ -1153,8 +1155,7 @@ static void tlshim_data_rx_handler(void *context, u_int16_t staid,
 					TLSHIM_LOGW("No available Rx message buffer");
 					goto drop_rx_buf;
 				}
-				pkt->callback = (vos_tlshim_cb)
-						tlshim_data_rx_cb;
+				pkt->callback = tlshim_data_rx_cb;
 				pkt->context = (void *) tl_shim;
 				pkt->Rxpkt = (void *) rx_buf_list;
 				pkt->staId = staid;

CORE/CLD_TXRX/TXRX/ol_tx.c

@@ -1,6 +1,6 @@
 /*
- * Copyright (c) 2011-2014, 2016-2018, 2021 The Linux Foundation. 
- * All rights reserved.
+ * Copyright (c) 2011-2014, 2016-2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -49,7 +49,7 @@
 #include <ol_tx_classify.h>   /* ol_tx_classify, ol_tx_classify_mgmt */
 #include <ol_tx_queue.h>      /* ol_tx_enqueue */
 #include <ol_tx_sched.h>      /* ol_tx_sched */
-
+#include <asm/div64.h>
 /* internal header files relevant only for specific systems (Pronto) */
 #include <ol_txrx_encap.h>    /* OL_TX_ENCAP, etc */
 #include "vos_lock.h"
@@ -1992,14 +1992,18 @@ ol_tx_vdev_set_bundle_require(uint8_t vdev_id, unsigned long tx_bytes,
 {
 	struct ol_txrx_vdev_t* vdev = ol_txrx_get_vdev_from_vdev_id(vdev_id);
 	bool old_bundle_required;
+	uint64_t high_th_temp;
+	uint64_t low_th_temp;
 
 	if ((!vdev) || (low_th > high_th))
 		return;
 
 	old_bundle_required = vdev->bundling_reqired;
-	if (tx_bytes > ((high_th * time_in_ms * 3) >> 1))
+	high_th_temp = high_th * time_in_ms * 1500;
+	low_th_temp = low_th * time_in_ms * 1500;
+	if (tx_bytes > vos_do_div(high_th_temp,1000))
 		vdev->bundling_reqired = true;
-	else if (tx_bytes < ((low_th * time_in_ms * 3) >> 1))
+	else if (tx_bytes < vos_do_div(low_th_temp,1000))
 		vdev->bundling_reqired = false;
 
 	if (old_bundle_required != vdev->bundling_reqired)
@@ -2020,7 +2024,7 @@ ol_tx_hl_queue_flush_all(struct ol_txrx_vdev_t* vdev)
 {
 	adf_os_spin_lock_bh(&vdev->bundle_queue.mutex);
 	if (vdev->bundle_queue.txq.depth != 0) {
-		adf_os_timer_cancel(&vdev->bundle_queue.timer);
+		vos_timer_stop(&vdev->bundle_queue.timer);
 		vdev->pdev->total_bundle_queue_length -=
 				vdev->bundle_queue.txq.depth;
 		adf_nbuf_tx_free(vdev->bundle_queue.txq.head, 1/*error*/);
@@ -2044,7 +2048,7 @@ ol_tx_hl_vdev_queue_append(struct ol_txrx_vdev_t* vdev, adf_nbuf_t msdu_list)
 	adf_os_spin_lock_bh(&vdev->bundle_queue.mutex);
 
 	if (!vdev->bundle_queue.txq.head) {
-		adf_os_timer_start(
+		vos_timer_start(
 			&vdev->bundle_queue.timer,
 			ol_cfg_get_bundle_timer_value(vdev->pdev->ctrl_pdev));
 		vdev->bundle_queue.txq.head = msdu_list;
@@ -2084,7 +2088,7 @@ ol_tx_hl_vdev_queue_send_all(struct ol_txrx_vdev_t* vdev, bool call_sched)
 	adf_os_spin_lock_bh(&vdev->bundle_queue.mutex);
 
 	if (vdev->bundle_queue.txq.depth != 0) {
-		adf_os_timer_cancel(&vdev->bundle_queue.timer);
+		vos_timer_stop(&vdev->bundle_queue.timer);
 		vdev->pdev->total_bundle_queue_length -=
 			vdev->bundle_queue.txq.depth;
 		msdu_list = ol_tx_hl_base(vdev, ol_tx_spec_std,
@@ -2126,18 +2130,6 @@ ol_tx_hl_pdev_queue_send_all(struct ol_txrx_pdev_t* pdev)
  *
  * Return: none
  */
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-void
-ol_tx_hl_vdev_bundle_timer(struct timer_list *t)
-{
-	adf_nbuf_t msdu_list;
-	struct ol_txrx_vdev_t *vdev = from_timer(vdev, t, bundle_queue.timer);
-
-	msdu_list = ol_tx_hl_vdev_queue_send_all(vdev, true);
-	if (msdu_list)
-		adf_nbuf_tx_free(msdu_list, 1/*error*/);
-}
-#else
 void
 ol_tx_hl_vdev_bundle_timer(void *vdev)
 {
@@ -2147,7 +2139,6 @@ ol_tx_hl_vdev_bundle_timer(void *vdev)
 	if (msdu_list)
 		adf_nbuf_tx_free(msdu_list, 1/*error*/);
 }
-#endif
 
 /**
  * ol_tx_hl_queue() - queueing logic to bundle in HL

CORE/CLD_TXRX/TXRX/ol_tx.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2011-2014,2016-2017,2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -125,33 +126,20 @@ void ol_tx_hl_del_ack_queue_flush_all(struct ol_txrx_vdev_t *vdev)
 #endif
 
 #ifdef QCA_SUPPORT_TXRX_HL_BUNDLE
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-void
-ol_tx_hl_vdev_bundle_timer(struct timer_list *t);
-#else
 void
 ol_tx_hl_vdev_bundle_timer(void *vdev);
-#endif
 
 void
 ol_tx_hl_queue_flush_all(struct ol_txrx_vdev_t* vdev);
 
 adf_nbuf_t
 ol_tx_hl_queue(struct ol_txrx_vdev_t* vdev, adf_nbuf_t msdu_list);
 
-#else
-
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
-static inline void ol_tx_hl_vdev_bundle_timer(struct timer_list *t)
-{
-	return;
-}
 #else
 static inline void ol_tx_hl_vdev_bundle_timer(void *vdev)
 {
 	return;
 }
-#endif
 
 static inline void
 ol_tx_hl_queue_flush_all(struct ol_txrx_vdev_t* vdev)

CORE/CLD_TXRX/TXRX/ol_tx_sched.c

@@ -1107,14 +1107,12 @@ void ol_tx_sched_wrr_param_update(struct ol_txrx_pdev_t *pdev,
 				struct ol_tx_sched_wrr_adv_t *scheduler)
 {
 	int i;
-#ifdef WLAN_DEBUG
 	char *tx_sched_wrr_name[4] = {
 		"BE",
 		"BK",
 		"VI",
 		"VO"
 	};
-#endif
 
 	if (NULL == scheduler)
 		return;

CORE/CLD_TXRX/TXRX/ol_txrx.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2011-2019, 2021 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -1276,11 +1277,8 @@ ol_txrx_vdev_attach(
     adf_os_spinlock_init(&vdev->bundle_queue.mutex);
     vdev->bundle_queue.txq.head = vdev->ll_pause.txq.tail = NULL;
     vdev->bundle_queue.txq.depth = 0;
-    adf_os_timer_init(
-            pdev->osdev,
-            &vdev->bundle_queue.timer,
-            ol_tx_hl_vdev_bundle_timer,
-            vdev, ADF_DEFERRABLE_TIMER);
+    vos_timer_init(&vdev->bundle_queue.timer, VOS_TIMER_TYPE_SW,
+                   ol_tx_hl_vdev_bundle_timer, vdev);
 
     ol_txrx_vdev_init_tcp_del_ack(vdev);
 
@@ -1399,7 +1397,7 @@ ol_txrx_vdev_detach(
         }
     }
 #endif /* defined(CONFIG_HL_SUPPORT) */
-
+    vos_timer_destroy(&vdev->bundle_queue.timer);
     adf_os_spin_lock_bh(&vdev->ll_pause.mutex);
     adf_os_timer_cancel(&vdev->ll_pause.timer);
     vdev->ll_pause.is_q_timer_on = FALSE;

CORE/CLD_TXRX/TXRX/ol_txrx_types.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2013-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -96,15 +97,6 @@ struct ol_txrx_pdev_t;
 struct ol_txrx_vdev_t;
 struct ol_txrx_peer_t;
 
-struct ol_pdev_t;
-typedef struct ol_pdev_t* ol_pdev_handle;
-
-struct ol_vdev_t;
-typedef struct ol_vdev_t* ol_vdev_handle;
-
-struct ol_peer_t;
-typedef struct ol_peer_t* ol_peer_handle;
-
 /* rx filter related */
 #define MAX_PRIVACY_FILTERS           4 /* max privacy filters */
 
@@ -1095,7 +1087,7 @@ struct ol_txrx_vdev_t {
 			int depth;
 		} txq;
 		adf_os_spinlock_t mutex;
-		adf_os_timer_t timer;
+		vos_timer_t timer;
 	} bundle_queue;
 
 #ifdef QCA_SUPPORT_TXRX_DRIVER_TCP_DEL_ACK

CORE/CLD_TXRX/TXRX/txrx.h

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2013-2015 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -113,18 +114,6 @@ VOS_STATUS wlan_register_mgmt_client(void *pdev_txrx,
 				     VOS_STATUS (*rx_mgmt)(void *g_vosctx,
 							   void *buf));
 
-typedef void (*ol_txrx_vdev_delete_cb)(void *context);
-
-/**
- * @typedef ol_txrx_tx_fp
- * @brief top-level transmit function
- */
-typedef adf_nbuf_t
-(*ol_txrx_tx_fp)(struct ol_txrx_vdev_t *vdev, adf_nbuf_t msdu_list);
-
-typedef void
-(*ol_txrx_mgmt_tx_cb)(void *ctxt, adf_nbuf_t tx_mgmt_frm, int had_error);
-
 /* If RSSI realm is changed, send notification to Clients, SME, HDD */
 typedef VOS_STATUS (*wlan_txrx_rssi_cross_thresh) (void *adapter, u8 rssi,
 					    void *usr_ctx, v_S7_t avg_rssi);

CORE/EPPING/src/epping_txrx.c

@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2014-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -143,7 +144,7 @@ static void epping_ndev_uninit (struct net_device *dev)
    return;
 }
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,5,0))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 6, 0))
 void epping_tx_queue_timeout(struct net_device *dev, unsigned int txqueue)
 #else
 void epping_tx_queue_timeout(struct net_device *dev)
@@ -174,7 +175,7 @@ void epping_tx_queue_timeout(struct net_device *dev)
 
 }
 
-int epping_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
+netdev_tx_t epping_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
 {
    epping_adapter_t *pAdapter;
    int ret = 0;
@@ -204,7 +205,8 @@ struct net_device_stats* epping_get_stats(struct net_device *dev)
    return &pAdapter->stats;
 }
 
-int epping_ndev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+static int
+__epping_ndev_ioctl(struct net_device *dev, void __user *data, int cmd)
 {
    epping_adapter_t *pAdapter;
    int ret = 0;
@@ -223,7 +225,7 @@ int epping_ndev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
       goto end;
    }
 
-   if ((!ifr) || (!ifr->ifr_data)) {
+   if (!data) {
       ret = -EINVAL;
       goto end;
    }
@@ -246,6 +248,21 @@ int epping_ndev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
    return ret;
 }
 
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0))
+static int
+epping_dev_private_ioctl(struct net_device *dev, struct ifreq *ifr,
+			 void __user *data, int cmd)
+{
+	return __epping_ndev_ioctl(dev, data, cmd);
+}
+#else
+static int
+epping_ndev_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
+{
+	return __epping_ndev_ioctl(dev, ifr->ifr_data, cmd);
+}
+#endif
+
 static int epping_set_mac_address(struct net_device *dev, void *addr)
 {
    epping_adapter_t *pAdapter = netdev_priv(dev);
@@ -367,7 +384,11 @@ static struct net_device_ops epping_drv_ops = {
    .ndo_start_xmit = epping_hard_start_xmit,
    .ndo_tx_timeout = epping_tx_queue_timeout,
    .ndo_get_stats = epping_get_stats,
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 15, 0))
+   .ndo_siocdevprivate = epping_dev_private_ioctl,
+#else
    .ndo_do_ioctl = epping_ndev_ioctl,
+#endif
    .ndo_set_mac_address = epping_set_mac_address,
    .ndo_select_queue    = NULL,
  };

CORE/HDD/inc/wlan_hdd_cfg80211.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2012-2019 The Linux Foundation. All rights reserved.
- * Copyright (c) 2021 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -3006,7 +3006,7 @@ int wlan_hdd_cfg80211_send_tdls_discover_req(struct wiphy *wiphy,
 extern void wlan_hdd_cfg80211_update_replayCounterCallback(void *callbackContext,
                             tpSirGtkOffloadGetInfoRspParams pGtkOffloadGetInfoRsp);
 #endif
-void* wlan_hdd_change_country_code_cb(void *pAdapter);
+void wlan_hdd_change_country_code_cb(void *pAdapter);
 void hdd_select_cbmode(hdd_adapter_t *pAdapter, v_U8_t operationChannel,
                 uint16_t *ch_width);
 void hdd_select_mon_cbmode(hdd_adapter_t *adapter, v_U8_t operation_channel,