diff options
| author | Kalle Valo <kvalo@kernel.org> | 2021-12-21 21:07:09 +0300 |
|---|---|---|
| committer | Kalle Valo <kvalo@kernel.org> | 2021-12-21 21:07:09 +0300 |
| commit | bc11517bc8219314948780570ec92814d14d6602 (patch) | |
| tree | ca44cba722b6a96f62053ebaff58840688671e75 /drivers/net/wireless/intel/iwlwifi/mei | |
| parent | 8b144dedb928e4e2f433a328d58f44c3c098d63e (diff) | |
| parent | bcbddc4f9d020a4a0b881cc065729c3aaeb28098 (diff) | |
| download | linux-bc11517bc8219314948780570ec92814d14d6602.tar.xz | |
Merge tag 'iwlwifi-next-for-kalle-2021-12-21-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
wlwifi patches for v5.17 v2
* Support for Time-Aware-SAR (TAS) as read from the BIOS;
* Fix scan timeout issue when 6GHz is enabled;
* Work continues for new HW family Bz;
* Support for Optimized Connectivity Experience (OCE) scan;
* A bunch of FW debugging improvements and fixes;
* Fix one 32-bit compilation issue;
* Some RX changes for new HW family
* Some fixes for 6 GHz scan;
* Fix SAR table fixes with newer platforms;
* Fix early restart crash;
* Small fix in the debugging code;
* Add new Killer device IDs;
* Datapath updates for Bz family continues;
* A couple of important fixes in iwlmei;
* Some other small fixes, clean-ups and improvements.
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/mei')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/mei/main.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/net/wireless/intel/iwlwifi/mei/main.c b/drivers/net/wireless/intel/iwlwifi/mei/main.c index 15b207d61ae6..d9733aaf6f6e 100644 --- a/drivers/net/wireless/intel/iwlwifi/mei/main.c +++ b/drivers/net/wireless/intel/iwlwifi/mei/main.c @@ -1705,6 +1705,7 @@ void iwl_mei_unregister_complete(void) mei_cldev_get_drvdata(iwl_mei_global_cldev); iwl_mei_send_sap_msg(mei->cldev, SAP_MSG_NOTIF_WIFIDR_DOWN); + mei->got_ownership = false; } mutex_unlock(&iwl_mei_mutex); @@ -1811,6 +1812,12 @@ static int iwl_mei_probe(struct mei_cl_device *cldev, mei_cldev_set_drvdata(cldev, mei); mei->cldev = cldev; + /* + * The CSME firmware needs to boot the internal WLAN client. Wait here + * so that the DMA map request will succeed. + */ + msleep(20); + ret = iwl_mei_alloc_shared_mem(cldev); if (ret) goto free; |