Commit dc5771df 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.12. Major changes:

ath9k

* more robust encryption key cache management
parents 73b7a604 abdcd4cb

drivers/net/wireless/ath/ath.h

+2 −1
Original line number Diff line number Diff line
@@ -197,12 +197,13 @@ struct sk_buff *ath_rxbuf_alloc(struct ath_common *common, 
bool ath_is_mybeacon(struct ath_common *common, struct ieee80211_hdr *hdr);



void ath_hw_setbssidmask(struct ath_common *common);

void ath_key_delete(struct ath_common *common, struct ieee80211_key_conf *key);

void ath_key_delete(struct ath_common *common, u8 hw_key_idx);

int ath_key_config(struct ath_common *common,

			  struct ieee80211_vif *vif,

			  struct ieee80211_sta *sta,

			  struct ieee80211_key_conf *key);

bool ath_hw_keyreset(struct ath_common *common, u16 entry);

bool ath_hw_keysetmac(struct ath_common *common, u16 entry, const u8 *mac);

void ath_hw_cycle_counters_update(struct ath_common *common);

int32_t ath_hw_get_listen_time(struct ath_common *common);

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

+2 −3
Original line number Diff line number Diff line
@@ -626,7 +626,7 @@ static int ath10k_ahb_hif_start(struct ath10k *ar) 
{

	ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot ahb hif start\n");



	napi_enable(&ar->napi);

	ath10k_core_napi_enable(ar);

	ath10k_ce_enable_interrupts(ar);

	ath10k_pci_enable_legacy_irq(ar);
@@ -644,8 +644,7 @@ static void ath10k_ahb_hif_stop(struct ath10k *ar) 
	ath10k_ahb_irq_disable(ar);

	synchronize_irq(ar_ahb->irq);



	napi_synchronize(&ar->napi);

	napi_disable(&ar->napi);

	ath10k_core_napi_sync_disable(ar);



	ath10k_pci_flush(ar);

}

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

+25 −0
Original line number Diff line number Diff line
@@ -2305,6 +2305,31 @@ void ath10k_core_start_recovery(struct ath10k *ar) 
}

EXPORT_SYMBOL(ath10k_core_start_recovery);



void ath10k_core_napi_enable(struct ath10k *ar)

{

	lockdep_assert_held(&ar->conf_mutex);



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

		return;



	napi_enable(&ar->napi);

	set_bit(ATH10K_FLAG_NAPI_ENABLED, &ar->dev_flags);

}

EXPORT_SYMBOL(ath10k_core_napi_enable);



void ath10k_core_napi_sync_disable(struct ath10k *ar)

{

	lockdep_assert_held(&ar->conf_mutex);



	if (!test_bit(ATH10K_FLAG_NAPI_ENABLED, &ar->dev_flags))

		return;



	napi_synchronize(&ar->napi);

	napi_disable(&ar->napi);

	clear_bit(ATH10K_FLAG_NAPI_ENABLED, &ar->dev_flags);

}

EXPORT_SYMBOL(ath10k_core_napi_sync_disable);



static void ath10k_core_restart(struct work_struct *work)

{

	struct ath10k *ar = container_of(work, struct ath10k, restart_work);

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

+5 −0
Original line number Diff line number Diff line
@@ -868,6 +868,9 @@ enum ath10k_dev_flags { 


	/* Indicates that ath10k device is during recovery process and not complete */

	ATH10K_FLAG_RESTARTING,



	/* protected by conf_mutex */

	ATH10K_FLAG_NAPI_ENABLED,

};



enum ath10k_cal_mode {
@@ -1308,6 +1311,8 @@ static inline bool ath10k_peer_stats_enabled(struct ath10k *ar) 


extern unsigned long ath10k_coredump_mask;



void ath10k_core_napi_sync_disable(struct ath10k *ar);

void ath10k_core_napi_enable(struct ath10k *ar);

struct ath10k *ath10k_core_create(size_t priv_size, struct device *dev,

				  enum ath10k_bus bus,

				  enum ath10k_hw_rev hw_rev,

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

+4 −3
Original line number Diff line number Diff line
@@ -1958,7 +1958,7 @@ static int ath10k_pci_hif_start(struct ath10k *ar) 


	ath10k_dbg(ar, ATH10K_DBG_BOOT, "boot hif start\n");



	napi_enable(&ar->napi);

	ath10k_core_napi_enable(ar);



	ath10k_pci_irq_enable(ar);

	ath10k_pci_rx_post(ar);
@@ -2075,8 +2075,9 @@ static void ath10k_pci_hif_stop(struct ath10k *ar) 


	ath10k_pci_irq_disable(ar);

	ath10k_pci_irq_sync(ar);

	napi_synchronize(&ar->napi);

	napi_disable(&ar->napi);



	ath10k_core_napi_sync_disable(ar);



	cancel_work_sync(&ar_pci->dump_work);



	/* Most likely the device has HTT Rx ring configured. The only way to