Commit d2280e8e 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 4.18. Major changes:

ath10k

* add quiet mode support for QCA6174/QCA9377

wil6210

* disable WIL6210_TRACING kconfig option by default
parents e3bb946c 3d6b7272

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

+17 −11
Original line number Diff line number Diff line
@@ -987,13 +987,13 @@ static ssize_t ath10k_write_htt_max_amsdu_ampdu(struct file *file, 
{

	struct ath10k *ar = file->private_data;

	int res;

	char buf[64];

	char buf[64] = {0};

	unsigned int amsdu, ampdu;



	simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, count);



	/* make sure that buf is null terminated */

	buf[sizeof(buf) - 1] = 0;

	res = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos,

				     user_buf, count);

	if (res <= 0)

		return res;



	res = sscanf(buf, "%u %u", &amsdu, &ampdu);
@@ -1043,14 +1043,14 @@ static ssize_t ath10k_write_fw_dbglog(struct file *file, 
{

	struct ath10k *ar = file->private_data;

	int ret;

	char buf[96];

	char buf[96] = {0};

	unsigned int log_level;

	u64 mask;



	simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, count);



	/* make sure that buf is null terminated */

	buf[sizeof(buf) - 1] = 0;

	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos,

				     user_buf, count);

	if (ret <= 0)

		return ret;



	ret = sscanf(buf, "%llx %u", &mask, &log_level);
@@ -1519,7 +1519,13 @@ static void ath10k_tpc_stats_print(struct ath10k_tpc_stats *tpc_stats, 
	*len += scnprintf(buf + *len, buf_len - *len,

			  "********************************\n");

	*len += scnprintf(buf + *len, buf_len - *len,

			  "No.  Preamble Rate_code tpc_value1 tpc_value2 tpc_value3\n");

			  "No.  Preamble Rate_code ");



	for (i = 0; i < WMI_TPC_TX_N_CHAIN; i++)

		*len += scnprintf(buf + *len, buf_len - *len,

				  "tpc_value%d ", i);



	*len += scnprintf(buf + *len, buf_len - *len, "\n");



	for (i = 0; i < tpc_stats->rate_max; i++) {

		*len += scnprintf(buf + *len, buf_len - *len,

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

+15 −15
Original line number Diff line number Diff line
@@ -254,12 +254,12 @@ static ssize_t ath10k_dbg_sta_write_addba(struct file *file, 
	struct ath10k *ar = arsta->arvif->ar;

	u32 tid, buf_size;

	int ret;

	char buf[64];

	char buf[64] = {0};



	simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, count);



	/* make sure that buf is null terminated */

	buf[sizeof(buf) - 1] = '\0';

	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos,

				     user_buf, count);

	if (ret <= 0)

		return ret;



	ret = sscanf(buf, "%u %u", &tid, &buf_size);

	if (ret != 2)
@@ -305,12 +305,12 @@ static ssize_t ath10k_dbg_sta_write_addba_resp(struct file *file, 
	struct ath10k *ar = arsta->arvif->ar;

	u32 tid, status;

	int ret;

	char buf[64];



	simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, count);

	char buf[64] = {0};



	/* make sure that buf is null terminated */

	buf[sizeof(buf) - 1] = '\0';

	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos,

				     user_buf, count);

	if (ret <= 0)

		return ret;



	ret = sscanf(buf, "%u %u", &tid, &status);

	if (ret != 2)
@@ -355,12 +355,12 @@ static ssize_t ath10k_dbg_sta_write_delba(struct file *file, 
	struct ath10k *ar = arsta->arvif->ar;

	u32 tid, initiator, reason;

	int ret;

	char buf[64];



	simple_write_to_buffer(buf, sizeof(buf) - 1, ppos, user_buf, count);

	char buf[64] = {0};



	/* make sure that buf is null terminated */

	buf[sizeof(buf) - 1] = '\0';

	ret = simple_write_to_buffer(buf, sizeof(buf) - 1, ppos,

				     user_buf, count);

	if (ret <= 0)

		return ret;



	ret = sscanf(buf, "%u %u %u", &tid, &initiator, &reason);

	if (ret != 3)

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

+2 −2
Original line number Diff line number Diff line
@@ -85,11 +85,11 @@ enum qca9377_chip_id_rev { 
	QCA9377_HW_1_1_CHIP_ID_REV = 0x1,

};



#define QCA6174_HW_2_1_FW_DIR		"ath10k/QCA6174/hw2.1"

#define QCA6174_HW_2_1_FW_DIR		ATH10K_FW_DIR "/QCA6174/hw2.1"

#define QCA6174_HW_2_1_BOARD_DATA_FILE	"board.bin"

#define QCA6174_HW_2_1_PATCH_LOAD_ADDR	0x1234



#define QCA6174_HW_3_0_FW_DIR		"ath10k/QCA6174/hw3.0"

#define QCA6174_HW_3_0_FW_DIR		ATH10K_FW_DIR "/QCA6174/hw3.0"

#define QCA6174_HW_3_0_BOARD_DATA_FILE	"board.bin"

#define QCA6174_HW_3_0_PATCH_LOAD_ADDR	0x1234

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

+1 −1
Original line number Diff line number Diff line
@@ -4290,7 +4290,7 @@ static void ath10k_mac_op_wake_tx_queue(struct ieee80211_hw *hw, 


	while (ath10k_mac_tx_can_push(hw, f_txq) && max--) {

		ret = ath10k_mac_tx_push_txq(hw, f_txq);

		if (ret)

		if (ret < 0)

			break;

	}

	if (ret != -ENOENT)

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

+69 −67
Original line number Diff line number Diff line
@@ -18,39 +18,41 @@ 
#ifndef _RX_DESC_H_

#define _RX_DESC_H_



#include <linux/bitops.h>



enum rx_attention_flags {

	RX_ATTENTION_FLAGS_FIRST_MPDU          = 1 << 0,

	RX_ATTENTION_FLAGS_LAST_MPDU           = 1 << 1,

	RX_ATTENTION_FLAGS_MCAST_BCAST         = 1 << 2,

	RX_ATTENTION_FLAGS_PEER_IDX_INVALID    = 1 << 3,

	RX_ATTENTION_FLAGS_PEER_IDX_TIMEOUT    = 1 << 4,

	RX_ATTENTION_FLAGS_POWER_MGMT          = 1 << 5,

	RX_ATTENTION_FLAGS_NON_QOS             = 1 << 6,

	RX_ATTENTION_FLAGS_NULL_DATA           = 1 << 7,

	RX_ATTENTION_FLAGS_MGMT_TYPE           = 1 << 8,

	RX_ATTENTION_FLAGS_CTRL_TYPE           = 1 << 9,

	RX_ATTENTION_FLAGS_MORE_DATA           = 1 << 10,

	RX_ATTENTION_FLAGS_EOSP                = 1 << 11,

	RX_ATTENTION_FLAGS_U_APSD_TRIGGER      = 1 << 12,

	RX_ATTENTION_FLAGS_FRAGMENT            = 1 << 13,

	RX_ATTENTION_FLAGS_ORDER               = 1 << 14,

	RX_ATTENTION_FLAGS_CLASSIFICATION      = 1 << 15,

	RX_ATTENTION_FLAGS_OVERFLOW_ERR        = 1 << 16,

	RX_ATTENTION_FLAGS_MSDU_LENGTH_ERR     = 1 << 17,

	RX_ATTENTION_FLAGS_TCP_UDP_CHKSUM_FAIL = 1 << 18,

	RX_ATTENTION_FLAGS_IP_CHKSUM_FAIL      = 1 << 19,

	RX_ATTENTION_FLAGS_SA_IDX_INVALID      = 1 << 20,

	RX_ATTENTION_FLAGS_DA_IDX_INVALID      = 1 << 21,

	RX_ATTENTION_FLAGS_SA_IDX_TIMEOUT      = 1 << 22,

	RX_ATTENTION_FLAGS_DA_IDX_TIMEOUT      = 1 << 23,

	RX_ATTENTION_FLAGS_ENCRYPT_REQUIRED    = 1 << 24,

	RX_ATTENTION_FLAGS_DIRECTED            = 1 << 25,

	RX_ATTENTION_FLAGS_BUFFER_FRAGMENT     = 1 << 26,

	RX_ATTENTION_FLAGS_MPDU_LENGTH_ERR     = 1 << 27,

	RX_ATTENTION_FLAGS_TKIP_MIC_ERR        = 1 << 28,

	RX_ATTENTION_FLAGS_DECRYPT_ERR         = 1 << 29,

	RX_ATTENTION_FLAGS_FCS_ERR             = 1 << 30,

	RX_ATTENTION_FLAGS_MSDU_DONE           = 1 << 31,

	RX_ATTENTION_FLAGS_FIRST_MPDU          = BIT(0),

	RX_ATTENTION_FLAGS_LAST_MPDU           = BIT(1),

	RX_ATTENTION_FLAGS_MCAST_BCAST         = BIT(2),

	RX_ATTENTION_FLAGS_PEER_IDX_INVALID    = BIT(3),

	RX_ATTENTION_FLAGS_PEER_IDX_TIMEOUT    = BIT(4),

	RX_ATTENTION_FLAGS_POWER_MGMT          = BIT(5),

	RX_ATTENTION_FLAGS_NON_QOS             = BIT(6),

	RX_ATTENTION_FLAGS_NULL_DATA           = BIT(7),

	RX_ATTENTION_FLAGS_MGMT_TYPE           = BIT(8),

	RX_ATTENTION_FLAGS_CTRL_TYPE           = BIT(9),

	RX_ATTENTION_FLAGS_MORE_DATA           = BIT(10),

	RX_ATTENTION_FLAGS_EOSP                = BIT(11),

	RX_ATTENTION_FLAGS_U_APSD_TRIGGER      = BIT(12),

	RX_ATTENTION_FLAGS_FRAGMENT            = BIT(13),

	RX_ATTENTION_FLAGS_ORDER               = BIT(14),

	RX_ATTENTION_FLAGS_CLASSIFICATION      = BIT(15),

	RX_ATTENTION_FLAGS_OVERFLOW_ERR        = BIT(16),

	RX_ATTENTION_FLAGS_MSDU_LENGTH_ERR     = BIT(17),

	RX_ATTENTION_FLAGS_TCP_UDP_CHKSUM_FAIL = BIT(18),

	RX_ATTENTION_FLAGS_IP_CHKSUM_FAIL      = BIT(19),

	RX_ATTENTION_FLAGS_SA_IDX_INVALID      = BIT(20),

	RX_ATTENTION_FLAGS_DA_IDX_INVALID      = BIT(21),

	RX_ATTENTION_FLAGS_SA_IDX_TIMEOUT      = BIT(22),

	RX_ATTENTION_FLAGS_DA_IDX_TIMEOUT      = BIT(23),

	RX_ATTENTION_FLAGS_ENCRYPT_REQUIRED    = BIT(24),

	RX_ATTENTION_FLAGS_DIRECTED            = BIT(25),

	RX_ATTENTION_FLAGS_BUFFER_FRAGMENT     = BIT(26),

	RX_ATTENTION_FLAGS_MPDU_LENGTH_ERR     = BIT(27),

	RX_ATTENTION_FLAGS_TKIP_MIC_ERR        = BIT(28),

	RX_ATTENTION_FLAGS_DECRYPT_ERR         = BIT(29),

	RX_ATTENTION_FLAGS_FCS_ERR             = BIT(30),

	RX_ATTENTION_FLAGS_MSDU_DONE           = BIT(31),

};



struct rx_attention {
@@ -254,15 +256,15 @@ enum htt_rx_mpdu_encrypt_type { 
#define RX_MPDU_START_INFO0_SEQ_NUM_LSB       16

#define RX_MPDU_START_INFO0_ENCRYPT_TYPE_MASK 0xf0000000

#define RX_MPDU_START_INFO0_ENCRYPT_TYPE_LSB  28

#define RX_MPDU_START_INFO0_FROM_DS           (1 << 11)

#define RX_MPDU_START_INFO0_TO_DS             (1 << 12)

#define RX_MPDU_START_INFO0_ENCRYPTED         (1 << 13)

#define RX_MPDU_START_INFO0_RETRY             (1 << 14)

#define RX_MPDU_START_INFO0_TXBF_H_INFO       (1 << 15)

#define RX_MPDU_START_INFO0_FROM_DS           BIT(11)

#define RX_MPDU_START_INFO0_TO_DS             BIT(12)

#define RX_MPDU_START_INFO0_ENCRYPTED         BIT(13)

#define RX_MPDU_START_INFO0_RETRY             BIT(14)

#define RX_MPDU_START_INFO0_TXBF_H_INFO       BIT(15)



#define RX_MPDU_START_INFO1_TID_MASK 0xf0000000

#define RX_MPDU_START_INFO1_TID_LSB  28

#define RX_MPDU_START_INFO1_DIRECTED (1 << 16)

#define RX_MPDU_START_INFO1_DIRECTED BIT(16)



struct rx_mpdu_start {

	__le32 info0;
@@ -357,13 +359,13 @@ struct rx_mpdu_start { 
#define RX_MPDU_END_INFO0_RESERVED_0_LSB      0

#define RX_MPDU_END_INFO0_POST_DELIM_CNT_MASK 0x0fff0000

#define RX_MPDU_END_INFO0_POST_DELIM_CNT_LSB  16

#define RX_MPDU_END_INFO0_OVERFLOW_ERR        (1 << 13)

#define RX_MPDU_END_INFO0_LAST_MPDU           (1 << 14)

#define RX_MPDU_END_INFO0_POST_DELIM_ERR      (1 << 15)

#define RX_MPDU_END_INFO0_MPDU_LENGTH_ERR     (1 << 28)

#define RX_MPDU_END_INFO0_TKIP_MIC_ERR        (1 << 29)

#define RX_MPDU_END_INFO0_DECRYPT_ERR         (1 << 30)

#define RX_MPDU_END_INFO0_FCS_ERR             (1 << 31)

#define RX_MPDU_END_INFO0_OVERFLOW_ERR        BIT(13)

#define RX_MPDU_END_INFO0_LAST_MPDU           BIT(14)

#define RX_MPDU_END_INFO0_POST_DELIM_ERR      BIT(15)

#define RX_MPDU_END_INFO0_MPDU_LENGTH_ERR     BIT(28)

#define RX_MPDU_END_INFO0_TKIP_MIC_ERR        BIT(29)

#define RX_MPDU_END_INFO0_DECRYPT_ERR         BIT(30)

#define RX_MPDU_END_INFO0_FCS_ERR             BIT(31)



struct rx_mpdu_end {

	__le32 info0;
@@ -422,12 +424,12 @@ struct rx_mpdu_end { 
#define RX_MSDU_START_INFO1_DECAP_FORMAT_LSB    8

#define RX_MSDU_START_INFO1_SA_IDX_MASK         0x07ff0000

#define RX_MSDU_START_INFO1_SA_IDX_LSB          16

#define RX_MSDU_START_INFO1_IPV4_PROTO          (1 << 10)

#define RX_MSDU_START_INFO1_IPV6_PROTO          (1 << 11)

#define RX_MSDU_START_INFO1_TCP_PROTO           (1 << 12)

#define RX_MSDU_START_INFO1_UDP_PROTO           (1 << 13)

#define RX_MSDU_START_INFO1_IP_FRAG             (1 << 14)

#define RX_MSDU_START_INFO1_TCP_ONLY_ACK        (1 << 15)

#define RX_MSDU_START_INFO1_IPV4_PROTO          BIT(10)

#define RX_MSDU_START_INFO1_IPV6_PROTO          BIT(11)

#define RX_MSDU_START_INFO1_TCP_PROTO           BIT(12)

#define RX_MSDU_START_INFO1_UDP_PROTO           BIT(13)

#define RX_MSDU_START_INFO1_IP_FRAG             BIT(14)

#define RX_MSDU_START_INFO1_TCP_ONLY_ACK        BIT(15)



#define RX_MSDU_START_INFO2_DA_IDX_MASK         0x000007ff

#define RX_MSDU_START_INFO2_DA_IDX_LSB          0
@@ -568,10 +570,10 @@ struct rx_msdu_start { 


#define RX_MSDU_END_INFO0_REPORTED_MPDU_LENGTH_MASK 0x00003fff

#define RX_MSDU_END_INFO0_REPORTED_MPDU_LENGTH_LSB  0

#define RX_MSDU_END_INFO0_FIRST_MSDU                (1 << 14)

#define RX_MSDU_END_INFO0_LAST_MSDU                 (1 << 15)

#define RX_MSDU_END_INFO0_PRE_DELIM_ERR             (1 << 30)

#define RX_MSDU_END_INFO0_RESERVED_3B               (1 << 31)

#define RX_MSDU_END_INFO0_FIRST_MSDU                BIT(14)

#define RX_MSDU_END_INFO0_LAST_MSDU                 BIT(15)

#define RX_MSDU_END_INFO0_PRE_DELIM_ERR             BIT(30)

#define RX_MSDU_END_INFO0_RESERVED_3B               BIT(31)



struct rx_msdu_end_common {

	__le16 ip_hdr_cksum;
@@ -691,7 +693,7 @@ struct rx_msdu_end { 
#define HTT_RX_PPDU_START_PREAMBLE_VHT           0x0C

#define HTT_RX_PPDU_START_PREAMBLE_VHT_WITH_TXBF 0x0D



#define RX_PPDU_START_INFO0_IS_GREENFIELD (1 << 0)

#define RX_PPDU_START_INFO0_IS_GREENFIELD BIT(0)



#define RX_PPDU_START_INFO1_L_SIG_RATE_MASK    0x0000000f

#define RX_PPDU_START_INFO1_L_SIG_RATE_LSB     0
@@ -701,15 +703,15 @@ struct rx_msdu_end { 
#define RX_PPDU_START_INFO1_L_SIG_TAIL_LSB     18

#define RX_PPDU_START_INFO1_PREAMBLE_TYPE_MASK 0xff000000

#define RX_PPDU_START_INFO1_PREAMBLE_TYPE_LSB  24

#define RX_PPDU_START_INFO1_L_SIG_RATE_SELECT  (1 << 4)

#define RX_PPDU_START_INFO1_L_SIG_PARITY       (1 << 17)

#define RX_PPDU_START_INFO1_L_SIG_RATE_SELECT  BIT(4)

#define RX_PPDU_START_INFO1_L_SIG_PARITY       BIT(17)



#define RX_PPDU_START_INFO2_HT_SIG_VHT_SIG_A_1_MASK 0x00ffffff

#define RX_PPDU_START_INFO2_HT_SIG_VHT_SIG_A_1_LSB  0



#define RX_PPDU_START_INFO3_HT_SIG_VHT_SIG_A_2_MASK 0x00ffffff

#define RX_PPDU_START_INFO3_HT_SIG_VHT_SIG_A_2_LSB  0

#define RX_PPDU_START_INFO3_TXBF_H_INFO             (1 << 24)

#define RX_PPDU_START_INFO3_TXBF_H_INFO             BIT(24)



#define RX_PPDU_START_INFO4_VHT_SIG_B_MASK 0x1fffffff

#define RX_PPDU_START_INFO4_VHT_SIG_B_LSB  0
@@ -898,14 +900,14 @@ struct rx_ppdu_start { 
 *		Reserved: HW should fill with 0, FW should ignore.

 */



#define RX_PPDU_END_FLAGS_PHY_ERR             (1 << 0)

#define RX_PPDU_END_FLAGS_RX_LOCATION         (1 << 1)

#define RX_PPDU_END_FLAGS_TXBF_H_INFO         (1 << 2)

#define RX_PPDU_END_FLAGS_PHY_ERR             BIT(0)

#define RX_PPDU_END_FLAGS_RX_LOCATION         BIT(1)

#define RX_PPDU_END_FLAGS_TXBF_H_INFO         BIT(2)



#define RX_PPDU_END_INFO0_RX_ANTENNA_MASK     0x00ffffff

#define RX_PPDU_END_INFO0_RX_ANTENNA_LSB      0

#define RX_PPDU_END_INFO0_FLAGS_TX_HT_VHT_ACK (1 << 24)

#define RX_PPDU_END_INFO0_BB_CAPTURED_CHANNEL (1 << 25)

#define RX_PPDU_END_INFO0_FLAGS_TX_HT_VHT_ACK BIT(24)

#define RX_PPDU_END_INFO0_BB_CAPTURED_CHANNEL BIT(25)



#define RX_PPDU_END_INFO1_PEER_IDX_MASK       0x1ffc

#define RX_PPDU_END_INFO1_PEER_IDX_LSB        2
@@ -1265,9 +1267,9 @@ struct rx_ppdu_end { 
 *		to 0.

 */



#define FW_RX_DESC_INFO0_DISCARD  (1 << 0)

#define FW_RX_DESC_INFO0_FORWARD  (1 << 1)

#define FW_RX_DESC_INFO0_INSPECT  (1 << 5)

#define FW_RX_DESC_INFO0_DISCARD  BIT(0)

#define FW_RX_DESC_INFO0_FORWARD  BIT(1)

#define FW_RX_DESC_INFO0_INSPECT  BIT(5)

#define FW_RX_DESC_INFO0_EXT_MASK 0xC0

#define FW_RX_DESC_INFO0_EXT_LSB  6

CRA Git | Maintained and supported by SUSTech CRA and CCSE