Skip to contentSkip to conversation

pull request: iwlwifi-next 2015-05-26

PATCH In review Grumbach, Emmanuel 3 participants 69 messages May 26, 2015 – Jun 3, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

SGkgS2FsbGUsDQoNCnRoaXMgaXMgYSBwdWxsIHJlcXVlc3QgZm9yIDQuMi4gTm90aGluZyByZWFs bHkgc3RhbmRzIG91dCBiZXNpZGVzIHdoYXQgSQ0Kd3JvdGUgaW4gdGhlIHRhZy4gRXZlbiB0aGUg ZGlmZnN0YXQgaGludHMgd2hhdCBpcyB0aGUgYmlnZ2VzdCBwYXJ0IG9mDQp0aGlzIHB1bGwgcmVx dWVzdCA6KQ0KTm90ZSB0aGF0IHRoZXJlIGFyZSBmaXhlcyBoZXJlIHRoYXQgZGlkbid0IG1ha2Ug aXQgdG8gbXkgcHJldmlvdXMgcHVsbA0KcmVxdWVzdCBmb3IgNC4xLiBJIHRhZ2dlZCB0aGVtIGZv ciBzdGFibGUgc2luY2UgdGhlIHdvcmRpbmcgb2YgeW91ciBsYXN0DQpwdWxsIHJlcXVlc3QgZm9y IDQuMSB0byBEYXZlIGhpbnRlZCBtZSB0aGF0IHlvdSB3b24ndCBzZW5kIGFueSBwdWxsDQpyZXF1 ZXN0IGZvciA0LjEgdG8gaGltIGFueW1vcmUuDQoNCkxldCBtZSBrbm93IGlmIHlvdSBoYXZlIGlz c3Vlcy4NCg0KVGhlIGZvbGxvd2luZyBjaGFuZ2VzIHNpbmNlIGNvbW1pdCBiYmJlOGM4YzU5NmIz Nzg0YTJlZDA4NzcyOTAwZTgyN2Y4YmE3MmM1Og0KDQogIG1hYzgwMjExOiBhZGQgbWlzc2luZyBk b2N1bWVudGF0aW9uIGZvciByYXRlX2N0cmxfbG9jayAoMjAxNS0wNS0wNiAxNjowMDozMiArMDIw MCkNCg0KYXJlIGF2YWlsYWJsZSBpbiB0aGUgZ2l0IHJlcG9zaXRvcnkgYXQ6DQoNCiAgaHR0cHM6 Ly9naXQua2VybmVsLm9yZy9wdWIvc2NtL2xpbnV4L2tlcm5lbC9naXQvaXdsd2lmaS9pd2x3aWZp LW5leHQuZ2l0IHRhZ3MvaXdsd2lmaS1uZXh0LWZvci1rYWxsZS0yMDE1LTA1LTI2DQoNCmZvciB5 b3UgdG8gZmV0Y2ggY2hhbmdlcyB1cCB0byA2MzUwM2IxMTA2ZDk3OWJjMWJjNzM5MWZlYjNiZWZh NzAxZTY0NDhmOg0KDQogIGl3bHdpZmk6IG12bTogY2xlYW4gaW50ZXJmYWNlcyBvbiBkcnZfc3Rv cCAoMjAxNS0wNS0yNiAyMjowMjo0OCArMDMwMCkNCg0KLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQ0KKiBzY2FuIHJld29ycyBj b250aW51YXRpb24gKEx1Y2EpDQoqIGNsZWFudXBzDQoqIGZpeGVzDQoNCi0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCkFuZHJl aSBPdGNoZXJldGlhbnNraSAoMSk6DQogICAgICBpd2x3aWZpOiBtdm06IENvbmZpZ3VyZSBhZ2cu IHF1ZXVlIGJlZm9yZSBhc3NpZ25pbmcgaXQgdG8gU1RBDQoNCkFyaWsgTmVtdHNvdiAoMSk6DQog ICAgICBpd2x3aWZpOiBtdm06IGNsZWFuIGludGVyZmFjZXMgb24gZHJ2X3N0b3ANCg0KQXZyYWhh bSBTdGVybiAoMyk6DQogICAgICBpd2x3aWZpOiBtdm06IHByaW50IHNjYW5uZWQgY2hhbm5lbCBs aXN0IG9uIHNjYW4gaXRlcmF0aW9uIGNvbXBsZXRlIG5vdGlmaWNhdGlvbg0KICAgICAgaXdsd2lm aTogbXZtOiBhZGQgVU1BQyBzY2FuIGl0ZXJhdGlvbiBjb21wbGV0ZSBub3RpZmljYXRpb24NCiAg ICAgIGl3bHdpZmk6IG12bTogYWRkIHN1cHBvcnQgZm9yIDggbGV2ZWwgc2NhbiBwcmlvcml0eSBB UEkNCg0KQXZyaSBBbHRtYW4gKDIpOg0KICAgICAgaXdsd2lmaTogcGNpZTogZG9uJ3QgZGlzYWJs ZSB0aGUgYnVzbWFzdGVyIERNQSBjbG9jayBmb3IgZmFtaWx5IDgwMDANCiAgICAgIGl3bHdpZmk6 IHBjaWU6IFJlbW92ZSByZWR1bmRhbnQgY2hlY2sgZm9yIGZhbWlseSB0eXBlDQoNCkVsaWFkIFBl bGxlciAoMyk6DQogICAgICBpd2x3aWZpOiBtdm06IGF2b2lkIHVzZS1hZnRlci1mcmVlIG9uIGl3 bF9tdm1fZDBpM19lbmFibGVfdHgoKQ0KICAgICAgaXdsd2lmaTogbXZtOiBmaXggUk9DIHJlZmVy ZW5jZSBhY2NvdW50aW5nDQogICAgICBpd2x3aWZpOiB0cmFjaW5nOiBhZGQgcnggY21kIGhlYWRl ciBmaWVsZHMNCg0KRW1tYW51ZWwgR3J1bWJhY2ggKDEyKToNCiAgICAgIGl3bHdpZmk6IG12bTog Zm9yYmlkIE1JTU8gb24gZGV2aWNlcyB0aGF0IGRvbid0IHN1cHBvcnQgaXQNCiAgICAgIGl3bHdp Zmk6IDcwMDA6IG1vZGlmeSB0aGUgZmlybXdhcmUgbmFtZSBmb3IgMzE2NQ0KICAgICAgaXdsd2lm aTogbXZtOiBmaXggTUxNRSB0cmlnZ2VyDQogICAgICBpd2x3aWZpOiBtdm06IEJUIENvZXggLSBk dXBsaWNhdGUgdGhlIGNvbW1hbmQgaWYgc2VudCBBU1lOQw0KICAgICAgTWVyZ2UgcmVtb3RlLXRy YWNraW5nIGJyYW5jaCAnaXdsd2lmaS1maXhlcy9tYXN0ZXInIGludG8gaXdsd2lmaS1uZXh0DQog ICAgICBpd2x3aWZpOiBkdW1wIEFQSSB0byAxNA0KICAgICAgaXdsd2lmaTogcGNpZTogc2ltcGxp ZnkgcmV0dXJuIHZhbHVlDQogICAgICBpd2x3aWZpOiBtdm06IEJUIENvZXggLSByZW1vdmUgdXNl bGVzcyBjb2RlDQogICAgICBpd2x3aWZpOiBtdm06IEJUIENvZXggLSBhbGxvY2F0ZSBhIHNob3J0 IGNvbW1hbmQgb24gdGhlIHN0YWNrDQogICAgICBpd2x3aWZpOiBtdm06IEJUIENvZXggLSBmaXgg c2hhcmVkIGFudGVubmEgY2hlY2sgd2l0aCBuZXcgQVBJDQogICAgICBNZXJnZSB0YWcgJ21hYzgw MjExLW5leHQtZm9yLWRhdmVtLTIwMTUtMDUtMDYnIGludG8gaXdsd2lmaS1uZXh0DQogICAgICBp d2x3aWZpOiBtdm06IGltcGxlbWVudCB0aGUgQmxvY2tBY2sgcmVsYXRlZCBkZWJ1ZyB0cmlnZ2Vy cw0KDQpFcmFuIEhhcmFyeSAoMSk6DQogICAgICBpd2x3aWZpOiA4MDAwOiBmYWxsYmFjayB0byBk ZWZhdWx0IE5WTSBmaWxlDQoNCkhhaW0gRHJleWZ1c3MgKDEpOg0KICAgICAgaXdsd2lmaTogbXZt OiBGcmVlIGZ3X3N0YXR1cyBhZnRlciB1c2UgdG8gYXZvaWQgbWVtb3J5IGxlYWsNCg0KSWRvIFlh cml2ICgxKToNCiAgICAgIGl3bHdpZmk6IHVwZGF0ZSB0aGVybWFsIHRocm90dGxpbmcgdmFsdWVz IGZvciA4MDAwIGRldmljZXMNCg0KSWxhbiBQZWVyICgxKToNCiAgICAgIGl3bHdpZmk6IHBjaWU6 IGZpeCB0cmFja2luZyBvZiBjbWRfaW5fZmxpZ2h0DQoNCkpvaGFubmVzIEJlcmcgKDMpOg0KICAg ICAgaXdsd2lmaTogcmVmYWN0b3IgY29tbW9uIHRyYW5zcG9ydCBhbGxvYy9pbml0IGNvZGUNCiAg ICAgIGl3bHdpZmk6IG12bTogYWR2ZXJ0aXNlIHJhbmRvbWlzZWQgbmV0ZGV0ZWN0IE1BQyBhZGRy ZXNzDQogICAgICBpd2x3aWZpOiBtdm06IGhhbmRsZSBkZXZpY2Ugc3RhcnQgZmFpbHVyZSBjb3Jy ZWN0bHkNCg0KTGlhZCBLYXVmbWFuICgyKToNCiAgICAgIGl3bHdpZmk6IG52bTogZm9yY2UgbWFj IGZyb20gb3RwIGluIGNhc2UgbnZtIG1hYyBpcyByZXNlcnZlZA0KICAgICAgaXdsd2lmaTogbnZt OiBmaXggb3RwIHBhcnNpbmcgaW4gODAwMCBodyBmYW1pbHkNCg0KTHVjaWFubyBDb2VsaG8gKDE4 KToNCiAgICAgIGl3bHdpZmk6IG12bTogdGFrZSB0aGUgVUNPREVfRE9XTiByZWZlcmVuY2Ugd2hl biByZXN1bWluZw0KICAgICAgaXdsd2lmaTogbXZtOiBjbGVhbiBuZXQtZGV0ZWN0IGluZm8gaWYg ZGV2aWNlIHdhcyByZXNldCBkdXJpbmcgc3VzcGVuZA0KICAgICAgaXdsd2lmaTogcGNpZTogZG9u J3QgY2FsbCBzZXRfcHdyIGZ1bmN0aW9ucyBmb3IgZmFtaWx5IDgwMDANCiAgICAgIGl3bHdpZmk6 IG12bTogc21hbGwgZml4IGluIGEgY29tbWVudCBhYm91dCBVTUFDIHNjYW4gc2NoZWR1bGVzDQog ICAgICBpd2x3aWZpOiBtdm06IHJlbW92ZSB0aGUgVU1BQyBzcGVjaWZpYyBzY2FuIHR5cGVzDQog ICAgICBpd2x3aWZpOiBtdm06IGZpeCB0aGUgbmV0LWRldGVjdCBTU0lEcyByZXBvcnQgb3JkZXIN CiAgICAgIGl3bHdpZmk6IG12bTogbWFrZSBpd2xfbXZtX2NvbmZpZ19zY2hlZF9zY2FuX3Byb2Zp bGVzKCkgc3RhdGljDQogICAgICBpd2x3aWZpOiBtdm06IHJlb3JnYW5pemUgc2NhbiBzdG9wcGlu ZyBmdW5jdGlvbnMNCiAgICAgIGl3bHdpZmk6IG12bTogZG9uJ3Qgc3RvcCByZWd1bGFyIHNjYW5z IHdoZW4gZ29pbmcgb3V0IG9mIGlkbGUgc3RhdGUNCiAgICAgIGl3bHdpZmk6IG12bTogY29tYmlu ZSBwYXJ0IG9mIHRoZSBzY2FuIHN0b3AgZmxvd3MNCiAgICAgIGl3bHdpZmk6IG12bTogcmVuYW1l IHVtYWMgc2NhbiBzdG9wIGZ1bmN0aW9uDQogICAgICBpd2x3aWZpOiBtdm06IHJlbmFtZSBzb21l IExNQUMtc3BlY2lmaWMgc2NhbiBmdW5jdGlvbnMNCiAgICAgIGl3bHdpZmk6IG12bTogcmVmYWN0 b3IgVU1BQyBzY2FuIFVJRCBoYW5kbGluZw0KICAgICAgaXdsd2lmaTogbXZtOiByZW1vdmUgY29k ZSB0aGF0IHN0b3BzIG11bHRpcGxlIFVNQUMgc2NhbnMgb2YgYSB0eXBlDQogICAgICBpd2x3aWZp OiBtdm06IGNvbWJpbmUgVU1BQyBhbmQgTE1BQyBzY2FuX3N0b3AgZnVuY3Rpb25zDQogICAgICBp d2x3aWZpOiBtdm06IGNvbWJpbmUgcmVndWxhciBhbmQgc2NoZWQgc2NhbiBzdG9wIGZ1bmN0aW9u cw0KICAgICAgaXdsd2lmaTogbXZtOiBtYWtlIFVNQUMgc2NhbnMgdXNlIHRoZSBzdG9wcGluZyBz Y2FuIHN0YXR1cw0KICAgICAgaXdsd2lmaTogbXZtOiB0cmVhdCBzY2FuIHJhY2VzIGFsc28gb24g VU1BQyBzY2Fucw0KDQpNYXR0aSBHb3R0bGllYiAoMSk6DQogICAgICBpd2x3aWZpOiBtdm06IEFk ZCBkZWJ1Z2ZzIGVudHJ5IGZvciBUeCBwb3dlciBsaW1pdA0KDQpOaWNob2xhcyBLcmF1c2UgKDEp Og0KICAgICAgaXdsd2lmaTogUmVtb3ZlIHVzZSBvZiB0aGUgZGVwcmVjYWN0ZWQgUFRSX1JFVA0K DQogZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9LY29uZmlnICAgICAgICAgICAgICAgIHwg ICAxMyArLQ0KIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvTWFrZWZpbGUgICAgICAgICAg ICAgICB8ICAgIDEgKw0KIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvaXdsLTcwMDAuYyAg ICAgICAgICAgICB8ICAgNDEgKystDQogZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9pd2wt ODAwMC5jICAgICAgICAgICAgIHwgICA3MCArKystLQ0KIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3 bHdpZmkvaXdsLWNvbmZpZy5oICAgICAgICAgICB8ICAgNDQgKysrDQogZHJpdmVycy9uZXQvd2ly ZWxlc3MvaXdsd2lmaS9pd2wtZGV2dHJhY2UtaXdsd2lmaS5oIHwgICAxNSArLQ0KIGRyaXZlcnMv bmV0L3dpcmVsZXNzL2l3bHdpZmkvaXdsLWRydi5jICAgICAgICAgICAgICB8ICAgIDYgKy0NCiBk cml2ZXJzL25ldC93aXJlbGVzcy9pd2x3aWZpL2l3bC1lZXByb20tcGFyc2UuYyAgICAgfCAgICA1 ICsNCiBkcml2ZXJzL25ldC93aXJlbGVzcy9pd2x3aWZpL2l3bC1lZXByb20tcGFyc2UuaCAgICAg fCAgICAzICsNCiBkcml2ZXJzL25ldC93aXJlbGVzcy9pd2x3aWZpL2l3bC1mdy1lcnJvci1kdW1w LmggICAgfCAgICA2ICstDQogZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9pd2wtZnctZmls ZS5oICAgICAgICAgIHwgICA0MCArKy0NCiBkcml2ZXJzL25ldC93aXJlbGVzcy9pd2x3aWZpL2l3 bC1udm0tcGFyc2UuYyAgICAgICAgfCAgIDMyICstDQogZHJpdmVycy9uZXQvd2lyZWxlc3MvaXds d2lmaS9pd2wtcHJwaC5oICAgICAgICAgICAgIHwgICAgMyArDQogZHJpdmVycy9uZXQvd2lyZWxl c3MvaXdsd2lmaS9pd2wtdHJhbnMuYyAgICAgICAgICAgIHwgIDExMyArKysrKysrDQogZHJpdmVy cy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9pd2wtdHJhbnMuaCAgICAgICAgICAgIHwgICA2MSArKy0t DQogZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9tdm0vY29leC5jICAgICAgICAgICAgIHwg ICA4MSArLS0tLQ0KIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvbXZtL2NvZXhfbGVnYWN5 LmMgICAgICB8ICAgIDIgKy0NCiBkcml2ZXJzL25ldC93aXJlbGVzcy9pd2x3aWZpL212bS9kMy5j ICAgICAgICAgICAgICAgfCAgIDQzICsrLQ0KIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkv bXZtL2RlYnVnZnMtdmlmLmMgICAgICB8ICAgMjEgKy0NCiBkcml2ZXJzL25ldC93aXJlbGVzcy9p d2x3aWZpL212bS9kZWJ1Z2ZzLmMgICAgICAgICAgfCAgICA1ICstDQogZHJpdmVycy9uZXQvd2ly ZWxlc3MvaXdsd2lmaS9tdm0vZnctYXBpLXBvd2VyLmggICAgIHwgICAzNCArKysNCiBkcml2ZXJz L25ldC93aXJlbGVzcy9pd2x3aWZpL212bS9mdy1hcGktc2Nhbi5oICAgICAgfCAgMTM0ICsrKy0t LS0tLQ0KIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvbXZtL2Z3LWFwaS5oICAgICAgICAg ICB8ICAgMjUgKy0NCiBkcml2ZXJzL25ldC93aXJlbGVzcy9pd2x3aWZpL212bS9mdy5jICAgICAg ICAgICAgICAgfCAgIDY3ICsrLS0tDQogZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9tdm0v bWFjODAyMTEuYyAgICAgICAgIHwgIDM2NCArKysrKysrKysrKysrLS0tLS0tLS0tDQogZHJpdmVy cy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9tdm0vbXZtLmggICAgICAgICAgICAgIHwgIDE0MCArKysr LS0tLS0NCiBkcml2ZXJzL25ldC93aXJlbGVzcy9pd2x3aWZpL212bS9udm0uYyAgICAgICAgICAg ICAgfCAgICA4ICstDQogZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9tdm0vb3BzLmMgICAg ICAgICAgICAgIHwgICA0NSArLS0NCiBkcml2ZXJzL25ldC93aXJlbGVzcy9pd2x3aWZpL212bS9y cy5jICAgICAgICAgICAgICAgfCAgIDIzICstDQogZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsd2lm aS9tdm0vcnMuaCAgICAgICAgICAgICAgIHwgICAgMiAtDQogZHJpdmVycy9uZXQvd2lyZWxlc3Mv aXdsd2lmaS9tdm0vcnguYyAgICAgICAgICAgICAgIHwgICAgNSArDQogZHJpdmVycy9uZXQvd2ly ZWxlc3MvaXdsd2lmaS9tdm0vc2Nhbi5jICAgICAgICAgICAgIHwgMTM3MCArKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLQ0KIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvbXZtL3N0YS5jICAg ICAgICAgICAgICB8ICAgMTQgKy0NCiBkcml2ZXJzL25ldC93aXJlbGVzcy9pd2x3aWZpL212bS90 aW1lLWV2ZW50LmMgICAgICAgfCAgIDE1ICstDQogZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsd2lm aS9tdm0vdHQuYyAgICAgICAgICAgICAgIHwgICA0MCArLS0NCiBkcml2ZXJzL25ldC93aXJlbGVz cy9pd2x3aWZpL212bS90eC5jICAgICAgICAgICAgICAgfCAgIDMxICstDQogZHJpdmVycy9uZXQv d2lyZWxlc3MvaXdsd2lmaS9wY2llL2ludGVybmFsLmggICAgICAgIHwgICAgNiArLQ0KIGRyaXZl cnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvcGNpZS90cmFucy5jICAgICAgICAgICB8ICAxNjAgKysr KystLS0tLQ0KIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvcGNpZS90eC5jICAgICAgICAg ICAgICB8ICAgMjUgKy0NCiAzOSBmaWxlcyBjaGFuZ2VkLCAxNjMzIGluc2VydGlvbnMoKyksIDE0 ODAgZGVsZXRpb25zKC0pDQogY3JlYXRlIG1vZGUgMTAwNjQ0IGRyaXZlcnMvbmV0L3dpcmVsZXNz L2l3bHdpZmkvaXdsLXRyYW5zLmMNCg0K

#1 lore raw

PATCH 1/39 iwlwifi: pcie: don't call set_pwr functions for family 8000

From: Luciano Coelho <[email protected]>

We should not call the iwl_pcie_set_pwr() functions in the suspend/resume flows for family 8000, because the register used is locked in devices from this family. Doing this causes an NMI protection error (RT_NMI_INTERRUPT_PREG_PROTECTION).

To fix this, skip those calls if the device family is IWL_DEVICE_FAMILY_8000.

---
 drivers/net/wireless/iwlwifi/pcie/trans.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/wireless/iwlwifi/pcie/trans.c +4 -2
index 8e5be8d..d894338 100644
@@ -1164,7 +1164,8 @@ static void iwl_trans_pcie_d3_suspend(struct iwl_trans *trans, bool test)
 	 */
 	iwl_trans_pcie_tx_reset(trans);
 
-	iwl_pcie_set_pwr(trans, true);
+	if (trans->cfg->device_family != IWL_DEVICE_FAMILY_8000)
+		iwl_pcie_set_pwr(trans, true);
 }
 
 static int iwl_trans_pcie_d3_resume(struct iwl_trans *trans,
@@ -1202,7 +1203,8 @@ static int iwl_trans_pcie_d3_resume(struct iwl_trans *trans,
 		return ret;
 	}
 
-	iwl_pcie_set_pwr(trans, false);
+	if (trans->cfg->device_family != IWL_DEVICE_FAMILY_8000)
+		iwl_pcie_set_pwr(trans, false);
 
 	iwl_trans_pcie_tx_reset(trans);
 
Signature · 1 line
2.1.4
#2 lore raw

PATCH 2/39 iwlwifi: mvm: fix ROC reference accounting

In reply to Grumbach, Emmanuel

From: Eliad Peller <[email protected]>

commit b112889c5af8124 ("iwlwifi: mvm: add Aux ROC request/response flow") added aux ROC flow in addition to the existing ROC flow. While doing it, it moved the ROC reference release to a common work item, which is being called for both the ROC and aux ROC flows.

This resulted in invalid reference accounting, as no reference was taken in case of aux ROC, while a reference was released on completion.

Fix it by adding a reference for the aux ROC as well, and release only the relevant references on completion (according to the set bits).

While at it, convert cancel_work_sync() to flush_work(), in order to make sure the references are being cleaned properly.

Fixes b112889c5af8 ("iwlwifi: mvm: add Aux ROC request/response flow")
---
 drivers/net/wireless/iwlwifi/mvm/debugfs.c    |  5 +++--
 drivers/net/wireless/iwlwifi/mvm/mac80211.c   |  2 +-
 drivers/net/wireless/iwlwifi/mvm/mvm.h        |  1 +
 drivers/net/wireless/iwlwifi/mvm/time-event.c | 15 +++++++++------
 4 files changed, 14 insertions(+), 9 deletions(-)
drivers/net/wireless/iwlwifi/mvm/debugfs.c +3 -2
index 9ac04c1..8c17b94 100644
@@ -6,7 +6,7 @@
  * GPL LICENSE SUMMARY
  *
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -32,7 +32,7 @@
  * BSD LICENSE
  *
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1356,6 +1356,7 @@ static ssize_t iwl_dbgfs_d0i3_refs_read(struct file *file,
 	PRINT_MVM_REF(IWL_MVM_REF_UCODE_DOWN);
 	PRINT_MVM_REF(IWL_MVM_REF_SCAN);
 	PRINT_MVM_REF(IWL_MVM_REF_ROC);
+	PRINT_MVM_REF(IWL_MVM_REF_ROC_AUX);
 	PRINT_MVM_REF(IWL_MVM_REF_P2P_CLIENT);
 	PRINT_MVM_REF(IWL_MVM_REF_AP_IBSS);
 	PRINT_MVM_REF(IWL_MVM_REF_USER);
drivers/net/wireless/iwlwifi/mvm/mac80211.c +1 -1
index c131ce6..ccbe575 100644
@@ -1410,7 +1410,7 @@ void __iwl_mvm_mac_stop(struct iwl_mvm *mvm)
 	 * The work item could be running or queued if the
 	 * ROC time event stops just as we get here.
 	 */
-	cancel_work_sync(&mvm->roc_done_wk);
+	flush_work(&mvm->roc_done_wk);
 
 	iwl_trans_stop_device(mvm->trans);
 
drivers/net/wireless/iwlwifi/mvm/mvm.h +1 -0
index 6d33234..dde83ef 100644
@@ -276,6 +276,7 @@ enum iwl_mvm_ref_type {
 	IWL_MVM_REF_UCODE_DOWN,
 	IWL_MVM_REF_SCAN,
 	IWL_MVM_REF_ROC,
+	IWL_MVM_REF_ROC_AUX,
 	IWL_MVM_REF_P2P_CLIENT,
 	IWL_MVM_REF_AP_IBSS,
 	IWL_MVM_REF_USER,
drivers/net/wireless/iwlwifi/mvm/time-event.c +9 -6
index fd7b0d3..a7448cf 100644
@@ -6,7 +6,7 @@
  * GPL LICENSE SUMMARY
  *
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -32,7 +32,7 @@
  * BSD LICENSE
  *
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -108,12 +108,14 @@ void iwl_mvm_roc_done_wk(struct work_struct *wk)
 	 * in the case that the time event actually completed in the firmware
 	 * (which is handled in iwl_mvm_te_handle_notif).
 	 */
-	if (test_and_clear_bit(IWL_MVM_STATUS_ROC_RUNNING, &mvm->status))
+	if (test_and_clear_bit(IWL_MVM_STATUS_ROC_RUNNING, &mvm->status)) {
 		queues |= BIT(IWL_MVM_OFFCHANNEL_QUEUE);
-	if (test_and_clear_bit(IWL_MVM_STATUS_ROC_AUX_RUNNING, &mvm->status))
+		iwl_mvm_unref(mvm, IWL_MVM_REF_ROC);
+	}
+	if (test_and_clear_bit(IWL_MVM_STATUS_ROC_AUX_RUNNING, &mvm->status)) {
 		queues |= BIT(mvm->aux_queue);
-
-	iwl_mvm_unref(mvm, IWL_MVM_REF_ROC);
+		iwl_mvm_unref(mvm, IWL_MVM_REF_ROC_AUX);
+	}
 
 	synchronize_net();
 
@@ -393,6 +395,7 @@ static int iwl_mvm_aux_roc_te_handle_notif(struct iwl_mvm *mvm,
 	} else if (le32_to_cpu(notif->action) == TE_V2_NOTIF_HOST_EVENT_START) {
 		set_bit(IWL_MVM_STATUS_ROC_AUX_RUNNING, &mvm->status);
 		te_data->running = true;
+		iwl_mvm_ref(mvm, IWL_MVM_REF_ROC_AUX);
 		ieee80211_ready_on_channel(mvm->hw); /* Start TE */
 	} else {
 		IWL_DEBUG_TE(mvm,
Signature · 1 line
2.1.4
#3 lore raw

PATCH 3/39 iwlwifi: pcie: fix tracking of cmd_in_flight

In reply to Grumbach, Emmanuel

From: Ilan Peer <[email protected]>

The cmd_in_flight tracking was introduced to workaround faulty power management hardware, by having the driver keep the NIC awake as long as there are commands in flight. However, some of the code handling this workaround was unconditionally executed, which resulted with an inconsistent state where the driver assumed that the NIC was awake although it wasn't.

Fix this by renaming 'cmd_in_flight' to 'cmd_hold_nic_awake' and handling the NIC requested awake state only for hardwares for which the workaround is needed.

---
 drivers/net/wireless/iwlwifi/pcie/internal.h |  6 +++---
 drivers/net/wireless/iwlwifi/pcie/trans.c    |  4 ++--
 drivers/net/wireless/iwlwifi/pcie/tx.c       | 23 +++++++++--------------
 3 files changed, 14 insertions(+), 19 deletions(-)
drivers/net/wireless/iwlwifi/pcie/internal.h +3 -3
index 01996c9..376b84e 100644
@@ -1,7 +1,7 @@
 /******************************************************************************
  *
- * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2003 - 2015 Intel Corporation. All rights reserved.
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  *
  * Portions of this file are derived from the ipw3945 project, as well
  * as portions of the ieee80211 subsystem header files.
@@ -320,7 +320,7 @@ struct iwl_trans_pcie {
 
 	/*protect hw register */
 	spinlock_t reg_lock;
-	bool cmd_in_flight;
+	bool cmd_hold_nic_awake;
 	bool ref_cmd_in_flight;
 
 	/* protect ref counter */
drivers/net/wireless/iwlwifi/pcie/trans.c +2 -2
index d894338..1cb1204 100644
@@ -1392,7 +1392,7 @@ static bool iwl_trans_pcie_grab_nic_access(struct iwl_trans *trans, bool silent,
 
 	spin_lock_irqsave(&trans_pcie->reg_lock, *flags);
 
-	if (trans_pcie->cmd_in_flight)
+	if (trans_pcie->cmd_hold_nic_awake)
 		goto out;
 
 	/* this bit wakes up the NIC */
@@ -1458,7 +1458,7 @@ static void iwl_trans_pcie_release_nic_access(struct iwl_trans *trans,
 	 */
 	__acquire(&trans_pcie->reg_lock);
 
-	if (trans_pcie->cmd_in_flight)
+	if (trans_pcie->cmd_hold_nic_awake)
 		goto out;
 
 	__iwl_trans_pcie_clear_bit(trans, CSR_GP_CNTRL,
drivers/net/wireless/iwlwifi/pcie/tx.c +9 -14
index 06952aa..5ef8044 100644
@@ -1039,18 +1039,14 @@ static int iwl_pcie_set_cmd_in_flight(struct iwl_trans *trans,
 		iwl_trans_pcie_ref(trans);
 	}
 
-	if (trans_pcie->cmd_in_flight)
-		return 0;
-
-	trans_pcie->cmd_in_flight = true;
-
 	/*
 	 * wake up the NIC to make sure that the firmware will see the host
 	 * command - we will let the NIC sleep once all the host commands
 	 * returned. This needs to be done only on NICs that have
 	 * apmg_wake_up_wa set.
 	 */
-	if (trans->cfg->base_params->apmg_wake_up_wa) {
+	if (trans->cfg->base_params->apmg_wake_up_wa &&
+	    !trans_pcie->cmd_hold_nic_awake) {
 		__iwl_trans_pcie_set_bit(trans, CSR_GP_CNTRL,
 					 CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
 		if (trans->cfg->device_family == IWL_DEVICE_FAMILY_8000)
@@ -1064,10 +1060,10 @@ static int iwl_pcie_set_cmd_in_flight(struct iwl_trans *trans,
 		if (ret < 0) {
 			__iwl_trans_pcie_clear_bit(trans, CSR_GP_CNTRL,
 					CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
-			trans_pcie->cmd_in_flight = false;
 			IWL_ERR(trans, "Failed to wake NIC for hcmd\n");
 			return -EIO;
 		}
+		trans_pcie->cmd_hold_nic_awake = true;
 	}
 
 	return 0;
@@ -1085,15 +1081,14 @@ static int iwl_pcie_clear_cmd_in_flight(struct iwl_trans *trans)
 		iwl_trans_pcie_unref(trans);
 	}
 
-	if (WARN_ON(!trans_pcie->cmd_in_flight))
-		return 0;
-
-	trans_pcie->cmd_in_flight = false;
+	if (trans->cfg->base_params->apmg_wake_up_wa) {
+		if (WARN_ON(!trans_pcie->cmd_hold_nic_awake))
+			return 0;
 
-	if (trans->cfg->base_params->apmg_wake_up_wa)
+		trans_pcie->cmd_hold_nic_awake = false;
 		__iwl_trans_pcie_clear_bit(trans, CSR_GP_CNTRL,
-					CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
-
+					   CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
+	}
 	return 0;
 }
 
Signature · 1 line
2.1.4
#4 lore raw

PATCH 4/39 iwlwifi: Remove use of the deprecacted PTR_RET

In reply to Grumbach, Emmanuel

From: Nicholas Krause <[email protected]>

This removes the use of the two deprecated calls to the macro PTR_RET in iwl_mvm_get_regdomain and replaces them both to PTR_ERR_OR_ZERO.

[Commit message editing]
---
 drivers/net/wireless/iwlwifi/mvm/mac80211.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/iwlwifi/mvm/mac80211.c +2 -2
index ccbe575..677143c 100644
@@ -318,7 +318,7 @@ struct ieee80211_regdomain *iwl_mvm_get_regdomain(struct wiphy *wiphy,
 	resp = iwl_mvm_update_mcc(mvm, alpha2, src_id);
 	if (IS_ERR_OR_NULL(resp)) {
 		IWL_DEBUG_LAR(mvm, "Could not get update from FW %d\n",
-			      PTR_RET(resp));
+			      PTR_ERR_OR_ZERO(resp));
 		goto out;
 	}
 
@@ -334,7 +334,7 @@ struct ieee80211_regdomain *iwl_mvm_get_regdomain(struct wiphy *wiphy,
 	kfree(resp);
 	if (IS_ERR_OR_NULL(regd)) {
 		IWL_DEBUG_LAR(mvm, "Could not get parse update from FW %d\n",
-			      PTR_RET(regd));
+			      PTR_ERR_OR_ZERO(regd));
 		goto out;
 	}
 
Signature · 1 line
2.1.4
#5 lore raw

PATCH 5/39 iwlwifi: mvm: small fix in a comment about UMAC scan schedules

In reply to Grumbach, Emmanuel

From: Luciano Coelho <[email protected]>

The UMAC API supports multiple scan schedules, but now we use only a single one. Change the comment to make this clear and avoid confusion.

---
 drivers/net/wireless/iwlwifi/mvm/scan.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/iwlwifi/mvm/scan.c +2 -2
index e50fd3f..e54432a 100644
@@ -1222,8 +1222,8 @@ static int iwl_mvm_scan_umac(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 	iwl_mvm_umac_scan_cfg_channels(mvm, params->channels,
 				       params->n_channels, ssid_bitmap, cmd);
 
-	/* With UMAC we can have only one schedule, so use the sum of
-	 * the iterations (with a a maximum of 255).
+	/* With UMAC we use only one schedule for now, so use the sum
+	 * of the iterations (with a a maximum of 255).
 	 */
 	sec_part->schedule[0].iter_count =
 		(n_iterations > 255) ? 255 : n_iterations;
Signature · 1 line
2.1.4
#6 lore raw

PATCH 6/39 iwlwifi: refactor common transport alloc/init code

In reply to Grumbach, Emmanuel

From: Johannes Berg <[email protected]>

The transport modules all need to allocate memory and set up certain values. Refactor that code into a new common function to share it and to simplify the error handling.

---
 drivers/net/wireless/iwlwifi/Makefile     |   1 +
 drivers/net/wireless/iwlwifi/iwl-trans.c  | 113 ++++++++++++++++++++++++++++++
 drivers/net/wireless/iwlwifi/iwl-trans.h  |  20 +++---
 drivers/net/wireless/iwlwifi/pcie/trans.c |  40 ++---------
 4 files changed, 131 insertions(+), 43 deletions(-)
 create mode 100644 drivers/net/wireless/iwlwifi/iwl-trans.c
drivers/net/wireless/iwlwifi/Makefile +1 -0
index 3d32f41..dbfc5b1 100644
@@ -9,6 +9,7 @@ iwlwifi-objs		+= iwl-phy-db.o iwl-nvm-parse.o
 iwlwifi-objs		+= pcie/drv.o pcie/rx.o pcie/tx.o pcie/trans.o
 iwlwifi-$(CONFIG_IWLDVM) += iwl-1000.o iwl-2000.o iwl-5000.o iwl-6000.o
 iwlwifi-$(CONFIG_IWLMVM) += iwl-7000.o iwl-8000.o
+iwlwifi-objs		+= iwl-trans.o
 
 iwlwifi-objs += $(iwlwifi-m)
 
drivers/net/wireless/iwlwifi/iwl-trans.c new file +113 -0

113 lines not on this page · raw message

drivers/net/wireless/iwlwifi/iwl-trans.h +10 -10
index 56254a8..eb34b94 100644
@@ -1011,19 +1011,19 @@ static inline void iwl_trans_fw_error(struct iwl_trans *trans)
 }
 
 /*****************************************************
+ * transport helper functions
+ *****************************************************/
+struct iwl_trans *iwl_trans_alloc(unsigned int priv_size,
+				  struct device *dev,
+				  const struct iwl_cfg *cfg,
+				  const struct iwl_trans_ops *ops,
+				  size_t dev_cmd_headroom);
+void iwl_trans_free(struct iwl_trans *trans);
+
+/*****************************************************
 * driver (transport) register/unregister functions
 ******************************************************/
 int __must_check iwl_pci_register_driver(void);
 void iwl_pci_unregister_driver(void);
 
-static inline void trans_lockdep_init(struct iwl_trans *trans)
-{
-#ifdef CONFIG_LOCKDEP
-	static struct lock_class_key __key;
-
-	lockdep_init_map(&trans->sync_cmd_lockdep_map, "sync_cmd_lockdep_map",
-			 &__key, 0);
-#endif
-}
-
 #endif /* __iwl_trans_h__ */
drivers/net/wireless/iwlwifi/pcie/trans.c +7 -33
index 1cb1204..dd1f828 100644
@@ -1366,14 +1366,13 @@ void iwl_trans_pcie_free(struct iwl_trans *trans)
 	iounmap(trans_pcie->hw_base);
 	pci_release_regions(trans_pcie->pci_dev);
 	pci_disable_device(trans_pcie->pci_dev);
-	kmem_cache_destroy(trans->dev_cmd_pool);
 
 	if (trans_pcie->napi.poll)
 		netif_napi_del(&trans_pcie->napi);
 
 	iwl_pcie_free_fw_monitor(trans);
 
-	kfree(trans);
+	iwl_trans_free(trans);
 }
 
 static void iwl_trans_pcie_set_pmi(struct iwl_trans *trans, bool state)
@@ -2466,18 +2465,13 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
 	u16 pci_cmd;
 	int err;
 
-	trans = kzalloc(sizeof(struct iwl_trans) +
-			sizeof(struct iwl_trans_pcie), GFP_KERNEL);
-	if (!trans) {
-		err = -ENOMEM;
-		goto out;
-	}
+	trans = iwl_trans_alloc(sizeof(struct iwl_trans_pcie),
+				&pdev->dev, cfg, &trans_ops_pcie, 0);
+	if (!trans)
+		return ERR_PTR(-ENOMEM);
 
 	trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
-	trans->ops = &trans_ops_pcie;
-	trans->cfg = cfg;
-	trans_lockdep_init(trans);
 	trans_pcie->trans = trans;
 	spin_lock_init(&trans_pcie->irq_lock);
 	spin_lock_init(&trans_pcie->reg_lock);
@@ -2601,25 +2595,8 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
 	/* Initialize the wait queue for commands */
 	init_waitqueue_head(&trans_pcie->wait_command_queue);
 
-	snprintf(trans->dev_cmd_pool_name, sizeof(trans->dev_cmd_pool_name),
-		 "iwl_cmd_pool:%s", dev_name(trans->dev));
-
-	trans->dev_cmd_headroom = 0;
-	trans->dev_cmd_pool =
-		kmem_cache_create(trans->dev_cmd_pool_name,
-				  sizeof(struct iwl_device_cmd)
-				  + trans->dev_cmd_headroom,
-				  sizeof(void *),
-				  SLAB_HWCACHE_ALIGN,
-				  NULL);
-
-	if (!trans->dev_cmd_pool) {
-		err = -ENOMEM;
-		goto out_pci_disable_msi;
-	}
-
 	if (iwl_pcie_alloc_ict(trans))
-		goto out_free_cmd_pool;
+		goto out_pci_disable_msi;
 
 	err = request_threaded_irq(pdev->irq, iwl_pcie_isr,
 				   iwl_pcie_irq_handler,
@@ -2636,8 +2613,6 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
 
 out_free_ict:
 	iwl_pcie_free_ict(trans);
-out_free_cmd_pool:
-	kmem_cache_destroy(trans->dev_cmd_pool);
 out_pci_disable_msi:
 	pci_disable_msi(pdev);
 out_pci_release_regions:
@@ -2645,7 +2620,6 @@ out_pci_release_regions:
 out_pci_disable_device:
 	pci_disable_device(pdev);
 out_no_pci:
-	kfree(trans);
-out:
+	iwl_trans_free(trans);
 	return ERR_PTR(err);
 }
Signature · 1 line
2.1.4
#7 lore raw

PATCH 7/39 iwlwifi: dump API to 14

In reply to Grumbach, Emmanuel

The iwlmvm driver is now able to handle -14.ucode.

---
 drivers/net/wireless/iwlwifi/iwl-7000.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/iwlwifi/iwl-7000.c +1 -1
index 0afe494..b40b385 100644
@@ -69,7 +69,7 @@
 #include "iwl-agn-hw.h"
 
 /* Highest firmware API version supported */
-#define IWL7260_UCODE_API_MAX	13
+#define IWL7260_UCODE_API_MAX	14
 
 /* Oldest version we won't warn about */
 #define IWL7260_UCODE_API_OK	12
Signature · 1 line
2.1.4
#8 lore raw

Re: [PATCH 07/39] iwlwifi: dump API to 14

Quoted 1 line · Emmanuel Grumbach

The iwlmvm driver is now able to handle -14.ucode.

Dump? Bump? ;)

#9 lore raw

Re: [PATCH 07/39] iwlwifi: dump API to 14

T24gVHVlLCAyMDE1LTA1LTI2IGF0IDIxOjM5ICswMjAwLCBSYWZhxYIgTWnFgmVja2kgd3JvdGU6 DQo+IE9uIDI2IE1heSAyMDE1IGF0IDIxOjE3LCBFbW1hbnVlbCBHcnVtYmFjaCA8ZW1tYW51ZWwu Z3J1bWJhY2hAaW50ZWwuY29tPiB3cm90ZToNCj4gPiBUaGUgaXdsbXZtIGRyaXZlciBpcyBub3cg YWJsZSB0byBoYW5kbGUgLTE0LnVjb2RlLg0KPiANCj4gRHVtcD8gQnVtcD8gOykNCg0KSGEhIFNv bWVvbmUgYWN0dWFsbHkgbG9va2luZyBhdCB0aGUgcGF0Y2hlcy4gR29vZCB0aGluZy4gTm8sIGl0 IHdhcyBub3QNCm9uIHB1cnBvc2UgOykNCg==

#10 lore raw

PATCH 8/39 iwlwifi: pcie: simplify return value

In reply to Grumbach, Emmanuel

This was spot by Coccinelle.

---
 drivers/net/wireless/iwlwifi/pcie/trans.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/net/wireless/iwlwifi/pcie/trans.c +2 -6
index dd1f828..d392ef4 100644
@@ -973,12 +973,8 @@ static int iwl_pcie_load_given_ucode_8000(struct iwl_trans *trans,
 		return ret;
 
 	/* load to FW the binary sections of CPU2 */
-	ret = iwl_pcie_load_cpu_sections_8000(trans, image, 2,
-					      &first_ucode_section);
-	if (ret)
-		return ret;
-
-	return 0;
+	return iwl_pcie_load_cpu_sections_8000(trans, image, 2,
+					       &first_ucode_section);
 }
 
 static int iwl_trans_pcie_start_fw(struct iwl_trans *trans,
Signature · 1 line
2.1.4
#11 lore raw

PATCH 9/39 iwlwifi: mvm: Add debugfs entry for Tx power limit

In reply to Grumbach, Emmanuel

From: Matti Gottlieb <[email protected]>

Add debugfs entry for showing the different Tx power restrictions that are caused due to various reasons.

---
 drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)
drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c +19 -2
index 5f37eab..5c8a65d 100644
@@ -6,7 +6,7 @@
  * GPL LICENSE SUMMARY
  *
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -32,7 +32,7 @@
  * BSD LICENSE
  *
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -190,6 +190,21 @@ static ssize_t iwl_dbgfs_pm_params_write(struct ieee80211_vif *vif, char *buf,
 	return ret ?: count;
 }
 
+static ssize_t iwl_dbgfs_tx_pwr_lmt_read(struct file *file,
+					 char __user *user_buf,
+					 size_t count, loff_t *ppos)
+{
+	struct ieee80211_vif *vif = file->private_data;
+	char buf[64];
+	int bufsz = sizeof(buf);
+	int pos;
+
+	pos = scnprintf(buf, bufsz, "bss limit = %d\n",
+			vif->bss_conf.txpower);
+
+	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
+}
+
 static ssize_t iwl_dbgfs_pm_params_read(struct file *file,
 					char __user *user_buf,
 					size_t count, loff_t *ppos)
@@ -607,6 +622,7 @@ static ssize_t iwl_dbgfs_rx_phyinfo_read(struct file *file,
 	} while (0)
 
 MVM_DEBUGFS_READ_FILE_OPS(mac_params);
+MVM_DEBUGFS_READ_FILE_OPS(tx_pwr_lmt);
 MVM_DEBUGFS_READ_WRITE_FILE_OPS(pm_params, 32);
 MVM_DEBUGFS_READ_WRITE_FILE_OPS(bf_params, 256);
 MVM_DEBUGFS_READ_WRITE_FILE_OPS(low_latency, 10);
@@ -641,6 +657,7 @@ void iwl_mvm_vif_dbgfs_register(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
 		MVM_DEBUGFS_ADD_FILE_VIF(pm_params, mvmvif->dbgfs_dir, S_IWUSR |
 					 S_IRUSR);
 
+	MVM_DEBUGFS_ADD_FILE_VIF(tx_pwr_lmt, mvmvif->dbgfs_dir, S_IRUSR);
 	MVM_DEBUGFS_ADD_FILE_VIF(mac_params, mvmvif->dbgfs_dir, S_IRUSR);
 	MVM_DEBUGFS_ADD_FILE_VIF(low_latency, mvmvif->dbgfs_dir,
 				 S_IRUSR | S_IWUSR);
Signature · 1 line
2.1.4
#12 lore raw

PATCH 10/39 iwlwifi: 8000: fallback to default NVM file

In reply to Grumbach, Emmanuel

From: Eran Harary <[email protected]>

Set a default NVM in case the userspace specifies a file that doesn't match the hardware version. This allows not to change the boot scripts when someone replaces the device with a newer hardware step.

---
 drivers/net/wireless/iwlwifi/iwl-8000.c | 48 ++++++++++++++++-----------------
 drivers/net/wireless/iwlwifi/mvm/nvm.c  |  8 +++---
 drivers/net/wireless/iwlwifi/mvm/ops.c  | 17 +++++-------
 3 files changed, 34 insertions(+), 39 deletions(-)
drivers/net/wireless/iwlwifi/iwl-8000.c +23 -25
index ce6321b..75881f9 100644
@@ -6,7 +6,7 @@
  * GPL LICENSE SUMMARY
  *
  * Copyright(c) 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2014 - 2015 Intel Mobile Communications GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -32,7 +32,7 @@
  * BSD LICENSE
  *
  * Copyright(c) 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2014 - 2015 Intel Mobile Communications GmbH
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -69,7 +69,7 @@
 #include "iwl-agn-hw.h"
 
 /* Highest firmware API version supported */
-#define IWL8000_UCODE_API_MAX	13
+#define IWL8000_UCODE_API_MAX	14
 
 /* Oldest version we won't warn about */
 #define IWL8000_UCODE_API_OK	12
@@ -122,24 +122,26 @@ static const struct iwl_ht_params iwl8000_ht_params = {
 	.ht40_bands = BIT(IEEE80211_BAND_2GHZ) | BIT(IEEE80211_BAND_5GHZ),
 };
 
-#define IWL_DEVICE_8000						\
-	.ucode_api_max = IWL8000_UCODE_API_MAX,			\
-	.ucode_api_ok = IWL8000_UCODE_API_OK,			\
-	.ucode_api_min = IWL8000_UCODE_API_MIN,			\
-	.device_family = IWL_DEVICE_FAMILY_8000,		\
-	.max_inst_size = IWL60_RTC_INST_SIZE,			\
-	.max_data_size = IWL60_RTC_DATA_SIZE,			\
-	.base_params = &iwl8000_base_params,			\
-	.led_mode = IWL_LED_RF_STATE,				\
-	.nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_8000,	\
-	.d0i3 = true,						\
-	.non_shared_ant = ANT_A,				\
-	.dccm_offset = IWL8260_DCCM_OFFSET,			\
-	.dccm_len = IWL8260_DCCM_LEN,				\
-	.dccm2_offset = IWL8260_DCCM2_OFFSET,			\
-	.dccm2_len = IWL8260_DCCM2_LEN,				\
-	.smem_offset = IWL8260_SMEM_OFFSET,			\
-	.smem_len = IWL8260_SMEM_LEN
+#define IWL_DEVICE_8000							\
+	.ucode_api_max = IWL8000_UCODE_API_MAX,				\
+	.ucode_api_ok = IWL8000_UCODE_API_OK,				\
+	.ucode_api_min = IWL8000_UCODE_API_MIN,				\
+	.device_family = IWL_DEVICE_FAMILY_8000,			\
+	.max_inst_size = IWL60_RTC_INST_SIZE,				\
+	.max_data_size = IWL60_RTC_DATA_SIZE,				\
+	.base_params = &iwl8000_base_params,				\
+	.led_mode = IWL_LED_RF_STATE,					\
+	.nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_8000,		\
+	.d0i3 = true,							\
+	.non_shared_ant = ANT_A,					\
+	.dccm_offset = IWL8260_DCCM_OFFSET,				\
+	.dccm_len = IWL8260_DCCM_LEN,					\
+	.dccm2_offset = IWL8260_DCCM2_OFFSET,				\
+	.dccm2_len = IWL8260_DCCM2_LEN,					\
+	.smem_offset = IWL8260_SMEM_OFFSET,				\
+	.smem_len = IWL8260_SMEM_LEN,					\
+	.default_nvm_file_B_step = DEFAULT_NVM_FILE_FAMILY_8000B,	\
+	.default_nvm_file_C_step = DEFAULT_NVM_FILE_FAMILY_8000C
 
 const struct iwl_cfg iwl8260_2n_cfg = {
 	.name = "Intel(R) Dual Band Wireless N 8260",
@@ -177,8 +179,6 @@ const struct iwl_cfg iwl8260_2ac_sdio_cfg = {
 	.ht_params = &iwl8000_ht_params,
 	.nvm_ver = IWL8000_NVM_VERSION,
 	.nvm_calib_ver = IWL8000_TX_POWER_VERSION,
-	.default_nvm_file_B_step = DEFAULT_NVM_FILE_FAMILY_8000B,
-	.default_nvm_file_C_step = DEFAULT_NVM_FILE_FAMILY_8000C,
 	.max_rx_agg_size = MAX_RX_AGG_SIZE_8260_SDIO,
 	.disable_dummy_notification = true,
 	.max_ht_ampdu_exponent  = MAX_HT_AMPDU_EXPONENT_8260_SDIO,
@@ -192,8 +192,6 @@ const struct iwl_cfg iwl4165_2ac_sdio_cfg = {
 	.ht_params = &iwl8000_ht_params,
 	.nvm_ver = IWL8000_NVM_VERSION,
 	.nvm_calib_ver = IWL8000_TX_POWER_VERSION,
-	.default_nvm_file_B_step = DEFAULT_NVM_FILE_FAMILY_8000B,
-	.default_nvm_file_C_step = DEFAULT_NVM_FILE_FAMILY_8000C,
 	.max_rx_agg_size = MAX_RX_AGG_SIZE_8260_SDIO,
 	.bt_shared_single_ant = true,
 	.disable_dummy_notification = true,
drivers/net/wireless/iwlwifi/mvm/nvm.c +4 -4
index 87b2a30..4701424 100644
@@ -6,7 +6,7 @@
  * GPL LICENSE SUMMARY
  *
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -32,7 +32,7 @@
  * BSD LICENSE
  *
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -583,9 +583,9 @@ int iwl_nvm_init(struct iwl_mvm *mvm, bool read_nvm_from_nic)
 		kfree(nvm_buffer);
 	}
 
-	/* load external NVM if configured */
+	/* Only if PNVM selected in the mod param - load external NVM  */
 	if (mvm->nvm_file_name) {
-		/* read External NVM file - take the default */
+		/* read External NVM file from the mod param */
 		ret = iwl_mvm_read_external_nvm(mvm);
 		if (ret) {
 			/* choose the nvm_file name according to the
drivers/net/wireless/iwlwifi/mvm/ops.c +7 -10
index 02028bc..534a9fd 100644
@@ -6,7 +6,7 @@
  * GPL LICENSE SUMMARY
  *
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -32,7 +32,7 @@
  * BSD LICENSE
  *
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -517,15 +517,12 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
 
 	min_backoff = calc_min_backoff(trans, cfg);
 	iwl_mvm_tt_initialize(mvm, min_backoff);
-	/* set the nvm_file_name according to priority */
-	if (iwlwifi_mod_params.nvm_file) {
+
+	if (iwlwifi_mod_params.nvm_file)
 		mvm->nvm_file_name = iwlwifi_mod_params.nvm_file;
-	} else if (trans->cfg->device_family == IWL_DEVICE_FAMILY_8000) {
-		if (CSR_HW_REV_STEP(trans->hw_rev) == SILICON_B_STEP)
-			mvm->nvm_file_name = mvm->cfg->default_nvm_file_B_step;
-		else
-			mvm->nvm_file_name = mvm->cfg->default_nvm_file_C_step;
-	}
+	else
+		IWL_DEBUG_EEPROM(mvm->trans->dev,
+				 "working without external nvm file\n");
 
 	if (WARN(cfg->no_power_up_nic_in_init && !mvm->nvm_file_name,
 		 "not allowing power-up and not having nvm_file\n"))
Signature · 1 line
2.1.4
#13 lore raw

PATCH 11/39 iwlwifi: update thermal throttling values for 8000 devices

In reply to Grumbach, Emmanuel

From: Ido Yariv <[email protected]>

8000 devices have different thermal throttling values from previous generations.

---
 drivers/net/wireless/iwlwifi/iwl-8000.c | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)
drivers/net/wireless/iwlwifi/iwl-8000.c +23 -1
index 75881f9..5dca838 100644
@@ -122,6 +122,27 @@ static const struct iwl_ht_params iwl8000_ht_params = {
 	.ht40_bands = BIT(IEEE80211_BAND_2GHZ) | BIT(IEEE80211_BAND_5GHZ),
 };
 
+static const struct iwl_tt_params iwl8000_tt_params = {
+	.ct_kill_entry = 115,
+	.ct_kill_exit = 93,
+	.ct_kill_duration = 5,
+	.dynamic_smps_entry = 111,
+	.dynamic_smps_exit = 107,
+	.tx_protection_entry = 112,
+	.tx_protection_exit = 105,
+	.tx_backoff = {
+		{.temperature = 110, .backoff = 200},
+		{.temperature = 111, .backoff = 600},
+		{.temperature = 112, .backoff = 1200},
+		{.temperature = 113, .backoff = 2000},
+		{.temperature = 114, .backoff = 4000},
+	},
+	.support_ct_kill = true,
+	.support_dynamic_smps = true,
+	.support_tx_protection = true,
+	.support_tx_backoff = true,
+};
+
 #define IWL_DEVICE_8000							\
 	.ucode_api_max = IWL8000_UCODE_API_MAX,				\
 	.ucode_api_ok = IWL8000_UCODE_API_OK,				\
@@ -141,7 +162,8 @@ static const struct iwl_ht_params iwl8000_ht_params = {
 	.smem_offset = IWL8260_SMEM_OFFSET,				\
 	.smem_len = IWL8260_SMEM_LEN,					\
 	.default_nvm_file_B_step = DEFAULT_NVM_FILE_FAMILY_8000B,	\
-	.default_nvm_file_C_step = DEFAULT_NVM_FILE_FAMILY_8000C
+	.default_nvm_file_C_step = DEFAULT_NVM_FILE_FAMILY_8000C,	\
+	.thermal_params = &iwl8000_tt_params
 
 const struct iwl_cfg iwl8260_2n_cfg = {
 	.name = "Intel(R) Dual Band Wireless N 8260",
Signature · 1 line
2.1.4
#14 lore raw

PATCH 12/39 iwlwifi: mvm: advertise randomised netdetect MAC address

In reply to Grumbach, Emmanuel

From: Johannes Berg <[email protected]>

According to the nl80211 documentation, we can neither advertise scheduled scan nor netdetect address randomisation. However, all the products that currently require this don't have a need for the full randomisation.

Therefore, advertise the feature anyway which results in host- based randomisation, done whenever the system suspends. This is sufficient for the platforms currently requiring this feature.

If we ever extend this in the future to do full randomisation in the firmware, then certainly this will still be sufficient for the current requirements, so it doesn't make a lot of sense to split the feature bits.

---
 drivers/net/wireless/iwlwifi/mvm/mac80211.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/wireless/iwlwifi/mvm/mac80211.c +2 -1
index 677143c..d13138e 100644
@@ -452,7 +452,8 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
 	hw->flags |= IEEE80211_SINGLE_HW_SCAN_ON_ALL_BANDS;
 	hw->wiphy->features |=
 		NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR |
-		NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR;
+		NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR |
+		NL80211_FEATURE_ND_RANDOM_MAC_ADDR;
 
 	hw->sta_data_size = sizeof(struct iwl_mvm_sta);
 	hw->vif_data_size = sizeof(struct iwl_mvm_vif);
Signature · 1 line
2.1.4
#15 lore raw

PATCH 13/39 iwlwifi: mvm: handle device start failure correctly

In reply to Grumbach, Emmanuel

From: Johannes Berg <[email protected]>

If the device fails to start correctly prior to loading the regular runtime firmware (after having run the INIT firmware), treat that error correctly by actually checking the return value of _iwl_trans_start_hw() and stopping the device again before returning an error.

---
 drivers/net/wireless/iwlwifi/mvm/fw.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/iwlwifi/mvm/fw.c +2 -2
index 0601445..2f76fb2 100644
@@ -662,9 +662,9 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
 		 * device that are triggered by the INIT firwmare (MFUART).
 		 */
 		_iwl_trans_stop_device(mvm->trans, false);
-		_iwl_trans_start_hw(mvm->trans, false);
+		ret = _iwl_trans_start_hw(mvm->trans, false);
 		if (ret)
-			return ret;
+			goto error;
 	}
 
 	if (iwlmvm_mod_params.init_dbg)
Signature · 1 line
2.1.4
#16 lore raw

PATCH 14/39 iwlwifi: mvm: Configure agg. queue before assigning it to STA

In reply to Grumbach, Emmanuel

From: Andrei Otcheretianski <[email protected]>

In order to imeplement the extended VI session feature for Miracast, the FW requires to detect the VI queue. The detection of the VI queue is done when it is assigned to a STA with ADD_STA command, so by this time the FW expects the queue to be already configured (mapped to VI AC and aggregation enabled). Previously, the queue configuration was done after STA modificaton which broke the extended VI session feature and resulted in higher latencies. Fix this by calling iwl_mvm_enable_agg_txq before station modification.

---
 drivers/net/wireless/iwlwifi/mvm/sta.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/net/wireless/iwlwifi/mvm/sta.c +7 -7
index 1845b79..d68dc69 100644
@@ -5,8 +5,8 @@
  *
  * GPL LICENSE SUMMARY
  *
- * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2012 - 2015 Intel Corporation. All rights reserved.
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -31,8 +31,8 @@
  *
  * BSD LICENSE
  *
- * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2012 - 2015 Intel Corporation. All rights reserved.
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1000,13 +1000,13 @@ int iwl_mvm_sta_tx_agg_oper(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 
 	fifo = iwl_mvm_ac_to_tx_fifo[tid_to_mac80211_ac[tid]];
 
+	iwl_mvm_enable_agg_txq(mvm, queue, fifo, mvmsta->sta_id, tid,
+			       buf_size, ssn, wdg_timeout);
+
 	ret = iwl_mvm_sta_tx_agg(mvm, sta, tid, queue, true);
 	if (ret)
 		return -EIO;
 
-	iwl_mvm_enable_agg_txq(mvm, queue, fifo, mvmsta->sta_id, tid,
-			       buf_size, ssn, wdg_timeout);
-
 	/*
 	 * Even though in theory the peer could have different
 	 * aggregation reorder buffer sizes for different sessions,
Signature · 1 line
2.1.4
#17 lore raw

PATCH 15/39 iwlwifi: mvm: remove the UMAC specific scan types

In reply to Grumbach, Emmanuel

From: Luciano Coelho <[email protected]>

There is no need to have separate definitions for the UMAC scan types, since they are the same as the LMAC types. Remove UMAC scan types and use the generic ones instead.

---
 drivers/net/wireless/iwlwifi/mvm/scan.c | 47 ++++++++++++---------------------
 1 file changed, 17 insertions(+), 30 deletions(-)
drivers/net/wireless/iwlwifi/mvm/scan.c +17 -30
index e54432a..7777d56 100644
@@ -101,13 +101,7 @@ struct iwl_mvm_scan_params {
 	} schedule[2];
 };
 
-enum iwl_umac_scan_uid_type {
-	IWL_UMAC_SCAN_UID_REG_SCAN	= BIT(0),
-	IWL_UMAC_SCAN_UID_SCHED_SCAN	= BIT(1),
-};
-
-static int iwl_umac_scan_stop(struct iwl_mvm *mvm,
-			      enum iwl_umac_scan_uid_type type, bool notify);
+static int iwl_umac_scan_stop(struct iwl_mvm *mvm, int type, bool notify);
 
 static u8 iwl_mvm_scan_rx_ant(struct iwl_mvm *mvm)
 {
@@ -588,8 +582,7 @@ int iwl_mvm_scan_offload_stop(struct iwl_mvm *mvm, bool notify)
 	lockdep_assert_held(&mvm->mutex);
 
 	if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN)
-		return iwl_umac_scan_stop(mvm, IWL_UMAC_SCAN_UID_SCHED_SCAN,
-					  notify);
+		return iwl_umac_scan_stop(mvm, IWL_MVM_SCAN_SCHED, notify);
 
 	/* FIXME: For now we only check if no scan is set here, since
 	 * we only support LMAC in this flow and it doesn't support
@@ -917,8 +910,7 @@ static int iwl_mvm_scan_lmac(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 int iwl_mvm_cancel_scan(struct iwl_mvm *mvm)
 {
 	if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN)
-		return iwl_umac_scan_stop(mvm, IWL_UMAC_SCAN_UID_REG_SCAN,
-					  true);
+		return iwl_umac_scan_stop(mvm, IWL_MVM_SCAN_REGULAR, true);
 
 	if (!(mvm->scan_status & IWL_MVM_SCAN_REGULAR))
 		return 0;
@@ -937,7 +929,7 @@ int iwl_mvm_cancel_scan(struct iwl_mvm *mvm)
 
 struct iwl_umac_scan_done {
 	struct iwl_mvm *mvm;
-	enum iwl_umac_scan_uid_type type;
+	int type;
 };
 
 static int rate_to_scan_rate_flag(unsigned int rate)
@@ -1064,8 +1056,7 @@ static int iwl_mvm_find_free_scan_uid(struct iwl_mvm *mvm)
 	return iwl_mvm_find_scan_uid(mvm, 0);
 }
 
-static bool iwl_mvm_find_scan_type(struct iwl_mvm *mvm,
-				   enum iwl_umac_scan_uid_type type)
+static bool iwl_mvm_find_scan_type(struct iwl_mvm *mvm, int type)
 {
 	int i;
 
@@ -1076,8 +1067,7 @@ static bool iwl_mvm_find_scan_type(struct iwl_mvm *mvm,
 	return false;
 }
 
-static int iwl_mvm_find_first_scan(struct iwl_mvm *mvm,
-				   enum iwl_umac_scan_uid_type type)
+static int iwl_mvm_find_first_scan(struct iwl_mvm *mvm, int type)
 {
 	int i;
 
@@ -1088,8 +1078,7 @@ static int iwl_mvm_find_first_scan(struct iwl_mvm *mvm,
 	return i;
 }
 
-static u32 iwl_generate_scan_uid(struct iwl_mvm *mvm,
-				 enum iwl_umac_scan_uid_type type)
+static u32 iwl_generate_scan_uid(struct iwl_mvm *mvm, int type)
 {
 	u32 uid;
 
@@ -1201,9 +1190,9 @@ static int iwl_mvm_scan_umac(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 	iwl_mvm_scan_umac_dwell(mvm, cmd, params);
 
 	if (n_iterations == 1)
-		uid = iwl_generate_scan_uid(mvm, IWL_UMAC_SCAN_UID_REG_SCAN);
+		uid = iwl_generate_scan_uid(mvm, IWL_MVM_SCAN_REGULAR);
 	else
-		uid = iwl_generate_scan_uid(mvm, IWL_UMAC_SCAN_UID_SCHED_SCAN);
+		uid = iwl_generate_scan_uid(mvm, IWL_MVM_SCAN_SCHED);
 
 	mvm->scan_uid[uid_idx] = uid;
 	cmd->uid = cpu_to_le32(uid);
@@ -1478,7 +1467,7 @@ int iwl_mvm_rx_umac_scan_complete_notif(struct iwl_mvm *mvm,
 	struct iwl_rx_packet *pkt = rxb_addr(rxb);
 	struct iwl_umac_scan_complete *notif = (void *)pkt->data;
 	u32 uid = __le32_to_cpu(notif->uid);
-	bool sched = !!(uid & IWL_UMAC_SCAN_UID_SCHED_SCAN);
+	bool sched = !!(uid & IWL_MVM_SCAN_SCHED);
 	int uid_idx = iwl_mvm_find_scan_uid(mvm, uid);
 
 	/*
@@ -1505,7 +1494,7 @@ int iwl_mvm_rx_umac_scan_complete_notif(struct iwl_mvm *mvm,
 					 notif->status ==
 						IWL_SCAN_OFFLOAD_ABORTED);
 		iwl_mvm_unref(mvm, IWL_MVM_REF_SCAN);
-	} else if (!iwl_mvm_find_scan_type(mvm, IWL_UMAC_SCAN_UID_SCHED_SCAN)) {
+	} else if (!iwl_mvm_find_scan_type(mvm, IWL_MVM_SCAN_SCHED)) {
 		ieee80211_sched_scan_stopped(mvm->hw);
 	} else {
 		IWL_DEBUG_SCAN(mvm, "Another sched scan is running\n");
@@ -1556,8 +1545,7 @@ static int iwl_umac_scan_abort_one(struct iwl_mvm *mvm, u32 uid)
 	return iwl_mvm_send_cmd_pdu(mvm, SCAN_ABORT_UMAC, 0, sizeof(cmd), &cmd);
 }
 
-static int iwl_umac_scan_stop(struct iwl_mvm *mvm,
-			      enum iwl_umac_scan_uid_type type, bool notify)
+static int iwl_umac_scan_stop(struct iwl_mvm *mvm, int type, bool notify)
 {
 	struct iwl_notification_wait wait_scan_done;
 	static const u8 scan_done_notif[] = { SCAN_COMPLETE_UMAC, };
@@ -1579,7 +1567,7 @@ static int iwl_umac_scan_stop(struct iwl_mvm *mvm,
 			int err;
 
 			if (iwl_mvm_is_radio_killed(mvm) &&
-			    (type & IWL_UMAC_SCAN_UID_REG_SCAN)) {
+			    (type & IWL_MVM_SCAN_REGULAR)) {
 				ieee80211_scan_completed(mvm->hw, true);
 				iwl_mvm_unref(mvm, IWL_MVM_REF_SCAN);
 				break;
@@ -1602,9 +1590,9 @@ static int iwl_umac_scan_stop(struct iwl_mvm *mvm,
 		return ret;
 
 	if (notify) {
-		if (type & IWL_UMAC_SCAN_UID_SCHED_SCAN)
+		if (type & IWL_MVM_SCAN_SCHED)
 			ieee80211_sched_scan_stopped(mvm->hw);
-		if (type & IWL_UMAC_SCAN_UID_REG_SCAN) {
+		if (type & IWL_MVM_SCAN_REGULAR) {
 			ieee80211_scan_completed(mvm->hw, true);
 			iwl_mvm_unref(mvm, IWL_MVM_REF_SCAN);
 		}
@@ -1636,13 +1624,12 @@ void iwl_mvm_report_scan_aborted(struct iwl_mvm *mvm)
 	if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN) {
 		u32 uid, i;
 
-		uid = iwl_mvm_find_first_scan(mvm, IWL_UMAC_SCAN_UID_REG_SCAN);
+		uid = iwl_mvm_find_first_scan(mvm, IWL_MVM_SCAN_REGULAR);
 		if (uid < mvm->max_scans) {
 			ieee80211_scan_completed(mvm->hw, true);
 			mvm->scan_uid[uid] = 0;
 		}
-		uid = iwl_mvm_find_first_scan(mvm,
-					      IWL_UMAC_SCAN_UID_SCHED_SCAN);
+		uid = iwl_mvm_find_first_scan(mvm, IWL_MVM_SCAN_SCHED);
 		if (uid < mvm->max_scans && !mvm->restart_fw) {
 			ieee80211_sched_scan_stopped(mvm->hw);
 			mvm->scan_uid[uid] = 0;
Signature · 1 line
2.1.4
#18 lore raw

PATCH 16/39 iwlwifi: mvm: BT Coex - remove useless code

In reply to Grumbach, Emmanuel

Since we don't need to configure the Ack / CTS kill mask anymore in the new API, we don't need to iterate all the interfaces upon rssi event on one of the interfaces. Remove that code.

---
 drivers/net/wireless/iwlwifi/mvm/coex.c | 43 ---------------------------------
 1 file changed, 43 deletions(-)
drivers/net/wireless/iwlwifi/mvm/coex.c +0 -43
index 13a0a03..03dab95 100644
@@ -770,49 +770,10 @@ int iwl_mvm_rx_bt_coex_notif(struct iwl_mvm *mvm,
 	return 0;
 }
 
-static void iwl_mvm_bt_rssi_iterator(void *_data, u8 *mac,
-				   struct ieee80211_vif *vif)
-{
-	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
-	struct iwl_bt_iterator_data *data = _data;
-	struct iwl_mvm *mvm = data->mvm;
-
-	struct ieee80211_sta *sta;
-	struct iwl_mvm_sta *mvmsta;
-
-	struct ieee80211_chanctx_conf *chanctx_conf;
-
-	rcu_read_lock();
-	chanctx_conf = rcu_dereference(vif->chanctx_conf);
-	/* If channel context is invalid or not on 2.4GHz - don't count it */
-	if (!chanctx_conf ||
-	    chanctx_conf->def.chan->band != IEEE80211_BAND_2GHZ) {
-		rcu_read_unlock();
-		return;
-	}
-	rcu_read_unlock();
-
-	if (vif->type != NL80211_IFTYPE_STATION ||
-	    mvmvif->ap_sta_id == IWL_MVM_STATION_COUNT)
-		return;
-
-	sta = rcu_dereference_protected(mvm->fw_id_to_mac_id[mvmvif->ap_sta_id],
-					lockdep_is_held(&mvm->mutex));
-
-	/* This can happen if the station has been removed right now */
-	if (IS_ERR_OR_NULL(sta))
-		return;
-
-	mvmsta = iwl_mvm_sta_from_mac80211(sta);
-}
-
 void iwl_mvm_bt_rssi_event(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 			   enum ieee80211_rssi_event_data rssi_event)
 {
 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
-	struct iwl_bt_iterator_data data = {
-		.mvm = mvm,
-	};
 	int ret;
 
 	if (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_BT_COEX_SPLIT)) {
@@ -853,10 +814,6 @@ void iwl_mvm_bt_rssi_event(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 
 	if (ret)
 		IWL_ERR(mvm, "couldn't send BT_CONFIG HCMD upon RSSI event\n");
-
-	ieee80211_iterate_active_interfaces_atomic(
-		mvm->hw, IEEE80211_IFACE_ITER_NORMAL,
-		iwl_mvm_bt_rssi_iterator, &data);
 }
 
 #define LINK_QUAL_AGG_TIME_LIMIT_DEF	(4000)
Signature · 1 line
2.1.4
#19 lore raw

PATCH 17/39 iwlwifi: mvm: BT Coex - allocate a short command on the stack

In reply to Grumbach, Emmanuel

The BT_CONFIG command used to be very long, hence it was allocated on the heap in the previous API. In the new API, this command is much smaller, and can now safely be allocated on the stack.

---
 drivers/net/wireless/iwlwifi/mvm/coex.c | 36 ++++++++++-----------------------
 1 file changed, 11 insertions(+), 25 deletions(-)
drivers/net/wireless/iwlwifi/mvm/coex.c +11 -25
index 03dab95..a990886 100644
@@ -6,7 +6,7 @@
  * GPL LICENSE SUMMARY
  *
  * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -32,7 +32,7 @@
  * BSD LICENSE
  *
  * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -408,23 +408,12 @@ iwl_get_coex_type(struct iwl_mvm *mvm, const struct ieee80211_vif *vif)
 
 int iwl_send_bt_init_conf(struct iwl_mvm *mvm)
 {
-	struct iwl_bt_coex_cmd *bt_cmd;
-	struct iwl_host_cmd cmd = {
-		.id = BT_CONFIG,
-		.len = { sizeof(*bt_cmd), },
-		.dataflags = { IWL_HCMD_DFL_NOCOPY, },
-	};
-	int ret;
+	struct iwl_bt_coex_cmd bt_cmd = {};
 	u32 mode;
 
 	if (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_BT_COEX_SPLIT))
 		return iwl_send_bt_init_conf_old(mvm);
 
-	bt_cmd = kzalloc(sizeof(*bt_cmd), GFP_KERNEL);
-	if (!bt_cmd)
-		return -ENOMEM;
-	cmd.data[0] = bt_cmd;
-
 	lockdep_assert_held(&mvm->mutex);
 
 	if (unlikely(mvm->bt_force_ant_mode != BT_FORCE_ANT_DIS)) {
@@ -440,36 +429,33 @@ int iwl_send_bt_init_conf(struct iwl_mvm *mvm)
 			mode = 0;
 		}
 
-		bt_cmd->mode = cpu_to_le32(mode);
+		bt_cmd.mode = cpu_to_le32(mode);
 		goto send_cmd;
 	}
 
 	mode = iwlwifi_mod_params.bt_coex_active ? BT_COEX_NW : BT_COEX_DISABLE;
-	bt_cmd->mode = cpu_to_le32(mode);
+	bt_cmd.mode = cpu_to_le32(mode);
 
 	if (IWL_MVM_BT_COEX_SYNC2SCO)
-		bt_cmd->enabled_modules |=
+		bt_cmd.enabled_modules |=
 			cpu_to_le32(BT_COEX_SYNC2SCO_ENABLED);
 
 	if (iwl_mvm_bt_is_plcr_supported(mvm))
-		bt_cmd->enabled_modules |= cpu_to_le32(BT_COEX_CORUN_ENABLED);
+		bt_cmd.enabled_modules |= cpu_to_le32(BT_COEX_CORUN_ENABLED);
 
 	if (IWL_MVM_BT_COEX_MPLUT) {
-		bt_cmd->enabled_modules |= cpu_to_le32(BT_COEX_MPLUT_ENABLED);
-		bt_cmd->enabled_modules |=
+		bt_cmd.enabled_modules |= cpu_to_le32(BT_COEX_MPLUT_ENABLED);
+		bt_cmd.enabled_modules |=
 			cpu_to_le32(BT_COEX_MPLUT_BOOST_ENABLED);
 	}
 
-	bt_cmd->enabled_modules |= cpu_to_le32(BT_COEX_HIGH_BAND_RET);
+	bt_cmd.enabled_modules |= cpu_to_le32(BT_COEX_HIGH_BAND_RET);
 
 send_cmd:
 	memset(&mvm->last_bt_notif, 0, sizeof(mvm->last_bt_notif));
 	memset(&mvm->last_bt_ci_cmd, 0, sizeof(mvm->last_bt_ci_cmd));
 
-	ret = iwl_mvm_send_cmd(mvm, &cmd);
-
-	kfree(bt_cmd);
-	return ret;
+	return iwl_mvm_send_cmd_pdu(mvm, BT_CONFIG, 0, sizeof(bt_cmd), &bt_cmd);
 }
 
 static int iwl_mvm_bt_coex_reduced_txp(struct iwl_mvm *mvm, u8 sta_id,
Signature · 1 line
2.1.4
#20 lore raw

PATCH 18/39 iwlwifi: mvm: print scanned channel list on scan iteration complete notification

In reply to Grumbach, Emmanuel

From: Avraham Stern <[email protected]>

When receiving scan iteration complete notification, print a list of the channels that have been scanned in this iteration. This is useful for debugging.

---
 drivers/net/wireless/iwlwifi/mvm/scan.c | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)
drivers/net/wireless/iwlwifi/mvm/scan.c +21 -2
index 7777d56..e859584 100644
@@ -312,16 +312,35 @@ int iwl_mvm_max_scan_ie_len(struct iwl_mvm *mvm)
 	return max_ie_len;
 }
 
+static u8 *iwl_mvm_dump_channel_list(struct iwl_scan_results_notif *res,
+				     int num_res, u8 *buf, size_t buf_size)
+{
+	int i;
+	u8 *pos = buf, *end = buf + buf_size;
+
+	for (i = 0; pos < end && i < num_res; i++)
+		pos += snprintf(pos, end - pos, " %u", res[i].channel);
+
+	/* terminate the string in case the buffer was too short */
+	*(buf + buf_size - 1) = '\0';
+
+	return buf;
+}
+
 int iwl_mvm_rx_scan_offload_iter_complete_notif(struct iwl_mvm *mvm,
 						struct iwl_rx_cmd_buffer *rxb,
 						struct iwl_device_cmd *cmd)
 {
 	struct iwl_rx_packet *pkt = rxb_addr(rxb);
 	struct iwl_lmac_scan_complete_notif *notif = (void *)pkt->data;
+	u8 buf[256];
 
 	IWL_DEBUG_SCAN(mvm,
-		       "Scan offload iteration complete: status=0x%x scanned channels=%d\n",
-		       notif->status, notif->scanned_channels);
+		       "Scan offload iteration complete: status=0x%x scanned channels=%d channels list: %s\n",
+		       notif->status, notif->scanned_channels,
+		       iwl_mvm_dump_channel_list(notif->results,
+						 notif->scanned_channels, buf,
+						 sizeof(buf)));
 	return 0;
 }
 
Signature · 1 line
2.1.4
#21 lore raw

PATCH 19/39 iwlwifi: mvm: add UMAC scan iteration complete notification

In reply to Grumbach, Emmanuel

From: Avraham Stern <[email protected]>

Add UMAC scan iteration complete notification. This notification can be enabled by setting scan_iter_notif_enabled through debugfs. Upon receiving this notification, print the list of channels that have been scanned in this iteration. This is useful for debugging.

---
 drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 23 +++++++++++++++++++++++
 drivers/net/wireless/iwlwifi/mvm/fw-api.h      |  5 +++--
 drivers/net/wireless/iwlwifi/mvm/mvm.h         |  3 +++
 drivers/net/wireless/iwlwifi/mvm/ops.c         |  3 +++
 drivers/net/wireless/iwlwifi/mvm/scan.c        | 21 +++++++++++++++++++++
 5 files changed, 53 insertions(+), 2 deletions(-)
drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h +23 -0
index be1a0a1..0228693 100644
@@ -837,4 +837,27 @@ struct iwl_scan_offload_profiles_query {
 	struct iwl_scan_offload_profile_match matches[IWL_SCAN_MAX_PROFILES];
 } __packed; /* SCAN_OFFLOAD_PROFILES_QUERY_RSP_S_VER_2 */
 
+/**
+ * struct iwl_umac_scan_iter_complete_notif - notifies end of scanning iteration
+ * @uid: scan id, &enum iwl_umac_scan_uid_offsets
+ * @scanned_channels: number of channels scanned and number of valid elements in
+ *	results array
+ * @status: one of SCAN_COMP_STATUS_*
+ * @bt_status: BT on/off status
+ * @last_channel: last channel that was scanned
+ * @tsf_low: TSF timer (lower half) in usecs
+ * @tsf_high: TSF timer (higher half) in usecs
+ * @results: array of scan results, only "scanned_channels" of them are valid
+ */
+struct iwl_umac_scan_iter_complete_notif {
+	__le32 uid;
+	u8 scanned_channels;
+	u8 status;
+	u8 bt_status;
+	u8 last_channel;
+	__le32 tsf_low;
+	__le32 tsf_high;
+	struct iwl_scan_results_notif results[];
+} __packed; /* SCAN_ITER_COMPLETE_NTF_UMAC_API_S_VER_1 */
+
 #endif
drivers/net/wireless/iwlwifi/mvm/fw-api.h +3 -2
index 56db2ba..0ed7675 100644
@@ -6,7 +6,7 @@
  * GPL LICENSE SUMMARY
  *
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -32,7 +32,7 @@
  * BSD LICENSE
  *
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -108,6 +108,7 @@ enum {
 	ANTENNA_COUPLING_NOTIFICATION = 0xa,
 
 	/* UMAC scan commands */
+	SCAN_ITERATION_COMPLETE_UMAC = 0xb5,
 	SCAN_CFG_CMD = 0xc,
 	SCAN_REQ_UMAC = 0xd,
 	SCAN_ABORT_UMAC = 0xe,
drivers/net/wireless/iwlwifi/mvm/mvm.h +3 -0
index dde83ef..d4e0cab 100644
@@ -1150,6 +1150,9 @@ int iwl_mvm_config_scan(struct iwl_mvm *mvm);
 int iwl_mvm_rx_umac_scan_complete_notif(struct iwl_mvm *mvm,
 					struct iwl_rx_cmd_buffer *rxb,
 					struct iwl_device_cmd *cmd);
+int iwl_mvm_rx_umac_scan_iter_complete_notif(struct iwl_mvm *mvm,
+					     struct iwl_rx_cmd_buffer *rxb,
+					     struct iwl_device_cmd *cmd);
 
 /* MVM debugfs */
 #ifdef CONFIG_IWLWIFI_DEBUGFS
drivers/net/wireless/iwlwifi/mvm/ops.c +3 -0
index 534a9fd..4935caf 100644
@@ -245,6 +245,8 @@ static const struct iwl_rx_handlers iwl_mvm_rx_handlers[] = {
 		   false),
 	RX_HANDLER(SCAN_COMPLETE_UMAC, iwl_mvm_rx_umac_scan_complete_notif,
 		   true),
+	RX_HANDLER(SCAN_ITERATION_COMPLETE_UMAC,
+		   iwl_mvm_rx_umac_scan_iter_complete_notif, false),
 
 	RX_HANDLER(CARD_STATE_NOTIFICATION, iwl_mvm_rx_card_state_notif, false),
 
@@ -356,6 +358,7 @@ static const char *const iwl_mvm_cmd_strings[REPLY_MAX] = {
 	CMD(TDLS_CHANNEL_SWITCH_NOTIFICATION),
 	CMD(TDLS_CONFIG_CMD),
 	CMD(MCC_UPDATE_CMD),
+	CMD(SCAN_ITERATION_COMPLETE_UMAC),
 };
 #undef CMD
 
drivers/net/wireless/iwlwifi/mvm/scan.c +21 -0
index e859584..81ea9f4 100644
@@ -1181,6 +1181,10 @@ static u32 iwl_mvm_scan_umac_flags(struct iwl_mvm *mvm,
 	if (iwl_mvm_scan_total_iterations(params) > 1)
 		flags |= IWL_UMAC_SCAN_GEN_FLAGS_PERIODIC;
 
+#ifdef CONFIG_IWLWIFI_DEBUGFS
+	if (mvm->scan_iter_notif_enabled)
+		flags |= IWL_UMAC_SCAN_GEN_FLAGS_ITER_COMPLETE;
+#endif
 	return flags;
 }
 
@@ -1522,6 +1526,23 @@ int iwl_mvm_rx_umac_scan_complete_notif(struct iwl_mvm *mvm,
 	return 0;
 }
 
+int iwl_mvm_rx_umac_scan_iter_complete_notif(struct iwl_mvm *mvm,
+					     struct iwl_rx_cmd_buffer *rxb,
+					     struct iwl_device_cmd *cmd)
+{
+	struct iwl_rx_packet *pkt = rxb_addr(rxb);
+	struct iwl_umac_scan_iter_complete_notif *notif = (void *)pkt->data;
+	u8 buf[256];
+
+	IWL_DEBUG_SCAN(mvm,
+		       "UMAC Scan iteration complete: status=0x%x scanned_channels=%d channels list: %s\n",
+		       notif->status, notif->scanned_channels,
+		       iwl_mvm_dump_channel_list(notif->results,
+						 notif->scanned_channels, buf,
+						 sizeof(buf)));
+	return 0;
+}
+
 static bool iwl_scan_umac_done_check(struct iwl_notif_wait_data *notif_wait,
 				     struct iwl_rx_packet *pkt, void *data)
 {
Signature · 1 line
2.1.4
#22 lore raw

PATCH 20/39 iwlwifi: mvm: fix the net-detect SSIDs report order

In reply to Grumbach, Emmanuel

From: Luciano Coelho <[email protected]>

After the scan refactor, the order of the SSIDs passed to the firmware in all scans (including net-detect) are inverted. This was causing the reporting code to use the wrong SSIDs. To fix this, invert the array index when accessing the saved match SSIDs to report the wake-up.

---
 drivers/net/wireless/iwlwifi/mvm/d3.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/net/wireless/iwlwifi/mvm/d3.c +7 -3
index d30f168..408b0ce 100644
@@ -1785,7 +1785,7 @@ static void iwl_mvm_query_netdetect_reasons(struct iwl_mvm *mvm,
 	for_each_set_bit(i, &matched_profiles, mvm->n_nd_match_sets) {
 		struct iwl_scan_offload_profile_match *fw_match;
 		struct cfg80211_wowlan_nd_match *match;
-		int n_channels = 0;
+		int idx, n_channels = 0;
 
 		fw_match = &query.matches[i];
 
@@ -1800,8 +1800,12 @@ static void iwl_mvm_query_netdetect_reasons(struct iwl_mvm *mvm,
 
 		net_detect->matches[net_detect->n_matches++] = match;
 
-		match->ssid.ssid_len = mvm->nd_match_sets[i].ssid.ssid_len;
-		memcpy(match->ssid.ssid, mvm->nd_match_sets[i].ssid.ssid,
+		/* We inverted the order of the SSIDs in the scan
+		 * request, so invert the index here.
+		 */
+		idx = mvm->n_nd_match_sets - i - 1;
+		match->ssid.ssid_len = mvm->nd_match_sets[idx].ssid.ssid_len;
+		memcpy(match->ssid.ssid, mvm->nd_match_sets[idx].ssid.ssid,
 		       match->ssid.ssid_len);
 
 		if (mvm->n_nd_channels < n_channels)
Signature · 1 line
2.1.4
#23 lore raw

PATCH 21/39 iwlwifi: mvm: make iwl_mvm_config_sched_scan_profiles() static

In reply to Grumbach, Emmanuel

From: Luciano Coelho <[email protected]>

The iwl_mvm_config_sched_scan_profiles() function is only used in scan.c, so remove the declaration from mvm.h and make it static.

---
 drivers/net/wireless/iwlwifi/mvm/mvm.h  | 2 --
 drivers/net/wireless/iwlwifi/mvm/scan.c | 5 +++--
 2 files changed, 3 insertions(+), 4 deletions(-)
drivers/net/wireless/iwlwifi/mvm/mvm.h +0 -2
index d4e0cab..46668ef 100644
@@ -1133,8 +1133,6 @@ int iwl_mvm_rx_scan_offload_complete_notif(struct iwl_mvm *mvm,
 int iwl_mvm_rx_scan_offload_iter_complete_notif(struct iwl_mvm *mvm,
 						struct iwl_rx_cmd_buffer *rxb,
 						struct iwl_device_cmd *cmd);
-int iwl_mvm_config_sched_scan_profiles(struct iwl_mvm *mvm,
-				       struct cfg80211_sched_scan_request *req);
 int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm,
 			     struct ieee80211_vif *vif,
 			     struct cfg80211_sched_scan_request *req,
drivers/net/wireless/iwlwifi/mvm/scan.c +3 -2
index 81ea9f4..443562c 100644
@@ -476,8 +476,9 @@ static void iwl_scan_build_ssids(struct iwl_mvm_scan_params *params,
 	}
 }
 
-int iwl_mvm_config_sched_scan_profiles(struct iwl_mvm *mvm,
-				       struct cfg80211_sched_scan_request *req)
+static int
+iwl_mvm_config_sched_scan_profiles(struct iwl_mvm *mvm,
+				   struct cfg80211_sched_scan_request *req)
 {
 	struct iwl_scan_offload_profile *profile;
 	struct iwl_scan_offload_profile_cfg *profile_cfg;
Signature · 1 line
2.1.4
#24 lore raw

PATCH 22/39 iwlwifi: mvm: BT Coex - fix shared antenna check with new API

In reply to Grumbach, Emmanuel

The commit below fixed this for the old firmware API only. Since the new firmware API hasn't been released yet, this doesn't fix anything on currently existing firmwares. This completes:

commit afcee962b09842d0f4191beb4a2d08251b4c7705

Author: Eyal Shapira <[email protected]>
Date:   Mon Feb 9 15:18:17 2015 +0200

iwlwifi: mvm: fix BT coex shared antenna activity check

type=bugfix
bug=not-tracked
fixes=unknown

---
 drivers/net/wireless/iwlwifi/mvm/coex.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/iwlwifi/mvm/coex.c +1 -1
index a990886..662fa9c 100644
@@ -886,7 +886,7 @@ bool iwl_mvm_bt_coex_is_shared_ant_avail(struct iwl_mvm *mvm)
 	if (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_BT_COEX_SPLIT))
 		return iwl_mvm_bt_coex_is_shared_ant_avail_old(mvm);
 
-	return le32_to_cpu(mvm->last_bt_notif.bt_activity_grading) == BT_OFF;
+	return le32_to_cpu(mvm->last_bt_notif.bt_activity_grading) < BT_HIGH_TRAFFIC;
 }
 
 bool iwl_mvm_bt_coex_is_tpc_allowed(struct iwl_mvm *mvm,
Signature · 1 line
2.1.4
#25 lore raw

PATCH 23/39 iwlwifi: mvm: reorganize scan stopping functions

In reply to Grumbach, Emmanuel

From: Luciano Coelho <[email protected]>

The iwl_mvm_scan_offload_stop() function is used to stop LMAC regular scan, stop LMAC scheduled scan and stop UMAC scheduled scans (but not UMAC regular scans), making it very difficult to read.

Reorganize the scan stopping functions by creating separate functions to stop regular and scheduled scans, separating the LMAC stopping part of the code from the rest and renaming the offload_stop function to iwl_mvm_lmac_scan_stop().

---
 drivers/net/wireless/iwlwifi/mvm/d3.c       |   2 +-
 drivers/net/wireless/iwlwifi/mvm/mac80211.c |  10 +--
 drivers/net/wireless/iwlwifi/mvm/mvm.h      |   4 +-
 drivers/net/wireless/iwlwifi/mvm/scan.c     | 101 ++++++++++++++--------------
 4 files changed, 59 insertions(+), 58 deletions(-)
drivers/net/wireless/iwlwifi/mvm/d3.c +1 -1
index 408b0ce..ceffc78 100644
@@ -761,7 +761,7 @@ void iwl_mvm_set_last_nonqos_seq(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
 
 static int iwl_mvm_switch_to_d3(struct iwl_mvm *mvm)
 {
-	iwl_mvm_cancel_scan(mvm);
+	iwl_mvm_reg_scan_stop(mvm);
 
 	iwl_trans_stop_device(mvm->trans);
 
drivers/net/wireless/iwlwifi/mvm/mac80211.c +6 -4
index d13138e..1346931 100644
@@ -2360,8 +2360,10 @@ static void iwl_mvm_bss_info_changed(struct ieee80211_hw *hw,
 
 	mutex_lock(&mvm->mutex);
 
-	if (changes & BSS_CHANGED_IDLE && !bss_conf->idle)
-		iwl_mvm_scan_offload_stop(mvm, true);
+	if (changes & BSS_CHANGED_IDLE && !bss_conf->idle) {
+		iwl_mvm_sched_scan_stop(mvm, true);
+		iwl_mvm_reg_scan_stop(mvm);
+	}
 
 	switch (vif->type) {
 	case NL80211_IFTYPE_STATION:
@@ -2417,7 +2419,7 @@ static void iwl_mvm_mac_cancel_hw_scan(struct ieee80211_hw *hw,
 	 */
 	if ((mvm->scan_status & IWL_MVM_SCAN_REGULAR) ||
 	    (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN))
-		iwl_mvm_cancel_scan(mvm);
+		iwl_mvm_reg_scan_stop(mvm);
 
 	mutex_unlock(&mvm->mutex);
 }
@@ -2775,7 +2777,7 @@ static int iwl_mvm_mac_sched_scan_stop(struct ieee80211_hw *hw,
 		return 0;
 	}
 
-	ret = iwl_mvm_scan_offload_stop(mvm, false);
+	ret = iwl_mvm_sched_scan_stop(mvm, false);
 	mutex_unlock(&mvm->mutex);
 	iwl_mvm_wait_for_async_handlers(mvm);
 
drivers/net/wireless/iwlwifi/mvm/mvm.h +2 -2
index 46668ef..71b7763 100644
@@ -1122,7 +1122,7 @@ int iwl_mvm_reg_scan_start(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 			   struct cfg80211_scan_request *req,
 			   struct ieee80211_scan_ies *ies);
 int iwl_mvm_scan_size(struct iwl_mvm *mvm);
-int iwl_mvm_cancel_scan(struct iwl_mvm *mvm);
+int iwl_mvm_reg_scan_stop(struct iwl_mvm *mvm);
 int iwl_mvm_max_scan_ie_len(struct iwl_mvm *mvm);
 void iwl_mvm_report_scan_aborted(struct iwl_mvm *mvm);
 
@@ -1138,7 +1138,7 @@ int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm,
 			     struct cfg80211_sched_scan_request *req,
 			     struct ieee80211_scan_ies *ies,
 			     int type);
-int iwl_mvm_scan_offload_stop(struct iwl_mvm *mvm, bool notify);
+int iwl_mvm_sched_scan_stop(struct iwl_mvm *mvm, bool notify);
 int iwl_mvm_rx_scan_offload_results(struct iwl_mvm *mvm,
 				    struct iwl_rx_cmd_buffer *rxb,
 				    struct iwl_device_cmd *cmd);
drivers/net/wireless/iwlwifi/mvm/scan.c +50 -51

151 lines not on this page · raw message

Signature · 1 line
2.1.4
#26 lore raw

PATCH 24/39 iwlwifi: mvm: don't stop regular scans when going out of idle state

In reply to Grumbach, Emmanuel

From: Luciano Coelho <[email protected]>

It is not necessary to stop regular scans when going out of idle state. Previously, we were doing so for LMAC scans because the iwl_mvm_scan_offload_stop() function was stopping both kinds of scans. Now that we have more granularity, we can skip it.

---
 drivers/net/wireless/iwlwifi/mvm/mac80211.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/wireless/iwlwifi/mvm/mac80211.c +1 -3
index 1346931..df0199e 100644
@@ -2360,10 +2360,8 @@ static void iwl_mvm_bss_info_changed(struct ieee80211_hw *hw,
 
 	mutex_lock(&mvm->mutex);
 
-	if (changes & BSS_CHANGED_IDLE && !bss_conf->idle) {
+	if (changes & BSS_CHANGED_IDLE && !bss_conf->idle)
 		iwl_mvm_sched_scan_stop(mvm, true);
-		iwl_mvm_reg_scan_stop(mvm);
-	}
 
 	switch (vif->type) {
 	case NL80211_IFTYPE_STATION:
Signature · 1 line
2.1.4
#27 lore raw

PATCH 25/39 iwlwifi: mvm: combine part of the scan stop flows

In reply to Grumbach, Emmanuel

From: Luciano Coelho <[email protected]>

For UMAC scans, we were simply jumping into another function when scan stop functions were called, while for LMAC scans, the flow continued. To make the flows cleaner and more balanced, combine the UMAC part into the main stop functions. This also makes us take one step closer into combining the state flags for both APIs.

Note that some STOPPING flags will be dangling in UMAC scans, but it doesn't matter because they are not used in UMAC yet (and this will be fixed in subsequent patches).

---
 drivers/net/wireless/iwlwifi/mvm/scan.c | 40 ++++++++++-----------------------
 1 file changed, 12 insertions(+), 28 deletions(-)
drivers/net/wireless/iwlwifi/mvm/scan.c +12 -28
index 579b36b..ec8ef56 100644
@@ -101,7 +101,7 @@ struct iwl_mvm_scan_params {
 	} schedule[2];
 };
 
-static int iwl_umac_scan_stop(struct iwl_mvm *mvm, int type, bool notify);
+static int iwl_umac_scan_stop(struct iwl_mvm *mvm, int type);
 
 static u8 iwl_mvm_scan_rx_ant(struct iwl_mvm *mvm)
 {
@@ -889,9 +889,6 @@ int iwl_mvm_reg_scan_stop(struct iwl_mvm *mvm)
 {
 	int ret;
 
-	if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN)
-		return iwl_umac_scan_stop(mvm, IWL_MVM_SCAN_REGULAR, true);
-
 	if (!(mvm->scan_status & IWL_MVM_SCAN_REGULAR))
 		return 0;
 
@@ -900,7 +897,11 @@ int iwl_mvm_reg_scan_stop(struct iwl_mvm *mvm)
 		goto out;
 	}
 
-	ret = iwl_mvm_lmac_scan_stop(mvm, IWL_MVM_SCAN_REGULAR);
+	if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN)
+		ret = iwl_umac_scan_stop(mvm, IWL_MVM_SCAN_REGULAR);
+	else
+		ret = iwl_mvm_lmac_scan_stop(mvm, IWL_MVM_SCAN_REGULAR);
+
 	if (!ret)
 		mvm->scan_status |= IWL_MVM_SCAN_STOPPING_REGULAR;
 out:
@@ -922,9 +923,6 @@ int iwl_mvm_sched_scan_stop(struct iwl_mvm *mvm, bool notify)
 {
 	int ret;
 
-	if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN)
-		return iwl_umac_scan_stop(mvm, IWL_MVM_SCAN_SCHED, notify);
-
 	if (!(mvm->scan_status & IWL_MVM_SCAN_SCHED))
 		return 0;
 
@@ -933,7 +931,11 @@ int iwl_mvm_sched_scan_stop(struct iwl_mvm *mvm, bool notify)
 		goto out;
 	}
 
-	ret = iwl_mvm_lmac_scan_stop(mvm, IWL_MVM_SCAN_SCHED);
+	if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN)
+		ret = iwl_umac_scan_stop(mvm, IWL_MVM_SCAN_SCHED);
+	else
+		ret = iwl_mvm_lmac_scan_stop(mvm, IWL_MVM_SCAN_SCHED);
+
 	if (!ret)
 		mvm->scan_status |= IWL_MVM_SCAN_STOPPING_SCHED;
 out:
@@ -1585,7 +1587,7 @@ static int iwl_umac_scan_abort_one(struct iwl_mvm *mvm, u32 uid)
 	return iwl_mvm_send_cmd_pdu(mvm, SCAN_ABORT_UMAC, 0, sizeof(cmd), &cmd);
 }
 
-static int iwl_umac_scan_stop(struct iwl_mvm *mvm, int type, bool notify)
+static int iwl_umac_scan_stop(struct iwl_mvm *mvm, int type)
 {
 	struct iwl_notification_wait wait_scan_done;
 	static const u8 scan_done_notif[] = { SCAN_COMPLETE_UMAC, };
@@ -1606,13 +1608,6 @@ static int iwl_umac_scan_stop(struct iwl_mvm *mvm, int type, bool notify)
 		if (mvm->scan_uid[i] & type) {
 			int err;
 
-			if (iwl_mvm_is_radio_killed(mvm) &&
-			    (type & IWL_MVM_SCAN_REGULAR)) {
-				ieee80211_scan_completed(mvm->hw, true);
-				iwl_mvm_unref(mvm, IWL_MVM_REF_SCAN);
-				break;
-			}
-
 			err = iwl_umac_scan_abort_one(mvm, mvm->scan_uid[i]);
 			if (!err)
 				ret = 0;
@@ -1626,17 +1621,6 @@ static int iwl_umac_scan_stop(struct iwl_mvm *mvm, int type, bool notify)
 	}
 
 	ret = iwl_wait_notification(&mvm->notif_wait, &wait_scan_done, 1 * HZ);
-	if (ret)
-		return ret;
-
-	if (notify) {
-		if (type & IWL_MVM_SCAN_SCHED)
-			ieee80211_sched_scan_stopped(mvm->hw);
-		if (type & IWL_MVM_SCAN_REGULAR) {
-			ieee80211_scan_completed(mvm->hw, true);
-			iwl_mvm_unref(mvm, IWL_MVM_REF_SCAN);
-		}
-	}
 
 	return ret;
 }
Signature · 1 line
2.1.4
#28 lore raw

PATCH 26/39 iwlwifi: mvm: rename umac scan stop function

In reply to Grumbach, Emmanuel

From: Luciano Coelho <[email protected]>

For consistency with the LMAC functions, rename the UMAC scan stop function to iwl_mvm_umac_scan_stop(). Additionally, move things around a bit to avoid an unnecessary forward declaration.

---
 drivers/net/wireless/iwlwifi/mvm/scan.c | 126 ++++++++++++++++----------------
 1 file changed, 62 insertions(+), 64 deletions(-)
drivers/net/wireless/iwlwifi/mvm/scan.c +62 -64
index ec8ef56..bee92d7 100644
@@ -101,8 +101,6 @@ struct iwl_mvm_scan_params {
 	} schedule[2];
 };
 
-static int iwl_umac_scan_stop(struct iwl_mvm *mvm, int type);
-
 static u8 iwl_mvm_scan_rx_ant(struct iwl_mvm *mvm)
 {
 	if (mvm->scan_rx_ant != ANT_NONE)
@@ -885,67 +883,6 @@ static int iwl_mvm_scan_lmac(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 	return 0;
 }
 
-int iwl_mvm_reg_scan_stop(struct iwl_mvm *mvm)
-{
-	int ret;
-
-	if (!(mvm->scan_status & IWL_MVM_SCAN_REGULAR))
-		return 0;
-
-	if (iwl_mvm_is_radio_killed(mvm)) {
-		ret = 0;
-		goto out;
-	}
-
-	if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN)
-		ret = iwl_umac_scan_stop(mvm, IWL_MVM_SCAN_REGULAR);
-	else
-		ret = iwl_mvm_lmac_scan_stop(mvm, IWL_MVM_SCAN_REGULAR);
-
-	if (!ret)
-		mvm->scan_status |= IWL_MVM_SCAN_STOPPING_REGULAR;
-out:
-	/* Clear the scan status so the next scan requests will
-	 * succeed and mark the scan as stopping, so that the Rx
-	 * handler doesn't do anything, as the scan was stopped from
-	 * above. Since the rx handler won't do anything now, we have
-	 * to release the scan reference here.
-	 */
-	iwl_mvm_unref(mvm, IWL_MVM_REF_SCAN);
-
-	mvm->scan_status &= ~IWL_MVM_SCAN_REGULAR;
-	ieee80211_scan_completed(mvm->hw, true);
-
-	return ret;
-}
-
-int iwl_mvm_sched_scan_stop(struct iwl_mvm *mvm, bool notify)
-{
-	int ret;
-
-	if (!(mvm->scan_status & IWL_MVM_SCAN_SCHED))
-		return 0;
-
-	if (iwl_mvm_is_radio_killed(mvm)) {
-		ret = 0;
-		goto out;
-	}
-
-	if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN)
-		ret = iwl_umac_scan_stop(mvm, IWL_MVM_SCAN_SCHED);
-	else
-		ret = iwl_mvm_lmac_scan_stop(mvm, IWL_MVM_SCAN_SCHED);
-
-	if (!ret)
-		mvm->scan_status |= IWL_MVM_SCAN_STOPPING_SCHED;
-out:
-	mvm->scan_status &= ~IWL_MVM_SCAN_SCHED;
-	if (notify)
-		ieee80211_sched_scan_stopped(mvm->hw);
-
-	return ret;
-}
-
 /* UMAC scan API */
 
 struct iwl_umac_scan_done {
@@ -1587,7 +1524,7 @@ static int iwl_umac_scan_abort_one(struct iwl_mvm *mvm, u32 uid)
 	return iwl_mvm_send_cmd_pdu(mvm, SCAN_ABORT_UMAC, 0, sizeof(cmd), &cmd);
 }
 
-static int iwl_umac_scan_stop(struct iwl_mvm *mvm, int type)
+static int iwl_mvm_umac_scan_stop(struct iwl_mvm *mvm, int type)
 {
 	struct iwl_notification_wait wait_scan_done;
 	static const u8 scan_done_notif[] = { SCAN_COMPLETE_UMAC, };
@@ -1681,3 +1618,64 @@ void iwl_mvm_report_scan_aborted(struct iwl_mvm *mvm)
 			ieee80211_sched_scan_stopped(mvm->hw);
 	}
 }
+
+int iwl_mvm_reg_scan_stop(struct iwl_mvm *mvm)
+{
+	int ret;
+
+	if (!(mvm->scan_status & IWL_MVM_SCAN_REGULAR))
+		return 0;
+
+	if (iwl_mvm_is_radio_killed(mvm)) {
+		ret = 0;
+		goto out;
+	}
+
+	if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN)
+		ret = iwl_mvm_umac_scan_stop(mvm, IWL_MVM_SCAN_REGULAR);
+	else
+		ret = iwl_mvm_lmac_scan_stop(mvm, IWL_MVM_SCAN_REGULAR);
+
+	if (!ret)
+		mvm->scan_status |= IWL_MVM_SCAN_STOPPING_REGULAR;
+out:
+	/* Clear the scan status so the next scan requests will
+	 * succeed and mark the scan as stopping, so that the Rx
+	 * handler doesn't do anything, as the scan was stopped from
+	 * above. Since the rx handler won't do anything now, we have
+	 * to release the scan reference here.
+	 */
+	iwl_mvm_unref(mvm, IWL_MVM_REF_SCAN);
+
+	mvm->scan_status &= ~IWL_MVM_SCAN_REGULAR;
+	ieee80211_scan_completed(mvm->hw, true);
+
+	return ret;
+}
+
+int iwl_mvm_sched_scan_stop(struct iwl_mvm *mvm, bool notify)
+{
+	int ret;
+
+	if (!(mvm->scan_status & IWL_MVM_SCAN_SCHED))
+		return 0;
+
+	if (iwl_mvm_is_radio_killed(mvm)) {
+		ret = 0;
+		goto out;
+	}
+
+	if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN)
+		ret = iwl_mvm_umac_scan_stop(mvm, IWL_MVM_SCAN_SCHED);
+	else
+		ret = iwl_mvm_lmac_scan_stop(mvm, IWL_MVM_SCAN_SCHED);
+
+	if (!ret)
+		mvm->scan_status |= IWL_MVM_SCAN_STOPPING_SCHED;
+out:
+	mvm->scan_status &= ~IWL_MVM_SCAN_SCHED;
+	if (notify)
+		ieee80211_sched_scan_stopped(mvm->hw);
+
+	return ret;
+}
Signature · 1 line
2.1.4
#29 lore raw

PATCH 27/39 iwlwifi: mvm: rename some LMAC-specific scan functions

In reply to Grumbach, Emmanuel

From: Luciano Coelho <[email protected]>

Some LMAC specific functions had too generic names
(i.e. *_scan_offload_*) and were hard to distinguish from functions that are really generic. Rename these functions to *_lmac_scan_* in to make it more consistent and easier to read.

---
 drivers/net/wireless/iwlwifi/mvm/mvm.h  | 18 +++++++++---------
 drivers/net/wireless/iwlwifi/mvm/ops.c  |  6 +++---
 drivers/net/wireless/iwlwifi/mvm/scan.c | 22 +++++++++++-----------
 3 files changed, 23 insertions(+), 23 deletions(-)
drivers/net/wireless/iwlwifi/mvm/mvm.h +9 -9
index 71b7763..760c626 100644
@@ -1127,21 +1127,21 @@ int iwl_mvm_max_scan_ie_len(struct iwl_mvm *mvm);
 void iwl_mvm_report_scan_aborted(struct iwl_mvm *mvm);
 
 /* Scheduled scan */
-int iwl_mvm_rx_scan_offload_complete_notif(struct iwl_mvm *mvm,
-					   struct iwl_rx_cmd_buffer *rxb,
-					   struct iwl_device_cmd *cmd);
-int iwl_mvm_rx_scan_offload_iter_complete_notif(struct iwl_mvm *mvm,
-						struct iwl_rx_cmd_buffer *rxb,
-						struct iwl_device_cmd *cmd);
+int iwl_mvm_rx_lmac_scan_complete_notif(struct iwl_mvm *mvm,
+					struct iwl_rx_cmd_buffer *rxb,
+					struct iwl_device_cmd *cmd);
+int iwl_mvm_rx_lmac_scan_iter_complete_notif(struct iwl_mvm *mvm,
+					     struct iwl_rx_cmd_buffer *rxb,
+					     struct iwl_device_cmd *cmd);
 int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm,
 			     struct ieee80211_vif *vif,
 			     struct cfg80211_sched_scan_request *req,
 			     struct ieee80211_scan_ies *ies,
 			     int type);
 int iwl_mvm_sched_scan_stop(struct iwl_mvm *mvm, bool notify);
-int iwl_mvm_rx_scan_offload_results(struct iwl_mvm *mvm,
-				    struct iwl_rx_cmd_buffer *rxb,
-				    struct iwl_device_cmd *cmd);
+int iwl_mvm_rx_scan_match_found(struct iwl_mvm *mvm,
+				struct iwl_rx_cmd_buffer *rxb,
+				struct iwl_device_cmd *cmd);
 
 /* UMAC scan */
 int iwl_mvm_config_scan(struct iwl_mvm *mvm);
drivers/net/wireless/iwlwifi/mvm/ops.c +3 -3
index 4935caf..690b336 100644
@@ -238,10 +238,10 @@ static const struct iwl_rx_handlers iwl_mvm_rx_handlers[] = {
 	RX_HANDLER(EOSP_NOTIFICATION, iwl_mvm_rx_eosp_notif, false),
 
 	RX_HANDLER(SCAN_ITERATION_COMPLETE,
-		   iwl_mvm_rx_scan_offload_iter_complete_notif, false),
+		   iwl_mvm_rx_lmac_scan_iter_complete_notif, false),
 	RX_HANDLER(SCAN_OFFLOAD_COMPLETE,
-		   iwl_mvm_rx_scan_offload_complete_notif, true),
-	RX_HANDLER(MATCH_FOUND_NOTIFICATION, iwl_mvm_rx_scan_offload_results,
+		   iwl_mvm_rx_lmac_scan_complete_notif, true),
+	RX_HANDLER(MATCH_FOUND_NOTIFICATION, iwl_mvm_rx_scan_match_found,
 		   false),
 	RX_HANDLER(SCAN_COMPLETE_UMAC, iwl_mvm_rx_umac_scan_complete_notif,
 		   true),
drivers/net/wireless/iwlwifi/mvm/scan.c +11 -11
index bee92d7..9becece 100644
@@ -325,9 +325,9 @@ static u8 *iwl_mvm_dump_channel_list(struct iwl_scan_results_notif *res,
 	return buf;
 }
 
-int iwl_mvm_rx_scan_offload_iter_complete_notif(struct iwl_mvm *mvm,
-						struct iwl_rx_cmd_buffer *rxb,
-						struct iwl_device_cmd *cmd)
+int iwl_mvm_rx_lmac_scan_iter_complete_notif(struct iwl_mvm *mvm,
+					     struct iwl_rx_cmd_buffer *rxb,
+					     struct iwl_device_cmd *cmd)
 {
 	struct iwl_rx_packet *pkt = rxb_addr(rxb);
 	struct iwl_lmac_scan_complete_notif *notif = (void *)pkt->data;
@@ -342,9 +342,9 @@ int iwl_mvm_rx_scan_offload_iter_complete_notif(struct iwl_mvm *mvm,
 	return 0;
 }
 
-int iwl_mvm_rx_scan_offload_results(struct iwl_mvm *mvm,
-				    struct iwl_rx_cmd_buffer *rxb,
-				    struct iwl_device_cmd *cmd)
+int iwl_mvm_rx_scan_match_found(struct iwl_mvm *mvm,
+				struct iwl_rx_cmd_buffer *rxb,
+				struct iwl_device_cmd *cmd)
 {
 	IWL_DEBUG_SCAN(mvm, "Scheduled scan results\n");
 	ieee80211_sched_scan_results(mvm->hw);
@@ -352,9 +352,9 @@ int iwl_mvm_rx_scan_offload_results(struct iwl_mvm *mvm,
 	return 0;
 }
 
-int iwl_mvm_rx_scan_offload_complete_notif(struct iwl_mvm *mvm,
-					   struct iwl_rx_cmd_buffer *rxb,
-					   struct iwl_device_cmd *cmd)
+int iwl_mvm_rx_lmac_scan_complete_notif(struct iwl_mvm *mvm,
+					struct iwl_rx_cmd_buffer *rxb,
+					struct iwl_device_cmd *cmd)
 {
 	struct iwl_rx_packet *pkt = rxb_addr(rxb);
 	struct iwl_periodic_scan_complete *scan_notif = (void *)pkt->data;
@@ -557,7 +557,7 @@ static bool iwl_mvm_scan_pass_all(struct iwl_mvm *mvm,
 	return true;
 }
 
-static int iwl_mvm_send_scan_offload_abort(struct iwl_mvm *mvm)
+static int iwl_mvm_send_lmac_scan_abort(struct iwl_mvm *mvm)
 {
 	int ret;
 	struct iwl_host_cmd cmd = {
@@ -598,7 +598,7 @@ static int iwl_mvm_lmac_scan_stop(struct iwl_mvm *mvm, int type)
 				   ARRAY_SIZE(scan_done_notif),
 				   NULL, NULL);
 
-	ret = iwl_mvm_send_scan_offload_abort(mvm);
+	ret = iwl_mvm_send_lmac_scan_abort(mvm);
 	if (ret) {
 		IWL_DEBUG_SCAN(mvm, "Send stop %sscan failed %d\n",
 			       sched ? "offloaded " : "", ret);
Signature · 1 line
2.1.4
#30 lore raw

PATCH 28/39 iwlwifi: mvm: add support for 8 level scan priority API

In reply to Grumbach, Emmanuel

From: Avraham Stern <[email protected]>

Add support for scan priority API with 8 levels instead of the existing 3 levels. This API is needed to define the priority of new ooc activities, e.g. gscan.
Add a TLV flag to indicate if the new API is supported so that devices that does not support the new API will continue to use the old one.

---
 drivers/net/wireless/iwlwifi/iwl-fw-file.h     |  3 +++
 drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h | 11 +++++++++++
 drivers/net/wireless/iwlwifi/mvm/scan.c        | 26 ++++++++++++++++++++++----
 3 files changed, 36 insertions(+), 4 deletions(-)
drivers/net/wireless/iwlwifi/iwl-fw-file.h +3 -0
index c7cfc38..839b2c4 100644
@@ -255,6 +255,8 @@ enum iwl_ucode_tlv_flag {
  * @IWL_UCODE_TLV_API_LQ_SS_PARAMS: Configure STBC/BFER via LQ CMD ss_params
  * @IWL_UCODE_TLV_API_STATS_V10: uCode supports/uses statistics API version 10
  * @IWL_UCODE_TLV_API_NEW_VERSION: new versioning format
+ * @IWL_UCODE_TLV_API_EXT_SCAN_PRIORITY: scan APIs use 8-level priority
+ *	instead of 3.
  */
 enum iwl_ucode_tlv_api {
 	IWL_UCODE_TLV_API_BT_COEX_SPLIT         = BIT(3),
@@ -269,6 +271,7 @@ enum iwl_ucode_tlv_api {
 	IWL_UCODE_TLV_API_LQ_SS_PARAMS		= BIT(18),
 	IWL_UCODE_TLV_API_STATS_V10		= BIT(19),
 	IWL_UCODE_TLV_API_NEW_VERSION		= BIT(20),
+	IWL_UCODE_TLV_API_EXT_SCAN_PRIORITY	= BIT(24),
 };
 
 /**
drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h +11 -0
index 0228693..f34cf00 100644
@@ -431,6 +431,17 @@ enum iwl_scan_priority {
 	IWL_SCAN_PRIORITY_HIGH,
 };
 
+enum iwl_scan_priority_ext {
+	IWL_SCAN_PRIORITY_EXT_0_LOWEST,
+	IWL_SCAN_PRIORITY_EXT_1,
+	IWL_SCAN_PRIORITY_EXT_2,
+	IWL_SCAN_PRIORITY_EXT_3,
+	IWL_SCAN_PRIORITY_EXT_4,
+	IWL_SCAN_PRIORITY_EXT_5,
+	IWL_SCAN_PRIORITY_EXT_6,
+	IWL_SCAN_PRIORITY_EXT_7_HIGHEST,
+};
+
 /**
  * iwl_scan_req_lmac - SCAN_REQUEST_CMD_API_S_VER_1
  * @reserved1: for alignment and future use
drivers/net/wireless/iwlwifi/mvm/scan.c +22 -4
index 9becece..d0312f0 100644
@@ -744,6 +744,21 @@ iwl_mvm_build_scan_probe(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 	params->preq.common_data.len = cpu_to_le16(ies->common_ie_len);
 }
 
+static __le32 iwl_mvm_scan_priority(struct iwl_mvm *mvm,
+				    enum iwl_scan_priority_ext prio)
+{
+	if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_EXT_SCAN_PRIORITY)
+		return cpu_to_le32(prio);
+
+	if (prio <= IWL_SCAN_PRIORITY_EXT_2)
+		return cpu_to_le32(IWL_SCAN_PRIORITY_LOW);
+
+	if (prio <= IWL_SCAN_PRIORITY_EXT_4)
+		return cpu_to_le32(IWL_SCAN_PRIORITY_MEDIUM);
+
+	return cpu_to_le32(IWL_SCAN_PRIORITY_HIGH);
+}
+
 static void iwl_mvm_scan_lmac_dwell(struct iwl_mvm *mvm,
 				    struct iwl_scan_req_lmac *cmd,
 				    struct iwl_mvm_scan_params *params)
@@ -755,7 +770,7 @@ static void iwl_mvm_scan_lmac_dwell(struct iwl_mvm *mvm,
 				params->dwell[IEEE80211_BAND_2GHZ].fragmented;
 	cmd->max_out_time = cpu_to_le32(params->max_out_time);
 	cmd->suspend_time = cpu_to_le32(params->suspend_time);
-	cmd->scan_prio = cpu_to_le32(IWL_SCAN_PRIORITY_HIGH);
+	cmd->scan_prio = iwl_mvm_scan_priority(mvm, IWL_SCAN_PRIORITY_EXT_6);
 }
 
 static inline bool iwl_mvm_scan_fits(struct iwl_mvm *mvm, int n_ssids,
@@ -1070,12 +1085,15 @@ static void iwl_mvm_scan_umac_dwell(struct iwl_mvm *mvm,
 				params->dwell[IEEE80211_BAND_2GHZ].fragmented;
 	cmd->max_out_time = cpu_to_le32(params->max_out_time);
 	cmd->suspend_time = cpu_to_le32(params->suspend_time);
-	cmd->scan_priority = cpu_to_le32(IWL_SCAN_PRIORITY_HIGH);
+	cmd->scan_priority =
+		iwl_mvm_scan_priority(mvm, IWL_SCAN_PRIORITY_EXT_6);
 
 	if (iwl_mvm_scan_total_iterations(params) == 0)
-		cmd->ooc_priority = cpu_to_le32(IWL_SCAN_PRIORITY_HIGH);
+		cmd->ooc_priority =
+			iwl_mvm_scan_priority(mvm, IWL_SCAN_PRIORITY_EXT_6);
 	else
-		cmd->ooc_priority = cpu_to_le32(IWL_SCAN_PRIORITY_LOW);
+		cmd->ooc_priority =
+			iwl_mvm_scan_priority(mvm, IWL_SCAN_PRIORITY_EXT_2);
 }
 
 static void
Signature · 1 line
2.1.4
#31 lore raw

PATCH 29/39 iwlwifi: mvm: refactor UMAC scan UID handling

In reply to Grumbach, Emmanuel

From: Luciano Coelho <[email protected]>

We can only have one scan of each type running at the same time, so we can remove one attribute in the UID information we save. We had array index, UID and type, but only UID (== array_index) and type are necessary. Refactor the code to use this simplified array.

---
 drivers/net/wireless/iwlwifi/mvm/mac80211.c |   8 +-
 drivers/net/wireless/iwlwifi/mvm/mvm.h      |   3 +-
 drivers/net/wireless/iwlwifi/mvm/scan.c     | 126 ++++++++--------------------
 3 files changed, 39 insertions(+), 98 deletions(-)
drivers/net/wireless/iwlwifi/mvm/mac80211.c +4 -4
index df0199e..cea236b 100644
@@ -1434,10 +1434,10 @@ void __iwl_mvm_mac_stop(struct iwl_mvm *mvm)
 		int i;
 
 		for (i = 0; i < mvm->max_scans; i++) {
-			if (WARN_ONCE(mvm->scan_uid[i],
-				      "UMAC scan UID %d was not cleaned\n",
-				      mvm->scan_uid[i]))
-				mvm->scan_uid[i] = 0;
+			if (WARN_ONCE(mvm->scan_uid_status[i],
+				      "UMAC scan UID %d status was not cleaned\n",
+				      i))
+				mvm->scan_uid_status[i] = 0;
 		}
 	}
 
drivers/net/wireless/iwlwifi/mvm/mvm.h +1 -2
index 760c626..f22d309 100644
@@ -628,8 +628,7 @@ struct iwl_mvm {
 	unsigned int max_scans;
 
 	/* UMAC scan tracking */
-	u32 scan_uid[IWL_MVM_MAX_UMAC_SCANS];
-	u8 scan_seq_num, sched_scan_seq_num;
+	u32 scan_uid_status[IWL_MVM_MAX_UMAC_SCANS];
 
 	/* rx chain antennas set through debugfs for the scan command */
 	u8 scan_rx_ant;
drivers/net/wireless/iwlwifi/mvm/scan.c +34 -92

237 lines not on this page · raw message

Signature · 1 line
2.1.4
#32 lore raw

PATCH 30/39 iwlwifi: mvm: remove code that stops multiple UMAC scans of a type

In reply to Grumbach, Emmanuel

From: Luciano Coelho <[email protected]>

We can only have one scan per type at the same time, so the code that tries to stop several scans of a type is unnecessary. Remove that to reduce code complexity.

---
 drivers/net/wireless/iwlwifi/mvm/scan.c | 74 ++++++++++-----------------------
 1 file changed, 21 insertions(+), 53 deletions(-)
drivers/net/wireless/iwlwifi/mvm/scan.c +21 -53
index 496d1df..4199c60 100644
@@ -898,13 +898,6 @@ static int iwl_mvm_scan_lmac(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 	return 0;
 }
 
-/* UMAC scan API */
-
-struct iwl_umac_scan_done {
-	struct iwl_mvm *mvm;
-	int type;
-};
-
 static int rate_to_scan_rate_flag(unsigned int rate)
 {
 	static const int rate_to_scan_rate[IWL_RATE_COUNT] = {
@@ -1443,76 +1436,51 @@ int iwl_mvm_rx_umac_scan_iter_complete_notif(struct iwl_mvm *mvm,
 	return 0;
 }
 
-static bool iwl_scan_umac_done_check(struct iwl_notif_wait_data *notif_wait,
-				     struct iwl_rx_packet *pkt, void *data)
-{
-	struct iwl_umac_scan_done *scan_done = data;
-	struct iwl_umac_scan_complete *notif = (void *)pkt->data;
-	u32 uid = __le32_to_cpu(notif->uid);
-
-	if (WARN_ON(pkt->hdr.cmd != SCAN_COMPLETE_UMAC))
-		return false;
-
-	if (scan_done->mvm->scan_uid_status[uid] == 0)
-		return false;
-
-	/*
-	 * Clear scan uid of scans that was aborted from above and completed
-	 * in FW so the RX handler does nothing. Set last_ebs_successful here if
-	 * needed.
-	 */
-	scan_done->mvm->scan_uid_status[uid] = 0;
-
-	if (notif->ebs_status)
-		scan_done->mvm->last_ebs_successful = false;
-
-	return iwl_mvm_scan_uid_by_status(scan_done->mvm, scan_done->type) < 0;
-}
-
-static int iwl_umac_scan_abort_one(struct iwl_mvm *mvm, u32 uid)
+static int iwl_mvm_umac_scan_abort(struct iwl_mvm *mvm, int type)
 {
 	struct iwl_umac_scan_abort cmd = {
 		.hdr.size = cpu_to_le16(sizeof(struct iwl_umac_scan_abort) -
 					sizeof(struct iwl_mvm_umac_cmd_hdr)),
-		.uid = cpu_to_le32(uid),
 	};
+	int uid, ret;
 
 	lockdep_assert_held(&mvm->mutex);
 
+	/* We should always get a valid index here, because we already
+	 * checked that this type of scan was running in the generic
+	 * code.
+	 */
+	uid = iwl_mvm_scan_uid_by_status(mvm, type);
+	if (WARN_ON_ONCE(uid < 0))
+		return uid;
+
+	cmd.uid = cpu_to_le32(uid);
+
 	IWL_DEBUG_SCAN(mvm, "Sending scan abort, uid %u\n", uid);
 
-	return iwl_mvm_send_cmd_pdu(mvm, SCAN_ABORT_UMAC, 0, sizeof(cmd), &cmd);
+	ret = iwl_mvm_send_cmd_pdu(mvm, SCAN_ABORT_UMAC, 0, sizeof(cmd), &cmd);
+	if (!ret)
+		mvm->scan_uid_status[uid] = 0;
+
+	return ret;
 }
 
 static int iwl_mvm_umac_scan_stop(struct iwl_mvm *mvm, int type)
 {
 	struct iwl_notification_wait wait_scan_done;
 	static const u8 scan_done_notif[] = { SCAN_COMPLETE_UMAC, };
-	struct iwl_umac_scan_done scan_done = {
-		.mvm = mvm,
-		.type = type,
-	};
-	int i, ret = -EIO;
+	int ret;
 
 	iwl_init_notification_wait(&mvm->notif_wait, &wait_scan_done,
 				   scan_done_notif,
 				   ARRAY_SIZE(scan_done_notif),
-				   iwl_scan_umac_done_check, &scan_done);
+				   NULL, NULL);
 
 	IWL_DEBUG_SCAN(mvm, "Preparing to stop scan, type %x\n", type);
 
-	for (i = 0; i < mvm->max_scans; i++) {
-		if (mvm->scan_uid_status[i] == type) {
-			int err;
-
-			err = iwl_umac_scan_abort_one(mvm, i);
-			if (!err)
-				ret = 0;
-		}
-	}
-
+	ret = iwl_mvm_umac_scan_abort(mvm, type);
 	if (ret) {
-		IWL_DEBUG_SCAN(mvm, "Couldn't stop scan\n");
+		IWL_DEBUG_SCAN(mvm, "couldn't stop scan type %d\n", type);
 		iwl_remove_notification(&mvm->notif_wait, &wait_scan_done);
 		return ret;
 	}
Signature · 1 line
2.1.4
#33 lore raw

PATCH 31/39 iwlwifi: mvm: combine UMAC and LMAC scan_stop functions

In reply to Grumbach, Emmanuel

From: Luciano Coelho <[email protected]>

The UMAC and LMAC scan_stop functions are now nearly identical, so they can be combined into a single function instead.

---
 drivers/net/wireless/iwlwifi/mvm/scan.c | 57 ++++++++-------------------------
 1 file changed, 13 insertions(+), 44 deletions(-)
drivers/net/wireless/iwlwifi/mvm/scan.c +13 -44
index 4199c60..49bcf7d 100644
@@ -557,7 +557,7 @@ static bool iwl_mvm_scan_pass_all(struct iwl_mvm *mvm,
 	return true;
 }
 
-static int iwl_mvm_send_lmac_scan_abort(struct iwl_mvm *mvm)
+static int iwl_mvm_lmac_scan_abort(struct iwl_mvm *mvm)
 {
 	int ret;
 	struct iwl_host_cmd cmd = {
@@ -584,36 +584,6 @@ static int iwl_mvm_send_lmac_scan_abort(struct iwl_mvm *mvm)
 	return ret;
 }
 
-static int iwl_mvm_lmac_scan_stop(struct iwl_mvm *mvm, int type)
-{
-	int ret;
-	struct iwl_notification_wait wait_scan_done;
-	static const u8 scan_done_notif[] = { SCAN_OFFLOAD_COMPLETE, };
-	bool sched = type & IWL_MVM_SCAN_SCHED;
-
-	lockdep_assert_held(&mvm->mutex);
-
-	iwl_init_notification_wait(&mvm->notif_wait, &wait_scan_done,
-				   scan_done_notif,
-				   ARRAY_SIZE(scan_done_notif),
-				   NULL, NULL);
-
-	ret = iwl_mvm_send_lmac_scan_abort(mvm);
-	if (ret) {
-		IWL_DEBUG_SCAN(mvm, "Send stop %sscan failed %d\n",
-			       sched ? "offloaded " : "", ret);
-		iwl_remove_notification(&mvm->notif_wait, &wait_scan_done);
-		goto out;
-	}
-
-	IWL_DEBUG_SCAN(mvm, "Successfully sent stop %sscan\n",
-		       sched ? "scheduled " : "");
-
-	ret = iwl_wait_notification(&mvm->notif_wait, &wait_scan_done, 1 * HZ);
-out:
-	return ret;
-}
-
 static void iwl_mvm_scan_fill_tx_cmd(struct iwl_mvm *mvm,
 				     struct iwl_scan_req_tx_cmd *tx_cmd,
 				     bool no_cck)
@@ -1465,12 +1435,15 @@ static int iwl_mvm_umac_scan_abort(struct iwl_mvm *mvm, int type)
 	return ret;
 }
 
-static int iwl_mvm_umac_scan_stop(struct iwl_mvm *mvm, int type)
+static int iwl_mvm_scan_stop_wait(struct iwl_mvm *mvm, int type)
 {
 	struct iwl_notification_wait wait_scan_done;
-	static const u8 scan_done_notif[] = { SCAN_COMPLETE_UMAC, };
+	static const u8 scan_done_notif[] = { SCAN_COMPLETE_UMAC,
+					      SCAN_OFFLOAD_COMPLETE, };
 	int ret;
 
+	lockdep_assert_held(&mvm->mutex);
+
 	iwl_init_notification_wait(&mvm->notif_wait, &wait_scan_done,
 				   scan_done_notif,
 				   ARRAY_SIZE(scan_done_notif),
@@ -1478,7 +1451,11 @@ static int iwl_mvm_umac_scan_stop(struct iwl_mvm *mvm, int type)
 
 	IWL_DEBUG_SCAN(mvm, "Preparing to stop scan, type %x\n", type);
 
-	ret = iwl_mvm_umac_scan_abort(mvm, type);
+	if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN)
+		ret = iwl_mvm_umac_scan_abort(mvm, type);
+	else
+		ret = iwl_mvm_lmac_scan_abort(mvm);
+
 	if (ret) {
 		IWL_DEBUG_SCAN(mvm, "couldn't stop scan type %d\n", type);
 		iwl_remove_notification(&mvm->notif_wait, &wait_scan_done);
@@ -1559,11 +1536,7 @@ int iwl_mvm_reg_scan_stop(struct iwl_mvm *mvm)
 		goto out;
 	}
 
-	if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN)
-		ret = iwl_mvm_umac_scan_stop(mvm, IWL_MVM_SCAN_REGULAR);
-	else
-		ret = iwl_mvm_lmac_scan_stop(mvm, IWL_MVM_SCAN_REGULAR);
-
+	ret = iwl_mvm_scan_stop_wait(mvm, IWL_MVM_SCAN_REGULAR);
 	if (!ret)
 		mvm->scan_status |= IWL_MVM_SCAN_STOPPING_REGULAR;
 out:
@@ -1593,11 +1566,7 @@ int iwl_mvm_sched_scan_stop(struct iwl_mvm *mvm, bool notify)
 		goto out;
 	}
 
-	if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN)
-		ret = iwl_mvm_umac_scan_stop(mvm, IWL_MVM_SCAN_SCHED);
-	else
-		ret = iwl_mvm_lmac_scan_stop(mvm, IWL_MVM_SCAN_SCHED);
-
+	ret = iwl_mvm_scan_stop_wait(mvm, IWL_MVM_SCAN_SCHED);
 	if (!ret)
 		mvm->scan_status |= IWL_MVM_SCAN_STOPPING_SCHED;
 out:
Signature · 1 line
2.1.4
#34 lore raw

PATCH 32/39 iwlwifi: nvm: fix otp parsing in 8000 hw family

In reply to Grumbach, Emmanuel

From: Liad Kaufman <[email protected]>

The radio cfg DWORD was taken from the wrong place in the 8000 HW family, after a line in the code was wrongly changed by mistake. This broke several 8260 devices.

Fixes 5dd9c68a854a ("iwlwifi: drop support for early versions of 8000")
---
 drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/iwlwifi/iwl-nvm-parse.c +1 -1
index 75e96db..8e604a3 100644
@@ -471,7 +471,7 @@ static int iwl_get_radio_cfg(const struct iwl_cfg *cfg, const __le16 *nvm_sw,
 	if (cfg->device_family != IWL_DEVICE_FAMILY_8000)
 		return le16_to_cpup(nvm_sw + RADIO_CFG);
 
-	return le32_to_cpup((__le32 *)(nvm_sw + RADIO_CFG_FAMILY_8000));
+	return le32_to_cpup((__le32 *)(phy_sku + RADIO_CFG_FAMILY_8000));
 
 }
 
Signature · 1 line
2.1.4
#35 lore raw

PATCH 33/39 iwlwifi: pcie: Remove redundant check for family type

In reply to Grumbach, Emmanuel

From: Avri Altman <[email protected]>

This check for family type is redundant as the if clause above checks a family-dependent Boolean (which is not set for family 8000 anyway).

---
 drivers/net/wireless/iwlwifi/pcie/tx.c | 2 --
 1 file changed, 2 deletions(-)
drivers/net/wireless/iwlwifi/pcie/tx.c +0 -2
index 5ef8044..2b86c21 100644
@@ -1049,8 +1049,6 @@ static int iwl_pcie_set_cmd_in_flight(struct iwl_trans *trans,
 	    !trans_pcie->cmd_hold_nic_awake) {
 		__iwl_trans_pcie_set_bit(trans, CSR_GP_CNTRL,
 					 CSR_GP_CNTRL_REG_FLAG_MAC_ACCESS_REQ);
-		if (trans->cfg->device_family == IWL_DEVICE_FAMILY_8000)
-			udelay(2);
 
 		ret = iwl_poll_bit(trans, CSR_GP_CNTRL,
 				   CSR_GP_CNTRL_REG_VAL_MAC_ACCESS_EN,
Signature · 1 line
2.1.4
#36 lore raw

PATCH 34/39 iwlwifi: tracing: add rx cmd header fields

In reply to Grumbach, Emmanuel

From: Eliad Peller <[email protected]>

Having explicit rx cmd header fields is useful, as it can be used for event filtering (e.g. saving only debug logs, rather than the whole data)

---
 drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h +9 -6
index 223b875..948ce08 100644
@@ -1,6 +1,7 @@
 /******************************************************************************
  *
  * Copyright(c) 2009 - 2014 Intel Corporation. All rights reserved.
+ * Copyright(c) 2015 Intel Mobile Communications GmbH
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of version 2 of the GNU General Public License as
@@ -64,19 +65,21 @@ TRACE_EVENT(iwlwifi_dev_hcmd,
 
 TRACE_EVENT(iwlwifi_dev_rx,
 	TP_PROTO(const struct device *dev, const struct iwl_trans *trans,
-		 void *rxbuf, size_t len),
-	TP_ARGS(dev, trans, rxbuf, len),
+		 struct iwl_rx_packet *pkt, size_t len),
+	TP_ARGS(dev, trans, pkt, len),
 	TP_STRUCT__entry(
 		DEV_ENTRY
-		__dynamic_array(u8, rxbuf, iwl_rx_trace_len(trans, rxbuf, len))
+		__field(u8, cmd)
+		__dynamic_array(u8, rxbuf, iwl_rx_trace_len(trans, pkt, len))
 	),
 	TP_fast_assign(
 		DEV_ASSIGN;
-		memcpy(__get_dynamic_array(rxbuf), rxbuf,
-		       iwl_rx_trace_len(trans, rxbuf, len));
+		__entry->cmd = pkt->hdr.cmd;
+		memcpy(__get_dynamic_array(rxbuf), pkt,
+		       iwl_rx_trace_len(trans, pkt, len));
 	),
 	TP_printk("[%s] RX cmd %#.2x",
-		  __get_str(dev), ((u8 *)__get_dynamic_array(rxbuf))[4])
+		  __get_str(dev), __entry->cmd)
 );
 
 TRACE_EVENT(iwlwifi_dev_tx,
Signature · 1 line
2.1.4
#37 lore raw

PATCH 35/39 iwlwifi: mvm: combine regular and sched scan stop functions

In reply to Grumbach, Emmanuel

From: Luciano Coelho <[email protected]>

The regular and scheduled scan functions are very similar, so they can be combined into one.

---
 drivers/net/wireless/iwlwifi/mvm/d3.c       |  2 +-
 drivers/net/wireless/iwlwifi/mvm/mac80211.c |  7 ++--
 drivers/net/wireless/iwlwifi/mvm/mvm.h      |  9 +++---
 drivers/net/wireless/iwlwifi/mvm/scan.c     | 50 ++++++++++-------------------
 4 files changed, 27 insertions(+), 41 deletions(-)
drivers/net/wireless/iwlwifi/mvm/d3.c +1 -1
index ceffc78..423c519 100644
@@ -761,7 +761,7 @@ void iwl_mvm_set_last_nonqos_seq(struct iwl_mvm *mvm, struct ieee80211_vif *vif)
 
 static int iwl_mvm_switch_to_d3(struct iwl_mvm *mvm)
 {
-	iwl_mvm_reg_scan_stop(mvm);
+	iwl_mvm_scan_stop(mvm, IWL_MVM_SCAN_REGULAR, true);
 
 	iwl_trans_stop_device(mvm->trans);
 
drivers/net/wireless/iwlwifi/mvm/mac80211.c +4 -3
index cea236b..d3af88b 100644
@@ -510,6 +510,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
 
 	hw->wiphy->max_scan_ssids = PROBE_OPTION_MAX;
 
+	BUILD_BUG_ON(IWL_MVM_SCAN_STOPPING_MASK & IWL_MVM_SCAN_MASK);
 	BUILD_BUG_ON(IWL_MVM_MAX_UMAC_SCANS > HWEIGHT32(IWL_MVM_SCAN_MASK) ||
 		     IWL_MVM_MAX_LMAC_SCANS > HWEIGHT32(IWL_MVM_SCAN_MASK));
 
@@ -2361,7 +2362,7 @@ static void iwl_mvm_bss_info_changed(struct ieee80211_hw *hw,
 	mutex_lock(&mvm->mutex);
 
 	if (changes & BSS_CHANGED_IDLE && !bss_conf->idle)
-		iwl_mvm_sched_scan_stop(mvm, true);
+		iwl_mvm_scan_stop(mvm, IWL_MVM_SCAN_SCHED, true);
 
 	switch (vif->type) {
 	case NL80211_IFTYPE_STATION:
@@ -2417,7 +2418,7 @@ static void iwl_mvm_mac_cancel_hw_scan(struct ieee80211_hw *hw,
 	 */
 	if ((mvm->scan_status & IWL_MVM_SCAN_REGULAR) ||
 	    (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN))
-		iwl_mvm_reg_scan_stop(mvm);
+		iwl_mvm_scan_stop(mvm, IWL_MVM_SCAN_REGULAR, true);
 
 	mutex_unlock(&mvm->mutex);
 }
@@ -2775,7 +2776,7 @@ static int iwl_mvm_mac_sched_scan_stop(struct ieee80211_hw *hw,
 		return 0;
 	}
 
-	ret = iwl_mvm_sched_scan_stop(mvm, false);
+	ret = iwl_mvm_scan_stop(mvm, IWL_MVM_SCAN_SCHED, false);
 	mutex_unlock(&mvm->mutex);
 	iwl_mvm_wait_for_async_handlers(mvm);
 
drivers/net/wireless/iwlwifi/mvm/mvm.h +5 -4
index f22d309..0173ad1 100644
@@ -447,6 +447,8 @@ iwl_mvm_vif_from_mac80211(struct ieee80211_vif *vif)
 
 extern const u8 tid_to_mac80211_ac[];
 
+#define IWL_MVM_SCAN_STOPPING_SHIFT	8
+
 enum iwl_scan_status {
 	IWL_MVM_SCAN_REGULAR		= BIT(0),
 	IWL_MVM_SCAN_SCHED		= BIT(1),
@@ -463,8 +465,8 @@ enum iwl_scan_status {
 	IWL_MVM_SCAN_NETDETECT_MASK	= IWL_MVM_SCAN_NETDETECT |
 					  IWL_MVM_SCAN_STOPPING_NETDETECT,
 
-	IWL_MVM_SCAN_STOPPING_MASK	= 0xff00,
-	IWL_MVM_SCAN_MASK		= 0x00ff,
+	IWL_MVM_SCAN_STOPPING_MASK	= 0xff << IWL_MVM_SCAN_STOPPING_SHIFT,
+	IWL_MVM_SCAN_MASK		= 0xff,
 };
 
 /**
@@ -1121,7 +1123,7 @@ int iwl_mvm_reg_scan_start(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 			   struct cfg80211_scan_request *req,
 			   struct ieee80211_scan_ies *ies);
 int iwl_mvm_scan_size(struct iwl_mvm *mvm);
-int iwl_mvm_reg_scan_stop(struct iwl_mvm *mvm);
+int iwl_mvm_scan_stop(struct iwl_mvm *mvm, int type, bool notify);
 int iwl_mvm_max_scan_ie_len(struct iwl_mvm *mvm);
 void iwl_mvm_report_scan_aborted(struct iwl_mvm *mvm);
 
@@ -1137,7 +1139,6 @@ int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm,
 			     struct cfg80211_sched_scan_request *req,
 			     struct ieee80211_scan_ies *ies,
 			     int type);
-int iwl_mvm_sched_scan_stop(struct iwl_mvm *mvm, bool notify);
 int iwl_mvm_rx_scan_match_found(struct iwl_mvm *mvm,
 				struct iwl_rx_cmd_buffer *rxb,
 				struct iwl_device_cmd *cmd);
drivers/net/wireless/iwlwifi/mvm/scan.c +17 -33

82 lines not on this page · raw message

Signature · 1 line
2.1.4
#38 lore raw

PATCH 36/39 iwlwifi: mvm: make UMAC scans use the stopping scan status

In reply to Grumbach, Emmanuel

From: Luciano Coelho <[email protected]>

UMAC scans now use the general scan status for almost everything, the only part missing was in the scan complete notifications. Change it to use the stopping flags instead of clearing the flags when the stop comes from above and clean the handler function a bit.

---
 drivers/net/wireless/iwlwifi/mvm/scan.c | 32 +++++++++++++++-----------------
 1 file changed, 15 insertions(+), 17 deletions(-)
drivers/net/wireless/iwlwifi/mvm/scan.c +15 -17
index d8de906..4f4570d 100644
@@ -1356,15 +1356,24 @@ int iwl_mvm_rx_umac_scan_complete_notif(struct iwl_mvm *mvm,
 	struct iwl_rx_packet *pkt = rxb_addr(rxb);
 	struct iwl_umac_scan_complete *notif = (void *)pkt->data;
 	u32 uid = __le32_to_cpu(notif->uid);
-	bool sched = (mvm->scan_uid_status[uid] == IWL_MVM_SCAN_SCHED);
+	bool aborted = (notif->status == IWL_SCAN_OFFLOAD_ABORTED);
 
-	/* the status may be already zero in case of scan abort from above */
-	if (mvm->scan_uid_status[uid] == 0)
+	if (WARN_ON(!(mvm->scan_uid_status[uid] & mvm->scan_status)))
 		return 0;
 
+	/* if the scan is already stopping, we don't need to notify mac80211 */
+	if (mvm->scan_uid_status[uid] == IWL_MVM_SCAN_REGULAR) {
+		ieee80211_scan_completed(mvm->hw, aborted);
+		iwl_mvm_unref(mvm, IWL_MVM_REF_SCAN);
+	} else if (mvm->scan_uid_status[uid] == IWL_MVM_SCAN_SCHED) {
+		ieee80211_sched_scan_stopped(mvm->hw);
+	}
+
+	mvm->scan_status &= ~mvm->scan_uid_status[uid];
+
 	IWL_DEBUG_SCAN(mvm,
-		       "Scan completed, uid %u type %s, status %s, EBS status %s\n",
-		       uid, sched ? "sched" : "regular",
+		       "Scan completed, uid %u type %u, status %s, EBS status %s\n",
+		       uid, mvm->scan_uid_status[uid],
 		       notif->status == IWL_SCAN_OFFLOAD_COMPLETED ?
 				"completed" : "aborted",
 		       notif->ebs_status == IWL_SCAN_EBS_SUCCESS ?
@@ -1375,17 +1384,6 @@ int iwl_mvm_rx_umac_scan_complete_notif(struct iwl_mvm *mvm,
 
 	mvm->scan_uid_status[uid] = 0;
 
-	if (!sched) {
-		ieee80211_scan_completed(mvm->hw,
-					 notif->status ==
-						IWL_SCAN_OFFLOAD_ABORTED);
-		iwl_mvm_unref(mvm, IWL_MVM_REF_SCAN);
-	} else if (iwl_mvm_scan_uid_by_status(mvm, IWL_MVM_SCAN_SCHED) < 0) {
-		ieee80211_sched_scan_stopped(mvm->hw);
-	} else {
-		IWL_DEBUG_SCAN(mvm, "Another sched scan is running\n");
-	}
-
 	return 0;
 }
 
@@ -1430,7 +1428,7 @@ static int iwl_mvm_umac_scan_abort(struct iwl_mvm *mvm, int type)
 
 	ret = iwl_mvm_send_cmd_pdu(mvm, SCAN_ABORT_UMAC, 0, sizeof(cmd), &cmd);
 	if (!ret)
-		mvm->scan_uid_status[uid] = 0;
+		mvm->scan_uid_status[uid] = type << IWL_MVM_SCAN_STOPPING_SHIFT;
 
 	return ret;
 }
Signature · 1 line
2.1.4
#39 lore raw

PATCH 37/39 iwlwifi: mvm: treat scan races also on UMAC scans

In reply to Grumbach, Emmanuel

From: Luciano Coelho <[email protected]>

For UMAC, we were not treating a race condition that happens in the scan flows, because it was not using the same state flags. Now that UMAC and LMAC scans use the same state flags, we can also handle the race conditions for UMAC.

---
 drivers/net/wireless/iwlwifi/mvm/mac80211.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/net/wireless/iwlwifi/mvm/mac80211.c +2 -10
index d3af88b..cea2366 100644
@@ -2413,11 +2413,7 @@ static void iwl_mvm_mac_cancel_hw_scan(struct ieee80211_hw *hw,
 	 * cancel scan scan before ieee80211_scan_work() could run.
 	 * To handle that, simply return if the scan is not running.
 	*/
-	/* FIXME: for now, we ignore this race for UMAC scans, since
-	 * they don't set the scan_status.
-	 */
-	if ((mvm->scan_status & IWL_MVM_SCAN_REGULAR) ||
-	    (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN))
+	if (mvm->scan_status & IWL_MVM_SCAN_REGULAR)
 		iwl_mvm_scan_stop(mvm, IWL_MVM_SCAN_REGULAR, true);
 
 	mutex_unlock(&mvm->mutex);
@@ -2767,11 +2763,7 @@ static int iwl_mvm_mac_sched_scan_stop(struct ieee80211_hw *hw,
 	 * could run.  To handle this, simply return if the scan is
 	 * not running.
 	*/
-	/* FIXME: for now, we ignore this race for UMAC scans, since
-	 * they don't set the scan_status.
-	 */
-	if (!(mvm->scan_status & IWL_MVM_SCAN_SCHED) &&
-	    !(mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN)) {
+	if (!(mvm->scan_status & IWL_MVM_SCAN_SCHED)) {
 		mutex_unlock(&mvm->mutex);
 		return 0;
 	}
Signature · 1 line
2.1.4
#40 lore raw

PATCH 38/39 iwlwifi: mvm: implement the BlockAck related debug triggers

In reply to Grumbach, Emmanuel

BlockAck sessions can have events that are interesting to debug. When we send or receive a BAR, it is may indicate that something bad is happening. Even more so when mac80211 tells us that a frame timed out in the reodering buffer. Add a few triggers for BlockAck session debugging. Allow per-TID debugging.

---
 drivers/net/wireless/iwlwifi/iwl-drv.c           |   6 +-
 drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h |   6 +-
 drivers/net/wireless/iwlwifi/iwl-fw-file.h       |  27 +++++
 drivers/net/wireless/iwlwifi/mvm/mac80211.c      | 140 ++++++++++++++++++++++-
 drivers/net/wireless/iwlwifi/mvm/tx.c            |  31 ++++-
 5 files changed, 200 insertions(+), 10 deletions(-)
drivers/net/wireless/iwlwifi/iwl-drv.c +4 -2
index 7267152..12566c8 100644
@@ -6,7 +6,7 @@
  * GPL LICENSE SUMMARY
  *
  * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -32,7 +32,7 @@
  * BSD LICENSE
  *
  * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -1239,6 +1239,8 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
 		sizeof(struct iwl_fw_dbg_trigger_txq_timer);
 	trigger_tlv_sz[FW_DBG_TRIGGER_TIME_EVENT] =
 		sizeof(struct iwl_fw_dbg_trigger_time_event);
+	trigger_tlv_sz[FW_DBG_TRIGGER_BA] =
+		sizeof(struct iwl_fw_dbg_trigger_ba);
 
 	for (i = 0; i < ARRAY_SIZE(drv->fw.dbg_trigger_tlv); i++) {
 		if (pieces->dbg_trigger_tlv[i]) {
drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h +4 -2
index 251bf8d..e57dbd0 100644
@@ -6,7 +6,7 @@
  * GPL LICENSE SUMMARY
  *
  * Copyright(c) 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2014 - 2015 Intel Mobile Communications GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -32,7 +32,7 @@
  * BSD LICENSE
  *
  * Copyright(c) 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2014 - 2015 Intel Mobile Communications GmbH
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -254,6 +254,7 @@ iwl_fw_error_next_data(struct iwl_fw_error_dump_data *data)
  *	detection.
  * @FW_DBG_TRIGGER_TIME_EVENT: trigger log collection upon time events related
  *	events.
+ * @FW_DBG_TRIGGER_BA: trigger log collection upon BlockAck related events.
  */
 enum iwl_fw_dbg_trigger {
 	FW_DBG_TRIGGER_INVALID = 0,
@@ -267,6 +268,7 @@ enum iwl_fw_dbg_trigger {
 	FW_DBG_TRIGGER_RSSI,
 	FW_DBG_TRIGGER_TXQ_TIMERS,
 	FW_DBG_TRIGGER_TIME_EVENT,
+	FW_DBG_TRIGGER_BA,
 
 	/* must be last */
 	FW_DBG_TRIGGER_MAX,
drivers/net/wireless/iwlwifi/iwl-fw-file.h +27 -0
index 839b2c4..a8d0b64 100644
@@ -664,6 +664,33 @@ struct iwl_fw_dbg_trigger_time_event {
 } __packed;
 
 /**
+ * struct iwl_fw_dbg_trigger_ba - configures BlockAck related trigger
+ * rx_ba_start: tid bitmap to configure on what tid the trigger should occur
+ *	when an Rx BlockAck session is started.
+ * rx_ba_stop: tid bitmap to configure on what tid the trigger should occur
+ *	when an Rx BlockAck session is stopped.
+ * tx_ba_start: tid bitmap to configure on what tid the trigger should occur
+ *	when a Tx BlockAck session is started.
+ * tx_ba_stop: tid bitmap to configure on what tid the trigger should occur
+ *	when a Tx BlockAck session is stopped.
+ * rx_bar: tid bitmap to configure on what tid the trigger should occur
+ *	when a BAR is received (for a Tx BlockAck session).
+ * tx_bar: tid bitmap to configure on what tid the trigger should occur
+ *	when a BAR is send (for an Rx BlocAck session).
+ * frame_timeout: tid bitmap to configure on what tid the trigger should occur
+ *	when a frame times out in the reodering buffer.
+ */
+struct iwl_fw_dbg_trigger_ba {
+	__le16 rx_ba_start;
+	__le16 rx_ba_stop;
+	__le16 tx_ba_start;
+	__le16 tx_ba_stop;
+	__le16 rx_bar;
+	__le16 tx_bar;
+	__le16 frame_timeout;
+} __packed;
+
+/**
  * struct iwl_fw_dbg_conf_tlv - a TLV that describes a debug configuration.
  * @id: conf id
  * @usniffer: should the uSniffer image be used
drivers/net/wireless/iwlwifi/mvm/mac80211.c +136 -4

170 lines not on this page · raw message

drivers/net/wireless/iwlwifi/mvm/tx.c +29 -2
index ef32e17..57e0cbb 100644
@@ -6,7 +6,7 @@
  * GPL LICENSE SUMMARY
  *
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -32,7 +32,7 @@
  * BSD LICENSE
  *
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -70,6 +70,30 @@
 #include "mvm.h"
 #include "sta.h"
 
+static void
+iwl_mvm_bar_check_trigger(struct iwl_mvm *mvm, const u8 *addr,
+			  u16 tid, u16 ssn)
+{
+	struct iwl_fw_dbg_trigger_tlv *trig;
+	struct iwl_fw_dbg_trigger_ba *ba_trig;
+
+	if (!iwl_fw_dbg_trigger_enabled(mvm->fw, FW_DBG_TRIGGER_BA))
+		return;
+
+	trig = iwl_fw_dbg_get_trigger(mvm->fw, FW_DBG_TRIGGER_BA);
+	ba_trig = (void *)trig->data;
+
+	if (!iwl_fw_dbg_trigger_check_stop(mvm, NULL, trig))
+		return;
+
+	if (!(le16_to_cpu(ba_trig->tx_bar) & BIT(tid)))
+		return;
+
+	iwl_mvm_fw_dbg_collect_trig(mvm, trig,
+				    "BAR sent to %pM, tid %d, ssn %d",
+				    addr, tid, ssn);
+}
+
 /*
  * Sets most of the Tx cmd's fields
  */
@@ -101,12 +125,15 @@ void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct sk_buff *skb,
 	} else if (ieee80211_is_back_req(fc)) {
 		struct ieee80211_bar *bar = (void *)skb->data;
 		u16 control = le16_to_cpu(bar->control);
+		u16 ssn = le16_to_cpu(bar->start_seq_num);
 
 		tx_flags |= TX_CMD_FLG_ACK | TX_CMD_FLG_BAR;
 		tx_cmd->tid_tspec = (control &
 				     IEEE80211_BAR_CTRL_TID_INFO_MASK) >>
 			IEEE80211_BAR_CTRL_TID_INFO_SHIFT;
 		WARN_ON_ONCE(tx_cmd->tid_tspec >= IWL_MAX_TID_COUNT);
+		iwl_mvm_bar_check_trigger(mvm, bar->ra, tx_cmd->tid_tspec,
+					  ssn);
 	} else {
 		tx_cmd->tid_tspec = IWL_TID_NON_QOS;
 		if (info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ)
Signature · 1 line
2.1.4
#41 lore raw

PATCH 39/39 iwlwifi: mvm: clean interfaces on drv_stop

In reply to Grumbach, Emmanuel

From: Arik Nemtsov <[email protected]>

If a HW recovery was started but not completed since all interfaces went down, make sure to cleanup all interfaces before clearing the HW_RESTART flag.

---
 drivers/net/wireless/iwlwifi/mvm/mac80211.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/wireless/iwlwifi/mvm/mac80211.c +5 -1
index 71b66cb..9e517e2 100644
@@ -1489,8 +1489,12 @@ void __iwl_mvm_mac_stop(struct iwl_mvm *mvm)
 	/*
 	 * Clear IN_HW_RESTART flag when stopping the hw (as restart_complete()
 	 * won't be called in this case).
+	 * But make sure to cleanup interfaces that have gone down before/during
+	 * HW restart was requested.
 	 */
-	clear_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status);
+	if (test_and_clear_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status))
+		ieee80211_iterate_interfaces(mvm->hw, 0,
+					     iwl_mvm_cleanup_iterator, mvm);
 
 	/* We shouldn't have any UIDs still set.  Loop over all the UIDs to
 	 * make sure there's nothing left there and warn if any is found.
Signature · 1 line
2.1.4
#42 lore raw
In reply to Grumbach, Emmanuel
Quoted 3 lines · Emmanuel

this is a pull request for 4.2. Nothing really stands out besides what I wrote in the tag. Even the diffstat hints what is the biggest part of this pull request :)

I see there was a minor comment to one of the patches. Can I still pull this or what are you planning to do?

Quoted 4 lines

Note that there are fixes here that didn't make it to my previous pull request for 4.1. I tagged them for stable since the wording of your last pull request for 4.1 to Dave hinted me that you won't send any pull request for 4.1 to him anymore.

Yeah, I said that hopefully it's the last pull request. I got one important fix from Arend so I will try to send one more, but let's see how it goes.

Signature · 1 line
Kalle Valo
#43 lore raw
Quoted 9 lines
Quoted 3 lines · Emmanuel

this is a pull request for 4.2. Nothing really stands out besides what I wrote in the tag. Even the diffstat hints what is the biggest part of this pull request :)

I see there was a minor comment to one of the patches. Can I still pull this or what are you planning to do?

I wasn't planning to fix that typo but...

Quoted 9 lines
Quoted 5 lines

Note that there are fixes here that didn't make it to my previous pull request for 4.1. I tagged them for stable since the wording of your last pull request for 4.1 to Dave hinted me that you won't send any pull request for 4.1 to him anymore.

Yeah, I said that hopefully it's the last pull request. I got one important fix from Arend so I will try to send one more, but let's see how it goes.

... if that's the case, do you want me to split the patches differently and add the ones I CCed to stable to iwlwifi-fixes? If I re-spin iwlwifi-next anyway, I'll fix the typo above.

#44 lore raw
Quoted 11 lines · Emmanuel
Quoted 9 lines
Quoted 3 lines · Emmanuel

this is a pull request for 4.2. Nothing really stands out besides what I wrote in the tag. Even the diffstat hints what is the biggest part of this pull request :)

I see there was a minor comment to one of the patches. Can I still pull this or what are you planning to do?

I wasn't planning to fix that typo but...

I won't mind ;)

#45 lore raw
In reply to Grumbach, Emmanuel
Quoted 10 lines · Emmanuel
Quoted 8 lines
Quoted 4 lines

Note that there are fixes here that didn't make it to my previous pull request for 4.1. I tagged them for stable since the wording of your last pull request for 4.1 to Dave hinted me that you won't send any pull request for 4.1 to him anymore.

Yeah, I said that hopefully it's the last pull request. I got one important fix from Arend so I will try to send one more, but let's see how it goes.

... if that's the case, do you want me to split the patches differently and add the ones I CCed to stable to iwlwifi-fixes?

Sure, go ahead if you want to do that. But please keep in mind that the bar is higher when we go closer to the actual release. I found two patches from the patchset with CC stable (I hope I didn't miss anything):

[PATCH 03/39] iwlwifi: pcie: fix tracking of cmd_in_flight [PATCH 32/39] iwlwifi: nvm: fix otp parsing in 8000 hw family

In my opinion these two are ok.

Quoted 1 line

If I re-spin iwlwifi-next anyway, I'll fix the typo above.

Ok, I don't care about the typo in the commit log, we do those all the time :) I just wanted to check that I don't pull anything which I'm not supposed to pull.

Signature · 1 line
Kalle Valo
#46 lore raw
Quoted 20 lines
Quoted 7 lines · Emmanuel
Quoted 7 lines
Quoted 4 lines

Note that there are fixes here that didn't make it to my previous pull request for 4.1. I tagged them for stable since the wording of your last pull request for 4.1 to Dave hinted me that you won't send any pull request for 4.1 to him anymore.

Yeah, I said that hopefully it's the last pull request. I got one important fix from Arend so I will try to send one more, but let's see how

it goes.

Quoted 3 lines
Quoted 1 line

... if that's the case, do you want me to split the patches differently and add the ones I CCed to stable to iwlwifi-fixes?

Sure, go ahead if you want to do that. But please keep in mind that the bar is higher when we go closer to the actual release. I found two patches from the patchset with CC stable (I hope I didn't miss
anything):

Quoted 5 lines

[PATCH 03/39] iwlwifi: pcie: fix tracking of cmd_in_flight [PATCH 32/39]
iwlwifi: nvm: fix otp parsing in 8000 hw family

In my opinion these two are ok.

Cool. I'll respin.

Quoted 9 lines
Quoted 1 line

If I re-spin iwlwifi-next anyway, I'll fix the typo above.

Ok, I don't care about the typo in the commit log, we do those all the time :) I just wanted to check that I don't pull anything which I'm not supposed to pull.

--
Kalle Valo

#47 lore raw

pull request: iwlwifi-next 2015-05-28

In reply to Grumbach, Emmanuel

SGkgS2FsbGUsDQoNCnRoaXMgaXMgdGhlIHNhbWUgcHVsbCByZXF1ZXN0IGZvciA0LjIgd2l0aCB0 aGUgdHlwbyBmaXhlZCBhbmQgd2l0aG91dA0KdGhlIHBhdGNoZXMgdGhhdCBhcmUgbm93IHRhcmdl dGVkIHRvIDQuMQ0KDQpUaGFua3MNCg0KDQpUaGUgZm9sbG93aW5nIGNoYW5nZXMgc2luY2UgY29t bWl0IGJiYmU4YzhjNTk2YjM3ODRhMmVkMDg3NzI5MDBlODI3ZjhiYTcyYzU6DQoNCiAgbWFjODAy MTE6IGFkZCBtaXNzaW5nIGRvY3VtZW50YXRpb24gZm9yIHJhdGVfY3RybF9sb2NrICgyMDE1LTA1 LTA2IDE2OjAwOjMyICswMjAwKQ0KDQphcmUgYXZhaWxhYmxlIGluIHRoZSBnaXQgcmVwb3NpdG9y eSBhdDoNCg0KICBodHRwczovL2dpdC5rZXJuZWwub3JnL3B1Yi9zY20vbGludXgva2VybmVsL2dp dC9pd2x3aWZpL2l3bHdpZmktbmV4dC5naXQgdGFncy9pd2x3aWZpLW5leHQtZm9yLWthbGxlLTIw MTUtMDUtMjgNCg0KZm9yIHlvdSB0byBmZXRjaCBjaGFuZ2VzIHVwIHRvIDhiMmI5ZmJmN2U0ZTFi MmU4NjYyMzlkNDYyNDg0MzFmNzE5YmEyYzE6DQoNCiAgaXdsd2lmaTogbXZtOiBjbGVhbiBpbnRl cmZhY2VzIG9uIGRydl9zdG9wICgyMDE1LTA1LTI4IDEzOjM2OjU0ICswMzAwKQ0KDQotLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t DQpBbmRyZWkgT3RjaGVyZXRpYW5za2kgKDEpOg0KICAgICAgaXdsd2lmaTogbXZtOiBDb25maWd1 cmUgYWdnLiBxdWV1ZSBiZWZvcmUgYXNzaWduaW5nIGl0IHRvIFNUQQ0KDQpBcmlrIE5lbXRzb3Yg KDEpOg0KICAgICAgaXdsd2lmaTogbXZtOiBjbGVhbiBpbnRlcmZhY2VzIG9uIGRydl9zdG9wDQoN CkF2cmFoYW0gU3Rlcm4gKDMpOg0KICAgICAgaXdsd2lmaTogbXZtOiBwcmludCBzY2FubmVkIGNo YW5uZWwgbGlzdCBvbiBzY2FuIGl0ZXJhdGlvbiBjb21wbGV0ZSBub3RpZmljYXRpb24NCiAgICAg IGl3bHdpZmk6IG12bTogYWRkIFVNQUMgc2NhbiBpdGVyYXRpb24gY29tcGxldGUgbm90aWZpY2F0 aW9uDQogICAgICBpd2x3aWZpOiBtdm06IGFkZCBzdXBwb3J0IGZvciA4IGxldmVsIHNjYW4gcHJp b3JpdHkgQVBJDQoNCkF2cmkgQWx0bWFuICgyKToNCiAgICAgIGl3bHdpZmk6IHBjaWU6IGRvbid0 IGRpc2FibGUgdGhlIGJ1c21hc3RlciBETUEgY2xvY2sgZm9yIGZhbWlseSA4MDAwDQogICAgICBp d2x3aWZpOiBwY2llOiBSZW1vdmUgcmVkdW5kYW50IGNoZWNrIGZvciBmYW1pbHkgdHlwZQ0KDQpF bGlhZCBQZWxsZXIgKDMpOg0KICAgICAgaXdsd2lmaTogbXZtOiBhdm9pZCB1c2UtYWZ0ZXItZnJl ZSBvbiBpd2xfbXZtX2QwaTNfZW5hYmxlX3R4KCkNCiAgICAgIGl3bHdpZmk6IG12bTogZml4IFJP QyByZWZlcmVuY2UgYWNjb3VudGluZw0KICAgICAgaXdsd2lmaTogdHJhY2luZzogYWRkIHJ4IGNt ZCBoZWFkZXIgZmllbGRzDQoNCkVtbWFudWVsIEdydW1iYWNoICgxMik6DQogICAgICBpd2x3aWZp OiBtdm06IGZvcmJpZCBNSU1PIG9uIGRldmljZXMgdGhhdCBkb24ndCBzdXBwb3J0IGl0DQogICAg ICBpd2x3aWZpOiA3MDAwOiBtb2RpZnkgdGhlIGZpcm13YXJlIG5hbWUgZm9yIDMxNjUNCiAgICAg IGl3bHdpZmk6IG12bTogZml4IE1MTUUgdHJpZ2dlcg0KICAgICAgaXdsd2lmaTogbXZtOiBCVCBD b2V4IC0gZHVwbGljYXRlIHRoZSBjb21tYW5kIGlmIHNlbnQgQVNZTkMNCiAgICAgIE1lcmdlIHJl bW90ZS10cmFja2luZyBicmFuY2ggJ2l3bHdpZmktZml4ZXMvbWFzdGVyJyBpbnRvIGl3bHdpZmkt bmV4dA0KICAgICAgaXdsd2lmaTogYnVtcCBBUEkgdG8gMTQNCiAgICAgIGl3bHdpZmk6IHBjaWU6 IHNpbXBsaWZ5IHJldHVybiB2YWx1ZQ0KICAgICAgaXdsd2lmaTogbXZtOiBCVCBDb2V4IC0gcmVt b3ZlIHVzZWxlc3MgY29kZQ0KICAgICAgaXdsd2lmaTogbXZtOiBCVCBDb2V4IC0gYWxsb2NhdGUg YSBzaG9ydCBjb21tYW5kIG9uIHRoZSBzdGFjaw0KICAgICAgaXdsd2lmaTogbXZtOiBCVCBDb2V4 IC0gZml4IHNoYXJlZCBhbnRlbm5hIGNoZWNrIHdpdGggbmV3IEFQSQ0KICAgICAgTWVyZ2UgdGFn ICdtYWM4MDIxMS1uZXh0LWZvci1kYXZlbS0yMDE1LTA1LTA2JyBpbnRvIGl3bHdpZmktbmV4dA0K ICAgICAgaXdsd2lmaTogbXZtOiBpbXBsZW1lbnQgdGhlIEJsb2NrQWNrIHJlbGF0ZWQgZGVidWcg dHJpZ2dlcnMNCg0KRXJhbiBIYXJhcnkgKDEpOg0KICAgICAgaXdsd2lmaTogODAwMDogZmFsbGJh Y2sgdG8gZGVmYXVsdCBOVk0gZmlsZQ0KDQpIYWltIERyZXlmdXNzICgxKToNCiAgICAgIGl3bHdp Zmk6IG12bTogRnJlZSBmd19zdGF0dXMgYWZ0ZXIgdXNlIHRvIGF2b2lkIG1lbW9yeSBsZWFrDQoN CklkbyBZYXJpdiAoMSk6DQogICAgICBpd2x3aWZpOiB1cGRhdGUgdGhlcm1hbCB0aHJvdHRsaW5n IHZhbHVlcyBmb3IgODAwMCBkZXZpY2VzDQoNCkpvaGFubmVzIEJlcmcgKDMpOg0KICAgICAgaXds d2lmaTogcmVmYWN0b3IgY29tbW9uIHRyYW5zcG9ydCBhbGxvYy9pbml0IGNvZGUNCiAgICAgIGl3 bHdpZmk6IG12bTogYWR2ZXJ0aXNlIHJhbmRvbWlzZWQgbmV0ZGV0ZWN0IE1BQyBhZGRyZXNzDQog ICAgICBpd2x3aWZpOiBtdm06IGhhbmRsZSBkZXZpY2Ugc3RhcnQgZmFpbHVyZSBjb3JyZWN0bHkN Cg0KTGlhZCBLYXVmbWFuICgxKToNCiAgICAgIGl3bHdpZmk6IG52bTogZm9yY2UgbWFjIGZyb20g b3RwIGluIGNhc2UgbnZtIG1hYyBpcyByZXNlcnZlZA0KDQpMdWNpYW5vIENvZWxobyAoMTgpOg0K ICAgICAgaXdsd2lmaTogbXZtOiB0YWtlIHRoZSBVQ09ERV9ET1dOIHJlZmVyZW5jZSB3aGVuIHJl c3VtaW5nDQogICAgICBpd2x3aWZpOiBtdm06IGNsZWFuIG5ldC1kZXRlY3QgaW5mbyBpZiBkZXZp Y2Ugd2FzIHJlc2V0IGR1cmluZyBzdXNwZW5kDQogICAgICBpd2x3aWZpOiBwY2llOiBkb24ndCBj YWxsIHNldF9wd3IgZnVuY3Rpb25zIGZvciBmYW1pbHkgODAwMA0KICAgICAgaXdsd2lmaTogbXZt OiBzbWFsbCBmaXggaW4gYSBjb21tZW50IGFib3V0IFVNQUMgc2NhbiBzY2hlZHVsZXMNCiAgICAg IGl3bHdpZmk6IG12bTogcmVtb3ZlIHRoZSBVTUFDIHNwZWNpZmljIHNjYW4gdHlwZXMNCiAgICAg IGl3bHdpZmk6IG12bTogZml4IHRoZSBuZXQtZGV0ZWN0IFNTSURzIHJlcG9ydCBvcmRlcg0KICAg ICAgaXdsd2lmaTogbXZtOiBtYWtlIGl3bF9tdm1fY29uZmlnX3NjaGVkX3NjYW5fcHJvZmlsZXMo KSBzdGF0aWMNCiAgICAgIGl3bHdpZmk6IG12bTogcmVvcmdhbml6ZSBzY2FuIHN0b3BwaW5nIGZ1 bmN0aW9ucw0KICAgICAgaXdsd2lmaTogbXZtOiBkb24ndCBzdG9wIHJlZ3VsYXIgc2NhbnMgd2hl biBnb2luZyBvdXQgb2YgaWRsZSBzdGF0ZQ0KICAgICAgaXdsd2lmaTogbXZtOiBjb21iaW5lIHBh cnQgb2YgdGhlIHNjYW4gc3RvcCBmbG93cw0KICAgICAgaXdsd2lmaTogbXZtOiByZW5hbWUgdW1h YyBzY2FuIHN0b3AgZnVuY3Rpb24NCiAgICAgIGl3bHdpZmk6IG12bTogcmVuYW1lIHNvbWUgTE1B Qy1zcGVjaWZpYyBzY2FuIGZ1bmN0aW9ucw0KICAgICAgaXdsd2lmaTogbXZtOiByZWZhY3RvciBV TUFDIHNjYW4gVUlEIGhhbmRsaW5nDQogICAgICBpd2x3aWZpOiBtdm06IHJlbW92ZSBjb2RlIHRo YXQgc3RvcHMgbXVsdGlwbGUgVU1BQyBzY2FucyBvZiBhIHR5cGUNCiAgICAgIGl3bHdpZmk6IG12 bTogY29tYmluZSBVTUFDIGFuZCBMTUFDIHNjYW5fc3RvcCBmdW5jdGlvbnMNCiAgICAgIGl3bHdp Zmk6IG12bTogY29tYmluZSByZWd1bGFyIGFuZCBzY2hlZCBzY2FuIHN0b3AgZnVuY3Rpb25zDQog ICAgICBpd2x3aWZpOiBtdm06IG1ha2UgVU1BQyBzY2FucyB1c2UgdGhlIHN0b3BwaW5nIHNjYW4g c3RhdHVzDQogICAgICBpd2x3aWZpOiBtdm06IHRyZWF0IHNjYW4gcmFjZXMgYWxzbyBvbiBVTUFD IHNjYW5zDQoNCk1hdHRpIEdvdHRsaWViICgxKToNCiAgICAgIGl3bHdpZmk6IG12bTogQWRkIGRl YnVnZnMgZW50cnkgZm9yIFR4IHBvd2VyIGxpbWl0DQoNCk5pY2hvbGFzIEtyYXVzZSAoMSk6DQog ICAgICBpd2x3aWZpOiBSZW1vdmUgdXNlIG9mIHRoZSBkZXByZWNhY3RlZCBQVFJfUkVUDQoNCiBk cml2ZXJzL25ldC93aXJlbGVzcy9pd2x3aWZpL0tjb25maWcgICAgICAgICAgICAgICAgfCAgIDEz ICstDQogZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9NYWtlZmlsZSAgICAgICAgICAgICAg IHwgICAgMSArDQogZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9pd2wtNzAwMC5jICAgICAg ICAgICAgIHwgICA0MSArKysrLQ0KIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvaXdsLTgw MDAuYyAgICAgICAgICAgICB8ICAgNzAgKysrKystLS0NCiBkcml2ZXJzL25ldC93aXJlbGVzcy9p d2x3aWZpL2l3bC1jb25maWcuaCAgICAgICAgICAgfCAgIDQ0ICsrKysrDQogZHJpdmVycy9uZXQv d2lyZWxlc3MvaXdsd2lmaS9pd2wtZGV2dHJhY2UtaXdsd2lmaS5oIHwgICAxNSArLQ0KIGRyaXZl cnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvaXdsLWRydi5jICAgICAgICAgICAgICB8ICAgIDYgKy0N CiBkcml2ZXJzL25ldC93aXJlbGVzcy9pd2x3aWZpL2l3bC1lZXByb20tcGFyc2UuYyAgICAgfCAg ICA1ICsNCiBkcml2ZXJzL25ldC93aXJlbGVzcy9pd2x3aWZpL2l3bC1lZXByb20tcGFyc2UuaCAg ICAgfCAgICAzICsNCiBkcml2ZXJzL25ldC93aXJlbGVzcy9pd2x3aWZpL2l3bC1mdy1lcnJvci1k dW1wLmggICAgfCAgICA2ICstDQogZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9pd2wtZnct ZmlsZS5oICAgICAgICAgIHwgICA0MCArKysrLQ0KIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdp ZmkvaXdsLW52bS1wYXJzZS5jICAgICAgICB8ICAgMzAgKysrLQ0KIGRyaXZlcnMvbmV0L3dpcmVs ZXNzL2l3bHdpZmkvaXdsLXBycGguaCAgICAgICAgICAgICB8ICAgIDMgKw0KIGRyaXZlcnMvbmV0 L3dpcmVsZXNzL2l3bHdpZmkvaXdsLXRyYW5zLmMgICAgICAgICAgICB8ICAxMTMgKysrKysrKysr KysrDQogZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9pd2wtdHJhbnMuaCAgICAgICAgICAg IHwgICA2MSArKysrLS0tDQogZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9tdm0vY29leC5j ICAgICAgICAgICAgIHwgICA4MSArKy0tLS0tLS0NCiBkcml2ZXJzL25ldC93aXJlbGVzcy9pd2x3 aWZpL212bS9jb2V4X2xlZ2FjeS5jICAgICAgfCAgICAyICstDQogZHJpdmVycy9uZXQvd2lyZWxl c3MvaXdsd2lmaS9tdm0vZDMuYyAgICAgICAgICAgICAgIHwgICA0MyArKystLQ0KIGRyaXZlcnMv bmV0L3dpcmVsZXNzL2l3bHdpZmkvbXZtL2RlYnVnZnMtdmlmLmMgICAgICB8ICAgMjEgKystDQog ZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9tdm0vZGVidWdmcy5jICAgICAgICAgIHwgICAg NSArLQ0KIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvbXZtL2Z3LWFwaS1wb3dlci5oICAg ICB8ICAgMzQgKysrKw0KIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvbXZtL2Z3LWFwaS1z Y2FuLmggICAgICB8ICAxMzQgKysrKysrLS0tLS0tLS0NCiBkcml2ZXJzL25ldC93aXJlbGVzcy9p d2x3aWZpL212bS9mdy1hcGkuaCAgICAgICAgICAgfCAgIDI1ICstLQ0KIGRyaXZlcnMvbmV0L3dp cmVsZXNzL2l3bHdpZmkvbXZtL2Z3LmMgICAgICAgICAgICAgICB8ICAgNjcgKysrLS0tLQ0KIGRy aXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvbXZtL21hYzgwMjExLmMgICAgICAgICB8ICAzNjQg KysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0NCiBkcml2ZXJzL25ldC93aXJl bGVzcy9pd2x3aWZpL212bS9tdm0uaCAgICAgICAgICAgICAgfCAgMTQwICsrKysrKy0tLS0tLS0t LQ0KIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvbXZtL252bS5jICAgICAgICAgICAgICB8 ICAgIDggKy0NCiBkcml2ZXJzL25ldC93aXJlbGVzcy9pd2x3aWZpL212bS9vcHMuYyAgICAgICAg ICAgICAgfCAgIDQ1ICsrKy0tDQogZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9tdm0vcnMu YyAgICAgICAgICAgICAgIHwgICAyMyArLS0NCiBkcml2ZXJzL25ldC93aXJlbGVzcy9pd2x3aWZp L212bS9ycy5oICAgICAgICAgICAgICAgfCAgICAyIC0NCiBkcml2ZXJzL25ldC93aXJlbGVzcy9p d2x3aWZpL212bS9yeC5jICAgICAgICAgICAgICAgfCAgICA1ICsNCiBkcml2ZXJzL25ldC93aXJl bGVzcy9pd2x3aWZpL212bS9zY2FuLmMgICAgICAgICAgICAgfCAxMzcwICsrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLQ0KIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvbXZtL3N0YS5j ICAgICAgICAgICAgICB8ICAgMTQgKy0NCiBkcml2ZXJzL25ldC93aXJlbGVzcy9pd2x3aWZpL212 bS90aW1lLWV2ZW50LmMgICAgICAgfCAgIDE1ICstDQogZHJpdmVycy9uZXQvd2lyZWxlc3MvaXds d2lmaS9tdm0vdHQuYyAgICAgICAgICAgICAgIHwgICA0MCArLS0tLQ0KIGRyaXZlcnMvbmV0L3dp cmVsZXNzL2l3bHdpZmkvbXZtL3R4LmMgICAgICAgICAgICAgICB8ICAgMzEgKysrLQ0KIGRyaXZl cnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvcGNpZS90cmFucy5jICAgICAgICAgICB8ICAxNTYgKysr KysrKysrLS0tLS0tLS0NCiBkcml2ZXJzL25ldC93aXJlbGVzcy9pd2x3aWZpL3BjaWUvdHguYyAg ICAgICAgICAgICAgfCAgICAyIC0NCiAzOCBmaWxlcyBjaGFuZ2VkLCAxNjE4IGluc2VydGlvbnMo KyksIDE0NjAgZGVsZXRpb25zKC0pDQogY3JlYXRlIG1vZGUgMTAwNjQ0IGRyaXZlcnMvbmV0L3dp cmVsZXNzL2l3bHdpZmkvaXdsLXRyYW5zLmMNCg==

#48 lore raw

Re: pull request: iwlwifi-next 2015-05-28

Quoted 8 lines · Emmanuel

Hi Kalle,

this is the same pull request for 4.2 with the typo fixed and without the patches that are now targeted to 4.1

Thanks

Quoted 7 lines

The following changes since commit bbbe8c8c596b3784a2ed08772900e827f8ba72c5:

mac80211: add missing documentation for rate_ctrl_lock (2015-05-06 16:00:32 +0200)

are available in the git repository at:

https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git tags/iwlwifi-next-for-kalle-2015-05-28

Hmm, something is not right with this one (or I just haven't fully woken up yet). Maybe you forgot to sign the tag?

Signature · 1 line
Kalle Valo
#49 lore raw

RE: pull request: iwlwifi-next 2015-05-28

Quoted 17 lines
Quoted 9 lines · Emmanuel

Hi Kalle,

this is the same pull request for 4.2 with the typo fixed and without the patches that are now targeted to 4.1

Thanks

The following changes since commit

bbbe8c8c596b3784a2ed08772900e827f8ba72c5:

Quoted 4 lines

mac80211: add missing documentation for rate_ctrl_lock (2015-05-06
16:00:32 +0200)

Quoted 9 lines
Quoted 5 lines

are available in the git repository at:

https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.g
it tags/iwlwifi-next-for-kalle-2015-05-28

Hmm, something is not right with this one (or I just haven't fully woken up yet). Maybe you forgot to sign the tag?

Hmm.. Weird.
Anyway - I was just adding some more content for another pull request. So let me send another one that includes everything.

#50 lore raw

Re: pull request: iwlwifi-next 2015-05-28

Quoted 23 lines · Emmanuel
Quoted 23 lines
Quoted 9 lines · Emmanuel

Hi Kalle,

this is the same pull request for 4.2 with the typo fixed and without the patches that are now targeted to 4.1

Thanks

The following changes since commit

bbbe8c8c596b3784a2ed08772900e827f8ba72c5:

Quoted 9 lines

mac80211: add missing documentation for rate_ctrl_lock (2015-05-06
16:00:32 +0200)

are available in the git repository at:

https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.g
it tags/iwlwifi-next-for-kalle-2015-05-28

Quoted 6 lines
Quoted 3 lines

Hmm, something is not right with this one (or I just haven't fully woken up yet). Maybe you forgot to sign the tag?

Hmm.. Weird. Anyway - I was just adding some more content for another pull request. So let me send another one that includes everything.

Sounds good. But can you do that still today? I was hoping to send a pull request to Dave today.

Signature · 1 line
Kalle Valo
#51 lore raw

pull request: iwlwifi-next 2015-06-03

In reply to Grumbach, Emmanuel

Hi Kalle,

As promised, here is the enlarged pull request for 4.2. I double checked that the tag is signed this time.
I also signed this email, just in case...

I'll reply to this pull request with the diff between the previous one and this one. All the other patches have been sent to the ML already. The good thing with this new pull request is that it allows us to jump to -15.ucode which is starting validation right now. I hope its first version will be available in 3 weeks-ish.

Let me know if you have issues with this.

Thank you.

The following changes since commit bbbe8c8c596b3784a2ed08772900e827f8ba72c5:

mac80211: add missing documentation for rate_ctrl_lock (2015-05-06 16:00:32 +0200)

are available in the git repository at:

https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git tags/iwlwifi-for-kalle-2015-06-03

for you to fetch changes up to 5f4c02e2b8c9251c827abf87c4ead4496c67492a:

iwlwifi: mvm: advertise only HW-supported ciphers (2015-06-03 10:12:26 +0300)

----------------------------------------------------------------
* a few fixes (re-enablement of interrupts for certain new platforms that have special power states)
* Rework completely the RBD allocation model towards new multi RX hardware.
* cleanups
* scan reworks continuation (Luca)

----------------------------------------------------------------
Andrei Otcheretianski (1):
iwlwifi: mvm: Configure agg. queue before assigning it to STA

Arik Nemtsov (1):
iwlwifi: mvm: clean interfaces on drv_stop

Avraham Stern (3):
iwlwifi: mvm: print scanned channel list on scan iteration complete notification
iwlwifi: mvm: add UMAC scan iteration complete notification
iwlwifi: mvm: add support for 8 level scan priority API

Avri Altman (3):
iwlwifi: pcie: don't disable the busmaster DMA clock for family 8000
iwlwifi: pcie: Remove redundant check for family type
iwlwifi: pcie: Control access to the NIC's PM registers via iwl_cfg

David Spinadel (2):
iwlwifi: mvm: add inactive state to ebs status
iwlwifi: mvm: don't use EBS for P2P find

Eliad Peller (4):
iwlwifi: mvm: avoid use-after-free on iwl_mvm_d0i3_enable_tx()
iwlwifi: mvm: fix ROC reference accounting
iwlwifi: tracing: add rx cmd header fields
iwlwifi: pcie: re-enable interrupts on resume

Emmanuel Grumbach (13):
iwlwifi: mvm: forbid MIMO on devices that don't support it
iwlwifi: 7000: modify the firmware name for 3165
iwlwifi: mvm: fix MLME trigger
iwlwifi: mvm: BT Coex - duplicate the command if sent ASYNC Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next
iwlwifi: bump API to 14
iwlwifi: pcie: simplify return value
iwlwifi: mvm: BT Coex - remove useless code
iwlwifi: mvm: BT Coex - allocate a short command on the stack
iwlwifi: mvm: BT Coex - fix shared antenna check with new API Merge tag 'mac80211-next-for-davem-2015-05-06' into iwlwifi-next
iwlwifi: mvm: implement the BlockAck related debug triggers
iwlwifi: bump the iwlmvm API number to 15

Eran Harary (1):
iwlwifi: 8000: fallback to default NVM file

Eyal Shapira (1):
iwlwifi: mvm: rs: pass rate directly to column checks

Haim Dreyfuss (1):
iwlwifi: mvm: Free fw_status after use to avoid memory leak

Ido Yariv (1):
iwlwifi: update thermal throttling values for 8000 devices

Johannes Berg (8):
iwlwifi: refactor common transport alloc/init code
iwlwifi: mvm: advertise randomised netdetect MAC address
iwlwifi: mvm: handle device start failure correctly
iwlwifi: mvm: enable IEEE80211_HW_SUPPORT_FAST_XMIT
iwlwifi: dvm: enable IEEE80211_HW_SUPPORT_FAST_XMIT
iwlwifi: mvm: simplify iwl_mvm_stop_roc()
iwlwifi: prepare for higher API/CAPA bits
iwlwifi: mvm: advertise only HW-supported ciphers

Liad Kaufman (2):
iwlwifi: nvm: force mac from otp in case nvm mac is reserved
iwlwifi: wrt: add mipi type to debug types

Luciano Coelho (18):
iwlwifi: mvm: take the UCODE_DOWN reference when resuming
iwlwifi: mvm: clean net-detect info if device was reset during suspend
iwlwifi: pcie: don't call set_pwr functions for family 8000
iwlwifi: mvm: small fix in a comment about UMAC scan schedules
iwlwifi: mvm: remove the UMAC specific scan types
iwlwifi: mvm: fix the net-detect SSIDs report order
iwlwifi: mvm: make iwl_mvm_config_sched_scan_profiles() static
iwlwifi: mvm: reorganize scan stopping functions
iwlwifi: mvm: don't stop regular scans when going out of idle state
iwlwifi: mvm: combine part of the scan stop flows
iwlwifi: mvm: rename umac scan stop function
iwlwifi: mvm: rename some LMAC-specific scan functions
iwlwifi: mvm: refactor UMAC scan UID handling
iwlwifi: mvm: remove code that stops multiple UMAC scans of a type
iwlwifi: mvm: combine UMAC and LMAC scan_stop functions
iwlwifi: mvm: combine regular and sched scan stop functions
iwlwifi: mvm: make UMAC scans use the stopping scan status
iwlwifi: mvm: treat scan races also on UMAC scans

Matti Gottlieb (3):
iwlwifi: mvm: Add debugfs entry for Tx power limit
iwlwifi: mvm: Remove old scan commands
iwlwifi: mvm: Add DC2DC_CONFIG_CMD (0x83) cmd & TLV

Nicholas Krause (1):
iwlwifi: Remove use of the deprecacted PTR_RET

Sara Sharon (1):
iwlwifi: pcie: New RBD allocation model

 drivers/net/wireless/iwlwifi/Kconfig                |   13 +-
 drivers/net/wireless/iwlwifi/Makefile               |    1 +
 drivers/net/wireless/iwlwifi/dvm/mac80211.c         |    1 +
 drivers/net/wireless/iwlwifi/iwl-7000.c             |   41 ++++-
 drivers/net/wireless/iwlwifi/iwl-8000.c             |   71 +++++---
 drivers/net/wireless/iwlwifi/iwl-config.h           |   45 +++++
 drivers/net/wireless/iwlwifi/iwl-devtrace-iwlwifi.h |   15 +-
 drivers/net/wireless/iwlwifi/iwl-drv.c              |   32 +++-
 drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c     |    5 +
 drivers/net/wireless/iwlwifi/iwl-eeprom-parse.h     |    3 +
 drivers/net/wireless/iwlwifi/iwl-fh.h               |    6 -
 drivers/net/wireless/iwlwifi/iwl-fw-error-dump.h    |    6 +-
 drivers/net/wireless/iwlwifi/iwl-fw-file.h          |  107 +++++++----
 drivers/net/wireless/iwlwifi/iwl-fw.h               |   24 ++-
 drivers/net/wireless/iwlwifi/iwl-nvm-parse.c        |   30 +++-
 drivers/net/wireless/iwlwifi/iwl-prph.h             |    3 +
 drivers/net/wireless/iwlwifi/iwl-trans.c            |  113 ++++++++++++
 drivers/net/wireless/iwlwifi/iwl-trans.h            |   63 ++++---
 drivers/net/wireless/iwlwifi/mvm/coex.c             |  103 +++--------
 drivers/net/wireless/iwlwifi/mvm/coex_legacy.c      |    2 +-
 drivers/net/wireless/iwlwifi/mvm/d3.c               |   46 +++--
 drivers/net/wireless/iwlwifi/mvm/debugfs-vif.c      |   21 ++-
 drivers/net/wireless/iwlwifi/mvm/debugfs.c          |   14 +-
 drivers/net/wireless/iwlwifi/mvm/fw-api-power.h     |   34 ++++
 drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h      |  135 ++++++--------
 drivers/net/wireless/iwlwifi/mvm/fw-api.h           |   76 +++++---
 drivers/net/wireless/iwlwifi/mvm/fw.c               |   71 +++-----
 drivers/net/wireless/iwlwifi/mvm/mac80211.c         |  440 +++++++++++++++++++++++++++------------------
 drivers/net/wireless/iwlwifi/mvm/mvm.h              |  163 +++++++----------
 drivers/net/wireless/iwlwifi/mvm/nvm.c              |   16 +-
 drivers/net/wireless/iwlwifi/mvm/ops.c              |   53 +++---
 drivers/net/wireless/iwlwifi/mvm/rs.c               |   47 ++---
 drivers/net/wireless/iwlwifi/mvm/rs.h               |    2 -
 drivers/net/wireless/iwlwifi/mvm/rx.c               |    9 +-
 drivers/net/wireless/iwlwifi/mvm/scan.c             | 1420 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------------------
 drivers/net/wireless/iwlwifi/mvm/sta.c              |   14 +-
 drivers/net/wireless/iwlwifi/mvm/time-event.c       |   33 ++--
 drivers/net/wireless/iwlwifi/mvm/tt.c               |   40 +----
 drivers/net/wireless/iwlwifi/mvm/tx.c               |   35 +++-
 drivers/net/wireless/iwlwifi/mvm/utils.c            |    2 +-
 drivers/net/wireless/iwlwifi/pcie/drv.c             |   17 +-
 drivers/net/wireless/iwlwifi/pcie/internal.h        |   51 +++++-
 drivers/net/wireless/iwlwifi/pcie/rx.c              |  415 +++++++++++++++++++++++++++++++++---------
 drivers/net/wireless/iwlwifi/pcie/trans.c           |  158 +++++++++-------
 drivers/net/wireless/iwlwifi/pcie/tx.c              |    2 -
 45 files changed, 2287 insertions(+), 1711 deletions(-)
 create mode 100644 drivers/net/wireless/iwlwifi/iwl-trans.c
#52 lore raw

PATCH 1/15 iwlwifi: mvm: rs: pass rate directly to column checks

From: Eyal Shapira <[email protected]>

A minor refactoring for following patches.
This enables the reuse of the checks functions.

type=cleanup

---
 drivers/net/wireless/iwlwifi/mvm/rs.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/net/wireless/iwlwifi/mvm/rs.c +7 -7
index 1295178..ae99656 100644
@@ -138,7 +138,7 @@ struct rs_tx_column;
 
 typedef bool (*allow_column_func_t) (struct iwl_mvm *mvm,
 				     struct ieee80211_sta *sta,
-				     struct iwl_scale_tbl_info *tbl,
+				     struct rs_rate *rate,
 				     const struct rs_tx_column *next_col);
 
 struct rs_tx_column {
@@ -150,14 +150,14 @@ struct rs_tx_column {
 };
 
 static bool rs_ant_allow(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
-			 struct iwl_scale_tbl_info *tbl,
+			 struct rs_rate *rate,
 			 const struct rs_tx_column *next_col)
 {
 	return iwl_mvm_bt_coex_is_ant_avail(mvm, next_col->ant);
 }
 
 static bool rs_mimo_allow(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
-			  struct iwl_scale_tbl_info *tbl,
+			  struct rs_rate *rate,
 			  const struct rs_tx_column *next_col)
 {
 	struct iwl_mvm_sta *mvmsta;
@@ -187,7 +187,7 @@ static bool rs_mimo_allow(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
 }
 
 static bool rs_siso_allow(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
-			  struct iwl_scale_tbl_info *tbl,
+			  struct rs_rate *rate,
 			  const struct rs_tx_column *next_col)
 {
 	if (!sta->ht_cap.ht_supported)
@@ -197,10 +197,9 @@ static bool rs_siso_allow(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
 }
 
 static bool rs_sgi_allow(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
-			 struct iwl_scale_tbl_info *tbl,
+			 struct rs_rate *rate,
 			 const struct rs_tx_column *next_col)
 {
-	struct rs_rate *rate = &tbl->rate;
 	struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap;
 	struct ieee80211_sta_vht_cap *vht_cap = &sta->vht_cap;
 
@@ -1659,7 +1658,8 @@ static enum rs_column rs_get_next_column(struct iwl_mvm *mvm,
 
 		for (j = 0; j < MAX_COLUMN_CHECKS; j++) {
 			allow_func = next_col->checks[j];
-			if (allow_func && !allow_func(mvm, sta, tbl, next_col))
+			if (allow_func && !allow_func(mvm, sta, &tbl->rate,
+						      next_col))
 				break;
 		}
 
Signature · 1 line
2.1.4
#53 lore raw

PATCH 2/15 iwlwifi: wrt: add mipi type to debug types

In reply to Grumbach, Emmanuel

From: Liad Kaufman <[email protected]>

This adds the MIPI mode type to the types declared supported by the driver. Without this patch, when using MIPI mode and looking at the logs the user would see the debug destination "UNKNOWN".

---
 drivers/net/wireless/iwlwifi/iwl-fw-file.h | 2 ++
 drivers/net/wireless/iwlwifi/iwl-fw.h      | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/net/wireless/iwlwifi/iwl-fw-file.h +2 -0
index a8d0b64..5b7c0ae 100644
@@ -427,11 +427,13 @@ struct iwl_fw_dbg_reg_op {
  * @SMEM_MODE: monitor stores the data in SMEM
  * @EXTERNAL_MODE: monitor stores the data in allocated DRAM
  * @MARBH_MODE: monitor stores the data in MARBH buffer
+ * @MIPI_MODE: monitor outputs the data through the MIPI interface
  */
 enum iwl_fw_dbg_monitor_mode {
 	SMEM_MODE = 0,
 	EXTERNAL_MODE = 1,
 	MARBH_MODE = 2,
+	MIPI_MODE = 3,
 };
 
 /**
drivers/net/wireless/iwlwifi/iwl-fw.h +3 -1
index cf75baf..cdc7f1e 100644
@@ -6,7 +6,7 @@
  * GPL LICENSE SUMMARY
  *
  * Copyright(c) 2008 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -205,6 +205,8 @@ static inline const char *get_fw_dbg_mode_string(int mode)
 		return "EXTERNAL_DRAM";
 	case MARBH_MODE:
 		return "MARBH";
+	case MIPI_MODE:
+		return "MIPI";
 	default:
 		return "UNKNOWN";
 	}
Signature · 1 line
2.1.4
#54 lore raw

PATCH 3/15 iwlwifi: pcie: Control access to the NIC's PM registers via iwl_cfg

In reply to Grumbach, Emmanuel

From: Avri Altman <[email protected]>

Allow a cleaner way to access those hw-dependent registers, instead of using the product family type etc.

---
 drivers/net/wireless/iwlwifi/iwl-8000.c   |  3 ++-
 drivers/net/wireless/iwlwifi/iwl-config.h |  1 +
 drivers/net/wireless/iwlwifi/mvm/ops.c    |  2 +-
 drivers/net/wireless/iwlwifi/pcie/rx.c    |  1 +
 drivers/net/wireless/iwlwifi/pcie/trans.c | 16 ++++++++--------
 5 files changed, 13 insertions(+), 10 deletions(-)
drivers/net/wireless/iwlwifi/iwl-8000.c +2 -1
index 5dca838..5c08f70 100644
@@ -163,7 +163,8 @@ static const struct iwl_tt_params iwl8000_tt_params = {
 	.smem_len = IWL8260_SMEM_LEN,					\
 	.default_nvm_file_B_step = DEFAULT_NVM_FILE_FAMILY_8000B,	\
 	.default_nvm_file_C_step = DEFAULT_NVM_FILE_FAMILY_8000C,	\
-	.thermal_params = &iwl8000_tt_params
+	.thermal_params = &iwl8000_tt_params,				\
+	.apmg_not_supported = true
 
 const struct iwl_cfg iwl8260_2n_cfg = {
 	.name = "Intel(R) Dual Band Wireless N 8260",
drivers/net/wireless/iwlwifi/iwl-config.h +1 -0
index 225b6d6..08c14af 100644
@@ -360,6 +360,7 @@ struct iwl_cfg {
 	const u32 smem_offset;
 	const u32 smem_len;
 	const struct iwl_tt_params *thermal_params;
+	bool apmg_not_supported;
 };
 
 /*
drivers/net/wireless/iwlwifi/mvm/ops.c +1 -1
index 690b336..91ca626 100644
@@ -194,7 +194,7 @@ static void iwl_mvm_nic_config(struct iwl_op_mode *op_mode)
 	 * (PCIe power is lost before PERST# is asserted), causing ME FW
 	 * to lose ownership and not being able to obtain it back.
 	 */
-	if (mvm->trans->cfg->device_family != IWL_DEVICE_FAMILY_8000)
+	if (!mvm->trans->cfg->apmg_not_supported)
 		iwl_set_bits_mask_prph(mvm->trans, APMG_PS_CTRL_REG,
 				       APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS,
 				       ~APMG_PS_CTRL_EARLY_PWR_OFF_RESET_DIS);
drivers/net/wireless/iwlwifi/pcie/rx.c +1 -0
index 7ff69c6..adad8d0 100644
@@ -775,6 +775,7 @@ static void iwl_pcie_irq_handle_error(struct iwl_trans *trans)
 
 	/* W/A for WiFi/WiMAX coex and WiMAX own the RF */
 	if (trans->cfg->internal_wimax_coex &&
+	    !trans->cfg->apmg_not_supported &&
 	    (!(iwl_read_prph(trans, APMG_CLK_CTRL_REG) &
 			     APMS_CLK_VAL_MRB_FUNC_MODE) ||
 	     (iwl_read_prph(trans, APMG_PS_CTRL_REG) &
drivers/net/wireless/iwlwifi/pcie/trans.c +8 -8
index a341ed9..dd1b90b 100644
@@ -182,6 +182,9 @@ static void iwl_trans_pcie_write_shr(struct iwl_trans *trans, u32 reg, u32 val)
 
 static void iwl_pcie_set_pwr(struct iwl_trans *trans, bool vaux)
 {
+	if (!trans->cfg->apmg_not_supported)
+		return;
+
 	if (vaux && pci_pme_capable(to_pci_dev(trans->dev), PCI_D3cold))
 		iwl_set_bits_mask_prph(trans, APMG_PS_CTRL_REG,
 				       APMG_PS_CTRL_VAL_PWR_SRC_VAUX,
@@ -315,7 +318,7 @@ static int iwl_pcie_apm_init(struct iwl_trans *trans)
 	 * bits do not disable clocks.  This preserves any hardware
 	 * bits already set by default in "CLK_CTRL_REG" after reset.
 	 */
-	if (trans->cfg->device_family != IWL_DEVICE_FAMILY_8000) {
+	if (!trans->cfg->apmg_not_supported) {
 		iwl_write_prph(trans, APMG_CLK_EN_REG,
 			       APMG_CLK_VAL_DMA_CLK_RQT);
 		udelay(20);
@@ -515,8 +518,7 @@ static int iwl_pcie_nic_init(struct iwl_trans *trans)
 
 	spin_unlock(&trans_pcie->irq_lock);
 
-	if (trans->cfg->device_family != IWL_DEVICE_FAMILY_8000)
-		iwl_pcie_set_pwr(trans, false);
+	iwl_pcie_set_pwr(trans, false);
 
 	iwl_op_mode_nic_config(trans->op_mode);
 
@@ -1063,7 +1065,7 @@ static void iwl_trans_pcie_stop_device(struct iwl_trans *trans, bool low_power)
 		iwl_pcie_rx_stop(trans);
 
 		/* Power-down device's busmaster DMA clocks */
-		if (trans->cfg->device_family != IWL_DEVICE_FAMILY_8000) {
+		if (!trans->cfg->apmg_not_supported) {
 			iwl_write_prph(trans, APMG_CLK_DIS_REG,
 				       APMG_CLK_VAL_DMA_CLK_RQT);
 			udelay(5);
@@ -1160,8 +1162,7 @@ static void iwl_trans_pcie_d3_suspend(struct iwl_trans *trans, bool test)
 	 */
 	iwl_trans_pcie_tx_reset(trans);
 
-	if (trans->cfg->device_family != IWL_DEVICE_FAMILY_8000)
-		iwl_pcie_set_pwr(trans, true);
+	iwl_pcie_set_pwr(trans, true);
 }
 
 static int iwl_trans_pcie_d3_resume(struct iwl_trans *trans,
@@ -1199,8 +1200,7 @@ static int iwl_trans_pcie_d3_resume(struct iwl_trans *trans,
 		return ret;
 	}
 
-	if (trans->cfg->device_family != IWL_DEVICE_FAMILY_8000)
-		iwl_pcie_set_pwr(trans, false);
+	iwl_pcie_set_pwr(trans, false);
 
 	iwl_trans_pcie_tx_reset(trans);
 
Signature · 1 line
2.1.4
#55 lore raw

PATCH 4/15 iwlwifi: mvm: add inactive state to ebs status

In reply to Grumbach, Emmanuel

From: David Spinadel <[email protected]>

Currently EBS status in scan complete notifications is set to success if EBS wasn't activated. FW will add a special return value for cases when EBS wasn't activated and we add a print of this status.

This change is needed for debug only, no behavior changes.

---
 drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h |  1 +
 drivers/net/wireless/iwlwifi/mvm/scan.c        | 33 +++++++++++++++++++-------
 2 files changed, 25 insertions(+), 9 deletions(-)
drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h +1 -0
index f34cf00..5e4cbdb 100644
@@ -294,6 +294,7 @@ enum iwl_scan_ebs_status {
 	IWL_SCAN_EBS_SUCCESS,
 	IWL_SCAN_EBS_FAILED,
 	IWL_SCAN_EBS_CHAN_NOT_FOUND,
+	IWL_SCAN_EBS_INACTIVE,
 };
 
 /**
drivers/net/wireless/iwlwifi/mvm/scan.c +24 -9
index 4f4570d..9409237 100644
@@ -352,6 +352,20 @@ int iwl_mvm_rx_scan_match_found(struct iwl_mvm *mvm,
 	return 0;
 }
 
+static const char *iwl_mvm_ebs_status_str(enum iwl_scan_ebs_status status)
+{
+	switch (status) {
+	case IWL_SCAN_EBS_SUCCESS:
+		return "successful";
+	case IWL_SCAN_EBS_INACTIVE:
+		return "inactive";
+	case IWL_SCAN_EBS_FAILED:
+	case IWL_SCAN_EBS_CHAN_NOT_FOUND:
+	default:
+		return "failed";
+	}
+}
+
 int iwl_mvm_rx_lmac_scan_complete_notif(struct iwl_mvm *mvm,
 					struct iwl_rx_cmd_buffer *rxb,
 					struct iwl_device_cmd *cmd)
@@ -359,7 +373,6 @@ int iwl_mvm_rx_lmac_scan_complete_notif(struct iwl_mvm *mvm,
 	struct iwl_rx_packet *pkt = rxb_addr(rxb);
 	struct iwl_periodic_scan_complete *scan_notif = (void *)pkt->data;
 	bool aborted = (scan_notif->status == IWL_SCAN_OFFLOAD_ABORTED);
-	bool ebs_successful = (scan_notif->ebs_status == IWL_SCAN_EBS_SUCCESS);
 
 	/* scan status must be locked for proper checking */
 	lockdep_assert_held(&mvm->mutex);
@@ -379,13 +392,13 @@ int iwl_mvm_rx_lmac_scan_complete_notif(struct iwl_mvm *mvm,
 
 		IWL_DEBUG_SCAN(mvm, "Scheduled scan %s, EBS status %s\n",
 			       aborted ? "aborted" : "completed",
-			       ebs_successful ? "successful" : "failed");
+			       iwl_mvm_ebs_status_str(scan_notif->ebs_status));
 
 		mvm->scan_status &= ~IWL_MVM_SCAN_STOPPING_SCHED;
 	} else if (mvm->scan_status & IWL_MVM_SCAN_STOPPING_REGULAR) {
 		IWL_DEBUG_SCAN(mvm, "Regular scan %s, EBS status %s\n",
 			       aborted ? "aborted" : "completed",
-			       ebs_successful ? "successful" : "failed");
+			       iwl_mvm_ebs_status_str(scan_notif->ebs_status));
 
 		mvm->scan_status &= ~IWL_MVM_SCAN_STOPPING_REGULAR;
 	} else if (mvm->scan_status & IWL_MVM_SCAN_SCHED) {
@@ -393,14 +406,14 @@ int iwl_mvm_rx_lmac_scan_complete_notif(struct iwl_mvm *mvm,
 
 		IWL_DEBUG_SCAN(mvm, "Scheduled scan %s, EBS status %s (FW)\n",
 			       aborted ? "aborted" : "completed",
-			       ebs_successful ? "successful" : "failed");
+			       iwl_mvm_ebs_status_str(scan_notif->ebs_status));
 
 		mvm->scan_status &= ~IWL_MVM_SCAN_SCHED;
 		ieee80211_sched_scan_stopped(mvm->hw);
 	} else if (mvm->scan_status & IWL_MVM_SCAN_REGULAR) {
 		IWL_DEBUG_SCAN(mvm, "Regular scan %s, EBS status %s (FW)\n",
 			       aborted ? "aborted" : "completed",
-			       ebs_successful ? "successful" : "failed");
+			       iwl_mvm_ebs_status_str(scan_notif->ebs_status));
 
 		mvm->scan_status &= ~IWL_MVM_SCAN_REGULAR;
 		ieee80211_scan_completed(mvm->hw,
@@ -408,7 +421,9 @@ int iwl_mvm_rx_lmac_scan_complete_notif(struct iwl_mvm *mvm,
 		iwl_mvm_unref(mvm, IWL_MVM_REF_SCAN);
 	}
 
-	mvm->last_ebs_successful = ebs_successful;
+	mvm->last_ebs_successful =
+			scan_notif->ebs_status == IWL_SCAN_EBS_SUCCESS ||
+			scan_notif->ebs_status == IWL_SCAN_EBS_INACTIVE;
 
 	return 0;
 }
@@ -1376,10 +1391,10 @@ int iwl_mvm_rx_umac_scan_complete_notif(struct iwl_mvm *mvm,
 		       uid, mvm->scan_uid_status[uid],
 		       notif->status == IWL_SCAN_OFFLOAD_COMPLETED ?
 				"completed" : "aborted",
-		       notif->ebs_status == IWL_SCAN_EBS_SUCCESS ?
-				"success" : "failed");
+		       iwl_mvm_ebs_status_str(notif->ebs_status));
 
-	if (notif->ebs_status)
+	if (notif->ebs_status != IWL_SCAN_EBS_SUCCESS &&
+	    notif->ebs_status != IWL_SCAN_EBS_INACTIVE)
 		mvm->last_ebs_successful = false;
 
 	mvm->scan_uid_status[uid] = 0;
Signature · 1 line
2.1.4
#56 lore raw

PATCH 5/15 iwlwifi: mvm: don't use EBS for P2P find

In reply to Grumbach, Emmanuel

From: David Spinadel <[email protected]>

Don't use EBS for P2P find to make sure we find all GOs in our only attempt.

---
 drivers/net/wireless/iwlwifi/mvm/scan.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)
drivers/net/wireless/iwlwifi/mvm/scan.c +9 -5
index 9409237..794109e 100644
@@ -770,19 +770,23 @@ static inline bool iwl_mvm_scan_fits(struct iwl_mvm *mvm, int n_ssids,
 		 iwl_mvm_max_scan_ie_fw_cmd_room(mvm)));
 }
 
-static inline bool iwl_mvm_scan_use_ebs(struct iwl_mvm *mvm, int n_iterations)
+static inline bool iwl_mvm_scan_use_ebs(struct iwl_mvm *mvm,
+					struct ieee80211_vif *vif,
+					int n_iterations)
 {
 	const struct iwl_ucode_capabilities *capa = &mvm->fw->ucode_capa;
 
 	/* We can only use EBS if:
 	 *	1. the feature is supported;
 	 *	2. the last EBS was successful;
-	 *	3. if only single scan, the single scan EBS API is supported.
+	 *	3. if only single scan, the single scan EBS API is supported;
+	 *	4. it's not a p2p find operation.
 	 */
 	return ((capa->flags & IWL_UCODE_TLV_FLAGS_EBS_SUPPORT) &&
 		mvm->last_ebs_successful &&
 		(n_iterations > 1 ||
-		 (capa->api[0] & IWL_UCODE_TLV_API_SINGLE_SCAN_EBS)));
+		 (capa->api[0] & IWL_UCODE_TLV_API_SINGLE_SCAN_EBS)) &&
+		vif->type != NL80211_IFTYPE_P2P_DEVICE);
 }
 
 static int iwl_mvm_scan_total_iterations(struct iwl_mvm_scan_params *params)
@@ -860,7 +864,7 @@ static int iwl_mvm_scan_lmac(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 	cmd->schedule[1].iterations = params->schedule[1].iterations;
 	cmd->schedule[1].full_scan_mul = params->schedule[1].iterations;
 
-	if (iwl_mvm_scan_use_ebs(mvm, n_iterations)) {
+	if (iwl_mvm_scan_use_ebs(mvm, vif, n_iterations)) {
 		cmd->channel_opt[0].flags =
 			cpu_to_le16(IWL_SCAN_CHANNEL_FLAG_EBS |
 				    IWL_SCAN_CHANNEL_FLAG_EBS_ACCURATE |
@@ -1102,7 +1106,7 @@ static int iwl_mvm_scan_umac(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 	cmd->uid = cpu_to_le32(uid);
 	cmd->general_flags = cpu_to_le32(iwl_mvm_scan_umac_flags(mvm, params));
 
-	if (iwl_mvm_scan_use_ebs(mvm, n_iterations))
+	if (iwl_mvm_scan_use_ebs(mvm, vif, n_iterations))
 		cmd->channel_flags = IWL_SCAN_CHANNEL_FLAG_EBS |
 				     IWL_SCAN_CHANNEL_FLAG_EBS_ACCURATE |
 				     IWL_SCAN_CHANNEL_FLAG_CACHE_ADD;
Signature · 1 line
2.1.4
#57 lore raw

Re: pull request: iwlwifi-next 2015-06-03

In reply to Grumbach, Emmanuel

T24gV2VkLCAyMDE1LTA2LTAzIGF0IDEwOjI0ICswMzAwLCBFbW1hbnVlbCBHcnVtYmFjaCB3cm90 ZToNCj4gSGkgS2FsbGUsDQo+IA0KPiBBcyBwcm9taXNlZCwgaGVyZSBpcyB0aGUgZW5sYXJnZWQg cHVsbCByZXF1ZXN0IGZvciA0LjIuIEkgZG91YmxlIGNoZWNrZWQNCj4gdGhhdCB0aGUgdGFnIGlz IHNpZ25lZCB0aGlzIHRpbWUuDQo+IEkgYWxzbyBzaWduZWQgdGhpcyBlbWFpbCwganVzdCBpbiBj YXNlLi4uDQo+IA0KPiBJJ2xsIHJlcGx5IHRvIHRoaXMgcHVsbCByZXF1ZXN0IHdpdGggdGhlIGRp ZmYgYmV0d2VlbiB0aGUgcHJldmlvdXMgb25lDQo+IGFuZCB0aGlzIG9uZS4gQWxsIHRoZSBvdGhl ciBwYXRjaGVzIGhhdmUgYmVlbiBzZW50IHRvIHRoZSBNTCBhbHJlYWR5Lg0KPiBUaGUgZ29vZCB0 aGluZyB3aXRoIHRoaXMgbmV3IHB1bGwgcmVxdWVzdCBpcyB0aGF0IGl0IGFsbG93cyB1cyB0byBq dW1wDQo+IHRvIC0xNS51Y29kZSB3aGljaCBpcyBzdGFydGluZyB2YWxpZGF0aW9uIHJpZ2h0IG5v dy4gSSBob3BlIGl0cyBmaXJzdA0KPiB2ZXJzaW9uIHdpbGwgYmUgYXZhaWxhYmxlIGluIDMgd2Vl a3MtaXNoLgkNCj4gDQo+IExldCBtZSBrbm93IGlmIHlvdSBoYXZlIGlzc3VlcyB3aXRoIHRoaXMu DQo+IA0KPiBUaGFuayB5b3UuDQo+IA0KPiBUaGUgZm9sbG93aW5nIGNoYW5nZXMgc2luY2UgY29t bWl0IGJiYmU4YzhjNTk2YjM3ODRhMmVkMDg3NzI5MDBlODI3ZjhiYTcyYzU6DQo+IA0KPiAgIG1h YzgwMjExOiBhZGQgbWlzc2luZyBkb2N1bWVudGF0aW9uIGZvciByYXRlX2N0cmxfbG9jayAoMjAx NS0wNS0wNiAxNjowMDozMiArMDIwMCkNCj4gDQo+IGFyZSBhdmFpbGFibGUgaW4gdGhlIGdpdCBy ZXBvc2l0b3J5IGF0Og0KPiANCj4gICBodHRwczovL2dpdC5rZXJuZWwub3JnL3B1Yi9zY20vbGlu dXgva2VybmVsL2dpdC9pd2x3aWZpL2l3bHdpZmktbmV4dC5naXQgdGFncy9pd2x3aWZpLWZvci1r YWxsZS0yMDE1LTA2LTAzDQoNCkFuZCBzaW5jZSBJIGNhbid0IHNlZW0gdG8gYmUgYWJsZSB0byBk byB0aGluZ3MgcmlnaHQgdGhlIGZpcnN0IHRpbWUsIEkNCnJlbmFtZWQgdGhlIHRhZyB0byBpd2x3 aWZpLW5leHQwZm9yLWthbGxlLTIwMTUtMDYtMDM6IHNvDQoNCg0KaHR0cHM6Ly9naXQua2VybmVs Lm9yZy9wdWIvc2NtL2xpbnV4L2tlcm5lbC9naXQvaXdsd2lmaS9pd2x3aWZpLW5leHQuZ2l0IHRh Z3MvaXdsd2lmaS1uZXh0LWZvci1rYWxsZS0yMDE1LTA2LTAzDQoNCg0KPiANCj4gZm9yIHlvdSB0 byBmZXRjaCBjaGFuZ2VzIHVwIHRvIDVmNGMwMmUyYjhjOTI1MWM4MjdhYmY4N2M0ZWFkNDQ5NmM2 NzQ5MmE6DQo+IA0KPiAgIGl3bHdpZmk6IG12bTogYWR2ZXJ0aXNlIG9ubHkgSFctc3VwcG9ydGVk IGNpcGhlcnMgKDIwMTUtMDYtMDMgMTA6MTI6MjYgKzAzMDApDQo+IA0KPiAtLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQo+ICog YSBmZXcgZml4ZXMgKHJlLWVuYWJsZW1lbnQgb2YgaW50ZXJydXB0cyBmb3IgY2VydGFpbiBuZXcN Cj4gICBwbGF0Zm9ybXMgdGhhdCBoYXZlIHNwZWNpYWwgcG93ZXIgc3RhdGVzKQ0KPiAqIFJld29y ayBjb21wbGV0ZWx5IHRoZSBSQkQgYWxsb2NhdGlvbiBtb2RlbCB0b3dhcmRzIG5ldw0KPiAgIG11 bHRpIFJYIGhhcmR3YXJlLg0KPiAqIGNsZWFudXBzDQo+ICogc2NhbiByZXdvcmtzIGNvbnRpbnVh dGlvbiAoTHVjYSkNCj4gDQo+IC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0NCj4gQW5kcmVpIE90Y2hlcmV0aWFuc2tpICgxKToN Cj4gICAgICAgaXdsd2lmaTogbXZtOiBDb25maWd1cmUgYWdnLiBxdWV1ZSBiZWZvcmUgYXNzaWdu aW5nIGl0IHRvIFNUQQ0KPiANCj4gQXJpayBOZW10c292ICgxKToNCj4gICAgICAgaXdsd2lmaTog bXZtOiBjbGVhbiBpbnRlcmZhY2VzIG9uIGRydl9zdG9wDQo+IA0KPiBBdnJhaGFtIFN0ZXJuICgz KToNCj4gICAgICAgaXdsd2lmaTogbXZtOiBwcmludCBzY2FubmVkIGNoYW5uZWwgbGlzdCBvbiBz Y2FuIGl0ZXJhdGlvbiBjb21wbGV0ZSBub3RpZmljYXRpb24NCj4gICAgICAgaXdsd2lmaTogbXZt OiBhZGQgVU1BQyBzY2FuIGl0ZXJhdGlvbiBjb21wbGV0ZSBub3RpZmljYXRpb24NCj4gICAgICAg aXdsd2lmaTogbXZtOiBhZGQgc3VwcG9ydCBmb3IgOCBsZXZlbCBzY2FuIHByaW9yaXR5IEFQSQ0K PiANCj4gQXZyaSBBbHRtYW4gKDMpOg0KPiAgICAgICBpd2x3aWZpOiBwY2llOiBkb24ndCBkaXNh YmxlIHRoZSBidXNtYXN0ZXIgRE1BIGNsb2NrIGZvciBmYW1pbHkgODAwMA0KPiAgICAgICBpd2x3 aWZpOiBwY2llOiBSZW1vdmUgcmVkdW5kYW50IGNoZWNrIGZvciBmYW1pbHkgdHlwZQ0KPiAgICAg ICBpd2x3aWZpOiBwY2llOiBDb250cm9sIGFjY2VzcyB0byB0aGUgTklDJ3MgUE0gcmVnaXN0ZXJz IHZpYSBpd2xfY2ZnDQo+IA0KPiBEYXZpZCBTcGluYWRlbCAoMik6DQo+ICAgICAgIGl3bHdpZmk6 IG12bTogYWRkIGluYWN0aXZlIHN0YXRlIHRvIGVicyBzdGF0dXMNCj4gICAgICAgaXdsd2lmaTog bXZtOiBkb24ndCB1c2UgRUJTIGZvciBQMlAgZmluZA0KPiANCj4gRWxpYWQgUGVsbGVyICg0KToN Cj4gICAgICAgaXdsd2lmaTogbXZtOiBhdm9pZCB1c2UtYWZ0ZXItZnJlZSBvbiBpd2xfbXZtX2Qw aTNfZW5hYmxlX3R4KCkNCj4gICAgICAgaXdsd2lmaTogbXZtOiBmaXggUk9DIHJlZmVyZW5jZSBh Y2NvdW50aW5nDQo+ICAgICAgIGl3bHdpZmk6IHRyYWNpbmc6IGFkZCByeCBjbWQgaGVhZGVyIGZp ZWxkcw0KPiAgICAgICBpd2x3aWZpOiBwY2llOiByZS1lbmFibGUgaW50ZXJydXB0cyBvbiByZXN1 bWUNCj4gDQo+IEVtbWFudWVsIEdydW1iYWNoICgxMyk6DQo+ICAgICAgIGl3bHdpZmk6IG12bTog Zm9yYmlkIE1JTU8gb24gZGV2aWNlcyB0aGF0IGRvbid0IHN1cHBvcnQgaXQNCj4gICAgICAgaXds d2lmaTogNzAwMDogbW9kaWZ5IHRoZSBmaXJtd2FyZSBuYW1lIGZvciAzMTY1DQo+ICAgICAgIGl3 bHdpZmk6IG12bTogZml4IE1MTUUgdHJpZ2dlcg0KPiAgICAgICBpd2x3aWZpOiBtdm06IEJUIENv ZXggLSBkdXBsaWNhdGUgdGhlIGNvbW1hbmQgaWYgc2VudCBBU1lOQw0KPiAgICAgICBNZXJnZSBy ZW1vdGUtdHJhY2tpbmcgYnJhbmNoICdpd2x3aWZpLWZpeGVzL21hc3RlcicgaW50byBpd2x3aWZp LW5leHQNCj4gICAgICAgaXdsd2lmaTogYnVtcCBBUEkgdG8gMTQNCj4gICAgICAgaXdsd2lmaTog cGNpZTogc2ltcGxpZnkgcmV0dXJuIHZhbHVlDQo+ICAgICAgIGl3bHdpZmk6IG12bTogQlQgQ29l eCAtIHJlbW92ZSB1c2VsZXNzIGNvZGUNCj4gICAgICAgaXdsd2lmaTogbXZtOiBCVCBDb2V4IC0g YWxsb2NhdGUgYSBzaG9ydCBjb21tYW5kIG9uIHRoZSBzdGFjaw0KPiAgICAgICBpd2x3aWZpOiBt dm06IEJUIENvZXggLSBmaXggc2hhcmVkIGFudGVubmEgY2hlY2sgd2l0aCBuZXcgQVBJDQo+ICAg ICAgIE1lcmdlIHRhZyAnbWFjODAyMTEtbmV4dC1mb3ItZGF2ZW0tMjAxNS0wNS0wNicgaW50byBp d2x3aWZpLW5leHQNCj4gICAgICAgaXdsd2lmaTogbXZtOiBpbXBsZW1lbnQgdGhlIEJsb2NrQWNr IHJlbGF0ZWQgZGVidWcgdHJpZ2dlcnMNCj4gICAgICAgaXdsd2lmaTogYnVtcCB0aGUgaXdsbXZt IEFQSSBudW1iZXIgdG8gMTUNCj4gDQo+IEVyYW4gSGFyYXJ5ICgxKToNCj4gICAgICAgaXdsd2lm aTogODAwMDogZmFsbGJhY2sgdG8gZGVmYXVsdCBOVk0gZmlsZQ0KPiANCj4gRXlhbCBTaGFwaXJh ICgxKToNCj4gICAgICAgaXdsd2lmaTogbXZtOiByczogcGFzcyByYXRlIGRpcmVjdGx5IHRvIGNv bHVtbiBjaGVja3MNCj4gDQo+IEhhaW0gRHJleWZ1c3MgKDEpOg0KPiAgICAgICBpd2x3aWZpOiBt dm06IEZyZWUgZndfc3RhdHVzIGFmdGVyIHVzZSB0byBhdm9pZCBtZW1vcnkgbGVhaw0KPiANCj4g SWRvIFlhcml2ICgxKToNCj4gICAgICAgaXdsd2lmaTogdXBkYXRlIHRoZXJtYWwgdGhyb3R0bGlu ZyB2YWx1ZXMgZm9yIDgwMDAgZGV2aWNlcw0KPiANCj4gSm9oYW5uZXMgQmVyZyAoOCk6DQo+ICAg ICAgIGl3bHdpZmk6IHJlZmFjdG9yIGNvbW1vbiB0cmFuc3BvcnQgYWxsb2MvaW5pdCBjb2RlDQo+ ICAgICAgIGl3bHdpZmk6IG12bTogYWR2ZXJ0aXNlIHJhbmRvbWlzZWQgbmV0ZGV0ZWN0IE1BQyBh ZGRyZXNzDQo+ICAgICAgIGl3bHdpZmk6IG12bTogaGFuZGxlIGRldmljZSBzdGFydCBmYWlsdXJl IGNvcnJlY3RseQ0KPiAgICAgICBpd2x3aWZpOiBtdm06IGVuYWJsZSBJRUVFODAyMTFfSFdfU1VQ UE9SVF9GQVNUX1hNSVQNCj4gICAgICAgaXdsd2lmaTogZHZtOiBlbmFibGUgSUVFRTgwMjExX0hX X1NVUFBPUlRfRkFTVF9YTUlUDQo+ICAgICAgIGl3bHdpZmk6IG12bTogc2ltcGxpZnkgaXdsX212 bV9zdG9wX3JvYygpDQo+ICAgICAgIGl3bHdpZmk6IHByZXBhcmUgZm9yIGhpZ2hlciBBUEkvQ0FQ QSBiaXRzDQo+ICAgICAgIGl3bHdpZmk6IG12bTogYWR2ZXJ0aXNlIG9ubHkgSFctc3VwcG9ydGVk IGNpcGhlcnMNCj4gDQo+IExpYWQgS2F1Zm1hbiAoMik6DQo+ICAgICAgIGl3bHdpZmk6IG52bTog Zm9yY2UgbWFjIGZyb20gb3RwIGluIGNhc2UgbnZtIG1hYyBpcyByZXNlcnZlZA0KPiAgICAgICBp d2x3aWZpOiB3cnQ6IGFkZCBtaXBpIHR5cGUgdG8gZGVidWcgdHlwZXMNCj4gDQo+IEx1Y2lhbm8g Q29lbGhvICgxOCk6DQo+ICAgICAgIGl3bHdpZmk6IG12bTogdGFrZSB0aGUgVUNPREVfRE9XTiBy ZWZlcmVuY2Ugd2hlbiByZXN1bWluZw0KPiAgICAgICBpd2x3aWZpOiBtdm06IGNsZWFuIG5ldC1k ZXRlY3QgaW5mbyBpZiBkZXZpY2Ugd2FzIHJlc2V0IGR1cmluZyBzdXNwZW5kDQo+ICAgICAgIGl3 bHdpZmk6IHBjaWU6IGRvbid0IGNhbGwgc2V0X3B3ciBmdW5jdGlvbnMgZm9yIGZhbWlseSA4MDAw DQo+ICAgICAgIGl3bHdpZmk6IG12bTogc21hbGwgZml4IGluIGEgY29tbWVudCBhYm91dCBVTUFD IHNjYW4gc2NoZWR1bGVzDQo+ICAgICAgIGl3bHdpZmk6IG12bTogcmVtb3ZlIHRoZSBVTUFDIHNw ZWNpZmljIHNjYW4gdHlwZXMNCj4gICAgICAgaXdsd2lmaTogbXZtOiBmaXggdGhlIG5ldC1kZXRl Y3QgU1NJRHMgcmVwb3J0IG9yZGVyDQo+ICAgICAgIGl3bHdpZmk6IG12bTogbWFrZSBpd2xfbXZt X2NvbmZpZ19zY2hlZF9zY2FuX3Byb2ZpbGVzKCkgc3RhdGljDQo+ICAgICAgIGl3bHdpZmk6IG12 bTogcmVvcmdhbml6ZSBzY2FuIHN0b3BwaW5nIGZ1bmN0aW9ucw0KPiAgICAgICBpd2x3aWZpOiBt dm06IGRvbid0IHN0b3AgcmVndWxhciBzY2FucyB3aGVuIGdvaW5nIG91dCBvZiBpZGxlIHN0YXRl DQo+ICAgICAgIGl3bHdpZmk6IG12bTogY29tYmluZSBwYXJ0IG9mIHRoZSBzY2FuIHN0b3AgZmxv d3MNCj4gICAgICAgaXdsd2lmaTogbXZtOiByZW5hbWUgdW1hYyBzY2FuIHN0b3AgZnVuY3Rpb24N Cj4gICAgICAgaXdsd2lmaTogbXZtOiByZW5hbWUgc29tZSBMTUFDLXNwZWNpZmljIHNjYW4gZnVu Y3Rpb25zDQo+ICAgICAgIGl3bHdpZmk6IG12bTogcmVmYWN0b3IgVU1BQyBzY2FuIFVJRCBoYW5k bGluZw0KPiAgICAgICBpd2x3aWZpOiBtdm06IHJlbW92ZSBjb2RlIHRoYXQgc3RvcHMgbXVsdGlw bGUgVU1BQyBzY2FucyBvZiBhIHR5cGUNCj4gICAgICAgaXdsd2lmaTogbXZtOiBjb21iaW5lIFVN QUMgYW5kIExNQUMgc2Nhbl9zdG9wIGZ1bmN0aW9ucw0KPiAgICAgICBpd2x3aWZpOiBtdm06IGNv bWJpbmUgcmVndWxhciBhbmQgc2NoZWQgc2NhbiBzdG9wIGZ1bmN0aW9ucw0KPiAgICAgICBpd2x3 aWZpOiBtdm06IG1ha2UgVU1BQyBzY2FucyB1c2UgdGhlIHN0b3BwaW5nIHNjYW4gc3RhdHVzDQo+ ICAgICAgIGl3bHdpZmk6IG12bTogdHJlYXQgc2NhbiByYWNlcyBhbHNvIG9uIFVNQUMgc2NhbnMN Cj4gDQo+IE1hdHRpIEdvdHRsaWViICgzKToNCj4gICAgICAgaXdsd2lmaTogbXZtOiBBZGQgZGVi dWdmcyBlbnRyeSBmb3IgVHggcG93ZXIgbGltaXQNCj4gICAgICAgaXdsd2lmaTogbXZtOiBSZW1v dmUgb2xkIHNjYW4gY29tbWFuZHMNCj4gICAgICAgaXdsd2lmaTogbXZtOiBBZGQgREMyRENfQ09O RklHX0NNRCAoMHg4MykgY21kICYgVExWDQo+IA0KPiBOaWNob2xhcyBLcmF1c2UgKDEpOg0KPiAg ICAgICBpd2x3aWZpOiBSZW1vdmUgdXNlIG9mIHRoZSBkZXByZWNhY3RlZCBQVFJfUkVUDQo+IA0K PiBTYXJhIFNoYXJvbiAoMSk6DQo+ICAgICAgIGl3bHdpZmk6IHBjaWU6IE5ldyBSQkQgYWxsb2Nh dGlvbiBtb2RlbA0KPiANCj4gIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvS2NvbmZpZyAg ICAgICAgICAgICAgICB8ICAgMTMgKy0NCj4gIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkv TWFrZWZpbGUgICAgICAgICAgICAgICB8ICAgIDEgKw0KPiAgZHJpdmVycy9uZXQvd2lyZWxlc3Mv aXdsd2lmaS9kdm0vbWFjODAyMTEuYyAgICAgICAgIHwgICAgMSArDQo+ICBkcml2ZXJzL25ldC93 aXJlbGVzcy9pd2x3aWZpL2l3bC03MDAwLmMgICAgICAgICAgICAgfCAgIDQxICsrKystDQo+ICBk cml2ZXJzL25ldC93aXJlbGVzcy9pd2x3aWZpL2l3bC04MDAwLmMgICAgICAgICAgICAgfCAgIDcx ICsrKysrLS0tDQo+ICBkcml2ZXJzL25ldC93aXJlbGVzcy9pd2x3aWZpL2l3bC1jb25maWcuaCAg ICAgICAgICAgfCAgIDQ1ICsrKysrDQo+ICBkcml2ZXJzL25ldC93aXJlbGVzcy9pd2x3aWZpL2l3 bC1kZXZ0cmFjZS1pd2x3aWZpLmggfCAgIDE1ICstDQo+ICBkcml2ZXJzL25ldC93aXJlbGVzcy9p d2x3aWZpL2l3bC1kcnYuYyAgICAgICAgICAgICAgfCAgIDMyICsrKy0NCj4gIGRyaXZlcnMvbmV0 L3dpcmVsZXNzL2l3bHdpZmkvaXdsLWVlcHJvbS1wYXJzZS5jICAgICB8ICAgIDUgKw0KPiAgZHJp dmVycy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9pd2wtZWVwcm9tLXBhcnNlLmggICAgIHwgICAgMyAr DQo+ICBkcml2ZXJzL25ldC93aXJlbGVzcy9pd2x3aWZpL2l3bC1maC5oICAgICAgICAgICAgICAg fCAgICA2IC0NCj4gIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvaXdsLWZ3LWVycm9yLWR1 bXAuaCAgICB8ICAgIDYgKy0NCj4gIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvaXdsLWZ3 LWZpbGUuaCAgICAgICAgICB8ICAxMDcgKysrKysrKy0tLS0NCj4gIGRyaXZlcnMvbmV0L3dpcmVs ZXNzL2l3bHdpZmkvaXdsLWZ3LmggICAgICAgICAgICAgICB8ICAgMjQgKystDQo+ICBkcml2ZXJz L25ldC93aXJlbGVzcy9pd2x3aWZpL2l3bC1udm0tcGFyc2UuYyAgICAgICAgfCAgIDMwICsrKy0N Cj4gIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvaXdsLXBycGguaCAgICAgICAgICAgICB8 ICAgIDMgKw0KPiAgZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9pd2wtdHJhbnMuYyAgICAg ICAgICAgIHwgIDExMyArKysrKysrKysrKysNCj4gIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdp ZmkvaXdsLXRyYW5zLmggICAgICAgICAgICB8ICAgNjMgKysrKy0tLQ0KPiAgZHJpdmVycy9uZXQv d2lyZWxlc3MvaXdsd2lmaS9tdm0vY29leC5jICAgICAgICAgICAgIHwgIDEwMyArKystLS0tLS0t LQ0KPiAgZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9tdm0vY29leF9sZWdhY3kuYyAgICAg IHwgICAgMiArLQ0KPiAgZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9tdm0vZDMuYyAgICAg ICAgICAgICAgIHwgICA0NiArKystLQ0KPiAgZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9t dm0vZGVidWdmcy12aWYuYyAgICAgIHwgICAyMSArKy0NCj4gIGRyaXZlcnMvbmV0L3dpcmVsZXNz L2l3bHdpZmkvbXZtL2RlYnVnZnMuYyAgICAgICAgICB8ICAgMTQgKy0NCj4gIGRyaXZlcnMvbmV0 L3dpcmVsZXNzL2l3bHdpZmkvbXZtL2Z3LWFwaS1wb3dlci5oICAgICB8ICAgMzQgKysrKw0KPiAg ZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9tdm0vZnctYXBpLXNjYW4uaCAgICAgIHwgIDEz NSArKysrKystLS0tLS0tLQ0KPiAgZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9tdm0vZnct YXBpLmggICAgICAgICAgIHwgICA3NiArKysrKy0tLQ0KPiAgZHJpdmVycy9uZXQvd2lyZWxlc3Mv aXdsd2lmaS9tdm0vZncuYyAgICAgICAgICAgICAgIHwgICA3MSArKystLS0tLQ0KPiAgZHJpdmVy cy9uZXQvd2lyZWxlc3MvaXdsd2lmaS9tdm0vbWFjODAyMTEuYyAgICAgICAgIHwgIDQ0MCArKysr KysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0NCj4gIGRyaXZlcnMvbmV0 L3dpcmVsZXNzL2l3bHdpZmkvbXZtL212bS5oICAgICAgICAgICAgICB8ICAxNjMgKysrKysrKy0t LS0tLS0tLS0NCj4gIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvbXZtL252bS5jICAgICAg ICAgICAgICB8ICAgMTYgKy0NCj4gIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvbXZtL29w cy5jICAgICAgICAgICAgICB8ICAgNTMgKysrLS0tDQo+ICBkcml2ZXJzL25ldC93aXJlbGVzcy9p d2x3aWZpL212bS9ycy5jICAgICAgICAgICAgICAgfCAgIDQ3ICsrLS0tDQo+ICBkcml2ZXJzL25l dC93aXJlbGVzcy9pd2x3aWZpL212bS9ycy5oICAgICAgICAgICAgICAgfCAgICAyIC0NCj4gIGRy aXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvbXZtL3J4LmMgICAgICAgICAgICAgICB8ICAgIDkg Ky0NCj4gIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvbXZtL3NjYW4uYyAgICAgICAgICAg ICB8IDE0MjAgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQo+ICBkcml2ZXJzL25ldC93 aXJlbGVzcy9pd2x3aWZpL212bS9zdGEuYyAgICAgICAgICAgICAgfCAgIDE0ICstDQo+ICBkcml2 ZXJzL25ldC93aXJlbGVzcy9pd2x3aWZpL212bS90aW1lLWV2ZW50LmMgICAgICAgfCAgIDMzICsr LS0NCj4gIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvbXZtL3R0LmMgICAgICAgICAgICAg ICB8ICAgNDAgKy0tLS0NCj4gIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvbXZtL3R4LmMg ICAgICAgICAgICAgICB8ICAgMzUgKysrLQ0KPiAgZHJpdmVycy9uZXQvd2lyZWxlc3MvaXdsd2lm aS9tdm0vdXRpbHMuYyAgICAgICAgICAgIHwgICAgMiArLQ0KPiAgZHJpdmVycy9uZXQvd2lyZWxl c3MvaXdsd2lmaS9wY2llL2Rydi5jICAgICAgICAgICAgIHwgICAxNyArLQ0KPiAgZHJpdmVycy9u ZXQvd2lyZWxlc3MvaXdsd2lmaS9wY2llL2ludGVybmFsLmggICAgICAgIHwgICA1MSArKysrKy0N Cj4gIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvcGNpZS9yeC5jICAgICAgICAgICAgICB8 ICA0MTUgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrLS0tLS0tLS0tDQo+ICBkcml2 ZXJzL25ldC93aXJlbGVzcy9pd2x3aWZpL3BjaWUvdHJhbnMuYyAgICAgICAgICAgfCAgMTU4ICsr KysrKysrKy0tLS0tLS0NCj4gIGRyaXZlcnMvbmV0L3dpcmVsZXNzL2l3bHdpZmkvcGNpZS90eC5j ICAgICAgICAgICAgICB8ICAgIDIgLQ0KPiAgNDUgZmlsZXMgY2hhbmdlZCwgMjI4NyBpbnNlcnRp b25zKCspLCAxNzExIGRlbGV0aW9ucygtKQ0KPiAgY3JlYXRlIG1vZGUgMTAwNjQ0IGRyaXZlcnMv bmV0L3dpcmVsZXNzL2l3bHdpZmkvaXdsLXRyYW5zLmMNCj4gDQoNCg==

#58 lore raw

Re: pull request: iwlwifi-next 2015-06-03

Quoted 23 lines · Emmanuel
Quoted 22 lines · Emmanuel Grumbach

Hi Kalle,

As promised, here is the enlarged pull request for 4.2. I double checked that the tag is signed this time.
I also signed this email, just in case...

I'll reply to this pull request with the diff between the previous one and this one. All the other patches have been sent to the ML already. The good thing with this new pull request is that it allows us to jump to -15.ucode which is starting validation right now. I hope its first version will be available in 3 weeks-ish.

Let me know if you have issues with this.

Thank you.

The following changes since commit bbbe8c8c596b3784a2ed08772900e827f8ba72c5:

mac80211: add missing documentation for rate_ctrl_lock (2015-05-06 16:00:32 +0200)

are available in the git repository at:

Quoted 7 lines
Quoted 1 line

https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git tags/iwlwifi-for-kalle-2015-06-03

And since I can't seem to be able to do things right the first time, I renamed the tag to iwlwifi-next0for-kalle-2015-06-03: so

https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git tags/iwlwifi-next-for-kalle-2015-06-03

Thanks, I pulled iwlwifi-next-for-kalle-2015-06-03 now and everything looked ok.

Signature · 1 line
Kalle Valo
#59 lore raw

PATCH 6/15 iwlwifi: pcie: re-enable interrupts on resume

In reply to Grumbach, Emmanuel

From: Eliad Peller <[email protected]>

On resume, all the interrupts are masked (CSR_INT_MASK is 0), and ict is disabled.

Re-configure them both.

---
 drivers/net/wireless/iwlwifi/iwl-trans.h |  2 ++
 drivers/net/wireless/iwlwifi/mvm/d3.c    |  3 ++-
 drivers/net/wireless/iwlwifi/pcie/drv.c  | 17 ++++++++++++++---
 3 files changed, 18 insertions(+), 4 deletions(-)
drivers/net/wireless/iwlwifi/iwl-trans.h +2 -0
index eb34b94..87a230a 100644
@@ -641,6 +641,8 @@ struct iwl_trans {
 
 	enum iwl_d0i3_mode d0i3_mode;
 
+	bool wowlan_d0i3;
+
 	/* pointer to trans specific struct */
 	/*Ensure that this pointer will always be aligned to sizeof pointer */
 	char trans_specific[0] __aligned(sizeof(void *));
drivers/net/wireless/iwlwifi/mvm/d3.c +2 -1
index 423c519..4165d10 100644
@@ -1170,7 +1170,8 @@ int iwl_mvm_suspend(struct ieee80211_hw *hw, struct cfg80211_wowlan *wowlan)
 	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
 
 	iwl_trans_suspend(mvm->trans);
-	if (wowlan->any) {
+	mvm->trans->wowlan_d0i3 = wowlan->any;
+	if (mvm->trans->wowlan_d0i3) {
 		/* 'any' trigger means d0i3 usage */
 		if (mvm->trans->d0i3_mode == IWL_D0I3_MODE_ON_SUSPEND) {
 			int ret = iwl_mvm_enter_d0i3_sync(mvm);
drivers/net/wireless/iwlwifi/pcie/drv.c +14 -3
index b185697..2ed1e4d 100644
@@ -6,7 +6,7 @@
  * GPL LICENSE SUMMARY
  *
  * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of version 2 of the GNU General Public License as
@@ -32,7 +32,7 @@
  * BSD LICENSE
  *
  * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -629,7 +629,18 @@ static int iwl_pci_resume(struct device *device)
 	if (!trans->op_mode)
 		return 0;
 
-	iwl_enable_rfkill_int(trans);
+	/*
+	 * On suspend, ict is disabled, and the interrupt mask
+	 * gets cleared. Reconfigure them both in case of d0i3
+	 * image. Otherwise, only enable rfkill interrupt (in
+	 * order to keep track of the rfkill status)
+	 */
+	if (trans->wowlan_d0i3) {
+		iwl_pcie_reset_ict(trans);
+		iwl_enable_interrupts(trans);
+	} else {
+		iwl_enable_rfkill_int(trans);
+	}
 
 	hw_rfkill = iwl_is_rfkill_set(trans);
 	iwl_trans_pcie_rf_kill(trans, hw_rfkill);
Signature · 1 line
2.1.4
#60 lore raw

PATCH 7/15 iwlwifi: pcie: New RBD allocation model

In reply to Grumbach, Emmanuel

From: Sara Sharon <[email protected]>

As a preperation for multiple RX queues change the RBD allocation model.

The new model includes a background allocator. The allocator is called by the interrupt handler when there are two released buffers by the queue, and the allocator starts allocating eight pages per request.
When the queue has released 8 pages it tries claiming the request. If the pages are not ready - it keeps claiming. This new model should make sure that RBDs are always available across the multiple queues.

The RBDs are transferred between the allocator and the queue. The queue moves the free RBDs upon freeing them to the allocator. The allocator moves them back to the queue's possession when the request is claimed.
The allocator has an initial pool to make sure there are always RBDs available for the request completion.
Release of the buffers at exit is done per pools - the allocator frees its own initial pool and the queue frees its own pool.

Existing code refactor -
-Queue's initial pool is the size of the queue only as the allocation of the new buffers no longer uses this pool.
-Removal of replenish background work, and replenish calls in the interrupt handler and restock().
-The replenish() and the rxq used_list are used only during initialization.
-Moved page allocation to a new function for code reuse.

New code -
Allocator code - new structure and functions.
Interrupt handler uses the allocator functions for replenishing buffers. Reuse of the restock() method.

---
 drivers/net/wireless/iwlwifi/iwl-fh.h        |   6 -
 drivers/net/wireless/iwlwifi/pcie/internal.h |  51 +++-
 drivers/net/wireless/iwlwifi/pcie/rx.c       | 414 +++++++++++++++++++++------
 3 files changed, 374 insertions(+), 97 deletions(-)
drivers/net/wireless/iwlwifi/iwl-fh.h +0 -6
index d45dc02..d560648 100644
@@ -438,12 +438,6 @@ static inline unsigned int FH_MEM_CBBC_QUEUE(unsigned int chnl)
 #define RX_QUEUE_MASK                         255
 #define RX_QUEUE_SIZE_LOG                     8
 
-/*
- * RX related structures and functions
- */
-#define RX_FREE_BUFFERS 64
-#define RX_LOW_WATERMARK 8
-
 /**
  * struct iwl_rb_status - reserve buffer status
  * 	host memory mapped FH registers
drivers/net/wireless/iwlwifi/pcie/internal.h +43 -8

98 lines not on this page · raw message

drivers/net/wireless/iwlwifi/pcie/rx.c +331 -83

590 lines not on this page · raw message

Signature · 1 line
2.1.4
#61 lore raw

PATCH 8/15 iwlwifi: mvm: enable IEEE80211_HW_SUPPORT_FAST_XMIT

In reply to Grumbach, Emmanuel

From: Johannes Berg <[email protected]>

Since the firmware is responsible for duration calculation, the driver can easily support fast-xmit.

---
 drivers/net/wireless/iwlwifi/mvm/mac80211.c | 1 +
 1 file changed, 1 insertion(+)
drivers/net/wireless/iwlwifi/mvm/mac80211.c +1 -0
index 9e517e2..57d75d1 100644
@@ -428,6 +428,7 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
 		    IEEE80211_HW_TIMING_BEACON_ONLY |
 		    IEEE80211_HW_CONNECTION_MONITOR |
 		    IEEE80211_HW_CHANCTX_STA_CSA |
+		    IEEE80211_HW_SUPPORT_FAST_XMIT |
 		    IEEE80211_HW_SUPPORTS_CLONED_SKBS;
 
 	hw->queues = mvm->first_agg_queue;
Signature · 1 line
2.1.4
#62 lore raw

PATCH 9/15 iwlwifi: dvm: enable IEEE80211_HW_SUPPORT_FAST_XMIT

In reply to Grumbach, Emmanuel

From: Johannes Berg <[email protected]>

Since the firmware is responsible for duration calculation, the driver can easily support fast-xmit.

---
 drivers/net/wireless/iwlwifi/dvm/mac80211.c | 1 +
 1 file changed, 1 insertion(+)
drivers/net/wireless/iwlwifi/dvm/mac80211.c +1 -0
index ba7fc42..852461f 100644
@@ -112,6 +112,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv,
 		    IEEE80211_HW_QUEUE_CONTROL |
 		    IEEE80211_HW_SUPPORTS_PS |
 		    IEEE80211_HW_SUPPORTS_DYNAMIC_PS |
+		    IEEE80211_HW_SUPPORT_FAST_XMIT |
 		    IEEE80211_HW_WANT_MONITOR_VIF;
 
 	hw->offchannel_tx_hw_queue = IWL_AUX_QUEUE;
Signature · 1 line
2.1.4
#63 lore raw

PATCH 10/15 iwlwifi: mvm: simplify iwl_mvm_stop_roc()

In reply to Grumbach, Emmanuel

From: Johannes Berg <[email protected]>

As pointed out by smatch, there's no need for a loop that always immediately terminates. Use an if statement instead and while at it clean up the mvmvif initialization.

---
 drivers/net/wireless/iwlwifi/mvm/time-event.c | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)
drivers/net/wireless/iwlwifi/mvm/time-event.c +7 -11
index a7448cf..d24b6a8 100644
@@ -797,13 +797,12 @@ int iwl_mvm_start_p2p_roc(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 
 void iwl_mvm_stop_roc(struct iwl_mvm *mvm)
 {
-	struct iwl_mvm_vif *mvmvif;
+	struct iwl_mvm_vif *mvmvif = NULL;
 	struct iwl_mvm_time_event_data *te_data;
 	bool is_p2p = false;
 
 	lockdep_assert_held(&mvm->mutex);
 
-	mvmvif = NULL;
 	spin_lock_bh(&mvm->time_event_lock);
 
 	/*
@@ -821,17 +820,14 @@ void iwl_mvm_stop_roc(struct iwl_mvm *mvm)
 		}
 	}
 
-	/*
-	 * Iterate over the list of aux roc time events and find the time
-	 * event that is associated with a BSS interface.
-	 * This assumes that a BSS interface can have only a single time
-	 * event at any given time and this time event corresponds to a ROC
-	 * request
+	/* There can only be at most one AUX ROC time event, we just use the
+	 * list to simplify/unify code. Remove it if it exists.
 	 */
-	list_for_each_entry(te_data, &mvm->aux_roc_te_list, list) {
+	te_data = list_first_entry_or_null(&mvm->aux_roc_te_list,
+					   struct iwl_mvm_time_event_data,
+					   list);
+	if (te_data)
 		mvmvif = iwl_mvm_vif_from_mac80211(te_data->vif);
-		goto remove_te;
-	}
 
 remove_te:
 	spin_unlock_bh(&mvm->time_event_lock);
Signature · 1 line
2.1.4
#64 lore raw

PATCH 11/15 iwlwifi: prepare for higher API/CAPA bits

In reply to Grumbach, Emmanuel

From: Johannes Berg <[email protected]>

Currently, loading the firmware fails when it has higher API or CAPA bits than the driver supports. That's an issue with integration.

At the same time, actually using api[0] and capa[0] will become confusing when we also have api[1] and capa[1], and it's almost certain that we'll mix up the bits and use the bits for api[1] with api[0] by accident.

Avoid all this by translating the API/CAPA bits to the regular kernel test_bit() format, and also providing wrapper functions. Also use the __bitwise__ facility of sparse to check that we're testing the right one.

---
 drivers/net/wireless/iwlwifi/iwl-drv.c      | 26 ++++++++---
 drivers/net/wireless/iwlwifi/iwl-fw-file.h  | 67 ++++++++++++++++-------------
 drivers/net/wireless/iwlwifi/iwl-fw.h       | 20 +++++++--
 drivers/net/wireless/iwlwifi/mvm/coex.c     | 22 +++++-----
 drivers/net/wireless/iwlwifi/mvm/debugfs.c  |  9 ++--
 drivers/net/wireless/iwlwifi/mvm/fw.c       |  4 +-
 drivers/net/wireless/iwlwifi/mvm/mac80211.c | 47 ++++++++++----------
 drivers/net/wireless/iwlwifi/mvm/mvm.h      | 21 +++++----
 drivers/net/wireless/iwlwifi/mvm/nvm.c      |  8 ++--
 drivers/net/wireless/iwlwifi/mvm/rs.c       | 10 ++---
 drivers/net/wireless/iwlwifi/mvm/rx.c       |  4 +-
 drivers/net/wireless/iwlwifi/mvm/scan.c     | 33 +++++++-------
 drivers/net/wireless/iwlwifi/mvm/tx.c       |  4 +-
 drivers/net/wireless/iwlwifi/mvm/utils.c    |  2 +-
 14 files changed, 161 insertions(+), 116 deletions(-)
drivers/net/wireless/iwlwifi/iwl-drv.c +19 -7
index 12566c8..6685259 100644
@@ -423,13 +423,19 @@ static int iwl_set_ucode_api_flags(struct iwl_drv *drv, const u8 *data,
 {
 	const struct iwl_ucode_api *ucode_api = (void *)data;
 	u32 api_index = le32_to_cpu(ucode_api->api_index);
+	u32 api_flags = le32_to_cpu(ucode_api->api_flags);
+	int i;
 
-	if (api_index >= IWL_API_ARRAY_SIZE) {
+	if (api_index >= IWL_API_MAX_BITS / 32) {
 		IWL_ERR(drv, "api_index larger than supported by driver\n");
-		return -EINVAL;
+		/* don't return an error so we can load FW that has more bits */
+		return 0;
 	}
 
-	capa->api[api_index] = le32_to_cpu(ucode_api->api_flags);
+	for (i = 0; i < 32; i++) {
+		if (api_flags & BIT(i))
+			__set_bit(i + 32 * api_index, capa->_api);
+	}
 
 	return 0;
 }
@@ -439,13 +445,19 @@ static int iwl_set_ucode_capabilities(struct iwl_drv *drv, const u8 *data,
 {
 	const struct iwl_ucode_capa *ucode_capa = (void *)data;
 	u32 api_index = le32_to_cpu(ucode_capa->api_index);
+	u32 api_flags = le32_to_cpu(ucode_capa->api_capa);
+	int i;
 
-	if (api_index >= IWL_CAPABILITIES_ARRAY_SIZE) {
+	if (api_index >= IWL_CAPABILITIES_MAX_BITS / 32) {
 		IWL_ERR(drv, "api_index larger than supported by driver\n");
-		return -EINVAL;
+		/* don't return an error so we can load FW that has more bits */
+		return 0;
 	}
 
-	capa->capa[api_index] = le32_to_cpu(ucode_capa->api_capa);
+	for (i = 0; i < 32; i++) {
+		if (api_flags & BIT(i))
+			__set_bit(i + 32 * api_index, capa->_capa);
+	}
 
 	return 0;
 }
@@ -1148,7 +1160,7 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context)
 	if (err)
 		goto try_again;
 
-	if (drv->fw.ucode_capa.api[0] & IWL_UCODE_TLV_API_NEW_VERSION)
+	if (fw_has_api(&drv->fw.ucode_capa, IWL_UCODE_TLV_API_NEW_VERSION))
 		api_ver = drv->fw.ucode_ver;
 	else
 		api_ver = IWL_UCODE_API(drv->fw.ucode_ver);
drivers/net/wireless/iwlwifi/iwl-fw-file.h +36 -31

98 lines not on this page · raw message

drivers/net/wireless/iwlwifi/iwl-fw.h +17 -3
index cdc7f1e..3e3c9d8 100644
@@ -32,7 +32,7 @@
  * BSD LICENSE
  *
  * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -105,10 +105,24 @@ struct iwl_ucode_capabilities {
 	u32 n_scan_channels;
 	u32 standard_phy_calibration_size;
 	u32 flags;
-	u32 api[IWL_API_ARRAY_SIZE];
-	u32 capa[IWL_CAPABILITIES_ARRAY_SIZE];
+	unsigned long _api[BITS_TO_LONGS(IWL_API_MAX_BITS)];
+	unsigned long _capa[BITS_TO_LONGS(IWL_CAPABILITIES_MAX_BITS)];
 };
 
+static inline bool
+fw_has_api(const struct iwl_ucode_capabilities *capabilities,
+	   iwl_ucode_tlv_api_t api)
+{
+	return test_bit((__force long)api, capabilities->_api);
+}
+
+static inline bool
+fw_has_capa(const struct iwl_ucode_capabilities *capabilities,
+	    iwl_ucode_tlv_capa_t capa)
+{
+	return test_bit((__force long)capa, capabilities->_capa);
+}
+
 /* one for each uCode image (inst/data, init/runtime/wowlan) */
 struct fw_desc {
 	const void *data;	/* vmalloc'ed data */
drivers/net/wireless/iwlwifi/mvm/coex.c +12 -10
index 662fa9c..b4737e2 100644
@@ -411,7 +411,7 @@ int iwl_send_bt_init_conf(struct iwl_mvm *mvm)
 	struct iwl_bt_coex_cmd bt_cmd = {};
 	u32 mode;
 
-	if (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_BT_COEX_SPLIT))
+	if (!fw_has_api(&mvm->fw->ucode_capa, IWL_UCODE_TLV_API_BT_COEX_SPLIT))
 		return iwl_send_bt_init_conf_old(mvm);
 
 	lockdep_assert_held(&mvm->mutex);
@@ -732,7 +732,7 @@ int iwl_mvm_rx_bt_coex_notif(struct iwl_mvm *mvm,
 	struct iwl_rx_packet *pkt = rxb_addr(rxb);
 	struct iwl_bt_coex_profile_notif *notif = (void *)pkt->data;
 
-	if (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_BT_COEX_SPLIT))
+	if (!fw_has_api(&mvm->fw->ucode_capa, IWL_UCODE_TLV_API_BT_COEX_SPLIT))
 		return iwl_mvm_rx_bt_coex_notif_old(mvm, rxb, dev_cmd);
 
 	IWL_DEBUG_COEX(mvm, "BT Coex Notification received\n");
@@ -762,7 +762,8 @@ void iwl_mvm_bt_rssi_event(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
 	int ret;
 
-	if (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_BT_COEX_SPLIT)) {
+	if (!fw_has_api(&mvm->fw->ucode_capa,
+			IWL_UCODE_TLV_API_BT_COEX_SPLIT)) {
 		iwl_mvm_bt_rssi_event_old(mvm, vif, rssi_event);
 		return;
 	}
@@ -813,7 +814,7 @@ u16 iwl_mvm_coex_agg_time_limit(struct iwl_mvm *mvm,
 	struct iwl_mvm_phy_ctxt *phy_ctxt = mvmvif->phy_ctxt;
 	enum iwl_bt_coex_lut_type lut_type;
 
-	if (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_BT_COEX_SPLIT))
+	if (!fw_has_api(&mvm->fw->ucode_capa, IWL_UCODE_TLV_API_BT_COEX_SPLIT))
 		return iwl_mvm_coex_agg_time_limit_old(mvm, sta);
 
 	if (IWL_COEX_IS_TTC_ON(mvm->last_bt_notif.ttc_rrc_status, phy_ctxt->id))
@@ -840,7 +841,7 @@ bool iwl_mvm_bt_coex_is_mimo_allowed(struct iwl_mvm *mvm,
 	struct iwl_mvm_phy_ctxt *phy_ctxt = mvmvif->phy_ctxt;
 	enum iwl_bt_coex_lut_type lut_type;
 
-	if (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_BT_COEX_SPLIT))
+	if (!fw_has_api(&mvm->fw->ucode_capa, IWL_UCODE_TLV_API_BT_COEX_SPLIT))
 		return iwl_mvm_bt_coex_is_mimo_allowed_old(mvm, sta);
 
 	if (IWL_COEX_IS_TTC_ON(mvm->last_bt_notif.ttc_rrc_status, phy_ctxt->id))
@@ -870,7 +871,7 @@ bool iwl_mvm_bt_coex_is_ant_avail(struct iwl_mvm *mvm, u8 ant)
 	if (ant & mvm->cfg->non_shared_ant)
 		return true;
 
-	if (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_BT_COEX_SPLIT))
+	if (!fw_has_api(&mvm->fw->ucode_capa, IWL_UCODE_TLV_API_BT_COEX_SPLIT))
 		return iwl_mvm_bt_coex_is_shared_ant_avail_old(mvm);
 
 	return le32_to_cpu(mvm->last_bt_notif.bt_activity_grading) <
@@ -883,7 +884,7 @@ bool iwl_mvm_bt_coex_is_shared_ant_avail(struct iwl_mvm *mvm)
 	if (mvm->cfg->bt_shared_single_ant)
 		return true;
 
-	if (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_BT_COEX_SPLIT))
+	if (!fw_has_api(&mvm->fw->ucode_capa, IWL_UCODE_TLV_API_BT_COEX_SPLIT))
 		return iwl_mvm_bt_coex_is_shared_ant_avail_old(mvm);
 
 	return le32_to_cpu(mvm->last_bt_notif.bt_activity_grading) < BT_HIGH_TRAFFIC;
@@ -894,7 +895,7 @@ bool iwl_mvm_bt_coex_is_tpc_allowed(struct iwl_mvm *mvm,
 {
 	u32 bt_activity = le32_to_cpu(mvm->last_bt_notif.bt_activity_grading);
 
-	if (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_BT_COEX_SPLIT))
+	if (!fw_has_api(&mvm->fw->ucode_capa, IWL_UCODE_TLV_API_BT_COEX_SPLIT))
 		return iwl_mvm_bt_coex_is_tpc_allowed_old(mvm, band);
 
 	if (band != IEEE80211_BAND_2GHZ)
@@ -937,7 +938,8 @@ u8 iwl_mvm_bt_coex_tx_prio(struct iwl_mvm *mvm, struct ieee80211_hdr *hdr,
 
 void iwl_mvm_bt_coex_vif_change(struct iwl_mvm *mvm)
 {
-	if (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_BT_COEX_SPLIT)) {
+	if (!fw_has_api(&mvm->fw->ucode_capa,
+			IWL_UCODE_TLV_API_BT_COEX_SPLIT)) {
 		iwl_mvm_bt_coex_vif_change_old(mvm);
 		return;
 	}
@@ -955,7 +957,7 @@ int iwl_mvm_rx_ant_coupling_notif(struct iwl_mvm *mvm,
 	u8 __maybe_unused lower_bound, upper_bound;
 	u8 lut;
 
-	if (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_BT_COEX_SPLIT))
+	if (!fw_has_api(&mvm->fw->ucode_capa, IWL_UCODE_TLV_API_BT_COEX_SPLIT))
 		return iwl_mvm_rx_ant_coupling_notif_old(mvm, rxb, dev_cmd);
 
 	if (!iwl_mvm_bt_is_plcr_supported(mvm))
drivers/net/wireless/iwlwifi/mvm/debugfs.c +6 -3
index 8c17b94..ffb4b5c 100644
@@ -493,7 +493,8 @@ static ssize_t iwl_dbgfs_bt_notif_read(struct file *file, char __user *user_buf,
 
 	mutex_lock(&mvm->mutex);
 
-	if (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_BT_COEX_SPLIT)) {
+	if (!fw_has_api(&mvm->fw->ucode_capa,
+			IWL_UCODE_TLV_API_BT_COEX_SPLIT)) {
 		struct iwl_bt_coex_profile_notif_old *notif =
 			&mvm->last_bt_notif_old;
 
@@ -550,7 +551,8 @@ static ssize_t iwl_dbgfs_bt_cmd_read(struct file *file, char __user *user_buf,
 
 	mutex_lock(&mvm->mutex);
 
-	if (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_BT_COEX_SPLIT)) {
+	if (!fw_has_api(&mvm->fw->ucode_capa,
+			IWL_UCODE_TLV_API_BT_COEX_SPLIT)) {
 		struct iwl_bt_coex_ci_cmd_old *cmd = &mvm->last_bt_ci_cmd_old;
 
 		pos += scnprintf(buf+pos, bufsz-pos,
@@ -916,7 +918,8 @@ iwl_dbgfs_scan_ant_rxchain_write(struct iwl_mvm *mvm, char *buf,
 
 	if (mvm->scan_rx_ant != scan_rx_ant) {
 		mvm->scan_rx_ant = scan_rx_ant;
-		if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN)
+		if (fw_has_capa(&mvm->fw->ucode_capa,
+				IWL_UCODE_TLV_CAPA_UMAC_SCAN))
 			iwl_mvm_config_scan(mvm);
 	}
 
drivers/net/wireless/iwlwifi/mvm/fw.c +2 -2
index 2f76fb2..eb10c5e 100644
@@ -623,7 +623,7 @@ static int iwl_mvm_config_ltr(struct iwl_mvm *mvm)
 	if (!mvm->trans->ltr_enabled)
 		return 0;
 
-	if (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_HDC_PHASE_0))
+	if (!fw_has_api(&mvm->fw->ucode_capa, IWL_UCODE_TLV_API_HDC_PHASE_0))
 		return iwl_mvm_config_ltr_v1(mvm);
 
 	return iwl_mvm_send_cmd_pdu(mvm, LTR_CONFIG, 0,
@@ -754,7 +754,7 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
 			goto error;
 	}
 
-	if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN) {
+	if (fw_has_capa(&mvm->fw->ucode_capa, IWL_UCODE_TLV_CAPA_UMAC_SCAN)) {
 		ret = iwl_mvm_config_scan(mvm);
 		if (ret)
 			goto error;
drivers/net/wireless/iwlwifi/mvm/mac80211.c +24 -23

111 lines not on this page · raw message

drivers/net/wireless/iwlwifi/mvm/mvm.h +13 -8
index 0173ad1..255cde4 100644
@@ -889,14 +889,15 @@ static inline bool iwl_mvm_is_d0i3_supported(struct iwl_mvm *mvm)
 	return mvm->trans->cfg->d0i3 &&
 	       mvm->trans->d0i3_mode != IWL_D0I3_MODE_OFF &&
 	       !iwlwifi_mod_params.d0i3_disable &&
-	       (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_D0I3_SUPPORT);
+	       fw_has_capa(&mvm->fw->ucode_capa,
+			   IWL_UCODE_TLV_CAPA_D0I3_SUPPORT);
 }
 
 static inline bool iwl_mvm_is_lar_supported(struct iwl_mvm *mvm)
 {
 	bool nvm_lar = mvm->nvm_data->lar_enabled;
-	bool tlv_lar = mvm->fw->ucode_capa.capa[0] &
-		IWL_UCODE_TLV_CAPA_LAR_SUPPORT;
+	bool tlv_lar = fw_has_capa(&mvm->fw->ucode_capa,
+				   IWL_UCODE_TLV_CAPA_LAR_SUPPORT);
 
 	if (iwlwifi_mod_params.lar_disable)
 		return false;
@@ -913,24 +914,28 @@ static inline bool iwl_mvm_is_lar_supported(struct iwl_mvm *mvm)
 
 static inline bool iwl_mvm_is_wifi_mcc_supported(struct iwl_mvm *mvm)
 {
-	return mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_WIFI_MCC_UPDATE ||
-	       mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_LAR_MULTI_MCC;
+	return fw_has_api(&mvm->fw->ucode_capa,
+			  IWL_UCODE_TLV_API_WIFI_MCC_UPDATE) ||
+	       fw_has_capa(&mvm->fw->ucode_capa,
+			   IWL_UCODE_TLV_CAPA_LAR_MULTI_MCC);
 }
 
 static inline bool iwl_mvm_is_scd_cfg_supported(struct iwl_mvm *mvm)
 {
-	return mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_SCD_CFG;
+	return fw_has_api(&mvm->fw->ucode_capa, IWL_UCODE_TLV_API_SCD_CFG);
 }
 
 static inline bool iwl_mvm_bt_is_plcr_supported(struct iwl_mvm *mvm)
 {
-	return (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_BT_COEX_PLCR) &&
+	return fw_has_capa(&mvm->fw->ucode_capa,
+			   IWL_UCODE_TLV_CAPA_BT_COEX_PLCR) &&
 		IWL_MVM_BT_COEX_CORUNNING;
 }
 
 static inline bool iwl_mvm_bt_is_rrc_supported(struct iwl_mvm *mvm)
 {
-	return (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_BT_COEX_RRC) &&
+	return fw_has_capa(&mvm->fw->ucode_capa,
+			   IWL_UCODE_TLV_CAPA_BT_COEX_RRC) &&
 		IWL_MVM_BT_COEX_RRC;
 }
 
drivers/net/wireless/iwlwifi/mvm/nvm.c +4 -4
index 4701424..2a6be35 100644
@@ -316,8 +316,8 @@ iwl_parse_nvm_sections(struct iwl_mvm *mvm)
 	phy_sku = (const __le16 *)sections[NVM_SECTION_TYPE_PHY_SKU].data;
 
 	lar_enabled = !iwlwifi_mod_params.lar_disable &&
-		      (mvm->fw->ucode_capa.capa[0] &
-		       IWL_UCODE_TLV_CAPA_LAR_SUPPORT);
+		      fw_has_capa(&mvm->fw->ucode_capa,
+				  IWL_UCODE_TLV_CAPA_LAR_SUPPORT);
 
 	return iwl_parse_nvm_data(mvm->trans->dev, mvm->cfg, hw, sw, calib,
 				  regulatory, mac_override, phy_sku,
@@ -792,8 +792,8 @@ int iwl_mvm_init_mcc(struct iwl_mvm *mvm)
 	char mcc[3];
 
 	if (mvm->cfg->device_family == IWL_DEVICE_FAMILY_8000) {
-		tlv_lar = mvm->fw->ucode_capa.capa[0] &
-			IWL_UCODE_TLV_CAPA_LAR_SUPPORT;
+		tlv_lar = fw_has_capa(&mvm->fw->ucode_capa,
+				      IWL_UCODE_TLV_CAPA_LAR_SUPPORT);
 		nvm_lar = mvm->nvm_data->lar_enabled;
 		if (tlv_lar != nvm_lar)
 			IWL_INFO(mvm,
drivers/net/wireless/iwlwifi/mvm/rs.c +5 -5
index ae99656..daff1d0 100644
@@ -1127,8 +1127,8 @@ void iwl_mvm_rs_tx_status(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
 	u32 tx_resp_hwrate = (uintptr_t)info->status.status_driver_data[1];
 	struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);
 	struct iwl_lq_sta *lq_sta = &mvmsta->lq_sta;
-	bool allow_ant_mismatch = mvm->fw->ucode_capa.api[0] &
-		IWL_UCODE_TLV_API_LQ_SS_PARAMS;
+	bool allow_ant_mismatch = fw_has_api(&mvm->fw->ucode_capa,
+					     IWL_UCODE_TLV_API_LQ_SS_PARAMS);
 
 	/* Treat uninitialized rate scaling data same as non-existing. */
 	if (!lq_sta) {
@@ -2714,7 +2714,7 @@ static void rs_vht_init(struct iwl_mvm *mvm,
 	    (vht_cap->cap & IEEE80211_VHT_CAP_RXSTBC_MASK))
 		lq_sta->stbc_capable = true;
 
-	if ((mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_BEAMFORMER) &&
+	if (fw_has_capa(&mvm->fw->ucode_capa, IWL_UCODE_TLV_CAPA_BEAMFORMER) &&
 	    (num_of_ant(iwl_mvm_get_valid_tx_ant(mvm)) > 1) &&
 	    (vht_cap->cap & IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE))
 		lq_sta->bfer_capable = true;
@@ -2998,7 +2998,7 @@ static void rs_build_rates_table(struct iwl_mvm *mvm,
 	valid_tx_ant = iwl_mvm_get_valid_tx_ant(mvm);
 
 	/* TODO: remove old API when min FW API hits 14 */
-	if (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LQ_SS_PARAMS) &&
+	if (!fw_has_api(&mvm->fw->ucode_capa, IWL_UCODE_TLV_API_LQ_SS_PARAMS) &&
 	    rs_stbc_allow(mvm, sta, lq_sta))
 		rate.stbc = true;
 
@@ -3212,7 +3212,7 @@ static void rs_fill_lq_cmd(struct iwl_mvm *mvm,
 
 	rs_build_rates_table(mvm, sta, lq_sta, initial_rate);
 
-	if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LQ_SS_PARAMS)
+	if (fw_has_api(&mvm->fw->ucode_capa, IWL_UCODE_TLV_API_LQ_SS_PARAMS))
 		rs_set_lq_ss_params(mvm, sta, lq_sta, initial_rate);
 
 	mvmsta = iwl_mvm_sta_from_mac80211(sta);
drivers/net/wireless/iwlwifi/mvm/rx.c +2 -2
index d6314dd..8f1d93b 100644
@@ -570,7 +570,7 @@ void iwl_mvm_handle_rx_statistics(struct iwl_mvm *mvm,
 	};
 	u32 temperature;
 
-	if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_STATS_V10) {
+	if (fw_has_api(&mvm->fw->ucode_capa, IWL_UCODE_TLV_API_STATS_V10)) {
 		struct iwl_notif_statistics_v10 *stats = (void *)&pkt->data;
 
 		if (iwl_rx_packet_payload_len(pkt) != v10_len)
@@ -610,7 +610,7 @@ void iwl_mvm_handle_rx_statistics(struct iwl_mvm *mvm,
 	/* Only handle rx statistics temperature changes if async temp
 	 * notifications are not supported
 	 */
-	if (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_ASYNC_DTM))
+	if (!fw_has_api(&mvm->fw->ucode_capa, IWL_UCODE_TLV_API_ASYNC_DTM))
 		iwl_mvm_tt_temp_changed(mvm, temperature);
 
 	ieee80211_iterate_active_interfaces(mvm->hw,
drivers/net/wireless/iwlwifi/mvm/scan.c +18 -15
index 794109e..5de1449 100644
@@ -160,7 +160,7 @@ iwl_mvm_scan_rate_n_flags(struct iwl_mvm *mvm, enum ieee80211_band band,
 static u16 iwl_mvm_get_active_dwell(struct iwl_mvm *mvm,
 				    enum ieee80211_band band, int n_ssids)
 {
-	if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_BASIC_DWELL)
+	if (fw_has_api(&mvm->fw->ucode_capa, IWL_UCODE_TLV_API_BASIC_DWELL))
 		return 10;
 	if (band == IEEE80211_BAND_2GHZ)
 		return 20  + 3 * (n_ssids + 1);
@@ -170,7 +170,7 @@ static u16 iwl_mvm_get_active_dwell(struct iwl_mvm *mvm,
 static u16 iwl_mvm_get_passive_dwell(struct iwl_mvm *mvm,
 				     enum ieee80211_band band)
 {
-	if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_BASIC_DWELL)
+	if (fw_has_api(&mvm->fw->ucode_capa, IWL_UCODE_TLV_API_BASIC_DWELL))
 			return 110;
 	return band == IEEE80211_BAND_2GHZ ? 100 + 20 : 100 + 10;
 }
@@ -205,8 +205,9 @@ static void iwl_mvm_scan_calc_dwell(struct iwl_mvm *mvm,
 	params->max_out_time = 120;
 
 	if (iwl_mvm_low_latency(mvm)) {
-		if (mvm->fw->ucode_capa.api[0] &
-		    IWL_UCODE_TLV_API_FRAGMENTED_SCAN) {
+		if (fw_has_api(&mvm->fw->ucode_capa,
+			       IWL_UCODE_TLV_API_FRAGMENTED_SCAN)) {
+
 			params->suspend_time = 105;
 			/*
 			 * If there is more than one active interface make
@@ -220,8 +221,9 @@ static void iwl_mvm_scan_calc_dwell(struct iwl_mvm *mvm,
 		}
 	}
 
-	if (frag_passive_dwell && (mvm->fw->ucode_capa.api[0] &
-				   IWL_UCODE_TLV_API_FRAGMENTED_SCAN)) {
+	if (frag_passive_dwell &&
+	    fw_has_api(&mvm->fw->ucode_capa,
+		       IWL_UCODE_TLV_API_FRAGMENTED_SCAN)) {
 		/*
 		 * P2P device scan should not be fragmented to avoid negative
 		 * impact on P2P device discovery. Configure max_out_time to be
@@ -273,8 +275,8 @@ not_bound:
 static inline bool iwl_mvm_rrm_scan_needed(struct iwl_mvm *mvm)
 {
 	/* require rrm scan whenever the fw supports it */
-	return mvm->fw->ucode_capa.capa[0] &
-	       IWL_UCODE_TLV_CAPA_DS_PARAM_SET_IE_SUPPORT;
+	return fw_has_capa(&mvm->fw->ucode_capa,
+			   IWL_UCODE_TLV_CAPA_DS_PARAM_SET_IE_SUPPORT);
 }
 
 static int iwl_mvm_max_scan_ie_fw_cmd_room(struct iwl_mvm *mvm)
@@ -732,7 +734,8 @@ iwl_mvm_build_scan_probe(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 static __le32 iwl_mvm_scan_priority(struct iwl_mvm *mvm,
 				    enum iwl_scan_priority_ext prio)
 {
-	if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_EXT_SCAN_PRIORITY)
+	if (fw_has_api(&mvm->fw->ucode_capa,
+		       IWL_UCODE_TLV_API_EXT_SCAN_PRIORITY))
 		return cpu_to_le32(prio);
 
 	if (prio <= IWL_SCAN_PRIORITY_EXT_2)
@@ -785,7 +788,7 @@ static inline bool iwl_mvm_scan_use_ebs(struct iwl_mvm *mvm,
 	return ((capa->flags & IWL_UCODE_TLV_FLAGS_EBS_SUPPORT) &&
 		mvm->last_ebs_successful &&
 		(n_iterations > 1 ||
-		 (capa->api[0] & IWL_UCODE_TLV_API_SINGLE_SCAN_EBS)) &&
+		 fw_has_api(capa, IWL_UCODE_TLV_API_SINGLE_SCAN_EBS)) &&
 		vif->type != NL80211_IFTYPE_P2P_DEVICE);
 }
 
@@ -1233,7 +1236,7 @@ int iwl_mvm_reg_scan_start(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 
 	iwl_mvm_build_scan_probe(mvm, vif, ies, &params);
 
-	if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN) {
+	if (fw_has_capa(&mvm->fw->ucode_capa, IWL_UCODE_TLV_CAPA_UMAC_SCAN)) {
 		hcmd.id = SCAN_REQ_UMAC;
 		ret = iwl_mvm_scan_umac(mvm, vif, &params,
 					IWL_MVM_SCAN_REGULAR);
@@ -1341,7 +1344,7 @@ int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm,
 
 	iwl_mvm_build_scan_probe(mvm, vif, ies, &params);
 
-	if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN) {
+	if (fw_has_capa(&mvm->fw->ucode_capa, IWL_UCODE_TLV_CAPA_UMAC_SCAN)) {
 		hcmd.id = SCAN_REQ_UMAC;
 		ret = iwl_mvm_scan_umac(mvm, vif, &params, IWL_MVM_SCAN_SCHED);
 	} else {
@@ -1468,7 +1471,7 @@ static int iwl_mvm_scan_stop_wait(struct iwl_mvm *mvm, int type)
 
 	IWL_DEBUG_SCAN(mvm, "Preparing to stop scan, type %x\n", type);
 
-	if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN)
+	if (fw_has_capa(&mvm->fw->ucode_capa, IWL_UCODE_TLV_CAPA_UMAC_SCAN))
 		ret = iwl_mvm_umac_scan_abort(mvm, type);
 	else
 		ret = iwl_mvm_lmac_scan_abort(mvm);
@@ -1486,7 +1489,7 @@ static int iwl_mvm_scan_stop_wait(struct iwl_mvm *mvm, int type)
 
 int iwl_mvm_scan_size(struct iwl_mvm *mvm)
 {
-	if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN)
+	if (fw_has_capa(&mvm->fw->ucode_capa, IWL_UCODE_TLV_CAPA_UMAC_SCAN))
 		return sizeof(struct iwl_scan_req_umac) +
 			sizeof(struct iwl_scan_channel_cfg_umac) *
 				mvm->fw->ucode_capa.n_scan_channels +
@@ -1504,7 +1507,7 @@ int iwl_mvm_scan_size(struct iwl_mvm *mvm)
  */
 void iwl_mvm_report_scan_aborted(struct iwl_mvm *mvm)
 {
-	if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN) {
+	if (fw_has_capa(&mvm->fw->ucode_capa, IWL_UCODE_TLV_CAPA_UMAC_SCAN)) {
 		int uid, i;
 
 		uid = iwl_mvm_scan_uid_by_status(mvm, IWL_MVM_SCAN_REGULAR);
drivers/net/wireless/iwlwifi/mvm/tx.c +2 -2
index 57e0cbb..7ba7a118 100644
@@ -171,8 +171,8 @@ void iwl_mvm_set_tx_cmd(struct iwl_mvm *mvm, struct sk_buff *skb,
 	    !is_multicast_ether_addr(ieee80211_get_DA(hdr)))
 		tx_flags |= TX_CMD_FLG_PROT_REQUIRE;
 
-	if ((mvm->fw->ucode_capa.capa[0] &
-	     IWL_UCODE_TLV_CAPA_TXPOWER_INSERTION_SUPPORT) &&
+	if (fw_has_capa(&mvm->fw->ucode_capa,
+			IWL_UCODE_TLV_CAPA_TXPOWER_INSERTION_SUPPORT) &&
 	    ieee80211_action_contains_tpc(skb))
 		tx_flags |= TX_CMD_FLG_WRITE_TX_POWER;
 
drivers/net/wireless/iwlwifi/mvm/utils.c +1 -1
index bc55a8b..03f8e06 100644
@@ -584,7 +584,7 @@ void iwl_mvm_dump_nic_error_log(struct iwl_mvm *mvm)
 	struct iwl_error_event_table table;
 	u32 base;
 
-	if (!(mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_NEW_VERSION)) {
+	if (!fw_has_api(&mvm->fw->ucode_capa, IWL_UCODE_TLV_API_NEW_VERSION)) {
 		iwl_mvm_dump_nic_error_log_old(mvm);
 		return;
 	}
Signature · 1 line
2.1.4
#65 lore raw

PATCH 12/15 iwlwifi: mvm: Remove old scan commands

In reply to Grumbach, Emmanuel

From: Matti Gottlieb <[email protected]>

The firmwares that used these commands is not supported anymore. Remove them.

---
 drivers/net/wireless/iwlwifi/mvm/fw-api.h | 7 -------
 drivers/net/wireless/iwlwifi/mvm/ops.c    | 5 -----
 2 files changed, 12 deletions(-)
drivers/net/wireless/iwlwifi/mvm/fw-api.h +0 -7
index 0ed7675..7128379 100644
@@ -171,13 +171,6 @@ enum {
 	/* Thermal Throttling*/
 	REPLY_THERMAL_MNG_BACKOFF = 0x7e,
 
-	/* Scanning */
-	SCAN_REQUEST_CMD = 0x80,
-	SCAN_ABORT_CMD = 0x81,
-	SCAN_START_NOTIFICATION = 0x82,
-	SCAN_RESULTS_NOTIFICATION = 0x83,
-	SCAN_COMPLETE_NOTIFICATION = 0x84,
-
 	/* NVM */
 	NVM_ACCESS_CMD = 0x88,
 
drivers/net/wireless/iwlwifi/mvm/ops.c +0 -5
index 91ca626..2801f97 100644
@@ -281,11 +281,6 @@ static const char *const iwl_mvm_cmd_strings[REPLY_MAX] = {
 	CMD(BINDING_CONTEXT_CMD),
 	CMD(TIME_QUOTA_CMD),
 	CMD(NON_QOS_TX_COUNTER_CMD),
-	CMD(SCAN_REQUEST_CMD),
-	CMD(SCAN_ABORT_CMD),
-	CMD(SCAN_START_NOTIFICATION),
-	CMD(SCAN_RESULTS_NOTIFICATION),
-	CMD(SCAN_COMPLETE_NOTIFICATION),
 	CMD(NVM_ACCESS_CMD),
 	CMD(PHY_CONFIGURATION_CMD),
 	CMD(CALIB_RES_NOTIF_PHY_DB),
Signature · 1 line
2.1.4
#66 lore raw

PATCH 13/15 iwlwifi: mvm: Add DC2DC_CONFIG_CMD (0x83) cmd & TLV

In reply to Grumbach, Emmanuel

From: Matti Gottlieb <[email protected]>

Add DC2DC_CONFIG_CMD (0x83) cmd.

Add IWL_UCODE_TLV_CAPA_DC2DC_CONFIG_SUPPORT tlv.

The command allows the driver get & set the DCDC's frequency tune. (freq_tune is the divider that is used to calculate the actual DCDC's clock rate)
The command always returns the current/updated frequency tune values of the DCDC.

---
 drivers/net/wireless/iwlwifi/iwl-fw-file.h |  2 ++
 drivers/net/wireless/iwlwifi/mvm/fw-api.h  | 46 ++++++++++++++++++++++++++++++
 drivers/net/wireless/iwlwifi/mvm/ops.c     |  1 +
 3 files changed, 49 insertions(+)
drivers/net/wireless/iwlwifi/iwl-fw-file.h +2 -0
index 7efd629..a9b5ae4 100644
@@ -297,6 +297,7 @@ typedef unsigned int __bitwise__ iwl_ucode_tlv_capa_t;
  *	which also implies support for the scheduler configuration command
  * @IWL_UCODE_TLV_CAPA_TDLS_CHANNEL_SWITCH: supports TDLS channel switching
  * @IWL_UCODE_TLV_CAPA_HOTSPOT_SUPPORT: supports Hot Spot Command
+ * @IWL_UCODE_TLV_CAPA_DC2DC_SUPPORT: supports DC2DC Command
  * @IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS: support radio and beacon statistics
  * @IWL_UCODE_TLV_CAPA_BT_COEX_PLCR: enabled BT Coex packet level co-running
  * @IWL_UCODE_TLV_CAPA_LAR_MULTI_MCC: ucode supports LAR updates with different
@@ -318,6 +319,7 @@ enum iwl_ucode_tlv_capa {
 	IWL_UCODE_TLV_CAPA_DQA_SUPPORT			= (__force iwl_ucode_tlv_capa_t)12,
 	IWL_UCODE_TLV_CAPA_TDLS_CHANNEL_SWITCH		= (__force iwl_ucode_tlv_capa_t)13,
 	IWL_UCODE_TLV_CAPA_HOTSPOT_SUPPORT		= (__force iwl_ucode_tlv_capa_t)18,
+	IWL_UCODE_TLV_CAPA_DC2DC_CONFIG_SUPPORT		= (__force iwl_ucode_tlv_capa_t)19,
 	IWL_UCODE_TLV_CAPA_RADIO_BEACON_STATS		= (__force iwl_ucode_tlv_capa_t)22,
 	IWL_UCODE_TLV_CAPA_BT_COEX_PLCR			= (__force iwl_ucode_tlv_capa_t)28,
 	IWL_UCODE_TLV_CAPA_LAR_MULTI_MCC		= (__force iwl_ucode_tlv_capa_t)29,
drivers/net/wireless/iwlwifi/mvm/fw-api.h +46 -0

58 lines not on this page · raw message

drivers/net/wireless/iwlwifi/mvm/ops.c +1 -0
index 2801f97..e4fa500 100644
@@ -281,6 +281,7 @@ static const char *const iwl_mvm_cmd_strings[REPLY_MAX] = {
 	CMD(BINDING_CONTEXT_CMD),
 	CMD(TIME_QUOTA_CMD),
 	CMD(NON_QOS_TX_COUNTER_CMD),
+	CMD(DC2DC_CONFIG_CMD),
 	CMD(NVM_ACCESS_CMD),
 	CMD(PHY_CONFIGURATION_CMD),
 	CMD(CALIB_RES_NOTIF_PHY_DB),
Signature · 1 line
2.1.4
#67 lore raw

PATCH 14/15 iwlwifi: bump the iwlmvm API number to 15

In reply to Grumbach, Emmanuel

The driver is now ready to handle the -15.ucode.

---
 drivers/net/wireless/iwlwifi/iwl-7000.c | 2 +-
 drivers/net/wireless/iwlwifi/iwl-8000.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/iwlwifi/iwl-7000.c +1 -1
index b40b385..cc35f79 100644
@@ -69,7 +69,7 @@
 #include "iwl-agn-hw.h"
 
 /* Highest firmware API version supported */
-#define IWL7260_UCODE_API_MAX	14
+#define IWL7260_UCODE_API_MAX	15
 
 /* Oldest version we won't warn about */
 #define IWL7260_UCODE_API_OK	12
drivers/net/wireless/iwlwifi/iwl-8000.c +1 -1
index 5c08f70..72040cd 100644
@@ -69,7 +69,7 @@
 #include "iwl-agn-hw.h"
 
 /* Highest firmware API version supported */
-#define IWL8000_UCODE_API_MAX	14
+#define IWL8000_UCODE_API_MAX	15
 
 /* Oldest version we won't warn about */
 #define IWL8000_UCODE_API_OK	12
Signature · 1 line
2.1.4
#68 lore raw

PATCH 15/15 iwlwifi: mvm: advertise only HW-supported ciphers

In reply to Grumbach, Emmanuel

From: Johannes Berg <[email protected]>

After the new ciphers CCMP-256 and GCMP-128/256 were implemented, wpa_supplicant could start negotiating them and use the software implementation. This, however, breaks D3 behaviour in the driver since it means that WoWLAN will not be possible.

To avoid breaking that feature, advertise only ciphers that the hardware supports.

---
 drivers/net/wireless/iwlwifi/mvm/mac80211.c | 32 ++++++++++++++++++++++-------
 drivers/net/wireless/iwlwifi/mvm/mvm.h      |  2 ++
 2 files changed, 27 insertions(+), 7 deletions(-)
drivers/net/wireless/iwlwifi/mvm/mac80211.c +25 -7
index c46c69f..08367fb 100644
@@ -415,6 +415,12 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
 {
 	struct ieee80211_hw *hw = mvm->hw;
 	int num_mac, ret, i;
+	static const u32 mvm_ciphers[] = {
+		WLAN_CIPHER_SUITE_WEP40,
+		WLAN_CIPHER_SUITE_WEP104,
+		WLAN_CIPHER_SUITE_TKIP,
+		WLAN_CIPHER_SUITE_CCMP,
+	};
 
 	/* Tell mac80211 our characteristics */
 	hw->flags = IEEE80211_HW_SIGNAL_DBM |
@@ -441,14 +447,32 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
 	hw->uapsd_queues = IWL_MVM_UAPSD_QUEUES;
 	hw->uapsd_max_sp_len = IWL_UAPSD_MAX_SP;
 
+	BUILD_BUG_ON(ARRAY_SIZE(mvm->ciphers) < ARRAY_SIZE(mvm_ciphers) + 2);
+	memcpy(mvm->ciphers, mvm_ciphers, sizeof(mvm_ciphers));
+	hw->wiphy->n_cipher_suites = ARRAY_SIZE(mvm_ciphers);
+	hw->wiphy->cipher_suites = mvm->ciphers;
+
 	/*
 	 * Enable 11w if advertised by firmware and software crypto
 	 * is not enabled (as the firmware will interpret some mgmt
 	 * packets, so enabling it with software crypto isn't safe)
 	 */
 	if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_MFP &&
-	    !iwlwifi_mod_params.sw_crypto)
+	    !iwlwifi_mod_params.sw_crypto) {
 		hw->flags |= IEEE80211_HW_MFP_CAPABLE;
+		mvm->ciphers[hw->wiphy->n_cipher_suites] =
+			WLAN_CIPHER_SUITE_AES_CMAC;
+		hw->wiphy->n_cipher_suites++;
+	}
+
+	/* currently FW API supports only one optional cipher scheme */
+	if (mvm->fw->cs[0].cipher) {
+		mvm->hw->n_cipher_schemes = 1;
+		mvm->hw->cipher_schemes = &mvm->fw->cs[0];
+		mvm->ciphers[hw->wiphy->n_cipher_suites] =
+			mvm->fw->cs[0].cipher;
+		hw->wiphy->n_cipher_suites++;
+	}
 
 	hw->flags |= IEEE80211_SINGLE_HW_SCAN_ON_ALL_BANDS;
 	hw->wiphy->features |=
@@ -574,12 +598,6 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
 
 	mvm->rts_threshold = IEEE80211_MAX_RTS_THRESHOLD;
 
-	/* currently FW API supports only one optional cipher scheme */
-	if (mvm->fw->cs[0].cipher) {
-		mvm->hw->n_cipher_schemes = 1;
-		mvm->hw->cipher_schemes = &mvm->fw->cs[0];
-	}
-
 #ifdef CONFIG_PM_SLEEP
 	if (iwl_mvm_is_d0i3_supported(mvm) &&
 	    device_can_wakeup(mvm->trans->dev)) {
drivers/net/wireless/iwlwifi/mvm/mvm.h +2 -0
index 255cde4..2d4bad5 100644
@@ -820,6 +820,8 @@ struct iwl_mvm {
 	} tdls_cs;
 
 	struct iwl_mvm_shared_mem_cfg shared_mem_cfg;
+
+	u32 ciphers[6];
 };
 
 /* Extract MVM priv from op_mode and _hw */
Signature · 1 line
2.1.4