Commit 3898da3b 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.18. Major changes:

ath11k

* add LDPC FEC type in 802.11 radiotap header

* enable RX PPDU stats in monitor co-exist mode

wcn36xx

* implement survey reporting
parents e7d78633 0d6e997b

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

+16 −0
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
			.board_size = QCA988X_BOARD_DATA_SZ,

			.board_ext_size = QCA988X_BOARD_EXT_DATA_SZ,

		},

		.rx_desc_ops = &qca988x_rx_desc_ops,

		.hw_ops = &qca988x_ops,

		.decap_align_bytes = 4,

		.spectral_bin_discard = 0,
@@ -111,6 +112,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
			.board_size = QCA988X_BOARD_DATA_SZ,

			.board_ext_size = QCA988X_BOARD_EXT_DATA_SZ,

		},

		.rx_desc_ops = &qca988x_rx_desc_ops,

		.hw_ops = &qca988x_ops,

		.decap_align_bytes = 4,

		.spectral_bin_discard = 0,
@@ -148,6 +150,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
			.board_size = QCA9887_BOARD_DATA_SZ,

			.board_ext_size = QCA9887_BOARD_EXT_DATA_SZ,

		},

		.rx_desc_ops = &qca988x_rx_desc_ops,

		.hw_ops = &qca988x_ops,

		.decap_align_bytes = 4,

		.spectral_bin_discard = 0,
@@ -184,6 +187,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
			.board_size = QCA6174_BOARD_DATA_SZ,

			.board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,

		},

		.rx_desc_ops = &qca988x_rx_desc_ops,

		.hw_ops = &qca6174_sdio_ops,

		.hw_clk = qca6174_clk,

		.target_cpu_freq = 176000000,
@@ -216,6 +220,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
			.board_size = QCA6174_BOARD_DATA_SZ,

			.board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,

		},

		.rx_desc_ops = &qca988x_rx_desc_ops,

		.hw_ops = &qca988x_ops,

		.decap_align_bytes = 4,

		.spectral_bin_discard = 0,
@@ -252,6 +257,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
			.board_size = QCA6174_BOARD_DATA_SZ,

			.board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,

		},

		.rx_desc_ops = &qca988x_rx_desc_ops,

		.hw_ops = &qca988x_ops,

		.decap_align_bytes = 4,

		.spectral_bin_discard = 0,
@@ -288,6 +294,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
			.board_size = QCA6174_BOARD_DATA_SZ,

			.board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,

		},

		.rx_desc_ops = &qca988x_rx_desc_ops,

		.hw_ops = &qca988x_ops,

		.decap_align_bytes = 4,

		.spectral_bin_discard = 0,
@@ -325,6 +332,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
			.board_size = QCA6174_BOARD_DATA_SZ,

			.board_ext_size = QCA6174_BOARD_EXT_DATA_SZ,

		},

		.rx_desc_ops = &qca988x_rx_desc_ops,

		.hw_ops = &qca6174_ops,

		.hw_clk = qca6174_clk,

		.target_cpu_freq = 176000000,
@@ -370,6 +378,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
			.board_ext_size = QCA99X0_BOARD_EXT_DATA_SZ,

		},

		.sw_decrypt_mcast_mgmt = true,

		.rx_desc_ops = &qca99x0_rx_desc_ops,

		.hw_ops = &qca99x0_ops,

		.decap_align_bytes = 1,

		.spectral_bin_discard = 4,
@@ -415,6 +424,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
			.ext_board_size = QCA99X0_EXT_BOARD_DATA_SZ,

		},

		.sw_decrypt_mcast_mgmt = true,

		.rx_desc_ops = &qca99x0_rx_desc_ops,

		.hw_ops = &qca99x0_ops,

		.decap_align_bytes = 1,

		.spectral_bin_discard = 12,
@@ -461,6 +471,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
			.board_ext_size = QCA99X0_BOARD_EXT_DATA_SZ,

		},

		.sw_decrypt_mcast_mgmt = true,

		.rx_desc_ops = &qca99x0_rx_desc_ops,

		.hw_ops = &qca99x0_ops,

		.decap_align_bytes = 1,

		.spectral_bin_discard = 12,
@@ -501,6 +512,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
			.board_size = QCA9377_BOARD_DATA_SZ,

			.board_ext_size = QCA9377_BOARD_EXT_DATA_SZ,

		},

		.rx_desc_ops = &qca988x_rx_desc_ops,

		.hw_ops = &qca988x_ops,

		.decap_align_bytes = 4,

		.spectral_bin_discard = 0,
@@ -537,6 +549,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
			.board_size = QCA9377_BOARD_DATA_SZ,

			.board_ext_size = QCA9377_BOARD_EXT_DATA_SZ,

		},

		.rx_desc_ops = &qca988x_rx_desc_ops,

		.hw_ops = &qca6174_ops,

		.hw_clk = qca6174_clk,

		.target_cpu_freq = 176000000,
@@ -575,6 +588,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
			.board_size = QCA9377_BOARD_DATA_SZ,

			.board_ext_size = QCA9377_BOARD_EXT_DATA_SZ,

		},

		.rx_desc_ops = &qca988x_rx_desc_ops,

		.hw_ops = &qca6174_ops,

		.hw_clk = qca6174_clk,

		.target_cpu_freq = 176000000,
@@ -611,6 +625,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
			.board_ext_size = QCA4019_BOARD_EXT_DATA_SZ,

		},

		.sw_decrypt_mcast_mgmt = true,

		.rx_desc_ops = &qca99x0_rx_desc_ops,

		.hw_ops = &qca99x0_ops,

		.decap_align_bytes = 1,

		.spectral_bin_discard = 4,
@@ -643,6 +658,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
			.dir = WCN3990_HW_1_0_FW_DIR,

		},

		.sw_decrypt_mcast_mgmt = true,

		.rx_desc_ops = &wcn3990_rx_desc_ops,

		.hw_ops = &wcn3990_ops,

		.decap_align_bytes = 1,

		.num_peers = TARGET_HL_TLV_NUM_PEERS,

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

+153 −0
Original line number Diff line number Diff line
@@ -131,6 +131,159 @@ static const enum htt_t2h_msg_type htt_10_4_t2h_msg_types[] = { 
				HTT_T2H_MSG_TYPE_PEER_STATS,

};



const struct ath10k_htt_rx_desc_ops qca988x_rx_desc_ops = {

	.rx_desc_size = sizeof(struct htt_rx_desc_v1),

	.rx_desc_msdu_payload_offset = offsetof(struct htt_rx_desc_v1, msdu_payload)

};



static int ath10k_qca99x0_rx_desc_get_l3_pad_bytes(struct htt_rx_desc *rxd)

{

	struct htt_rx_desc_v1 *rx_desc = container_of(rxd,

						      struct htt_rx_desc_v1,

						      base);



	return MS(__le32_to_cpu(rx_desc->msdu_end.qca99x0.info1),

		  RX_MSDU_END_INFO1_L3_HDR_PAD);

}



static bool ath10k_qca99x0_rx_desc_msdu_limit_error(struct htt_rx_desc *rxd)

{

	struct htt_rx_desc_v1 *rx_desc = container_of(rxd,

						      struct htt_rx_desc_v1,

						      base);



	return !!(rx_desc->msdu_end.common.info0 &

		  __cpu_to_le32(RX_MSDU_END_INFO0_MSDU_LIMIT_ERR));

}



const struct ath10k_htt_rx_desc_ops qca99x0_rx_desc_ops = {

	.rx_desc_size = sizeof(struct htt_rx_desc_v1),

	.rx_desc_msdu_payload_offset = offsetof(struct htt_rx_desc_v1, msdu_payload),



	.rx_desc_get_l3_pad_bytes = ath10k_qca99x0_rx_desc_get_l3_pad_bytes,

	.rx_desc_get_msdu_limit_error = ath10k_qca99x0_rx_desc_msdu_limit_error,

};



static void ath10k_rx_desc_wcn3990_get_offsets(struct htt_rx_ring_rx_desc_offsets *off)

{

#define desc_offset(x) (offsetof(struct htt_rx_desc_v2, x) / 4)

	off->mac80211_hdr_offset = __cpu_to_le16(desc_offset(rx_hdr_status));

	off->msdu_payload_offset = __cpu_to_le16(desc_offset(msdu_payload));

	off->ppdu_start_offset = __cpu_to_le16(desc_offset(ppdu_start));

	off->ppdu_end_offset = __cpu_to_le16(desc_offset(ppdu_end));

	off->mpdu_start_offset = __cpu_to_le16(desc_offset(mpdu_start));

	off->mpdu_end_offset = __cpu_to_le16(desc_offset(mpdu_end));

	off->msdu_start_offset = __cpu_to_le16(desc_offset(msdu_start));

	off->msdu_end_offset = __cpu_to_le16(desc_offset(msdu_end));

	off->rx_attention_offset = __cpu_to_le16(desc_offset(attention));

	off->frag_info_offset = __cpu_to_le16(desc_offset(frag_info));

#undef desc_offset

}



static struct htt_rx_desc *

ath10k_rx_desc_wcn3990_from_raw_buffer(void *buff)

{

	return &((struct htt_rx_desc_v2 *)buff)->base;

}



static struct rx_attention *

ath10k_rx_desc_wcn3990_get_attention(struct htt_rx_desc *rxd)

{

	struct htt_rx_desc_v2 *rx_desc = container_of(rxd, struct htt_rx_desc_v2, base);



	return &rx_desc->attention;

}



static struct rx_frag_info_common *

ath10k_rx_desc_wcn3990_get_frag_info(struct htt_rx_desc *rxd)

{

	struct htt_rx_desc_v2 *rx_desc = container_of(rxd, struct htt_rx_desc_v2, base);



	return &rx_desc->frag_info.common;

}



static struct rx_mpdu_start *

ath10k_rx_desc_wcn3990_get_mpdu_start(struct htt_rx_desc *rxd)

{

	struct htt_rx_desc_v2 *rx_desc = container_of(rxd, struct htt_rx_desc_v2, base);



	return &rx_desc->mpdu_start;

}



static struct rx_mpdu_end *

ath10k_rx_desc_wcn3990_get_mpdu_end(struct htt_rx_desc *rxd)

{

	struct htt_rx_desc_v2 *rx_desc = container_of(rxd, struct htt_rx_desc_v2, base);



	return &rx_desc->mpdu_end;

}



static struct rx_msdu_start_common *

ath10k_rx_desc_wcn3990_get_msdu_start(struct htt_rx_desc *rxd)

{

	struct htt_rx_desc_v2 *rx_desc = container_of(rxd, struct htt_rx_desc_v2, base);



	return &rx_desc->msdu_start.common;

}



static struct rx_msdu_end_common *

ath10k_rx_desc_wcn3990_get_msdu_end(struct htt_rx_desc *rxd)

{

	struct htt_rx_desc_v2 *rx_desc = container_of(rxd, struct htt_rx_desc_v2, base);



	return &rx_desc->msdu_end.common;

}



static struct rx_ppdu_start *

ath10k_rx_desc_wcn3990_get_ppdu_start(struct htt_rx_desc *rxd)

{

	struct htt_rx_desc_v2 *rx_desc = container_of(rxd, struct htt_rx_desc_v2, base);



	return &rx_desc->ppdu_start;

}



static struct rx_ppdu_end_common *

ath10k_rx_desc_wcn3990_get_ppdu_end(struct htt_rx_desc *rxd)

{

	struct htt_rx_desc_v2 *rx_desc = container_of(rxd, struct htt_rx_desc_v2, base);



	return &rx_desc->ppdu_end.common;

}



static u8 *

ath10k_rx_desc_wcn3990_get_rx_hdr_status(struct htt_rx_desc *rxd)

{

	struct htt_rx_desc_v2 *rx_desc = container_of(rxd, struct htt_rx_desc_v2, base);



	return rx_desc->rx_hdr_status;

}



static u8 *

ath10k_rx_desc_wcn3990_get_msdu_payload(struct htt_rx_desc *rxd)

{

	struct htt_rx_desc_v2 *rx_desc = container_of(rxd, struct htt_rx_desc_v2, base);



	return rx_desc->msdu_payload;

}



const struct ath10k_htt_rx_desc_ops wcn3990_rx_desc_ops = {

	.rx_desc_size = sizeof(struct htt_rx_desc_v2),

	.rx_desc_msdu_payload_offset = offsetof(struct htt_rx_desc_v2, msdu_payload),



	.rx_desc_from_raw_buffer = ath10k_rx_desc_wcn3990_from_raw_buffer,

	.rx_desc_get_offsets = ath10k_rx_desc_wcn3990_get_offsets,

	.rx_desc_get_attention = ath10k_rx_desc_wcn3990_get_attention,

	.rx_desc_get_frag_info = ath10k_rx_desc_wcn3990_get_frag_info,

	.rx_desc_get_mpdu_start = ath10k_rx_desc_wcn3990_get_mpdu_start,

	.rx_desc_get_mpdu_end = ath10k_rx_desc_wcn3990_get_mpdu_end,

	.rx_desc_get_msdu_start = ath10k_rx_desc_wcn3990_get_msdu_start,

	.rx_desc_get_msdu_end = ath10k_rx_desc_wcn3990_get_msdu_end,

	.rx_desc_get_ppdu_start = ath10k_rx_desc_wcn3990_get_ppdu_start,

	.rx_desc_get_ppdu_end = ath10k_rx_desc_wcn3990_get_ppdu_end,

	.rx_desc_get_rx_hdr_status = ath10k_rx_desc_wcn3990_get_rx_hdr_status,

	.rx_desc_get_msdu_payload = ath10k_rx_desc_wcn3990_get_msdu_payload,

};



int ath10k_htt_connect(struct ath10k_htt *htt)

{

	struct ath10k_htc_svc_conn_req conn_req;

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

+274 −22
Original line number Diff line number Diff line
@@ -240,14 +240,7 @@ enum htt_rx_ring_flags { 
#define HTT_RX_RING_FILL_LEVEL (((HTT_RX_RING_SIZE) / 2) - 1)

#define HTT_RX_RING_FILL_LEVEL_DUAL_MAC (HTT_RX_RING_SIZE - 1)



struct htt_rx_ring_setup_ring32 {

	__le32 fw_idx_shadow_reg_paddr;

	__le32 rx_ring_base_paddr;

	__le16 rx_ring_len; /* in 4-byte words */

	__le16 rx_ring_bufsize; /* rx skb size - in bytes */

	__le16 flags; /* %HTT_RX_RING_FLAGS_ */

	__le16 fw_idx_init_val;



struct htt_rx_ring_rx_desc_offsets {

	/* the following offsets are in 4-byte units */

	__le16 mac80211_hdr_offset;

	__le16 msdu_payload_offset;
@@ -261,6 +254,17 @@ struct htt_rx_ring_setup_ring32 { 
	__le16 frag_info_offset;

} __packed;



struct htt_rx_ring_setup_ring32 {

	__le32 fw_idx_shadow_reg_paddr;

	__le32 rx_ring_base_paddr;

	__le16 rx_ring_len; /* in 4-byte words */

	__le16 rx_ring_bufsize; /* rx skb size - in bytes */

	__le16 flags; /* %HTT_RX_RING_FLAGS_ */

	__le16 fw_idx_init_val;



	struct htt_rx_ring_rx_desc_offsets offsets;

} __packed;



struct htt_rx_ring_setup_ring64 {

	__le64 fw_idx_shadow_reg_paddr;

	__le64 rx_ring_base_paddr;
@@ -269,17 +273,7 @@ struct htt_rx_ring_setup_ring64 { 
	__le16 flags; /* %HTT_RX_RING_FLAGS_ */

	__le16 fw_idx_init_val;



	/* the following offsets are in 4-byte units */

	__le16 mac80211_hdr_offset;

	__le16 msdu_payload_offset;

	__le16 ppdu_start_offset;

	__le16 ppdu_end_offset;

	__le16 mpdu_start_offset;

	__le16 mpdu_end_offset;

	__le16 msdu_start_offset;

	__le16 msdu_end_offset;

	__le16 rx_attention_offset;

	__le16 frag_info_offset;

	struct htt_rx_ring_rx_desc_offsets offsets;

} __packed;



struct htt_rx_ring_setup_hdr {
@@ -2075,12 +2069,22 @@ static inline bool ath10k_htt_rx_proc_rx_frag_ind(struct ath10k_htt *htt, 
	return htt->rx_ops->htt_rx_proc_rx_frag_ind(htt, rx, skb);

}



/* the driver strongly assumes that the rx header status be 64 bytes long,

 * so all possible rx_desc structures must respect this assumption.

 */

#define RX_HTT_HDR_STATUS_LEN 64



/* This structure layout is programmed via rx ring setup

/* The rx descriptor structure layout is programmed via rx ring setup

 * so that FW knows how to transfer the rx descriptor to the host.

 * Buffers like this are placed on the rx ring.

 * Unfortunately, though, QCA6174's firmware doesn't currently behave correctly

 * when modifying the structure layout of the rx descriptor beyond what it expects

 * (even if it correctly programmed during the rx ring setup).

 * Therefore we must keep two different memory layouts, abstract the rx descriptor

 * representation and use ath10k_rx_desc_ops

 * for correctly accessing rx descriptor data.

 */



/* base struct used for abstracting the rx descritor representation */

struct htt_rx_desc {

	union {

		/* This field is filled on the host using the msdu buffer
@@ -2089,6 +2093,13 @@ struct htt_rx_desc { 
		struct fw_rx_desc_base fw_desc;

		u32 pad;

	} __packed;

} __packed;



/* rx descriptor for wcn3990 and possibly extensible for newer cards

 * Buffers like this are placed on the rx ring.

 */

struct htt_rx_desc_v2 {

	struct htt_rx_desc base;

	struct {

		struct rx_attention attention;

		struct rx_frag_info frag_info;
@@ -2103,6 +2114,240 @@ struct htt_rx_desc { 
	u8 msdu_payload[];

};



/* QCA6174, QCA988x, QCA99x0 dedicated rx descriptor to make sure their firmware

 * works correctly. We keep a single rx descriptor for all these three

 * families of cards because from tests it seems to be the most stable solution,

 * e.g. having a rx descriptor only for QCA6174 seldom caused firmware crashes

 * during some tests.

 * Buffers like this are placed on the rx ring.

 */

struct htt_rx_desc_v1 {

	struct htt_rx_desc base;

	struct {

		struct rx_attention attention;

		struct rx_frag_info_v1 frag_info;

		struct rx_mpdu_start mpdu_start;

		struct rx_msdu_start_v1 msdu_start;

		struct rx_msdu_end_v1 msdu_end;

		struct rx_mpdu_end mpdu_end;

		struct rx_ppdu_start ppdu_start;

		struct rx_ppdu_end_v1 ppdu_end;

	} __packed;

	u8 rx_hdr_status[RX_HTT_HDR_STATUS_LEN];

	u8 msdu_payload[];

};



/* rx_desc abstraction */

struct ath10k_htt_rx_desc_ops {

	/* These fields are mandatory, they must be specified in any instance */



	/* sizeof() of the rx_desc structure used by this hw */

	size_t rx_desc_size;



	/* offset of msdu_payload inside the rx_desc structure used by this hw */

	size_t rx_desc_msdu_payload_offset;



	/* These fields are options.

	 * When a field is not provided the default implementation gets used

	 * (see the ath10k_rx_desc_* operations below for more info about the defaults)

	 */

	bool (*rx_desc_get_msdu_limit_error)(struct htt_rx_desc *rxd);

	int (*rx_desc_get_l3_pad_bytes)(struct htt_rx_desc *rxd);



	/* Safely cast from a void* buffer containing an rx descriptor

	 * to the proper rx_desc structure

	 */

	struct htt_rx_desc *(*rx_desc_from_raw_buffer)(void *buff);



	void (*rx_desc_get_offsets)(struct htt_rx_ring_rx_desc_offsets *offs);

	struct rx_attention *(*rx_desc_get_attention)(struct htt_rx_desc *rxd);

	struct rx_frag_info_common *(*rx_desc_get_frag_info)(struct htt_rx_desc *rxd);

	struct rx_mpdu_start *(*rx_desc_get_mpdu_start)(struct htt_rx_desc *rxd);

	struct rx_mpdu_end *(*rx_desc_get_mpdu_end)(struct htt_rx_desc *rxd);

	struct rx_msdu_start_common *(*rx_desc_get_msdu_start)(struct htt_rx_desc *rxd);

	struct rx_msdu_end_common *(*rx_desc_get_msdu_end)(struct htt_rx_desc *rxd);

	struct rx_ppdu_start *(*rx_desc_get_ppdu_start)(struct htt_rx_desc *rxd);

	struct rx_ppdu_end_common *(*rx_desc_get_ppdu_end)(struct htt_rx_desc *rxd);

	u8 *(*rx_desc_get_rx_hdr_status)(struct htt_rx_desc *rxd);

	u8 *(*rx_desc_get_msdu_payload)(struct htt_rx_desc *rxd);

};



extern const struct ath10k_htt_rx_desc_ops qca988x_rx_desc_ops;

extern const struct ath10k_htt_rx_desc_ops qca99x0_rx_desc_ops;

extern const struct ath10k_htt_rx_desc_ops wcn3990_rx_desc_ops;



static inline int

ath10k_htt_rx_desc_get_l3_pad_bytes(struct ath10k_hw_params *hw, struct htt_rx_desc *rxd)

{

	if (hw->rx_desc_ops->rx_desc_get_l3_pad_bytes)

		return hw->rx_desc_ops->rx_desc_get_l3_pad_bytes(rxd);

	return 0;

}



static inline bool

ath10k_htt_rx_desc_msdu_limit_error(struct ath10k_hw_params *hw, struct htt_rx_desc *rxd)

{

	if (hw->rx_desc_ops->rx_desc_get_msdu_limit_error)

		return hw->rx_desc_ops->rx_desc_get_msdu_limit_error(rxd);

	return false;

}



/* The default implementation of all these getters is using the old rx_desc,

 * so that it is easier to define the ath10k_htt_rx_desc_ops instances.

 * But probably, if new wireless cards must be supported, it would be better

 * to switch the default implementation to the new rx_desc, since this would

 * make the extension easier .

 */

static inline struct htt_rx_desc *

ath10k_htt_rx_desc_from_raw_buffer(struct ath10k_hw_params *hw,	void *buff)

{

	if (hw->rx_desc_ops->rx_desc_from_raw_buffer)

		return hw->rx_desc_ops->rx_desc_from_raw_buffer(buff);

	return &((struct htt_rx_desc_v1 *)buff)->base;

}



static inline void

ath10k_htt_rx_desc_get_offsets(struct ath10k_hw_params *hw,

			       struct htt_rx_ring_rx_desc_offsets *off)

{

	if (hw->rx_desc_ops->rx_desc_get_offsets) {

		hw->rx_desc_ops->rx_desc_get_offsets(off);

	} else {

#define	desc_offset(x) (offsetof(struct	htt_rx_desc_v1, x)	/ 4)

		off->mac80211_hdr_offset = __cpu_to_le16(desc_offset(rx_hdr_status));

		off->msdu_payload_offset = __cpu_to_le16(desc_offset(msdu_payload));

		off->ppdu_start_offset = __cpu_to_le16(desc_offset(ppdu_start));

		off->ppdu_end_offset = __cpu_to_le16(desc_offset(ppdu_end));

		off->mpdu_start_offset = __cpu_to_le16(desc_offset(mpdu_start));

		off->mpdu_end_offset = __cpu_to_le16(desc_offset(mpdu_end));

		off->msdu_start_offset = __cpu_to_le16(desc_offset(msdu_start));

		off->msdu_end_offset = __cpu_to_le16(desc_offset(msdu_end));

		off->rx_attention_offset = __cpu_to_le16(desc_offset(attention));

		off->frag_info_offset =	__cpu_to_le16(desc_offset(frag_info));

#undef desc_offset

	}

}



static inline struct rx_attention *

ath10k_htt_rx_desc_get_attention(struct	ath10k_hw_params *hw, struct htt_rx_desc *rxd)

{

	struct htt_rx_desc_v1 *rx_desc;



	if (hw->rx_desc_ops->rx_desc_get_attention)

		return hw->rx_desc_ops->rx_desc_get_attention(rxd);



	rx_desc = container_of(rxd, struct htt_rx_desc_v1, base);

	return &rx_desc->attention;

}



static inline struct rx_frag_info_common *

ath10k_htt_rx_desc_get_frag_info(struct	ath10k_hw_params *hw, struct htt_rx_desc *rxd)

{

	struct htt_rx_desc_v1 *rx_desc;



	if (hw->rx_desc_ops->rx_desc_get_frag_info)

		return hw->rx_desc_ops->rx_desc_get_frag_info(rxd);



	rx_desc = container_of(rxd, struct htt_rx_desc_v1, base);

	return &rx_desc->frag_info.common;

}



static inline struct rx_mpdu_start *

ath10k_htt_rx_desc_get_mpdu_start(struct ath10k_hw_params *hw, struct htt_rx_desc *rxd)

{

	struct htt_rx_desc_v1 *rx_desc;



	if (hw->rx_desc_ops->rx_desc_get_mpdu_start)

		return hw->rx_desc_ops->rx_desc_get_mpdu_start(rxd);



	rx_desc = container_of(rxd, struct htt_rx_desc_v1, base);

	return &rx_desc->mpdu_start;

}



static inline struct rx_mpdu_end *

ath10k_htt_rx_desc_get_mpdu_end(struct ath10k_hw_params	*hw, struct htt_rx_desc	*rxd)

{

	struct htt_rx_desc_v1 *rx_desc;



	if (hw->rx_desc_ops->rx_desc_get_mpdu_end)

		return hw->rx_desc_ops->rx_desc_get_mpdu_end(rxd);



	rx_desc = container_of(rxd, struct htt_rx_desc_v1, base);

	return &rx_desc->mpdu_end;

}



static inline struct rx_msdu_start_common *

ath10k_htt_rx_desc_get_msdu_start(struct ath10k_hw_params *hw, struct htt_rx_desc *rxd)

{

	struct htt_rx_desc_v1 *rx_desc;



	if (hw->rx_desc_ops->rx_desc_get_msdu_start)

		return hw->rx_desc_ops->rx_desc_get_msdu_start(rxd);



	rx_desc = container_of(rxd, struct htt_rx_desc_v1, base);

	return &rx_desc->msdu_start.common;

}



static inline struct rx_msdu_end_common	*

ath10k_htt_rx_desc_get_msdu_end(struct ath10k_hw_params	*hw, struct htt_rx_desc	*rxd)

{

	struct htt_rx_desc_v1 *rx_desc;



	if (hw->rx_desc_ops->rx_desc_get_msdu_end)

		return hw->rx_desc_ops->rx_desc_get_msdu_end(rxd);



	rx_desc = container_of(rxd, struct htt_rx_desc_v1, base);

	return &rx_desc->msdu_end.common;

}



static inline struct rx_ppdu_start *

ath10k_htt_rx_desc_get_ppdu_start(struct ath10k_hw_params *hw, struct htt_rx_desc *rxd)

{

	struct htt_rx_desc_v1 *rx_desc;



	if (hw->rx_desc_ops->rx_desc_get_ppdu_start)

		return hw->rx_desc_ops->rx_desc_get_ppdu_start(rxd);



	rx_desc = container_of(rxd, struct htt_rx_desc_v1, base);

	return &rx_desc->ppdu_start;

}



static inline struct rx_ppdu_end_common	*

ath10k_htt_rx_desc_get_ppdu_end(struct ath10k_hw_params	*hw, struct htt_rx_desc	*rxd)

{

	struct htt_rx_desc_v1 *rx_desc;



	if (hw->rx_desc_ops->rx_desc_get_ppdu_end)

		return hw->rx_desc_ops->rx_desc_get_ppdu_end(rxd);



	rx_desc = container_of(rxd, struct htt_rx_desc_v1, base);

	return &rx_desc->ppdu_end.common;

}



static inline u8 *

ath10k_htt_rx_desc_get_rx_hdr_status(struct ath10k_hw_params *hw, struct htt_rx_desc *rxd)

{

	struct htt_rx_desc_v1 *rx_desc;



	if (hw->rx_desc_ops->rx_desc_get_rx_hdr_status)

		return hw->rx_desc_ops->rx_desc_get_rx_hdr_status(rxd);



	rx_desc = container_of(rxd, struct htt_rx_desc_v1, base);

	return rx_desc->rx_hdr_status;

}



static inline u8 *

ath10k_htt_rx_desc_get_msdu_payload(struct ath10k_hw_params *hw, struct	htt_rx_desc *rxd)

{

	struct htt_rx_desc_v1 *rx_desc;



	if (hw->rx_desc_ops->rx_desc_get_msdu_payload)

		return hw->rx_desc_ops->rx_desc_get_msdu_payload(rxd);



	rx_desc = container_of(rxd, struct htt_rx_desc_v1, base);

	return rx_desc->msdu_payload;

}



#define HTT_RX_DESC_HL_INFO_SEQ_NUM_MASK           0x00000fff

#define HTT_RX_DESC_HL_INFO_SEQ_NUM_LSB            0

#define HTT_RX_DESC_HL_INFO_ENCRYPTED_MASK         0x00001000
@@ -2136,7 +2381,14 @@ struct htt_rx_chan_info { 
 * rounded up to a cache line size.

 */

#define HTT_RX_BUF_SIZE 2048

#define HTT_RX_MSDU_SIZE (HTT_RX_BUF_SIZE - (int)sizeof(struct htt_rx_desc))



/* The HTT_RX_MSDU_SIZE can't be statically computed anymore,

 * because it depends on the underlying device rx_desc representation

 */

static inline int ath10k_htt_rx_msdu_size(struct ath10k_hw_params *hw)

{

	return HTT_RX_BUF_SIZE - (int)hw->rx_desc_ops->rx_desc_size;

}



/* Refill a bunch of RX buffers for each refill round so that FW/HW can handle

 * aggregated traffic more nicely.

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

+228 −103

File changed.

Preview size limit exceeded, changes collapsed.

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

+8 −28
Original line number Diff line number Diff line
@@ -796,47 +796,26 @@ static int ath10k_htt_send_frag_desc_bank_cfg_64(struct ath10k_htt *htt) 
	return 0;

}



static void ath10k_htt_fill_rx_desc_offset_32(void *rx_ring)

static void ath10k_htt_fill_rx_desc_offset_32(struct ath10k_hw_params *hw, void *rx_ring)

{

	struct htt_rx_ring_setup_ring32 *ring =

			(struct htt_rx_ring_setup_ring32 *)rx_ring;



#define desc_offset(x) (offsetof(struct htt_rx_desc, x) / 4)

	ring->mac80211_hdr_offset = __cpu_to_le16(desc_offset(rx_hdr_status));

	ring->msdu_payload_offset = __cpu_to_le16(desc_offset(msdu_payload));

	ring->ppdu_start_offset = __cpu_to_le16(desc_offset(ppdu_start));

	ring->ppdu_end_offset = __cpu_to_le16(desc_offset(ppdu_end));

	ring->mpdu_start_offset = __cpu_to_le16(desc_offset(mpdu_start));

	ring->mpdu_end_offset = __cpu_to_le16(desc_offset(mpdu_end));

	ring->msdu_start_offset = __cpu_to_le16(desc_offset(msdu_start));

	ring->msdu_end_offset = __cpu_to_le16(desc_offset(msdu_end));

	ring->rx_attention_offset = __cpu_to_le16(desc_offset(attention));

	ring->frag_info_offset = __cpu_to_le16(desc_offset(frag_info));

#undef desc_offset

}



static void ath10k_htt_fill_rx_desc_offset_64(void *rx_ring)

	ath10k_htt_rx_desc_get_offsets(hw, &ring->offsets);

}



static void ath10k_htt_fill_rx_desc_offset_64(struct ath10k_hw_params *hw, void *rx_ring)

{

	struct htt_rx_ring_setup_ring64 *ring =

			(struct htt_rx_ring_setup_ring64 *)rx_ring;



#define desc_offset(x) (offsetof(struct htt_rx_desc, x) / 4)

	ring->mac80211_hdr_offset = __cpu_to_le16(desc_offset(rx_hdr_status));

	ring->msdu_payload_offset = __cpu_to_le16(desc_offset(msdu_payload));

	ring->ppdu_start_offset = __cpu_to_le16(desc_offset(ppdu_start));

	ring->ppdu_end_offset = __cpu_to_le16(desc_offset(ppdu_end));

	ring->mpdu_start_offset = __cpu_to_le16(desc_offset(mpdu_start));

	ring->mpdu_end_offset = __cpu_to_le16(desc_offset(mpdu_end));

	ring->msdu_start_offset = __cpu_to_le16(desc_offset(msdu_start));

	ring->msdu_end_offset = __cpu_to_le16(desc_offset(msdu_end));

	ring->rx_attention_offset = __cpu_to_le16(desc_offset(attention));

	ring->frag_info_offset = __cpu_to_le16(desc_offset(frag_info));

#undef desc_offset

	ath10k_htt_rx_desc_get_offsets(hw, &ring->offsets);

}



static int ath10k_htt_send_rx_ring_cfg_32(struct ath10k_htt *htt)

{

	struct ath10k *ar = htt->ar;

	struct ath10k_hw_params *hw = &ar->hw_params;

	struct sk_buff *skb;

	struct htt_cmd *cmd;

	struct htt_rx_ring_setup_ring32 *ring;
@@ -896,7 +875,7 @@ static int ath10k_htt_send_rx_ring_cfg_32(struct ath10k_htt *htt) 
	ring->flags = __cpu_to_le16(flags);

	ring->fw_idx_init_val = __cpu_to_le16(fw_idx);



	ath10k_htt_fill_rx_desc_offset_32(ring);

	ath10k_htt_fill_rx_desc_offset_32(hw, ring);

	ret = ath10k_htc_send(&htt->ar->htc, htt->eid, skb);

	if (ret) {

		dev_kfree_skb_any(skb);
@@ -909,6 +888,7 @@ static int ath10k_htt_send_rx_ring_cfg_32(struct ath10k_htt *htt) 
static int ath10k_htt_send_rx_ring_cfg_64(struct ath10k_htt *htt)

{

	struct ath10k *ar = htt->ar;

	struct ath10k_hw_params *hw = &ar->hw_params;

	struct sk_buff *skb;

	struct htt_cmd *cmd;

	struct htt_rx_ring_setup_ring64 *ring;
@@ -965,7 +945,7 @@ static int ath10k_htt_send_rx_ring_cfg_64(struct ath10k_htt *htt) 
	ring->flags = __cpu_to_le16(flags);

	ring->fw_idx_init_val = __cpu_to_le16(fw_idx);



	ath10k_htt_fill_rx_desc_offset_64(ring);

	ath10k_htt_fill_rx_desc_offset_64(hw, ring);

	ret = ath10k_htc_send(&htt->ar->htc, htt->eid, skb);

	if (ret) {

		dev_kfree_skb_any(skb);