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

Commit c228dd27 authored by Maya Erez's avatar Maya Erez Committed by Lior David
Browse files

wil6210: increase RX rings and RX buff array size 



In Talyn-MB, the 11ad throughput is higher and performance drops
may occur in the current RX configuration due to unavailability
of Rx buffers.
Increase the RX descriptor ring, RX status ring and number of RX
buffers to stabilize the performance in high throughput.

Change-Id: I2c76e05aa1cb0e3a3a654f9fa0cb05e1fc8d9f2f
Signed-off-by: default avatarMaya Erez <merez@codeaurora.org>
[liord@codeaurora.org: trivial merge conflicts, SPDX license]
Signed-off-by: default avatarLior David <liord@codeaurora.org>
parent 4854cc33

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

+6 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ static const struct kernel_param_ops mtu_max_ops = { 
module_param_cb(mtu_max, &mtu_max_ops, &mtu_max, 0444);

MODULE_PARM_DESC(mtu_max, " Max MTU value.");



static uint rx_ring_order = WIL_RX_RING_SIZE_ORDER_DEFAULT;

static uint rx_ring_order;

static uint tx_ring_order = WIL_TX_RING_SIZE_ORDER_DEFAULT;

static uint bcast_ring_order = WIL_BCAST_RING_SIZE_ORDER_DEFAULT;
@@ -1703,6 +1703,11 @@ int __wil_up(struct wil6210_priv *wil) 
		return rc;



	/* Rx RING. After MAC and beacon */

	if (rx_ring_order == 0)

		rx_ring_order = wil->hw_version < HW_VER_TALYN_MB ?

			WIL_RX_RING_SIZE_ORDER_DEFAULT :

			WIL_RX_RING_SIZE_ORDER_TALYN_DEFAULT;



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

	if (rc)

		return rc;

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

+2 −2
Original line number Diff line number Diff line
@@ -357,8 +357,8 @@ static int wil_init_rx_sring(struct wil6210_priv *wil, 
	struct wil_status_ring *sring = &wil->srings[ring_id];

	int rc;



	wil_dbg_misc(wil, "init RX sring: size=%u, ring_id=%u\n", sring->size,

		     ring_id);

	wil_dbg_misc(wil, "init RX sring: size=%u, ring_id=%u\n",

		     status_ring_size, ring_id);



	memset(&sring->rx_data, 0, sizeof(sring->rx_data));

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

+5 −16
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2012-2016,2018, The Linux Foundation. All rights reserved.

 *

 * Permission to use, copy, modify, and/or distribute this software for any

 * purpose with or without fee is hereby granted, provided that the above

 * copyright notice and this permission notice appear in all copies.

 *

 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES

 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF

 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR

 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES

 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN

 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF

 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

/* SPDX-License-Identifier: ISC */

/* Copyright (c) 2012-2016,2018-2019, The Linux Foundation.

 * All rights reserved.

 */



#ifndef WIL6210_TXRX_EDMA_H
@@ -23,9 +12,9 @@ 
#define WIL_SRING_SIZE_ORDER_MIN	(WIL_RING_SIZE_ORDER_MIN)

#define WIL_SRING_SIZE_ORDER_MAX	(WIL_RING_SIZE_ORDER_MAX)

/* RX sring order should be bigger than RX ring order */

#define WIL_RX_SRING_SIZE_ORDER_DEFAULT	(11)

#define WIL_RX_SRING_SIZE_ORDER_DEFAULT	(12)

#define WIL_TX_SRING_SIZE_ORDER_DEFAULT	(12)

#define WIL_RX_BUFF_ARR_SIZE_DEFAULT (1536)

#define WIL_RX_BUFF_ARR_SIZE_DEFAULT (2600)



#define WIL_DEFAULT_RX_STATUS_RING_ID 0

#define WIL_RX_DESC_RING_ID 0

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

+1 −0
Original line number Diff line number Diff line
@@ -71,6 +71,7 @@ static inline u32 WIL_GET_BITS(u32 x, int b0, int b1) 


#define WIL_TX_Q_LEN_DEFAULT		(4000)

#define WIL_RX_RING_SIZE_ORDER_DEFAULT	(10)

#define WIL_RX_RING_SIZE_ORDER_TALYN_DEFAULT	(11)

#define WIL_TX_RING_SIZE_ORDER_DEFAULT	(12)

#define WIL_BCAST_RING_SIZE_ORDER_DEFAULT	(7)

#define WIL_BCAST_MCS0_LIMIT		(1024) /* limit for MCS0 frame size */