Commit ab687de9 authored by Erik Stromdahl's avatar Erik Stromdahl Committed by Kalle Valo
Browse files

ath10k: rename HTC_HOST_MAX_MSG_PER_BUNDLE define 



This define is only used for RX bundling so it is more descriptive if
RX is added to the define-name.

Signed-off-by: default avatarErik Stromdahl <erik.stromdahl@gmail.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent d1a566be

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

+2 −2
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ ath10k_htc_process_lookahead_bundle(struct ath10k_htc *htc, 
	struct ath10k *ar = htc->ar;

	int bundle_cnt = len / sizeof(*report);



	if (!bundle_cnt || (bundle_cnt > HTC_HOST_MAX_MSG_PER_BUNDLE)) {

	if (!bundle_cnt || (bundle_cnt > HTC_HOST_MAX_MSG_PER_RX_BUNDLE)) {

		ath10k_warn(ar, "Invalid lookahead bundle count: %d\n",

			    bundle_cnt);

		return -EINVAL;
@@ -655,7 +655,7 @@ int ath10k_htc_wait_target(struct ath10k_htc *htc) 
	    sizeof(msg->hdr) + sizeof(msg->ready_ext)) {

		htc->max_msgs_per_htc_bundle =

			min_t(u8, msg->ready_ext.max_msgs_per_htc_bundle,

			      HTC_HOST_MAX_MSG_PER_BUNDLE);

			      HTC_HOST_MAX_MSG_PER_RX_BUNDLE);

		ath10k_dbg(ar, ATH10K_DBG_HTC,

			   "Extended ready message. RX bundle size: %d\n",

			   htc->max_msgs_per_htc_bundle);

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

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ struct ath10k; 
 * 4-byte aligned.

 */



#define HTC_HOST_MAX_MSG_PER_BUNDLE        8

#define HTC_HOST_MAX_MSG_PER_RX_BUNDLE        8



enum ath10k_htc_tx_flags {

	ATH10K_HTC_FLAG_NEED_CREDIT_UPDATE = 0x01,

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

+2 −2
Original line number Diff line number Diff line
@@ -506,11 +506,11 @@ static int ath10k_sdio_mbox_alloc_pkt_bundle(struct ath10k *ar, 


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



	if (*bndl_cnt > HTC_HOST_MAX_MSG_PER_BUNDLE) {

	if (*bndl_cnt > HTC_HOST_MAX_MSG_PER_RX_BUNDLE) {

		ath10k_warn(ar,

			    "HTC bundle length %u exceeds maximum %u\n",

			    le16_to_cpu(htc_hdr->len),

			    HTC_HOST_MAX_MSG_PER_BUNDLE);

			    HTC_HOST_MAX_MSG_PER_RX_BUNDLE);

		return -ENOMEM;

	}

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

+4 −4
Original line number Diff line number Diff line
@@ -96,14 +96,14 @@ 
 * way:

 *

 * Let's assume that each packet in a bundle of the maximum bundle size

 * (HTC_HOST_MAX_MSG_PER_BUNDLE) has the HTC header bundle count set

 * to the maximum value (HTC_HOST_MAX_MSG_PER_BUNDLE).

 * (HTC_HOST_MAX_MSG_PER_RX_BUNDLE) has the HTC header bundle count set

 * to the maximum value (HTC_HOST_MAX_MSG_PER_RX_BUNDLE).

 *

 * in this case the driver must allocate

 * (HTC_HOST_MAX_MSG_PER_BUNDLE * HTC_HOST_MAX_MSG_PER_BUNDLE) skb's.

 * (HTC_HOST_MAX_MSG_PER_RX_BUNDLE * HTC_HOST_MAX_MSG_PER_RX_BUNDLE) skb's.

 */

#define ATH10K_SDIO_MAX_RX_MSGS \

	(HTC_HOST_MAX_MSG_PER_BUNDLE * HTC_HOST_MAX_MSG_PER_BUNDLE)

	(HTC_HOST_MAX_MSG_PER_RX_BUNDLE * HTC_HOST_MAX_MSG_PER_RX_BUNDLE)



#define ATH10K_FIFO_TIMEOUT_AND_CHIP_CONTROL   0x00000868u

#define ATH10K_FIFO_TIMEOUT_AND_CHIP_CONTROL_DISABLE_SLEEP_OFF 0xFFFEFFFF