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

Commit e9780367 authored by Kalle Valo's avatar Kalle Valo
Browse files

ath10k: simplify ath10k_ce_init() wake up handling 



ath10k_ce_init() and the functions it calls wakeup
the chip multiple times. Simplify that to call
ath10k_pci_wake() only once. This also makes it
easier to add error handling when wakeup fails.

Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent 3aebe54b

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

+5 −9
Original line number Diff line number Diff line
@@ -946,7 +946,6 @@ static int ath10k_ce_init_src_ring(struct ath10k *ar, 
	src_ring->nentries = nentries;

	src_ring->nentries_mask = nentries - 1;



	ath10k_pci_wake(ar);

	src_ring->sw_index = ath10k_ce_src_ring_read_index_get(ar, ctrl_addr);

	src_ring->sw_index &= src_ring->nentries_mask;

	src_ring->hw_index = src_ring->sw_index;
@@ -954,7 +953,6 @@ static int ath10k_ce_init_src_ring(struct ath10k *ar, 
	src_ring->write_index =

		ath10k_ce_src_ring_write_index_get(ar, ctrl_addr);

	src_ring->write_index &= src_ring->nentries_mask;

	ath10k_pci_sleep(ar);



	src_ring->per_transfer_context = (void **)ptr;
@@ -1004,7 +1002,6 @@ static int ath10k_ce_init_src_ring(struct ath10k *ar, 
			src_ring->shadow_base_unaligned,

			CE_DESC_RING_ALIGN);



	ath10k_pci_wake(ar);

	ath10k_ce_src_ring_base_addr_set(ar, ctrl_addr,

					 src_ring->base_addr_ce_space);

	ath10k_ce_src_ring_size_set(ar, ctrl_addr, nentries);
@@ -1012,7 +1009,6 @@ static int ath10k_ce_init_src_ring(struct ath10k *ar, 
	ath10k_ce_src_ring_byte_swap_set(ar, ctrl_addr, 0);

	ath10k_ce_src_ring_lowmark_set(ar, ctrl_addr, 0);

	ath10k_ce_src_ring_highmark_set(ar, ctrl_addr, nentries);

	ath10k_pci_sleep(ar);



	return 0;

}
@@ -1049,13 +1045,11 @@ static int ath10k_ce_init_dest_ring(struct ath10k *ar, 
	dest_ring->nentries = nentries;

	dest_ring->nentries_mask = nentries - 1;



	ath10k_pci_wake(ar);

	dest_ring->sw_index = ath10k_ce_dest_ring_read_index_get(ar, ctrl_addr);

	dest_ring->sw_index &= dest_ring->nentries_mask;

	dest_ring->write_index =

		ath10k_ce_dest_ring_write_index_get(ar, ctrl_addr);

	dest_ring->write_index &= dest_ring->nentries_mask;

	ath10k_pci_sleep(ar);



	dest_ring->per_transfer_context = (void **)ptr;
@@ -1090,14 +1084,12 @@ static int ath10k_ce_init_dest_ring(struct ath10k *ar, 
			dest_ring->base_addr_ce_space_unaligned,

			CE_DESC_RING_ALIGN);



	ath10k_pci_wake(ar);

	ath10k_ce_dest_ring_base_addr_set(ar, ctrl_addr,

					  dest_ring->base_addr_ce_space);

	ath10k_ce_dest_ring_size_set(ar, ctrl_addr, nentries);

	ath10k_ce_dest_ring_byte_swap_set(ar, ctrl_addr, 0);

	ath10k_ce_dest_ring_lowmark_set(ar, ctrl_addr, 0);

	ath10k_ce_dest_ring_highmark_set(ar, ctrl_addr, nentries);

	ath10k_pci_sleep(ar);



	return 0;

}
@@ -1138,6 +1130,10 @@ struct ath10k_ce_pipe *ath10k_ce_init(struct ath10k *ar, 
	u32 ctrl_addr = ath10k_ce_base_address(ce_id);

	int ret;



	ret = ath10k_pci_wake(ar);

	if (ret)

		return NULL;



	ce_state = ath10k_ce_init_state(ar, ce_id, attr);

	if (!ce_state) {

		ath10k_err("Failed to initialize CE state for ID: %d\n", ce_id);
@@ -1165,8 +1161,8 @@ struct ath10k_ce_pipe *ath10k_ce_init(struct ath10k *ar, 
	}



	/* Enable CE error interrupts */

	ath10k_pci_wake(ar);

	ath10k_ce_error_intr_enable(ar, ctrl_addr);



	ath10k_pci_sleep(ar);



	return ce_state;