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

Commit 29946878 authored by Michal Kazior's avatar Michal Kazior Committed by Kalle Valo
Browse files

ath10k: implement wake_tx_queue 



This implements very basic support for software
queueing. It also contains some knobs that will be
patched later.

Signed-off-by: default avatarMichal Kazior <michal.kazior@tieto.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 839ae637

drivers/net/wireless/ath/ath10k/core.c

+2 −0
Original line number Diff line number Diff line
@@ -2048,7 +2048,9 @@ struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev, 


	mutex_init(&ar->conf_mutex);

	spin_lock_init(&ar->data_lock);

	spin_lock_init(&ar->txqs_lock);



	INIT_LIST_HEAD(&ar->txqs);

	INIT_LIST_HEAD(&ar->peers);

	init_waitqueue_head(&ar->peer_mapping_wq);

	init_waitqueue_head(&ar->htt.empty_tx_wq);

drivers/net/wireless/ath/ath10k/core.h

+7 −0
Original line number Diff line number Diff line
@@ -308,6 +308,10 @@ struct ath10k_peer { 
	struct ieee80211_key_conf *keys[WMI_MAX_KEY_INDEX + 1];

};



struct ath10k_txq {

	struct list_head list;

};



struct ath10k_sta {

	struct ath10k_vif *arvif;
@@ -791,7 +795,10 @@ struct ath10k { 


	/* protects shared structure data */

	spinlock_t data_lock;

	/* protects: ar->txqs, artxq->list */

	spinlock_t txqs_lock;



	struct list_head txqs;

	struct list_head arvifs;

	struct list_head peers;

	struct ath10k_peer *peer_map[ATH10K_MAX_NUM_PEER_IDS];

drivers/net/wireless/ath/ath10k/htt_rx.c

+3 −0
Original line number Diff line number Diff line
@@ -2242,6 +2242,7 @@ void ath10k_htt_t2h_msg_handler(struct ath10k *ar, struct sk_buff *skb) 
		}



		ath10k_txrx_tx_unref(htt, &tx_done);

		ath10k_mac_tx_push_pending(ar);

		break;

	}

	case HTT_T2H_MSG_TYPE_TX_COMPL_IND:
@@ -2374,6 +2375,8 @@ static void ath10k_htt_txrx_compl_task(unsigned long ptr) 
		dev_kfree_skb_any(skb);

	}



	ath10k_mac_tx_push_pending(ar);



	while ((skb = __skb_dequeue(&rx_q))) {

		resp = (struct htt_resp *)skb->data;

		spin_lock_bh(&htt->rx_ring.lock);

drivers/net/wireless/ath/ath10k/mac.c

+144 −0
Original line number Diff line number Diff line
@@ -3620,6 +3620,123 @@ void ath10k_mgmt_over_wmi_tx_work(struct work_struct *work) 
	}

}



static void ath10k_mac_txq_init(struct ieee80211_txq *txq)

{

	struct ath10k_txq *artxq = (void *)txq->drv_priv;



	if (!txq)

		return;



	INIT_LIST_HEAD(&artxq->list);

}



static void ath10k_mac_txq_unref(struct ath10k *ar, struct ieee80211_txq *txq)

{

	struct ath10k_txq *artxq = (void *)txq->drv_priv;



	if (!txq)

		return;



	spin_lock_bh(&ar->txqs_lock);

	if (!list_empty(&artxq->list))

		list_del_init(&artxq->list);

	spin_unlock_bh(&ar->txqs_lock);

}



static bool ath10k_mac_tx_can_push(struct ieee80211_hw *hw,

				   struct ieee80211_txq *txq)

{

	return 1; /* TBD */

}



static int ath10k_mac_tx_push_txq(struct ieee80211_hw *hw,

				  struct ieee80211_txq *txq)

{

	const bool is_mgmt = false;

	const bool is_presp = false;

	struct ath10k *ar = hw->priv;

	struct ath10k_htt *htt = &ar->htt;

	struct ieee80211_vif *vif = txq->vif;

	struct ieee80211_sta *sta = txq->sta;

	enum ath10k_hw_txrx_mode txmode;

	enum ath10k_mac_tx_path txpath;

	struct sk_buff *skb;

	int ret;



	spin_lock_bh(&ar->htt.tx_lock);

	ret = ath10k_htt_tx_inc_pending(htt, is_mgmt, is_presp);

	spin_unlock_bh(&ar->htt.tx_lock);



	if (ret)

		return ret;



	skb = ieee80211_tx_dequeue(hw, txq);

	if (!skb) {

		spin_lock_bh(&ar->htt.tx_lock);

		ath10k_htt_tx_dec_pending(htt, is_mgmt);

		spin_unlock_bh(&ar->htt.tx_lock);



		return -ENOENT;

	}



	ath10k_mac_tx_h_fill_cb(ar, vif, skb);



	txmode = ath10k_mac_tx_h_get_txmode(ar, vif, sta, skb);

	txpath = ath10k_mac_tx_h_get_txpath(ar, skb, txmode);



	ret = ath10k_mac_tx(ar, vif, sta, txmode, txpath, skb);

	if (unlikely(ret)) {

		ath10k_warn(ar, "failed to push frame: %d\n", ret);



		spin_lock_bh(&ar->htt.tx_lock);

		ath10k_htt_tx_dec_pending(htt, is_mgmt);

		spin_unlock_bh(&ar->htt.tx_lock);



		return ret;

	}



	return 0;

}



void ath10k_mac_tx_push_pending(struct ath10k *ar)

{

	struct ieee80211_hw *hw = ar->hw;

	struct ieee80211_txq *txq;

	struct ath10k_txq *artxq;

	struct ath10k_txq *last;

	int ret;

	int max;



	spin_lock_bh(&ar->txqs_lock);

	rcu_read_lock();



	last = list_last_entry(&ar->txqs, struct ath10k_txq, list);

	while (!list_empty(&ar->txqs)) {

		artxq = list_first_entry(&ar->txqs, struct ath10k_txq, list);

		txq = container_of((void *)artxq, struct ieee80211_txq,

				   drv_priv);



		/* Prevent aggressive sta/tid taking over tx queue */

		max = 16;

		while (max--) {

			ret = ath10k_mac_tx_push_txq(hw, txq);

			if (ret < 0)

				break;

		}



		list_del_init(&artxq->list);



		if (artxq == last || (ret < 0 && ret != -ENOENT)) {

			if (ret != -ENOENT)

				list_add_tail(&artxq->list, &ar->txqs);

			break;

		}

	}



	rcu_read_unlock();

	spin_unlock_bh(&ar->txqs_lock);

}



/************/

/* Scanning */

/************/
@@ -3836,6 +3953,22 @@ static void ath10k_mac_op_tx(struct ieee80211_hw *hw, 
	}

}



static void ath10k_mac_op_wake_tx_queue(struct ieee80211_hw *hw,

					struct ieee80211_txq *txq)

{

	struct ath10k *ar = hw->priv;

	struct ath10k_txq *artxq = (void *)txq->drv_priv;



	if (ath10k_mac_tx_can_push(hw, txq)) {

		spin_lock_bh(&ar->txqs_lock);

		if (list_empty(&artxq->list))

			list_add_tail(&artxq->list, &ar->txqs);

		spin_unlock_bh(&ar->txqs_lock);



		tasklet_schedule(&ar->htt.txrx_compl_task);

	}

}



/* Must not be called with conf_mutex held as workers can use that also. */

void ath10k_drain_tx(struct ath10k *ar)

{
@@ -4462,6 +4595,7 @@ static int ath10k_add_interface(struct ieee80211_hw *hw, 
	mutex_lock(&ar->conf_mutex);



	memset(arvif, 0, sizeof(*arvif));

	ath10k_mac_txq_init(vif->txq);



	arvif->ar = ar;

	arvif->vif = vif;
@@ -4860,6 +4994,8 @@ static void ath10k_remove_interface(struct ieee80211_hw *hw, 
	ath10k_mac_vif_tx_unlock_all(arvif);

	spin_unlock_bh(&ar->htt.tx_lock);



	ath10k_mac_txq_unref(ar, vif->txq);



	mutex_unlock(&ar->conf_mutex);

}
@@ -5573,6 +5709,9 @@ static int ath10k_sta_state(struct ieee80211_hw *hw, 
		memset(arsta, 0, sizeof(*arsta));

		arsta->arvif = arvif;

		INIT_WORK(&arsta->update_wk, ath10k_sta_rc_update_wk);



		for (i = 0; i < ARRAY_SIZE(sta->txq); i++)

			ath10k_mac_txq_init(sta->txq[i]);

	}



	/* cancel must be done outside the mutex to avoid deadlock */
@@ -5710,6 +5849,9 @@ static int ath10k_sta_state(struct ieee80211_hw *hw, 
		}

		spin_unlock_bh(&ar->data_lock);



		for (i = 0; i < ARRAY_SIZE(sta->txq); i++)

			ath10k_mac_txq_unref(ar, sta->txq[i]);



		if (!sta->tdls)

			goto exit;
@@ -7013,6 +7155,7 @@ ath10k_mac_op_switch_vif_chanctx(struct ieee80211_hw *hw, 


static const struct ieee80211_ops ath10k_ops = {

	.tx				= ath10k_mac_op_tx,

	.wake_tx_queue			= ath10k_mac_op_wake_tx_queue,

	.start				= ath10k_start,

	.stop				= ath10k_stop,

	.config				= ath10k_config,
@@ -7467,6 +7610,7 @@ int ath10k_mac_register(struct ath10k *ar) 


	ar->hw->vif_data_size = sizeof(struct ath10k_vif);

	ar->hw->sta_data_size = sizeof(struct ath10k_sta);

	ar->hw->txq_data_size = sizeof(struct ath10k_txq);



	ar->hw->max_listen_interval = ATH10K_MAX_HW_LISTEN_INTERVAL;

drivers/net/wireless/ath/ath10k/mac.h

+1 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ void ath10k_mac_tx_unlock(struct ath10k *ar, int reason); 
void ath10k_mac_vif_tx_lock(struct ath10k_vif *arvif, int reason);

void ath10k_mac_vif_tx_unlock(struct ath10k_vif *arvif, int reason);

bool ath10k_mac_tx_frm_has_freq(struct ath10k *ar);

void ath10k_mac_tx_push_pending(struct ath10k *ar);



static inline struct ath10k_vif *ath10k_vif_to_arvif(struct ieee80211_vif *vif)

{