Commit eb77802e 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.10. Major changes:

ath11k

* add support for QCA6390 PCI devices

wcn36xx

* add support for TX ack

ath9k

* add support for NL80211_EXT_FEATURE_CAN_REPLACE_PTK0 to improve PTK0
  rekeying
parents 094dd0d7 0b294aeb

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

+0 −8
Original line number Diff line number Diff line
@@ -12,17 +12,9 @@ 


void ath10k_bmi_start(struct ath10k *ar)

{

	int ret;



	ath10k_dbg(ar, ATH10K_DBG_BMI, "bmi start\n");



	ar->bmi.done_sent = false;



	/* Enable hardware clock to speed up firmware download */

	if (ar->hw_params.hw_ops->enable_pll_clk) {

		ret = ar->hw_params.hw_ops->enable_pll_clk(ar);

		ath10k_dbg(ar, ATH10K_DBG_BMI, "bmi enable pll ret %d\n", ret);

	}

}



int ath10k_bmi_done(struct ath10k *ar)

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

+22 −10
Original line number Diff line number Diff line
@@ -481,6 +481,15 @@ static inline void ath10k_ce_engine_int_status_clear(struct ath10k *ar, 
	ath10k_ce_write32(ar, ce_ctrl_addr + wm_regs->addr, mask);

}



static inline bool ath10k_ce_engine_int_status_check(struct ath10k *ar,

						     u32 ce_ctrl_addr,

						     unsigned int mask)

{

	struct ath10k_hw_ce_host_wm_regs *wm_regs = ar->hw_ce_regs->wm_regs;



	return ath10k_ce_read32(ar, ce_ctrl_addr + wm_regs->addr) & mask;

}



/*

 * Guts of ath10k_ce_send.

 * The caller takes responsibility for any needed locking.
@@ -1301,7 +1310,9 @@ void ath10k_ce_per_engine_service(struct ath10k *ar, unsigned int ce_id) 


	spin_lock_bh(&ce->ce_lock);



	/* Clear the copy-complete interrupts that will be handled here. */

	if (ath10k_ce_engine_int_status_check(ar, ctrl_addr,

					      wm_regs->cc_mask)) {

		/* Clear before handling */

		ath10k_ce_engine_int_status_clear(ar, ctrl_addr,

						  wm_regs->cc_mask);
@@ -1314,6 +1325,7 @@ void ath10k_ce_per_engine_service(struct ath10k *ar, unsigned int ce_id) 
			ce_state->send_cb(ce_state);



		spin_lock_bh(&ce->ce_lock);

	}



	/*

	 * Misc CE interrupts are not being handled, but still need
@@ -1555,7 +1567,7 @@ ath10k_ce_alloc_src_ring(struct ath10k *ar, unsigned int ce_id, 
		ret = ath10k_ce_alloc_shadow_base(ar, src_ring, nentries);

		if (ret) {

			dma_free_coherent(ar->dev,

					  (nentries * sizeof(struct ce_desc_64) +

					  (nentries * sizeof(struct ce_desc) +

					   CE_DESC_RING_ALIGN),

					  src_ring->base_addr_owner_space_unaligned,

					  base_addr);

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

+9 −1
Original line number Diff line number Diff line
@@ -334,6 +334,7 @@ static const struct ath10k_hw_params ath10k_hw_params_list[] = { 
		.hw_filter_reset_required = true,

		.fw_diag_ce_download = true,

		.tx_stats_over_pktlog = false,

		.supports_peer_stats_info = true,

	},

	{

		.id = QCA99X0_HW_2_0_DEV_VERSION,
@@ -2320,7 +2321,7 @@ static void ath10k_core_restart(struct work_struct *work) 
		break;

	case ATH10K_STATE_RESTARTED:

		ar->state = ATH10K_STATE_WEDGED;

		/* fall through */

		fallthrough;

	case ATH10K_STATE_WEDGED:

		ath10k_warn(ar, "device is wedged, will not restart\n");

		break;
@@ -2614,6 +2615,13 @@ int ath10k_core_start(struct ath10k *ar, enum ath10k_firmware_mode mode, 
		      ar->running_fw->fw_file.fw_features)) {

		ath10k_bmi_start(ar);



		/* Enable hardware clock to speed up firmware download */

		if (ar->hw_params.hw_ops->enable_pll_clk) {

			status = ar->hw_params.hw_ops->enable_pll_clk(ar);

			ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot enable pll ret %d\n",

				   status);

		}



		if (ath10k_init_configure_target(ar)) {

			status = -EINVAL;

			goto err;

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

+21 −5
Original line number Diff line number Diff line
@@ -142,6 +142,14 @@ static int __ath10k_htt_rx_ring_fill_n(struct ath10k_htt *htt, int num) 
	BUILD_BUG_ON(HTT_RX_RING_FILL_LEVEL >= HTT_RX_RING_SIZE / 2);



	idx = __le32_to_cpu(*htt->rx_ring.alloc_idx.vaddr);



	if (idx < 0 || idx >= htt->rx_ring.size) {

		ath10k_err(htt->ar, "rx ring index is not valid, firmware malfunctioning?\n");

		idx &= htt->rx_ring.size_mask;

		ret = -ENOMEM;

		goto fail;

	}



	while (num > 0) {

		skb = dev_alloc_skb(HTT_RX_BUF_SIZE + HTT_RX_DESC_ALIGN);

		if (!skb) {
@@ -941,6 +949,7 @@ static void ath10k_htt_rx_h_rates(struct ath10k *ar, 
	u8 preamble = 0;

	u8 group_id;

	u32 info1, info2, info3;

	u32 stbc, nsts_su;



	info1 = __le32_to_cpu(rxd->ppdu_start.info1);

	info2 = __le32_to_cpu(rxd->ppdu_start.info2);
@@ -985,11 +994,16 @@ static void ath10k_htt_rx_h_rates(struct ath10k *ar, 
		 */

		bw = info2 & 3;

		sgi = info3 & 1;

		stbc = (info2 >> 3) & 1;

		group_id = (info2 >> 4) & 0x3F;



		if (GROUP_ID_IS_SU_MIMO(group_id)) {

			mcs = (info3 >> 4) & 0x0F;

			nss = ((info2 >> 10) & 0x07) + 1;

			nsts_su = ((info2 >> 10) & 0x07);

			if (stbc)

				nss = (nsts_su >> 2) + 1;

			else

				nss = (nsts_su + 1);

		} else {

			/* Hardware doesn't decode VHT-SIG-B into Rx descriptor

			 * so it's impossible to decode MCS. Also since
@@ -3017,7 +3031,7 @@ static int ath10k_htt_rx_in_ord_ind(struct ath10k *ar, struct sk_buff *skb) 
			ath10k_htt_rx_h_enqueue(ar, &amsdu, status);

			break;

		case -EAGAIN:

			/* fall through */

			fallthrough;

		default:

			/* Should not happen. */

			ath10k_warn(ar, "failed to extract amsdu: %d\n", ret);
@@ -3575,12 +3589,14 @@ ath10k_update_per_peer_tx_stats(struct ath10k *ar, 
	}



	if (ar->htt.disable_tx_comp) {

		arsta->tx_retries += peer_stats->retry_pkts;

		arsta->tx_failed += peer_stats->failed_pkts;

		ath10k_dbg(ar, ATH10K_DBG_HTT, "htt tx retries %d tx failed %d\n",

			   arsta->tx_retries, arsta->tx_failed);

		ath10k_dbg(ar, ATH10K_DBG_HTT, "tx failed %d\n",

			   arsta->tx_failed);

	}



	arsta->tx_retries += peer_stats->retry_pkts;

	ath10k_dbg(ar, ATH10K_DBG_HTT, "htt tx retries %d", arsta->tx_retries);



	if (ath10k_debug_is_extd_tx_stats_enabled(ar))

		ath10k_accumulate_per_peer_tx_stats(ar, arsta, peer_stats,

						    rate_idx);

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

+3 −3
Original line number Diff line number Diff line
@@ -1314,7 +1314,7 @@ static int ath10k_htt_tx_hl(struct ath10k_htt *htt, enum ath10k_hw_txrx_mode txm 
	case ATH10K_HW_TXRX_RAW:

	case ATH10K_HW_TXRX_NATIVE_WIFI:

		flags0 |= HTT_DATA_TX_DESC_FLAGS0_MAC_HDR_PRESENT;

		/* fall through */

		fallthrough;

	case ATH10K_HW_TXRX_ETHERNET:

		flags0 |= SM(txmode, HTT_DATA_TX_DESC_FLAGS0_PKT_TYPE);

		break;
@@ -1460,7 +1460,7 @@ static int ath10k_htt_tx_32(struct ath10k_htt *htt, 
	case ATH10K_HW_TXRX_RAW:

	case ATH10K_HW_TXRX_NATIVE_WIFI:

		flags0 |= HTT_DATA_TX_DESC_FLAGS0_MAC_HDR_PRESENT;

		/* fall through */

		fallthrough;

	case ATH10K_HW_TXRX_ETHERNET:

		if (ar->hw_params.continuous_frag_desc) {

			ext_desc_t = htt->frag_desc.vaddr_desc_32;
@@ -1662,7 +1662,7 @@ static int ath10k_htt_tx_64(struct ath10k_htt *htt, 
	case ATH10K_HW_TXRX_RAW:

	case ATH10K_HW_TXRX_NATIVE_WIFI:

		flags0 |= HTT_DATA_TX_DESC_FLAGS0_MAC_HDR_PRESENT;

		/* fall through */

		fallthrough;

	case ATH10K_HW_TXRX_ETHERNET:

		if (ar->hw_params.continuous_frag_desc) {

			ext_desc_t = htt->frag_desc.vaddr_desc_64;