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

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

ath10k: remove num_sends_allowed 



The value provided by num_sends_allowed is now
derived from CE source ringbuffer state.

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

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

+16 −1
Original line number Diff line number Diff line
@@ -283,7 +283,7 @@ static int ath10k_ce_send_nolock(struct ath10k_ce_pipe *ce_state, 


	if (unlikely(CE_RING_DELTA(nentries_mask,

				   write_index, sw_index - 1) <= 0)) {

		ret = -EIO;

		ret = -ENOSR;

		goto exit;

	}
@@ -338,6 +338,21 @@ int ath10k_ce_send(struct ath10k_ce_pipe *ce_state, 
	return ret;

}



int ath10k_ce_num_free_src_entries(struct ath10k_ce_pipe *pipe)

{

	struct ath10k *ar = pipe->ar;

	struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);

	int delta;



	spin_lock_bh(&ar_pci->ce_lock);

	delta = CE_RING_DELTA(pipe->src_ring->nentries_mask,

			      pipe->src_ring->write_index,

			      pipe->src_ring->sw_index - 1);

	spin_unlock_bh(&ar_pci->ce_lock);



	return delta;

}



int ath10k_ce_recv_buf_enqueue(struct ath10k_ce_pipe *ce_state,

			       void *per_recv_context,

			       u32 buffer)

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

+1 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ void ath10k_ce_send_cb_register(struct ath10k_ce_pipe *ce_state, 
				void (*send_cb)(struct ath10k_ce_pipe *),

				int disable_interrupts);



int ath10k_ce_num_free_src_entries(struct ath10k_ce_pipe *pipe);



/*==================Recv=======================*/

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

+1 −20
Original line number Diff line number Diff line
@@ -720,16 +720,6 @@ static int ath10k_pci_hif_send_head(struct ath10k *ar, u8 pipe_id, 
			"ath10k tx: data: ",

			nbuf->data, nbuf->len);



	/* Make sure we have resources to handle this request */

	spin_lock_bh(&pipe_info->pipe_lock);

	if (!pipe_info->num_sends_allowed) {

		ath10k_warn("Pipe: %d is full\n", pipe_id);

		spin_unlock_bh(&pipe_info->pipe_lock);

		return -ENOSR;

	}

	pipe_info->num_sends_allowed--;

	spin_unlock_bh(&pipe_info->pipe_lock);



	ret = ath10k_ce_send(ce_hdl, nbuf, skb_cb->paddr, len, transfer_id,

			     flags);

	if (ret)
@@ -741,14 +731,7 @@ static int ath10k_pci_hif_send_head(struct ath10k *ar, u8 pipe_id, 
static u16 ath10k_pci_hif_get_free_queue_number(struct ath10k *ar, u8 pipe)

{

	struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);

	struct ath10k_pci_pipe *pipe_info = &(ar_pci->pipe_info[pipe]);

	int ret;



	spin_lock_bh(&pipe_info->pipe_lock);

	ret = pipe_info->num_sends_allowed;

	spin_unlock_bh(&pipe_info->pipe_lock);



	return ret;

	return ath10k_ce_num_free_src_entries(ar_pci->pipe_info[pipe].ce_hdl);

}



static void ath10k_pci_hif_dump_area(struct ath10k *ar)
@@ -863,7 +846,6 @@ static int ath10k_pci_start_ce(struct ath10k *ar) 
						   ath10k_pci_ce_send_done,

						   disable_interrupts);

			completions += attr->src_nentries;

			pipe_info->num_sends_allowed = attr->src_nentries - 1;

		}



		if (attr->dest_nentries) {
@@ -1033,7 +1015,6 @@ static void ath10k_pci_process_ce(struct ath10k *ar) 
		 */

		spin_lock_bh(&compl->pipe_info->pipe_lock);

		list_add_tail(&compl->list, &compl->pipe_info->compl_free);

		compl->pipe_info->num_sends_allowed += send_done;

		spin_unlock_bh(&compl->pipe_info->pipe_lock);

	}

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

+0 −3
Original line number Diff line number Diff line
@@ -178,9 +178,6 @@ struct ath10k_pci_pipe { 
	/* List of free CE completion slots */

	struct list_head compl_free;



	/* Limit the number of outstanding send requests. */

	int num_sends_allowed;



	struct ath10k_pci *ar_pci;

	struct tasklet_struct intr;

};