pull request: iwlwifi 2015-01-15

pull request: iwlwifi 2015-01-15

[Grumbach, Emmanuel]

SGkgS2FsbGUsDQoNCk9uZSBzaW5nbGUgcGF0Y2ggaW4gdGhlcmUsIGJ1dCBzaW5jZSBpdCBoaXQg
TGludXMncyBzeXN0ZW0sIGFuZCB3ZSBhcmUNCmluIC1yYzUgYWxyZWFkeSwgSSBkaWRuJ3Qgd2Fu
dCB0byB3YWl0IHVudGlsIG1vcmUgc3R1ZmYgYWNjdW11bGF0ZXMuDQpUaGlzIGlzIGEgcGF0Y2gg
Zm9yIHRoZSBidWcgdGhhdCBMaW51cyByZXBvcnRlZC4NCkxldCBtZSBrbm93IGlmIHlvdSBoYXZl
IGlzc3VlcyENCg0KVGhlIGZvbGxvd2luZyBjaGFuZ2VzIHNpbmNlIGNvbW1pdCA5YjNiNDNkOGQx
MzAwYzM2YmE1OTQ1YzEyZmQ1MDU0MDllYWY0ODA3Og0KDQogIGl3bHdpZmk6IG12bTogc2V0IHRo
ZSB0eCBjbWQgdGlkIGZvciBCQVIgZnJhbWUgY29ycmVjdGx5ICgyMDE1LTAxLTEzIDA4OjUzOjIz
ICswMjAwKQ0KDQphcmUgYXZhaWxhYmxlIGluIHRoZSBnaXQgcmVwb3NpdG9yeSBhdDoNCg0KICBo
dHRwczovL2dpdC5rZXJuZWwub3JnL3B1Yi9zY20vbGludXgva2VybmVsL2dpdC9pd2x3aWZpL2l3
bHdpZmktZml4ZXMuZ2l0IHRhZ3MvaXdsd2lmaS1mb3Ita2FsbGUtMjAxNS0wMS0xNQ0KDQpmb3Ig
eW91IHRvIGZldGNoIGNoYW5nZXMgdXAgdG8gOTBlYTE1YzExNDhiYjE1MTdlNDAwZWQxNGJiODc1
ZTMzMGFlYWQyZToNCg0KICBpd2x3aWZpOiBtdm06IGFib3J0IHNjaGVkdWxlZCBzY2FuIHVwb24g
UkZLSUxMICgyMDE1LTAxLTE4IDIyOjA0OjM3ICswMjAwKQ0KDQotLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQoqIG9uZSBmaXgg
Zm9yIHJma2lsbCB3aGlsZSBzY2hlZHVsZWQgc2NhbiBpcyBydW5uaW5nLg0KICBMaW51cydzIHN5
c3RlbSBoaXQgdGhpcyBpc3N1ZS4gV2lGaSB3b3VsZCBiZSB1bmF2YWlsYWJsZQ0KICBhZnRlciB0
aGlzIGhhcyBoYXBwZW5lZCBiZWNhdXNlIG9mIGJhZCBzdGF0ZSBpbiBjZmc4MDIxMS4NCg0KLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLQ0KRW1tYW51ZWwgR3J1bWJhY2ggKDEpOg0KICAgICAgaXdsd2lmaTogbXZtOiBhYm9ydCBz
Y2hlZHVsZWQgc2NhbiB1cG9uIFJGS0lMTA0KDQogZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsd2lm
aS9tdm0vc2Nhbi5jIHwgNyArKysrKysrDQogMSBmaWxlIGNoYW5nZWQsIDcgaW5zZXJ0aW9ucygr
KQ0KDQoNCg==

[PATCH] iwlwifi: mvm: abort scheduled scan upon RFKILL

[Emmanuel Grumbach]

When we have an active scheduled scan, and the RFKILL
interrupt kicks in, the stack will cancel the scheduled
scan as part of the down flow. But cancelling scheduled
scan usually implies sending a command to the firwmare
which has been killed as part of the RFKILL interrupt
handling.
Because of that, we returned an error to mac80211 when
it asked to stop the scheduled scan and didn't notify the
end of the scheduled scan. Besides a fat warning, this led
to a situation in which cfg80211 would refuse any new scan
request.

To disentangle this, fake that the scheduled scan has been
stopped without sending the command to the firwmare, return
0 after having properly let cfg80211 know that the scan
has been cancelled.

This is basically the same as:
commit 9b520d84957d63348e87c0f2cbd21d86e1e8f2f2
Author: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Date:   Tue Nov 4 15:54:11 2014 +0200

    iwlwifi: mvm: abort scan upon RFKILL

    This code existed but not for all the different FW APIs
    we support.
    Fix this.

but for the scheduled scan case.

Link: http://permalink.gmane.org/gmane.linux.kernel.wireless.general/133232
Reported-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
 drivers/net/wireless/iwlwifi/mvm/scan.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c
index 3fbba4b..844bf7c 100644
--- a/drivers/net/wireless/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
@@ -1107,6 +1107,12 @@ int iwl_mvm_scan_offload_stop(struct iwl_mvm *mvm, bool notify)
 		return iwl_umac_scan_stop(mvm, IWL_UMAC_SCAN_UID_SCHED_SCAN,
 					  notify);
 
+	if (mvm->scan_status == IWL_MVM_SCAN_NONE)
+		return 0;
+
+	if (iwl_mvm_is_radio_killed(mvm))
+		goto out;
+
 	if (mvm->scan_status != IWL_MVM_SCAN_SCHED &&
 	    (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN) ||
 	     mvm->scan_status != IWL_MVM_SCAN_OS)) {
@@ -1143,6 +1149,7 @@ int iwl_mvm_scan_offload_stop(struct iwl_mvm *mvm, bool notify)
 	if (mvm->scan_status == IWL_MVM_SCAN_OS)
 		iwl_mvm_unref(mvm, IWL_MVM_REF_SCAN);
 
+out:
 	mvm->scan_status = IWL_MVM_SCAN_NONE;
 
 	if (notify) {
-- 
1.9.1

Re: [PATCH] iwlwifi: mvm: abort scheduled scan upon RFKILL

[Arend van Spriel]

On 01/18/15 21:18, Emmanuel Grumbach wrote:
> When we have an active scheduled scan, and the RFKILL
> interrupt kicks in, the stack will cancel the scheduled
> scan as part of the down flow. But cancelling scheduled
> scan usually implies sending a command to the firwmare
> which has been killed as part of the RFKILL interrupt
> handling.
> Because of that, we returned an error to mac80211 when
> it asked to stop the scheduled scan and didn't notify the
> end of the scheduled scan. Besides a fat warning, this led
> to a situation in which cfg80211 would refuse any new scan
> request.
>
> To disentangle this, fake that the scheduled scan has been
> stopped without sending the command to the firwmare, return
> 0 after having properly let cfg80211 know that the scan
> has been cancelled.
>
> This is basically the same as:
> commit 9b520d84957d63348e87c0f2cbd21d86e1e8f2f2
> Author: Emmanuel Grumbach<emmanuel.grumbach@intel.com>
> Date:   Tue Nov 4 15:54:11 2014 +0200
>
>      iwlwifi: mvm: abort scan upon RFKILL
>
>      This code existed but not for all the different FW APIs
>      we support.
>      Fix this.
>
> but for the scheduled scan case.

So looking at the patch I guess cfg80211 will still issues a WARN_ON, right?

Regards,
Arend

> Link: http://permalink.gmane.org/gmane.linux.kernel.wireless.general/133232
> Reported-by: Linus Torvalds<torvalds@linux-foundation.org>
> Signed-off-by: Emmanuel Grumbach<emmanuel.grumbach@intel.com>
> ---
>   drivers/net/wireless/iwlwifi/mvm/scan.c | 7 +++++++
>   1 file changed, 7 insertions(+)
>
> diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c
> index 3fbba4b..844bf7c 100644
> --- a/drivers/net/wireless/iwlwifi/mvm/scan.c
> +++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
> @@ -1107,6 +1107,12 @@ int iwl_mvm_scan_offload_stop(struct iwl_mvm *mvm, bool notify)
>   		return iwl_umac_scan_stop(mvm, IWL_UMAC_SCAN_UID_SCHED_SCAN,
>   					  notify);
>
> +	if (mvm->scan_status == IWL_MVM_SCAN_NONE)
> +		return 0;
> +
> +	if (iwl_mvm_is_radio_killed(mvm))
> +		goto out;
> +
>   	if (mvm->scan_status != IWL_MVM_SCAN_SCHED&&
>   	(!(mvm->fw->ucode_capa.api[0]&  IWL_UCODE_TLV_API_LMAC_SCAN) ||
>   	     mvm->scan_status != IWL_MVM_SCAN_OS)) {
> @@ -1143,6 +1149,7 @@ int iwl_mvm_scan_offload_stop(struct iwl_mvm *mvm, bool notify)
>   	if (mvm->scan_status == IWL_MVM_SCAN_OS)
>   		iwl_mvm_unref(mvm, IWL_MVM_REF_SCAN);
>
> +out:
>   	mvm->scan_status = IWL_MVM_SCAN_NONE;
>
>   	if (notify) {

Re: [PATCH] iwlwifi: mvm: abort scheduled scan upon RFKILL

[Grumbach, Emmanuel]

T24gU3VuLCAyMDE1LTAxLTE4IGF0IDIzOjE0ICswMTAwLCBBcmVuZCB2YW4gU3ByaWVsIHdyb3Rl
Og0KPiBPbiAwMS8xOC8xNSAyMToxOCwgRW1tYW51ZWwgR3J1bWJhY2ggd3JvdGU6DQo+ID4gV2hl
biB3ZSBoYXZlIGFuIGFjdGl2ZSBzY2hlZHVsZWQgc2NhbiwgYW5kIHRoZSBSRktJTEwNCj4gPiBp
bnRlcnJ1cHQga2lja3MgaW4sIHRoZSBzdGFjayB3aWxsIGNhbmNlbCB0aGUgc2NoZWR1bGVkDQo+
ID4gc2NhbiBhcyBwYXJ0IG9mIHRoZSBkb3duIGZsb3cuIEJ1dCBjYW5jZWxsaW5nIHNjaGVkdWxl
ZA0KPiA+IHNjYW4gdXN1YWxseSBpbXBsaWVzIHNlbmRpbmcgYSBjb21tYW5kIHRvIHRoZSBmaXJ3
bWFyZQ0KPiA+IHdoaWNoIGhhcyBiZWVuIGtpbGxlZCBhcyBwYXJ0IG9mIHRoZSBSRktJTEwgaW50
ZXJydXB0DQo+ID4gaGFuZGxpbmcuDQo+ID4gQmVjYXVzZSBvZiB0aGF0LCB3ZSByZXR1cm5lZCBh
biBlcnJvciB0byBtYWM4MDIxMSB3aGVuDQo+ID4gaXQgYXNrZWQgdG8gc3RvcCB0aGUgc2NoZWR1
bGVkIHNjYW4gYW5kIGRpZG4ndCBub3RpZnkgdGhlDQo+ID4gZW5kIG9mIHRoZSBzY2hlZHVsZWQg
c2Nhbi4gQmVzaWRlcyBhIGZhdCB3YXJuaW5nLCB0aGlzIGxlZA0KPiA+IHRvIGEgc2l0dWF0aW9u
IGluIHdoaWNoIGNmZzgwMjExIHdvdWxkIHJlZnVzZSBhbnkgbmV3IHNjYW4NCj4gPiByZXF1ZXN0
Lg0KPiA+DQo+ID4gVG8gZGlzZW50YW5nbGUgdGhpcywgZmFrZSB0aGF0IHRoZSBzY2hlZHVsZWQg
c2NhbiBoYXMgYmVlbg0KPiA+IHN0b3BwZWQgd2l0aG91dCBzZW5kaW5nIHRoZSBjb21tYW5kIHRv
IHRoZSBmaXJ3bWFyZSwgcmV0dXJuDQo+ID4gMCBhZnRlciBoYXZpbmcgcHJvcGVybHkgbGV0IGNm
ZzgwMjExIGtub3cgdGhhdCB0aGUgc2Nhbg0KPiA+IGhhcyBiZWVuIGNhbmNlbGxlZC4NCj4gPg0K
PiA+IFRoaXMgaXMgYmFzaWNhbGx5IHRoZSBzYW1lIGFzOg0KPiA+IGNvbW1pdCA5YjUyMGQ4NDk1
N2Q2MzM0OGU4N2MwZjJjYmQyMWQ4NmUxZThmMmYyDQo+ID4gQXV0aG9yOiBFbW1hbnVlbCBHcnVt
YmFjaDxlbW1hbnVlbC5ncnVtYmFjaEBpbnRlbC5jb20+DQo+ID4gRGF0ZTogICBUdWUgTm92IDQg
MTU6NTQ6MTEgMjAxNCArMDIwMA0KPiA+DQo+ID4gICAgICBpd2x3aWZpOiBtdm06IGFib3J0IHNj
YW4gdXBvbiBSRktJTEwNCj4gPg0KPiA+ICAgICAgVGhpcyBjb2RlIGV4aXN0ZWQgYnV0IG5vdCBm
b3IgYWxsIHRoZSBkaWZmZXJlbnQgRlcgQVBJcw0KPiA+ICAgICAgd2Ugc3VwcG9ydC4NCj4gPiAg
ICAgIEZpeCB0aGlzLg0KPiA+DQo+ID4gYnV0IGZvciB0aGUgc2NoZWR1bGVkIHNjYW4gY2FzZS4N
Cj4gDQo+IFNvIGxvb2tpbmcgYXQgdGhlIHBhdGNoIEkgZ3Vlc3MgY2ZnODAyMTEgd2lsbCBzdGls
bCBpc3N1ZXMgYSBXQVJOX09OLCByaWdodD8NCj4gDQoNCldoeT8NCmNmZzgwMjExIGdldHMgbm90
aWZpZWQgYWJvdXQgdGhlIHNjYW4gY29tcGxldGlvbiwgc28gbm8gc2Nhbm5pbmcgc2hvdWxkDQpy
ZW1haW4gYWN0aXZlIHdoZW4gdGhlIGRvd24gZmxvdyBpcyBvdmVyLg0KDQo+ID4gTGluazogaHR0
cDovL3Blcm1hbGluay5nbWFuZS5vcmcvZ21hbmUubGludXgua2VybmVsLndpcmVsZXNzLmdlbmVy
YWwvMTMzMjMyDQo+ID4gUmVwb3J0ZWQtYnk6IExpbnVzIFRvcnZhbGRzPHRvcnZhbGRzQGxpbnV4
LWZvdW5kYXRpb24ub3JnPg0KPiA+IFNpZ25lZC1vZmYtYnk6IEVtbWFudWVsIEdydW1iYWNoPGVt
bWFudWVsLmdydW1iYWNoQGludGVsLmNvbT4NCj4gPiAtLS0NCj4gPiAgIGRyaXZlcnMvbmV0L3dp
cmVsZXNzL2l3bHdpZmkvbXZtL3NjYW4uYyB8IDcgKysrKysrKw0KPiA+ICAgMSBmaWxlIGNoYW5n
ZWQsIDcgaW5zZXJ0aW9ucygrKQ0KPiA+DQo+ID4gZGlmZiAtLWdpdCBhL2RyaXZlcnMvbmV0L3dp
cmVsZXNzL2l3bHdpZmkvbXZtL3NjYW4uYyBiL2RyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkv
bXZtL3NjYW4uYw0KPiA+IGluZGV4IDNmYmJhNGIuLjg0NGJmN2MgMTAwNjQ0DQo+ID4gLS0tIGEv
ZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9tdm0vc2Nhbi5jDQo+ID4gKysrIGIvZHJpdmVy
cy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9tdm0vc2Nhbi5jDQo+ID4gQEAgLTExMDcsNiArMTEwNywx
MiBAQCBpbnQgaXdsX212bV9zY2FuX29mZmxvYWRfc3RvcChzdHJ1Y3QgaXdsX212bSAqbXZtLCBi
b29sIG5vdGlmeSkNCj4gPiAgIAkJcmV0dXJuIGl3bF91bWFjX3NjYW5fc3RvcChtdm0sIElXTF9V
TUFDX1NDQU5fVUlEX1NDSEVEX1NDQU4sDQo+ID4gICAJCQkJCSAgbm90aWZ5KTsNCj4gPg0KPiA+
ICsJaWYgKG12bS0+c2Nhbl9zdGF0dXMgPT0gSVdMX01WTV9TQ0FOX05PTkUpDQo+ID4gKwkJcmV0
dXJuIDA7DQo+ID4gKw0KPiA+ICsJaWYgKGl3bF9tdm1faXNfcmFkaW9fa2lsbGVkKG12bSkpDQo+
ID4gKwkJZ290byBvdXQ7DQo+ID4gKw0KPiA+ICAgCWlmIChtdm0tPnNjYW5fc3RhdHVzICE9IElX
TF9NVk1fU0NBTl9TQ0hFRCYmDQo+ID4gICAJKCEobXZtLT5mdy0+dWNvZGVfY2FwYS5hcGlbMF0m
ICBJV0xfVUNPREVfVExWX0FQSV9MTUFDX1NDQU4pIHx8DQo+ID4gICAJICAgICBtdm0tPnNjYW5f
c3RhdHVzICE9IElXTF9NVk1fU0NBTl9PUykpIHsNCj4gPiBAQCAtMTE0Myw2ICsxMTQ5LDcgQEAg
aW50IGl3bF9tdm1fc2Nhbl9vZmZsb2FkX3N0b3Aoc3RydWN0IGl3bF9tdm0gKm12bSwgYm9vbCBu
b3RpZnkpDQo+ID4gICAJaWYgKG12bS0+c2Nhbl9zdGF0dXMgPT0gSVdMX01WTV9TQ0FOX09TKQ0K
PiA+ICAgCQlpd2xfbXZtX3VucmVmKG12bSwgSVdMX01WTV9SRUZfU0NBTik7DQo+ID4NCj4gPiAr
b3V0Og0KPiA+ICAgCW12bS0+c2Nhbl9zdGF0dXMgPSBJV0xfTVZNX1NDQU5fTk9ORTsNCj4gPg0K
PiA+ICAgCWlmIChub3RpZnkpIHsNCj4gDQoNCg==

Re: pull request: iwlwifi 2015-01-15

[Kalle Valo]

"Grumbach, Emmanuel" <emmanuel.grumbach@intel.com> writes:

> One single patch in there, but since it hit Linus's system, and we are
> in -rc5 already, I didn't want to wait until more stuff accumulates.
> This is a patch for the bug that Linus reported. Let me know if you
> have issues!

Thanks, pulled.

-- 
Kalle Valo