Commit 22477652 authored by Wen Gong's avatar Wen Gong Committed by Kalle Valo
Browse files

ath10k: change max RX bundle size from 8 to 32 for sdio 



The max bundle size support by firmware is 32, change it from 8 to 32
will help performance. This results in significant performance
improvement on RX path.

The real max rx bundle is decided in ath10k_htc_wait_target(),
it is the min value of HTC_HOST_MAX_MSG_PER_RX_BUNDLE and the value reported
from firmware. So this change shouldn't cause any regressions with other
hardware supported by ath10k.

Tested with QCA6174 SDIO with firmware WLAN.RMH.4.4.1-00017-QCARMSWPZ-1.

Signed-off-by: default avatarWen Gong <wgong@codeaurora.org>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent 8d985555

drivers/net/wireless/ath/ath10k/htc.h

+19 −2
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <linux/bug.h>

#include <linux/skbuff.h>

#include <linux/timer.h>

#include <linux/bitfield.h>



struct ath10k;
@@ -39,7 +40,7 @@ struct ath10k; 
 * 4-byte aligned.

 */



#define HTC_HOST_MAX_MSG_PER_RX_BUNDLE        8

#define HTC_HOST_MAX_MSG_PER_RX_BUNDLE        32



enum ath10k_htc_tx_flags {

	ATH10K_HTC_FLAG_NEED_CREDIT_UPDATE = 0x01,
@@ -49,9 +50,25 @@ enum ath10k_htc_tx_flags { 
enum ath10k_htc_rx_flags {

	ATH10K_HTC_FLAGS_RECV_1MORE_BLOCK = 0x01,

	ATH10K_HTC_FLAG_TRAILER_PRESENT = 0x02,

	ATH10K_HTC_FLAG_BUNDLE_MASK     = 0xF0

};



#define ATH10K_HTC_FLAG_BUNDLE_MASK GENMASK(7, 4)



/* bits 2-3 are for extra bundle count bits 4-5 */

#define ATH10K_HTC_BUNDLE_EXTRA_MASK GENMASK(3, 2)

#define ATH10K_HTC_BUNDLE_EXTRA_SHIFT 4



static inline unsigned int ath10k_htc_get_bundle_count(u8 flags)

{

	unsigned int count, extra_count;



	count = FIELD_GET(ATH10K_HTC_FLAG_BUNDLE_MASK, flags);

	extra_count = FIELD_GET(ATH10K_HTC_BUNDLE_EXTRA_MASK, flags) <<

		ATH10K_HTC_BUNDLE_EXTRA_SHIFT;



	return count + extra_count;

}



struct ath10k_htc_hdr {

	u8 eid; /* @enum ath10k_htc_ep_id */

	u8 flags; /* @enum ath10k_htc_tx_flags, ath10k_htc_rx_flags */

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

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include "trace.h"

#include "sdio.h"



#define ATH10K_SDIO_VSG_BUF_SIZE	(32 * 1024)

#define ATH10K_SDIO_VSG_BUF_SIZE	(64 * 1024)



/* inlined helper functions */
@@ -494,7 +494,7 @@ static int ath10k_sdio_mbox_alloc_bundle(struct ath10k *ar, 
{

	int ret, i;



	*bndl_cnt = FIELD_GET(ATH10K_HTC_FLAG_BUNDLE_MASK, htc_hdr->flags);

	*bndl_cnt = ath10k_htc_get_bundle_count(htc_hdr->flags);



	if (*bndl_cnt > HTC_HOST_MAX_MSG_PER_RX_BUNDLE) {

		ath10k_warn(ar,

drivers/net/wireless/ath/ath10k/sdio.h

+2 −2
Original line number Diff line number Diff line
@@ -89,10 +89,10 @@ 
 * to the maximum value (HTC_HOST_MAX_MSG_PER_RX_BUNDLE).

 *

 * in this case the driver must allocate

 * (HTC_HOST_MAX_MSG_PER_RX_BUNDLE * HTC_HOST_MAX_MSG_PER_RX_BUNDLE) skb's.

 * (HTC_HOST_MAX_MSG_PER_RX_BUNDLE * 2) skb's.

 */

#define ATH10K_SDIO_MAX_RX_MSGS \

	(HTC_HOST_MAX_MSG_PER_RX_BUNDLE * HTC_HOST_MAX_MSG_PER_RX_BUNDLE)

	(HTC_HOST_MAX_MSG_PER_RX_BUNDLE * 2)



#define ATH10K_FIFO_TIMEOUT_AND_CHIP_CONTROL   0x00000868u

#define ATH10K_FIFO_TIMEOUT_AND_CHIP_CONTROL_DISABLE_SLEEP_OFF 0xFFFEFFFF

CRA Git | Maintained and supported by SUSTech CRA and CCSE