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

Commit dbe97afb authored by Dedy Lansky's avatar Dedy Lansky Committed by Lior David
Browse files

wil6210: make sure Rx ring sizes are correlated 



When enlarging rx_ring_order module param, wil6210 fails to load
because there are not enough Rx buffers.
Fix this by enlarging number of Rx buffers at startup, if needed based
on rx_ring_order.

Change-Id: Ib74575cdd25d1ff41c40a2c170c9f89b5858db74
Signed-off-by: default avatarDedy Lansky <dlansky@codeaurora.org>
Signed-off-by: default avatarMaya Erez <merez@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
Git-commit: 61e5ec044748486f06dec760a19dce78247b3ad8
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git


Signed-off-by: default avatarMaya Erez <merez@codeaurora.org>
Signed-off-by: default avatarLior David <liord@codeaurora.org>
parent d172c993

drivers/net/wireless/ath/wil6210/main.c

+1 −1
Original line number Diff line number Diff line
@@ -1718,7 +1718,7 @@ int __wil_up(struct wil6210_priv *wil) 
			WIL_RX_RING_SIZE_ORDER_DEFAULT :

			WIL_RX_RING_SIZE_ORDER_TALYN_DEFAULT;



	rc = wil->txrx_ops.rx_init(wil, 1 << rx_ring_order);

	rc = wil->txrx_ops.rx_init(wil, rx_ring_order);

	if (rc)

		return rc;

drivers/net/wireless/ath/wil6210/txrx.c

+2 −2
Original line number Diff line number Diff line
@@ -861,7 +861,7 @@ static void wil_rx_buf_len_init(struct wil6210_priv *wil) 
	}

}



static int wil_rx_init(struct wil6210_priv *wil, u16 size)

static int wil_rx_init(struct wil6210_priv *wil, uint order)

{

	struct wil_ring *vring = &wil->ring_rx;

	int rc;
@@ -875,7 +875,7 @@ static int wil_rx_init(struct wil6210_priv *wil, u16 size) 


	wil_rx_buf_len_init(wil);



	vring->size = size;

	vring->size = 1 << order;

	vring->is_rx = true;

	rc = wil_vring_alloc(wil, vring);

	if (rc)

drivers/net/wireless/ath/wil6210/txrx_edma.c

+8 −3
Original line number Diff line number Diff line
@@ -606,9 +606,9 @@ static void wil_rx_buf_len_init_edma(struct wil6210_priv *wil) 
		WIL_MAX_ETH_MTU : WIL_EDMA_RX_BUF_LEN_DEFAULT;

}



static int wil_rx_init_edma(struct wil6210_priv *wil, u16 desc_ring_size)

static int wil_rx_init_edma(struct wil6210_priv *wil, uint desc_ring_order)

{

	u16 status_ring_size;

	u16 status_ring_size, desc_ring_size = 1 << desc_ring_order;

	struct wil_ring *ring = &wil->ring_rx;

	int rc;

	size_t elem_size = wil->use_compressed_rx_status ?
@@ -623,7 +623,12 @@ static int wil_rx_init_edma(struct wil6210_priv *wil, u16 desc_ring_size) 
			"compressed RX status cannot be used with SW reorder\n");

		return -EINVAL;

	}



	if (wil->rx_status_ring_order <= desc_ring_order)

		/* make sure sring is larger than desc ring */

		wil->rx_status_ring_order = desc_ring_order + 1;

	if (wil->rx_buff_id_count <= desc_ring_size)

		/* make sure we will not run out of buff_ids */

		wil->rx_buff_id_count = desc_ring_size + 512;

	if (wil->rx_status_ring_order < WIL_SRING_SIZE_ORDER_MIN ||

	    wil->rx_status_ring_order > WIL_SRING_SIZE_ORDER_MAX)

		wil->rx_status_ring_order = WIL_RX_SRING_SIZE_ORDER_DEFAULT;

drivers/net/wireless/ath/wil6210/wil6210.h

+1 −1
Original line number Diff line number Diff line
@@ -607,7 +607,7 @@ struct wil_txrx_ops { 
			      int cid, int tid);

	irqreturn_t (*irq_tx)(int irq, void *cookie);

	/* RX ops */

	int (*rx_init)(struct wil6210_priv *wil, u16 ring_size);

	int (*rx_init)(struct wil6210_priv *wil, uint ring_order);

	void (*rx_fini)(struct wil6210_priv *wil);

	int (*wmi_addba_rx_resp)(struct wil6210_priv *wil, u8 mid, u8 cid,

				 u8 tid, u8 token, u16 status, bool amsdu,