Commit 4c4ca9f7 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 v6.4. Major changes:

ath10k

* enable threaded napi on WCN3990

ath11k

* push MU-MIMO params from hostapd to hardware

* tx ack signal support for management packets
parents 0da40e01 e238e62b

drivers/net/wireless/ath/ath.h

+7 −5
Original line number Diff line number Diff line
@@ -96,11 +96,13 @@ struct ath_keyval { 
	u8 kv_type;

	u8 kv_pad;

	u16 kv_len;

	struct_group(kv_values,

		u8 kv_val[16]; /* TK */

		u8 kv_mic[8]; /* Michael MIC key */

		u8 kv_txmic[8]; /* Michael MIC TX key (used only if the hardware

				 * supports both MIC keys in the same key cache entry;

				 * in that case, kv_mic is the RX key) */

	);

};



enum ath_cipher {

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

+0 −52
Original line number Diff line number Diff line
@@ -77,45 +77,6 @@ static inline u32 shadow_sr_wr_ind_addr(struct ath10k *ar, 
	return addr;

}



static inline u32 shadow_dst_wr_ind_addr(struct ath10k *ar,

					 struct ath10k_ce_pipe *ce_state)

{

	u32 ce_id = ce_state->id;

	u32 addr = 0;



	switch (ce_id) {

	case 1:

		addr = 0x00032034;

		break;

	case 2:

		addr = 0x00032038;

		break;

	case 5:

		addr = 0x00032044;

		break;

	case 7:

		addr = 0x0003204C;

		break;

	case 8:

		addr = 0x00032050;

		break;

	case 9:

		addr = 0x00032054;

		break;

	case 10:

		addr = 0x00032058;

		break;

	case 11:

		addr = 0x0003205C;

		break;

	default:

		ath10k_warn(ar, "invalid CE id: %d", ce_id);

		break;

	}



	return addr;

}



static inline unsigned int

ath10k_set_ring_byte(unsigned int offset,

		     struct ath10k_hw_ce_regs_addr_map *addr_map)
@@ -438,19 +399,6 @@ static inline void ath10k_ce_watermark_intr_disable(struct ath10k *ar, 
			  host_ie_addr & ~(wm_regs->wm_mask));

}



static inline void ath10k_ce_error_intr_enable(struct ath10k *ar,

					       u32 ce_ctrl_addr)

{

	struct ath10k_hw_ce_misc_regs *misc_regs = ar->hw_ce_regs->misc_regs;



	u32 misc_ie_addr = ath10k_ce_read32(ar, ce_ctrl_addr +

					    ar->hw_ce_regs->misc_ie_addr);



	ath10k_ce_write32(ar,

			  ce_ctrl_addr + ar->hw_ce_regs->misc_ie_addr,

			  misc_ie_addr | misc_regs->err_mask);

}



static inline void ath10k_ce_error_intr_disable(struct ath10k *ar,

						u32 ce_ctrl_addr)

{

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

+0 −1
Original line number Diff line number Diff line
@@ -6030,7 +6030,6 @@ static void ath10k_configure_filter(struct ieee80211_hw *hw, 


	mutex_lock(&ar->conf_mutex);



	changed_flags &= SUPPORTED_FILTERS;

	*total_flags &= SUPPORTED_FILTERS;

	ar->filter_flags = *total_flags;

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

+1 −0
Original line number Diff line number Diff line
@@ -927,6 +927,7 @@ static int ath10k_snoc_hif_start(struct ath10k *ar) 


	bitmap_clear(ar_snoc->pending_ce_irqs, 0, CE_COUNT_MAX);



	dev_set_threaded(&ar->napi_dev, true);

	ath10k_core_napi_enable(ar);

	ath10k_snoc_irq_enable(ar);

	ath10k_snoc_rx_post(ar);

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

+5 −5
Original line number Diff line number Diff line
@@ -874,11 +874,11 @@ static int ath11k_ahb_setup_msi_resources(struct ath11k_base *ab) 
	ab->pci.msi.ep_base_data = int_prop + 32;



	for (i = 0; i < ab->pci.msi.config->total_vectors; i++) {

		res = platform_get_resource(pdev, IORESOURCE_IRQ, i);

		if (!res)

			return -ENODEV;

		ret = platform_get_irq(pdev, i);

		if (ret < 0)

			return ret;



		ab->pci.msi.irqs[i] = res->start;

		ab->pci.msi.irqs[i] = ret;

	}



	set_bit(ATH11K_FLAG_MULTI_MSI_VECTORS, &ab->dev_flags);
@@ -1174,7 +1174,7 @@ static int ath11k_ahb_probe(struct platform_device *pdev) 
		 * to a new space for accessing them.

		 */

		ab->mem_ce = ioremap(ce_remap->base, ce_remap->size);

		if (IS_ERR(ab->mem_ce)) {

		if (!ab->mem_ce) {

			dev_err(&pdev->dev, "ce ioremap error\n");

			ret = -ENOMEM;

			goto err_core_free;