Commit b3fcf9c5 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.16. Major changes:

ath9k

* load calibration data and pci init values via nvmem subsystem

ath11k

* include channel rx and tx time in survey dump statistics

* support for setting fixed Wi-Fi 6 rates from user space

* support for 80P80 and 160 MHz bandwidths

* spectral scan support for QCN9074

* support for calibration data files per radio

* support for calibration data via eeprom

* support for rx decapsulation offload (data frames in 802.3 format)

* support channel 2 in 6 GHz band

ath10k

* include frame time stamp in beacon and probe response frames

wcn36xx

* enable Idle Mode Power Save (IMPS) to reduce power consumption during idle
parents 7acd723c 019edd01

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

+23 −8
Original line number Diff line number Diff line
@@ -993,8 +993,12 @@ static void ath10k_mac_vif_beacon_cleanup(struct ath10k_vif *arvif) 
	ath10k_mac_vif_beacon_free(arvif);



	if (arvif->beacon_buf) {

		if (ar->bus_param.dev_type == ATH10K_DEV_TYPE_HL)

			kfree(arvif->beacon_buf);

		else

			dma_free_coherent(ar->dev, IEEE80211_MAX_FRAME_LEN,

				  arvif->beacon_buf, arvif->beacon_paddr);

					  arvif->beacon_buf,

					  arvif->beacon_paddr);

		arvif->beacon_buf = NULL;

	}

}
@@ -5576,10 +5580,17 @@ static int ath10k_add_interface(struct ieee80211_hw *hw, 
	if (vif->type == NL80211_IFTYPE_ADHOC ||

	    vif->type == NL80211_IFTYPE_MESH_POINT ||

	    vif->type == NL80211_IFTYPE_AP) {

		arvif->beacon_buf = dma_alloc_coherent(ar->dev,

		if (ar->bus_param.dev_type == ATH10K_DEV_TYPE_HL) {

			arvif->beacon_buf = kmalloc(IEEE80211_MAX_FRAME_LEN,

						    GFP_KERNEL);

			arvif->beacon_paddr = (dma_addr_t)arvif->beacon_buf;

		} else {

			arvif->beacon_buf =

				dma_alloc_coherent(ar->dev,

						   IEEE80211_MAX_FRAME_LEN,

						   &arvif->beacon_paddr,

						   GFP_ATOMIC);

		}

		if (!arvif->beacon_buf) {

			ret = -ENOMEM;

			ath10k_warn(ar, "failed to allocate beacon buffer: %d\n",
@@ -5794,8 +5805,12 @@ static int ath10k_add_interface(struct ieee80211_hw *hw, 


err:

	if (arvif->beacon_buf) {

		if (ar->bus_param.dev_type == ATH10K_DEV_TYPE_HL)

			kfree(arvif->beacon_buf);

		else

			dma_free_coherent(ar->dev, IEEE80211_MAX_FRAME_LEN,

				  arvif->beacon_buf, arvif->beacon_paddr);

					  arvif->beacon_buf,

					  arvif->beacon_paddr);

		arvif->beacon_buf = NULL;

	}

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

+4 −1
Original line number Diff line number Diff line
@@ -1363,8 +1363,11 @@ static void ath10k_rx_indication_async_work(struct work_struct *work) 
		ep->ep_ops.ep_rx_complete(ar, skb);

	}



	if (test_bit(ATH10K_FLAG_CORE_REGISTERED, &ar->dev_flags))

	if (test_bit(ATH10K_FLAG_CORE_REGISTERED, &ar->dev_flags)) {

		local_bh_disable();

		napi_schedule(&ar->napi);

		local_bh_enable();

	}

}



static int ath10k_sdio_read_rtc_state(struct ath10k_sdio *ar_sdio, unsigned char *state)

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

+4 −0
Original line number Diff line number Diff line
@@ -2610,6 +2610,10 @@ int ath10k_wmi_event_mgmt_rx(struct ath10k *ar, struct sk_buff *skb) 
	if (ieee80211_is_beacon(hdr->frame_control))

		ath10k_mac_handle_beacon(ar, skb);



	if (ieee80211_is_beacon(hdr->frame_control) ||

	    ieee80211_is_probe_resp(hdr->frame_control))

		status->boottime_ns = ktime_get_boottime_ns();



	ath10k_dbg(ar, ATH10K_DBG_MGMT,

		   "event mgmt rx skb %pK len %d ftype %02x stype %02x\n",

		   skb, skb->len,

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

+49 −9
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.fw = {

			.dir = "IPQ8074/hw2.0",

			.board_size = 256 * 1024,

			.cal_size = 256 * 1024,

			.cal_offset = 128 * 1024,

		},

		.max_radios = 3,

		.bdf_addr = 0x4B0C0000,
@@ -59,7 +59,17 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.vdev_start_delay = false,

		.htt_peer_map_v2 = true,

		.tcl_0_only = false,

		.spectral_fft_sz = 2,



		.spectral = {

			.fft_sz = 2,

			/* HW bug, expected BIN size is 2 bytes but HW report as 4 bytes.

			 * so added pad size as 2 bytes to compensate the BIN size

			 */

			.fft_pad_sz = 2,

			.summary_pad_sz = 0,

			.fft_hdr_len = 16,

			.max_fft_bins = 512,

		},



		.interface_modes = BIT(NL80211_IFTYPE_STATION) |

					BIT(NL80211_IFTYPE_AP) |
@@ -78,7 +88,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.fw = {

			.dir = "IPQ6018/hw1.0",

			.board_size = 256 * 1024,

			.cal_size = 256 * 1024,

			.cal_offset = 128 * 1024,

		},

		.max_radios = 2,

		.bdf_addr = 0x4ABC0000,
@@ -100,7 +110,14 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.vdev_start_delay = false,

		.htt_peer_map_v2 = true,

		.tcl_0_only = false,

		.spectral_fft_sz = 4,



		.spectral = {

			.fft_sz = 4,

			.fft_pad_sz = 0,

			.summary_pad_sz = 0,

			.fft_hdr_len = 16,

			.max_fft_bins = 512,

		},



		.interface_modes = BIT(NL80211_IFTYPE_STATION) |

					BIT(NL80211_IFTYPE_AP) |
@@ -119,7 +136,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.fw = {

			.dir = "QCA6390/hw2.0",

			.board_size = 256 * 1024,

			.cal_size = 256 * 1024,

			.cal_offset = 128 * 1024,

		},

		.max_radios = 3,

		.bdf_addr = 0x4B0C0000,
@@ -141,7 +158,14 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.vdev_start_delay = true,

		.htt_peer_map_v2 = false,

		.tcl_0_only = true,

		.spectral_fft_sz = 0,



		.spectral = {

			.fft_sz = 0,

			.fft_pad_sz = 0,

			.summary_pad_sz = 0,

			.fft_hdr_len = 0,

			.max_fft_bins = 0,

		},



		.interface_modes = BIT(NL80211_IFTYPE_STATION) |

					BIT(NL80211_IFTYPE_AP),
@@ -159,7 +183,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.fw = {

			.dir = "QCN9074/hw1.0",

			.board_size = 256 * 1024,

			.cal_size = 256 * 1024,

			.cal_offset = 128 * 1024,

		},

		.max_radios = 1,

		.single_pdev_only = false,
@@ -180,6 +204,15 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.vdev_start_delay = false,

		.htt_peer_map_v2 = true,

		.tcl_0_only = false,



		.spectral = {

			.fft_sz = 2,

			.fft_pad_sz = 0,

			.summary_pad_sz = 16,

			.fft_hdr_len = 24,

			.max_fft_bins = 1024,

		},



		.interface_modes = BIT(NL80211_IFTYPE_STATION) |

					BIT(NL80211_IFTYPE_AP) |

					BIT(NL80211_IFTYPE_MESH_POINT),
@@ -197,7 +230,7 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.fw = {

			.dir = "WCN6855/hw2.0",

			.board_size = 256 * 1024,

			.cal_size = 256 * 1024,

			.cal_offset = 128 * 1024,

		},

		.max_radios = 3,

		.bdf_addr = 0x4B0C0000,
@@ -219,7 +252,14 @@ static const struct ath11k_hw_params ath11k_hw_params[] = { 
		.vdev_start_delay = true,

		.htt_peer_map_v2 = false,

		.tcl_0_only = true,

		.spectral_fft_sz = 0,



		.spectral = {

			.fft_sz = 0,

			.fft_pad_sz = 0,

			.summary_pad_sz = 0,

			.fft_hdr_len = 0,

			.max_fft_bins = 0,

		},



		.interface_modes = BIT(NL80211_IFTYPE_STATION) |

					BIT(NL80211_IFTYPE_AP),

drivers/net/wireless/ath/ath11k/core.h

+45 −4
Original line number Diff line number Diff line
@@ -93,6 +93,8 @@ struct ath11k_skb_rxcb { 
	bool is_first_msdu;

	bool is_last_msdu;

	bool is_continuation;

	bool is_mcbc;

	bool is_eapol;

	struct hal_rx_desc *rx_desc;

	u8 err_rel_src;

	u8 err_code;
@@ -100,6 +102,8 @@ struct ath11k_skb_rxcb { 
	u8 unmapped;

	u8 is_frag;

	u8 tid;

	u16 peer_id;

	u16 seq_no;

};



enum ath11k_hw_rev {
@@ -193,7 +197,9 @@ enum ath11k_dev_flags { 
};



enum ath11k_monitor_flags {

	ATH11K_FLAG_MONITOR_ENABLED,

	ATH11K_FLAG_MONITOR_CONF_ENABLED,

	ATH11K_FLAG_MONITOR_STARTED,

	ATH11K_FLAG_MONITOR_VDEV_CREATED,

};



struct ath11k_vif {
@@ -362,6 +368,7 @@ struct ath11k_sta { 
	enum hal_pn_type pn_type;



	struct work_struct update_wk;

	struct work_struct set_4addr_wk;

	struct rate_info txrate;

	struct rate_info last_txrate;

	u64 rx_duration;
@@ -374,12 +381,15 @@ struct ath11k_sta { 
	/* protected by conf_mutex */

	bool aggr_mode;

#endif



	bool use_4addr_set;

	u16 tcl_metadata;

};



#define ATH11K_MIN_5G_FREQ 4150

#define ATH11K_MIN_6G_FREQ 5945

#define ATH11K_MIN_6G_FREQ 5925

#define ATH11K_MAX_6G_FREQ 7115

#define ATH11K_NUM_CHANS 100

#define ATH11K_NUM_CHANS 101

#define ATH11K_MAX_5G_CHAN 173



enum ath11k_state {
@@ -484,7 +494,6 @@ struct ath11k { 
	u32 chan_tx_pwr;

	u32 num_stations;

	u32 max_num_stations;

	bool monitor_present;

	/* To synchronize concurrent synchronous mac80211 callback operations,

	 * concurrent debugfs configuration and concurrent FW statistics events.

	 */
@@ -559,6 +568,7 @@ struct ath11k { 
	struct ath11k_per_peer_tx_stats cached_stats;

	u32 last_ppdu_id;

	u32 cached_ppdu_id;

	int monitor_vdev_id;

#ifdef CONFIG_ATH11K_DEBUGFS

	struct ath11k_debug debug;

#endif
@@ -591,6 +601,8 @@ struct ath11k_pdev_cap { 
	u32 tx_chain_mask_shift;

	u32 rx_chain_mask_shift;

	struct ath11k_band_cap band[NUM_NL80211_BANDS];

	bool nss_ratio_enabled;

	u8 nss_ratio_info;

};



struct ath11k_pdev {
@@ -794,12 +806,15 @@ struct ath11k_fw_stats_pdev { 
	s32 hw_reaped;

	/* Num underruns */

	s32 underrun;

	/* Num hw paused */

	u32 hw_paused;

	/* Num PPDUs cleaned up in TX abort */

	s32 tx_abort;

	/* Num MPDUs requeued by SW */

	s32 mpdus_requeued;

	/* excessive retries */

	u32 tx_ko;

	u32 tx_xretry;

	/* data hw rate code */

	u32 data_rc;

	/* Scheduler self triggers */
@@ -820,6 +835,30 @@ struct ath11k_fw_stats_pdev { 
	u32 phy_underrun;

	/* MPDU is more than txop limit */

	u32 txop_ovf;

	/* Num sequences posted */

	u32 seq_posted;

	/* Num sequences failed in queueing */

	u32 seq_failed_queueing;

	/* Num sequences completed */

	u32 seq_completed;

	/* Num sequences restarted */

	u32 seq_restarted;

	/* Num of MU sequences posted */

	u32 mu_seq_posted;

	/* Num MPDUs flushed by SW, HWPAUSED, SW TXABORT

	 * (Reset,channel change)

	 */

	s32 mpdus_sw_flush;

	/* Num MPDUs filtered by HW, all filter condition (TTL expired) */

	s32 mpdus_hw_filter;

	/* Num MPDUs truncated by PDG (TXOP, TBTT,

	 * PPDU_duration based on rate, dyn_bw)

	 */

	s32 mpdus_truncated;

	/* Num MPDUs that was tried but didn't receive ACK or BA */

	s32 mpdus_ack_failed;

	/* Num MPDUs that was dropped du to expiry. */

	s32 mpdus_expired;



	/* PDEV RX stats */

	/* Cnts any change in ring routing mid-ppdu */
@@ -845,6 +884,8 @@ struct ath11k_fw_stats_pdev { 
	s32 phy_err_drop;

	/* Number of mpdu errors - FCS, MIC, ENC etc. */

	s32 mpdu_errs;

	/* Num overflow errors */

	s32 rx_ovfl_errs;

};



struct ath11k_fw_stats_vdev {