Commit 67f37312 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git 

ath.git patches for v5.8. Major changes:

ath11k

* add debugfs file for testing ADDBA and DELBA

ath10k

* enable VHT160 and VHT80+80 modes

* enable radar detection in secondary segment

* sdio: disable TX complete indication to improve throughput
parents 8f3d9f35 7395fb49

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

+1 −4
Original line number Diff line number Diff line
@@ -723,10 +723,7 @@ static int ath10k_init_sdio(struct ath10k *ar, enum ath10k_firmware_mode mode) 
	if (ret)

		return ret;



	/* Data transfer is not initiated, when reduced Tx completion

	 * is used for SDIO. disable it until fixed

	 */

	param &= ~HI_ACS_FLAGS_SDIO_REDUCE_TX_COMPL_SET;

	param |= HI_ACS_FLAGS_SDIO_REDUCE_TX_COMPL_SET;



	/* Alternate credit size of 1544 as used by SDIO firmware is

	 * not big enough for mac80211 / native wifi frames. disable it

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

+9 −0
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ struct ath10k_hif_ops { 


	int (*swap_mailbox)(struct ath10k *ar);



	int (*get_htt_tx_complete)(struct ath10k *ar);



	int (*map_service_to_pipe)(struct ath10k *ar, u16 service_id,

				   u8 *ul_pipe, u8 *dl_pipe);
@@ -144,6 +146,13 @@ static inline int ath10k_hif_swap_mailbox(struct ath10k *ar) 
	return 0;

}



static inline int ath10k_hif_get_htt_tx_complete(struct ath10k *ar)

{

	if (ar->hif.ops->get_htt_tx_complete)

		return ar->hif.ops->get_htt_tx_complete(ar);

	return 0;

}



static inline int ath10k_hif_map_service_to_pipe(struct ath10k *ar,

						 u16 service_id,

						 u8 *ul_pipe, u8 *dl_pipe)

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

+10 −0
Original line number Diff line number Diff line
@@ -660,6 +660,16 @@ int ath10k_htc_wait_target(struct ath10k_htc *htc) 
	return 0;

}



void ath10k_htc_change_tx_credit_flow(struct ath10k_htc *htc,

				      enum ath10k_htc_ep_id eid,

				      bool enable)

{

	struct ath10k *ar = htc->ar;

	struct ath10k_htc_ep *ep = &ar->htc.endpoint[eid];



	ep->tx_credit_flow_enabled = enable;

}



int ath10k_htc_connect_service(struct ath10k_htc *htc,

			       struct ath10k_htc_svc_conn_req *conn_req,

			       struct ath10k_htc_svc_conn_resp *conn_resp)

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

+3 −0
Original line number Diff line number Diff line
@@ -386,6 +386,9 @@ int ath10k_htc_start(struct ath10k_htc *htc); 
int ath10k_htc_connect_service(struct ath10k_htc *htc,

			       struct ath10k_htc_svc_conn_req  *conn_req,

			       struct ath10k_htc_svc_conn_resp *conn_resp);

void ath10k_htc_change_tx_credit_flow(struct ath10k_htc *htc,

				      enum ath10k_htc_ep_id eid,

				      bool enable);

int ath10k_htc_send(struct ath10k_htc *htc, enum ath10k_htc_ep_id eid,

		    struct sk_buff *packet);

struct sk_buff *ath10k_htc_alloc_skb(struct ath10k *ar, int size);

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

+5 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include "htt.h"

#include "core.h"

#include "debug.h"

#include "hif.h"



static const enum htt_t2h_msg_type htt_main_t2h_msg_types[] = {

	[HTT_MAIN_T2H_MSG_TYPE_VERSION_CONF] = HTT_T2H_MSG_TYPE_VERSION_CONF,
@@ -153,6 +154,10 @@ int ath10k_htt_connect(struct ath10k_htt *htt) 


	htt->eid = conn_resp.eid;



	htt->disable_tx_comp = ath10k_hif_get_htt_tx_complete(htt->ar);

	if (htt->disable_tx_comp)

		ath10k_htc_change_tx_credit_flow(&htt->ar->htc, htt->eid, true);



	return 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE