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

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

ath10k: convert pci_alloc_consistent() to dma_alloc_coherent() 



This allows to use GFP_KERNEL allocation. This
should decrease chance of allocation failure, e.g.
during firmware recovery.

Reported-By: default avatarAvery Pennarun <apenwarr@gmail.com>
Signed-off-by: default avatarMichal Kazior <michal.kazior@tieto.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent c508671d

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

+25 −28
Original line number Diff line number Diff line
@@ -843,7 +843,6 @@ static int ath10k_ce_init_src_ring(struct ath10k *ar, 
				   struct ath10k_ce_pipe *ce_state,

				   const struct ce_attr *attr)

{

	struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);

	struct ath10k_ce_ring *src_ring;

	unsigned int nentries = attr->src_nentries;

	unsigned int ce_nbytes;
@@ -885,10 +884,10 @@ static int ath10k_ce_init_src_ring(struct ath10k *ar, 
	 * coherent DMA are unsupported

	 */

	src_ring->base_addr_owner_space_unaligned =

		pci_alloc_consistent(ar_pci->pdev,

		dma_alloc_coherent(ar->dev,

				   (nentries * sizeof(struct ce_desc) +

				    CE_DESC_RING_ALIGN),

				     &base_addr);

				   &base_addr, GFP_KERNEL);

	if (!src_ring->base_addr_owner_space_unaligned) {

		kfree(ce_state->src_ring);

		ce_state->src_ring = NULL;
@@ -912,7 +911,7 @@ static int ath10k_ce_init_src_ring(struct ath10k *ar, 
		kmalloc((nentries * sizeof(struct ce_desc) +

			 CE_DESC_RING_ALIGN), GFP_KERNEL);

	if (!src_ring->shadow_base_unaligned) {

		pci_free_consistent(ar_pci->pdev,

		dma_free_coherent(ar->dev,

				  (nentries * sizeof(struct ce_desc) +

				   CE_DESC_RING_ALIGN),

				  src_ring->base_addr_owner_space,
@@ -946,7 +945,6 @@ static int ath10k_ce_init_dest_ring(struct ath10k *ar, 
				    struct ath10k_ce_pipe *ce_state,

				    const struct ce_attr *attr)

{

	struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);

	struct ath10k_ce_ring *dest_ring;

	unsigned int nentries = attr->dest_nentries;

	unsigned int ce_nbytes;
@@ -986,10 +984,10 @@ static int ath10k_ce_init_dest_ring(struct ath10k *ar, 
	 * coherent DMA are unsupported

	 */

	dest_ring->base_addr_owner_space_unaligned =

		pci_alloc_consistent(ar_pci->pdev,

		dma_alloc_coherent(ar->dev,

				   (nentries * sizeof(struct ce_desc) +

				    CE_DESC_RING_ALIGN),

				     &base_addr);

				   &base_addr, GFP_KERNEL);

	if (!dest_ring->base_addr_owner_space_unaligned) {

		kfree(ce_state->dest_ring);

		ce_state->dest_ring = NULL;
@@ -1112,11 +1110,10 @@ struct ath10k_ce_pipe *ath10k_ce_init(struct ath10k *ar, 
void ath10k_ce_deinit(struct ath10k_ce_pipe *ce_state)

{

	struct ath10k *ar = ce_state->ar;

	struct ath10k_pci *ar_pci = ath10k_pci_priv(ar);



	if (ce_state->src_ring) {

		kfree(ce_state->src_ring->shadow_base_unaligned);

		pci_free_consistent(ar_pci->pdev,

		dma_free_coherent(ar->dev,

				  (ce_state->src_ring->nentries *

				   sizeof(struct ce_desc) +

				   CE_DESC_RING_ALIGN),
@@ -1126,7 +1123,7 @@ void ath10k_ce_deinit(struct ath10k_ce_pipe *ce_state) 
	}



	if (ce_state->dest_ring) {

		pci_free_consistent(ar_pci->pdev,

		dma_free_coherent(ar->dev,

				  (ce_state->dest_ring->nentries *

				   sizeof(struct ce_desc) +

				   CE_DESC_RING_ALIGN),

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

+12 −10
Original line number Diff line number Diff line
@@ -358,9 +358,10 @@ static int ath10k_pci_diag_read_mem(struct ath10k *ar, u32 address, void *data, 
	 *   2) Buffer in DMA-able space

	 */

	orig_nbytes = nbytes;

	data_buf = (unsigned char *)pci_alloc_consistent(ar_pci->pdev,

	data_buf = (unsigned char *)dma_alloc_coherent(ar->dev,

						       orig_nbytes,

							 &ce_data_base);

						       &ce_data_base,

						       GFP_ATOMIC);



	if (!data_buf) {

		ret = -ENOMEM;
@@ -458,8 +459,8 @@ static int ath10k_pci_diag_read_mem(struct ath10k *ar, u32 address, void *data, 
			    address, ret);



	if (data_buf)

		pci_free_consistent(ar_pci->pdev, orig_nbytes,

				    data_buf, ce_data_base);

		dma_free_coherent(ar->dev, orig_nbytes, data_buf,

				  ce_data_base);



	return ret;

}
@@ -502,9 +503,10 @@ static int ath10k_pci_diag_write_mem(struct ath10k *ar, u32 address, 
	 *   2) Buffer in DMA-able space

	 */

	orig_nbytes = nbytes;

	data_buf = (unsigned char *)pci_alloc_consistent(ar_pci->pdev,

	data_buf = (unsigned char *)dma_alloc_coherent(ar->dev,

						       orig_nbytes,

							 &ce_data_base);

						       &ce_data_base,

						       GFP_ATOMIC);

	if (!data_buf) {

		ret = -ENOMEM;

		goto done;
@@ -600,7 +602,7 @@ static int ath10k_pci_diag_write_mem(struct ath10k *ar, u32 address, 


done:

	if (data_buf) {

		pci_free_consistent(ar_pci->pdev, orig_nbytes, data_buf,

		dma_free_coherent(ar->dev, orig_nbytes, data_buf,

				  ce_data_base);

	}