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

Commit c44690a1 authored by Vladimir Kondratiev's avatar Vladimir Kondratiev Committed by Kalle Valo
Browse files

wil6210: fix max. MPDU size 



When configuring Tx/Rx VRING's, driver need to specify max. MPDU size
It should take into account all overhead introduced by 802.3->208.11
transformation.

Signed-off-by: default avatarVladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 26a359d9

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

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ MODULE_PARM_DESC(itr_trsh, " Interrupt moderation threshold, usecs."); 
/* We allow allocation of more than 1 page buffers to support large packets.

 * It is suboptimal behavior performance wise in case MTU above page size.

 */

unsigned int mtu_max = TXRX_BUF_LEN_DEFAULT - ETH_HLEN;

unsigned int mtu_max = TXRX_BUF_LEN_DEFAULT - WIL_MAX_MPDU_OVERHEAD;

static int mtu_max_set(const char *val, const struct kernel_param *kp)

{

	int ret;

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

+1 −1
Original line number Diff line number Diff line
@@ -645,7 +645,7 @@ int wil_vring_init_tx(struct wil6210_priv *wil, int id, int size, 
		.vring_cfg = {

			.tx_sw_ring = {

				.max_mpdu_size =

					cpu_to_le16(mtu_max + ETH_HLEN),

					cpu_to_le16(wil_mtu2macbuf(mtu_max)),

				.ring_size = cpu_to_le16(size),

			},

			.ringid = id,

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

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
#define BUF_SW_OWNED    (1)

#define BUF_HW_OWNED    (0)



/* size of max. Tx/Rx buffers, as supported by FW */

#define TXRX_BUF_LEN_DEFAULT (2242)

/* default size of MAC Tx/Rx buffers */

#define TXRX_BUF_LEN_DEFAULT (2048)



/* how many bytes to reserve for rtap header? */

#define WIL6210_RTAP_SIZE (128)

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

+11 −1
Original line number Diff line number Diff line
@@ -62,11 +62,21 @@ static inline u32 WIL_GET_BITS(u32 x, int b0, int b1) 
#define WIL_MAX_AGG_WSIZE	(32) /* FW/HW limit */

/* Hardware offload block adds the following:

 * 26 bytes - 3-address QoS data header

 *  8 bytes - IV + EIV (for GCMP)

 *  8 bytes - SNAP

 * 16 bytes - MIC (for GCMP)

 *  4 bytes - CRC

 * 24 bytes - security related (if connection is secure)

 */

#define WIL_MAX_MPDU_OVERHEAD	(62)



/* Calculate MAC buffer size for the firmware. It includes all overhead,

 * as it will go over the air, and need to be 8 byte aligned

 */

static inline u32 wil_mtu2macbuf(u32 mtu)

{

	return ALIGN(mtu + WIL_MAX_MPDU_OVERHEAD, 8);

}



/* Max supported by wil6210 value for interrupt threshold is 5sec. */

#define WIL6210_ITR_TRSH_MAX (5000000)

#define WIL6210_ITR_TRSH_DEFAULT	(300) /* usec */

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

+1 −1
Original line number Diff line number Diff line
@@ -1083,7 +1083,7 @@ int wmi_rx_chain_add(struct wil6210_priv *wil, struct vring *vring) 
	struct wmi_cfg_rx_chain_cmd cmd = {

		.action = WMI_RX_CHAIN_ADD,

		.rx_sw_ring = {

			.max_mpdu_size = cpu_to_le16(mtu_max + ETH_HLEN),

			.max_mpdu_size = cpu_to_le16(wil_mtu2macbuf(mtu_max)),

			.ring_mem_base = cpu_to_le64(vring->pa),

			.ring_size = cpu_to_le16(vring->size),

		},