From: Xinming Hu <[email protected]>
If wakeup interrupt handler is called, we know that the wakeup
interrupt number is valid, there is no need to check it.
Signed-off-by: Xinming Hu <[email protected]>
Signed-off-by: Cathy Luo <[email protected]>
Reviewed-by: Dmitry Torokhov <[email protected]>
Reviewed-by: Brian Norris <[email protected]>
---
v2: modify description(Dimtry)
v4: same as v2, v3
---
drivers/net/wireless/marvell/mwifiex/main.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c
index 0dfbac8..98fd491 100644
--- a/drivers/net/wireless/marvell/mwifiex/main.c
+++ b/drivers/net/wireless/marvell/mwifiex/main.c
@@ -1513,11 +1513,9 @@ static irqreturn_t mwifiex_irq_wakeup_handler(int irq, void *priv)
{
struct mwifiex_adapter *adapter = priv;
- if (adapter->irq_wakeup >= 0) {
- dev_dbg(adapter->dev, "%s: wake by wifi", __func__);
- adapter->wake_by_wifi = true;
- disable_irq_nosync(irq);
- }
+ dev_dbg(adapter->dev, "%s: wake by wifi", __func__);
+ adapter->wake_by_wifi = true;
+ disable_irq_nosync(irq);
/* Notify PM core we are wakeup source */
pm_wakeup_event(adapter->dev, 0);
--
1.8.1.4
Xinming Hu <[email protected]> writes:
> From: Xinming Hu <[email protected]>
>
> A seprate wifi-only firmware was download during pcie function level reset.
> It is in fact the tail part of wifi/bt combo firmware. Per Brian's and
> Dmitry's suggestion, this patch extract the wifi part from combo firmware.
>
> After that, we can discard the redudant image in linux-firmware repo.
If you mean with discarding removing the actual image from
linux-firmware, then you cannot do that. The image is still needed so
that linux-firmware works with older kernels.
--
Kalle Valo
SGksDQoNCj4gLS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0NCj4gRnJvbTogQnJpYW4gTm9ycmlz
IFttYWlsdG86YnJpYW5ub3JyaXNAY2hyb21pdW0ub3JnXQ0KPiBTZW50OiAyMDE3xOo01MIxNMjV
IDQ6MTENCj4gVG86IFhpbm1pbmcgSHUNCj4gQ2M6IExpbnV4IFdpcmVsZXNzOyBLYWxsZSBWYWxv
OyBEbWl0cnkgVG9yb2tob3Y7IHJhamF0amFAZ29vZ2xlLmNvbTsgQ2F0aHkgTHVvOw0KPiBYaW5t
aW5nIEh1OyBHYW5hcGF0aGkgQmhhdA0KPiBTdWJqZWN0OiBbRVhUXSBbUEFUQ0ggdjUgNC80XSBt
d2lmaWV4OiBwY2llOiBleHRyYWN0IHdpZmkgcGFydCBmcm9tIGNvbWJvDQo+IGZpcm13YXJlIGR1
cmluZyBmdW5jdGlvbiBsZXZlbCByZXNldA0KPiANCj4gRXh0ZXJuYWwgRW1haWwNCj4gDQo+IC0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0NCj4gRnJvbTogWGlubWluZyBIdSA8aHV4bUBtYXJ2ZWxsLmNvbT4NCj4gDQo+
IEEgc2VwYXJhdGUgd2lmaS1vbmx5IGZpcm13YXJlIHdhcyBkb3dubG9hZCBkdXJpbmcgcGNpZSBm
dW5jdGlvbiBsZXZlbCByZXNldC4gSXQNCj4gaXMgaW4gZmFjdCB0aGUgdGFpbCBwYXJ0IG9mIHdp
ZmkvYnQgY29tYm8gZmlybXdhcmUuIFBlciBCcmlhbidzIGFuZCBEbWl0cnkncw0KPiBzdWdnZXN0
aW9uLCB0aGlzIHBhdGNoIGV4dHJhY3QgdGhlIHdpZmkgcGFydCBmcm9tIGNvbWJvIGZpcm13YXJl
Lg0KPiANCj4gQWZ0ZXIgdGhhdCwgdGhlIG1ydmwvcGNpZTg5OTdfd2xhbl92NC5iaW4gaW1hZ2Ug
aW4gbGludXgtZmlybXdhcmUgcmVwbyBpcw0KPiByZWR1bmRhbnQgKHRob3VnaCBJIGd1ZXNzIHdl
IGtlZXAgaXQgYXJvdW5kIHRvIHN1cHBvcnQgb2xkZXIga2VybmVscykuDQo+IA0KPiBTaWduZWQt
b2ZmLWJ5OiBYaW5taW5nIEh1IDxodXhtQG1hcnZlbGwuY29tPg0KPiBTaWduZWQtb2ZmLWJ5OiBH
YW5hcGF0aGkgQmhhdCA8Z2JoYXRAbWFydmVsbC5jb20+DQo+IFNpZ25lZC1vZmYtYnk6IENhdGh5
IEx1byA8Y2x1b0BtYXJ2ZWxsLmNvbT4NCj4gU2lnbmVkLW9mZi1ieTogQnJpYW4gTm9ycmlzIDxi
cmlhbm5vcnJpc0BjaHJvbWl1bS5vcmc+DQo+IC0tLQ0KPiBPbiBUaHUsIEFwciAxMywgMjAxNyBh
dCAxMTo0NjozMEFNIC0wNzAwLCBCcmlhbiBOb3JyaXMgd3JvdGU6DQo+ID4gSSBtaWdodCBqdXN0
IHJld3JpdGUgdGhpcyBhbmQgc2VuZCBpdCBteXNlbGYsIGlmIEkgZ2V0IHRoZSB0aW1lLg0KPiAN
Cj4gRG9uZS4NCj4gDQo+IHYyOiBleHRyYWN0IHdpZmkgcGFydCBmcm9tIGNvbWJvIGZpcm13YXJl
KERtaXRyeSBhbmQgQnJpYW4pDQo+ICAgICBhZGQgbW9yZSBkZXNjcmlwdGlvbihLYWxsZSkNCj4g
djM6IHNhbWUgYXMgdjINCj4gdjQ6IGFkZCBzZXF1ZW5jZSBjb21tZW50cywgY29kZSBlbmhhbmNl
KEJyaWFuKQ0KPiB2NTogKEJyaWFuKSBmaXggb3ZlcmZsb3cgZXJyb3JzDQo+ICAgICAoQnJpYW4p
IGFkZCBtaXNzaW5nIG5ld2xpbmUgY2hhcnMNCj4gICAgIChCcmlhbikgY29uc29saWRhdGUgaGVh
ZGVyLXNraXBwaW5nIGxvZ2ljDQo+IA0KPiBOb3RlOiBJIG9ubHkgcmVzdWJtaXR0ZWQgdGhlIDR0
aCBwYXRjaCwgYXMgdGhlIG90aGVycyBsb29rIGZpbmUNCj4gLS0tDQo+ICBkcml2ZXJzL25ldC93
aXJlbGVzcy9tYXJ2ZWxsL213aWZpZXgvZncuaCAgIHwgIDE4ICsrKysrDQo+ICBkcml2ZXJzL25l
dC93aXJlbGVzcy9tYXJ2ZWxsL213aWZpZXgvcGNpZS5jIHwgMTE0DQo+ICsrKysrKysrKysrKysr
KysrKysrKysrKysrLS0NCj4gIGRyaXZlcnMvbmV0L3dpcmVsZXNzL21hcnZlbGwvbXdpZmlleC9w
Y2llLmggfCAgIDMgKy0NCj4gIDMgZmlsZXMgY2hhbmdlZCwgMTI3IGluc2VydGlvbnMoKyksIDgg
ZGVsZXRpb25zKC0pDQo+IA0KPiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9uZXQvd2lyZWxlc3MvbWFy
dmVsbC9td2lmaWV4L2Z3LmgNCj4gYi9kcml2ZXJzL25ldC93aXJlbGVzcy9tYXJ2ZWxsL213aWZp
ZXgvZncuaA0KPiBpbmRleCAwYjY4Mzc0MmUzMGMuLjZjZjlhYjkxMzNlYSAxMDA2NDQNCj4gLS0t
IGEvZHJpdmVycy9uZXQvd2lyZWxlc3MvbWFydmVsbC9td2lmaWV4L2Z3LmgNCj4gKysrIGIvZHJp
dmVycy9uZXQvd2lyZWxlc3MvbWFydmVsbC9td2lmaWV4L2Z3LmgNCj4gQEAgLTQzLDYgKzQzLDI0
IEBAIHN0cnVjdCB0eF9wYWNrZXRfaGRyIHsNCj4gIAlzdHJ1Y3QgcmZjXzEwNDJfaGRyIHJmYzEw
NDJfaGRyOw0KPiAgfSBfX3BhY2tlZDsNCj4gDQo+ICtzdHJ1Y3QgbXdpZmlleF9md19oZWFkZXIg
ew0KPiArCV9fbGUzMiBkbmxkX2NtZDsNCj4gKwlfX2xlMzIgYmFzZV9hZGRyOw0KPiArCV9fbGUz
MiBkYXRhX2xlbmd0aDsNCj4gKwlfX2xlMzIgY3JjOw0KPiArfSBfX3BhY2tlZDsNCj4gKw0KPiAr
c3RydWN0IG13aWZpZXhfZndfZGF0YSB7DQo+ICsJc3RydWN0IG13aWZpZXhfZndfaGVhZGVyIGhl
YWRlcjsNCj4gKwlfX2xlMzIgc2VxX251bTsNCj4gKwl1OCBkYXRhWzFdOw0KPiArfSBfX3BhY2tl
ZDsNCj4gKw0KPiArI2RlZmluZSBNV0lGSUVYX0ZXX0ROTERfQ01EXzEgMHgxDQo+ICsjZGVmaW5l
IE1XSUZJRVhfRldfRE5MRF9DTURfNSAweDUNCj4gKyNkZWZpbmUgTVdJRklFWF9GV19ETkxEX0NN
RF82IDB4Ng0KPiArI2RlZmluZSBNV0lGSUVYX0ZXX0ROTERfQ01EXzcgMHg3DQo+ICsNCj4gICNk
ZWZpbmUgQl9TVVBQT1JURURfUkFURVMgICAgICAgICAgICAgICA1DQo+ICAjZGVmaW5lIEdfU1VQ
UE9SVEVEX1JBVEVTICAgICAgICAgICAgICAgOQ0KPiAgI2RlZmluZSBCR19TVVBQT1JURURfUkFU
RVMgICAgICAgICAgICAgIDEzDQo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL25ldC93aXJlbGVzcy9t
YXJ2ZWxsL213aWZpZXgvcGNpZS5jDQo+IGIvZHJpdmVycy9uZXQvd2lyZWxlc3MvbWFydmVsbC9t
d2lmaWV4L3BjaWUuYw0KPiBpbmRleCAwNjEyMjMxNDliZWQuLjYzMTAyZWZiMzg4ZSAxMDA2NDQN
Cj4gLS0tIGEvZHJpdmVycy9uZXQvd2lyZWxlc3MvbWFydmVsbC9td2lmaWV4L3BjaWUuYw0KPiAr
KysgYi9kcml2ZXJzL25ldC93aXJlbGVzcy9tYXJ2ZWxsL213aWZpZXgvcGNpZS5jDQo+IEBAIC0x
OTU2LDYgKzE5NTYsOTQgQEAgc3RhdGljIGludCBtd2lmaWV4X3BjaWVfZXZlbnRfY29tcGxldGUo
c3RydWN0DQo+IG13aWZpZXhfYWRhcHRlciAqYWRhcHRlciwNCj4gIAlyZXR1cm4gcmV0Ow0KPiAg
fQ0KPiANCj4gKy8qIENvbWJvIGZpcm13YXJlIGltYWdlIGlzIGEgY29tYmluYXRpb24gb2YNCj4g
KyAqICgxKSBjb21ibyBjcmMgaGVhZXIsIHN0YXJ0IHdpdGggQ01ENQ0KPiArICogKDIpIGJsdWV0
b290aCBpbWFnZSwgc3RhcnQgd2l0aCBDTUQ3LCBlbmQgd2l0aCBDTUQ2LCBkYXRhIHdyYXBwZWQg
aW4NCj4gQ01EMS4NCj4gKyAqICgzKSB3aWZpIGltYWdlLg0KPiArICoNCj4gKyAqIFRoaXMgZnVu
Y3Rpb24gYnlwYXNzIHRoZSBoZWFkZXIgYW5kIGJsdWV0b290aCBwYXJ0LCByZXR1cm4NCj4gKyAq
IHRoZSBvZmZzZXQgb2YgdGFpbCB3aWZpLW9ubHkgcGFydC4NCj4gKyAqLw0KPiArDQo+ICtzdGF0
aWMgaW50IG13aWZpZXhfZXh0cmFjdF93aWZpX2Z3KHN0cnVjdCBtd2lmaWV4X2FkYXB0ZXIgKmFk
YXB0ZXIsDQo+ICsJCQkJICAgY29uc3Qgdm9pZCAqZmlybXdhcmUsIHUzMiBmaXJtd2FyZV9sZW4p
IHsNCj4gKwljb25zdCBzdHJ1Y3QgbXdpZmlleF9md19kYXRhICpmd2RhdGE7DQo+ICsJdTMyIG9m
ZnNldCA9IDAsIGRhdGFfbGVuLCBkbmxkX2NtZDsNCj4gKwlpbnQgcmV0ID0gMDsNCj4gKwlib29s
IGNtZDdfYmVmb3JlID0gZmFsc2U7DQo+ICsNCj4gKwl3aGlsZSAoMSkgew0KPiArCQkvKiBDaGVj
ayBmb3IgaW50ZWdlciBhbmQgYnVmZmVyIG92ZXJmbG93ICovDQo+ICsJCWlmIChvZmZzZXQgKyBz
aXplb2YoZndkYXRhLT5oZWFkZXIpIDwgc2l6ZW9mKGZ3ZGF0YS0+aGVhZGVyKSB8fA0KPiArCQkg
ICAgb2Zmc2V0ICsgc2l6ZW9mKGZ3ZGF0YS0+aGVhZGVyKSA+PSBmaXJtd2FyZV9sZW4pIHsNCj4g
KwkJCW13aWZpZXhfZGJnKGFkYXB0ZXIsIEVSUk9SLA0KPiArCQkJCSAgICAiZXh0cmFjdCB3aWZp
LW9ubHkgZncgZmFpbHVyZSFcbiIpOw0KPiArCQkJcmV0ID0gLTE7DQo+ICsJCQlnb3RvIGRvbmU7
DQo+ICsJCX0NCj4gKw0KPiArCQlmd2RhdGEgPSBmaXJtd2FyZSArIG9mZnNldDsNCj4gKwkJZG5s
ZF9jbWQgPSBsZTMyX3RvX2NwdShmd2RhdGEtPmhlYWRlci5kbmxkX2NtZCk7DQo+ICsJCWRhdGFf
bGVuID0gbGUzMl90b19jcHUoZndkYXRhLT5oZWFkZXIuZGF0YV9sZW5ndGgpOw0KPiArDQo+ICsJ
CS8qIFNraXAgcGFzdCBoZWFkZXIgKi8NCj4gKwkJb2Zmc2V0ICs9IHNpemVvZihmd2RhdGEtPmhl
YWRlcik7DQo+ICsNCj4gKwkJc3dpdGNoIChkbmxkX2NtZCkgew0KPiArCQljYXNlIE1XSUZJRVhf
RldfRE5MRF9DTURfMToNCj4gKwkJCWlmICghY21kN19iZWZvcmUpIHsNCj4gKwkJCQltd2lmaWV4
X2RiZyhhZGFwdGVyLCBFUlJPUiwNCj4gKwkJCQkJICAgICJubyBjbWQ3IGJlZm9yZSBjbWQxIVxu
Iik7DQo+ICsJCQkJcmV0ID0gLTE7DQo+ICsJCQkJZ290byBkb25lOw0KPiArCQkJfQ0KPiArCQkJ
aWYgKG9mZnNldCArIGRhdGFfbGVuIDwgZGF0YV9sZW4pIHsNCj4gKwkJCQltd2lmaWV4X2RiZyhh
ZGFwdGVyLCBFUlJPUiwgImJhZCBGVyBwYXJzZVxuIik7DQo+ICsJCQkJcmV0ID0gLTE7DQo+ICsJ
CQkJZ290byBkb25lOw0KPiArCQkJfQ0KPiArCQkJb2Zmc2V0ICs9IGRhdGFfbGVuOw0KDQpMb29r
cyBmaW5lIHRvIG1lLg0KRXZlbiB0aG91Z2ggZGF0YV9sZW4gc2hvdWxkIG5vdCBleGNlZWQgTVdJ
RklFWF9VUExEX1NJWkUgYWNjb3JkaW5nIHRvIGZpcm13YXJlIGRvd25sb2FkIHByb3RvY29sLCBh
bmQgd2UgY2FuIGFkZCBzYW5pdHkgY2hlY2sgbGlrZaOsDQoJaWYgKGRhdGFfbGVuID4gTVdJRklF
WF9VUExEX1NJWkUgLSBzaXplb2YoZndkYXRhLT5oZWFkZXIpKQ0KCQkqZXJyb3IqDQpDb25zaWRl
cmluZyB0aGUgZnV0dXJlIHByb3RvY29sIG1pZ2h0IGNoYW5nZSBNV0lGSUVYX1VQTERfU0laRSBh
bmQgdGhlIGFiaWxpdHkgdG8gY29tcGF0aWJsZSB3aXRoIG9sZCBkcml2ZXIgYXQgdGhhdCB0aW1l
Lg0Kb3ZlcmZsb3cgY2hlY2sgaGVyZSBkb2VzIHByb3ZpZGUgYSBnZW5lcmFsIHdheSwgYW5kIGxl
dCBkZXZpY2UgdGFrZSBjYXJlIG9mIGludmFsaWQgZGF0YV9MZW4gY2FzZSB3b3VsZCBiZSByZWFz
b25hYmxlLg0KDQpUaGFua3MsDQpTaW1vbg0KPiArCQkJYnJlYWs7DQo+ICsJCWNhc2UgTVdJRklF
WF9GV19ETkxEX0NNRF81Og0KPiArCQkJLyogQ2hlY2sgZm9yIGludGVnZXIgb3ZlcmZsb3cgKi8N
Cj4gKwkJCWlmIChvZmZzZXQgKyBkYXRhX2xlbiA8IGRhdGFfbGVuKSB7DQo+ICsJCQkJbXdpZmll
eF9kYmcoYWRhcHRlciwgRVJST1IsICJiYWQgRlcgcGFyc2VcbiIpOw0KPiArCQkJCXJldCA9IC0x
Ow0KPiArCQkJCWdvdG8gZG9uZTsNCj4gKwkJCX0NCj4gKwkJCW9mZnNldCArPSBkYXRhX2xlbjsN
Cj4gKwkJCWJyZWFrOw0KPiArCQljYXNlIE1XSUZJRVhfRldfRE5MRF9DTURfNjoNCj4gKwkJCS8q
IENoZWNrIGZvciBpbnRlZ2VyIG92ZXJmbG93ICovDQo+ICsJCQlpZiAob2Zmc2V0ICsgZGF0YV9s
ZW4gPCBkYXRhX2xlbikgew0KPiArCQkJCW13aWZpZXhfZGJnKGFkYXB0ZXIsIEVSUk9SLCAiYmFk
IEZXIHBhcnNlXG4iKTsNCj4gKwkJCQlyZXQgPSAtMTsNCj4gKwkJCQlnb3RvIGRvbmU7DQo+ICsJ
CQl9DQo+ICsJCQlvZmZzZXQgKz0gZGF0YV9sZW47DQo+ICsJCQlpZiAob2Zmc2V0ID49IGZpcm13
YXJlX2xlbikgew0KPiArCQkJCW13aWZpZXhfZGJnKGFkYXB0ZXIsIEVSUk9SLA0KPiArCQkJCQkg
ICAgImV4dHJhY3Qgd2lmaS1vbmx5IGZ3IGZhaWx1cmUhXG4iKTsNCj4gKwkJCQlyZXQgPSAtMTsN
Cj4gKwkJCX0gZWxzZSB7DQo+ICsJCQkJcmV0ID0gb2Zmc2V0Ow0KPiArCQkJfQ0KPiArCQkJZ290
byBkb25lOw0KPiArCQljYXNlIE1XSUZJRVhfRldfRE5MRF9DTURfNzoNCj4gKwkJCWNtZDdfYmVm
b3JlID0gdHJ1ZTsNCj4gKwkJCWJyZWFrOw0KPiArCQlkZWZhdWx0Og0KPiArCQkJbXdpZmlleF9k
YmcoYWRhcHRlciwgRVJST1IsICJ1bmtub3duIGRubGRfY21kICVkXG4iLA0KPiArCQkJCSAgICBk
bmxkX2NtZCk7DQo+ICsJCQlyZXQgPSAtMTsNCj4gKwkJCWdvdG8gZG9uZTsNCj4gKwkJfQ0KPiAr
CX0NCj4gKw0KPiArZG9uZToNCj4gKwlyZXR1cm4gcmV0Ow0KPiArfQ0KPiArDQo+ICAvKg0KPiAg
ICogVGhpcyBmdW5jdGlvbiBkb3dubG9hZHMgdGhlIGZpcm13YXJlIHRvIHRoZSBjYXJkLg0KPiAg
ICoNCj4gQEAgLTE5NzEsNyArMjA1OSw3IEBAIHN0YXRpYyBpbnQgbXdpZmlleF9wcm9nX2Z3X3df
aGVscGVyKHN0cnVjdA0KPiBtd2lmaWV4X2FkYXB0ZXIgKmFkYXB0ZXIsDQo+ICAJdTMyIGZpcm13
YXJlX2xlbiA9IGZ3LT5md19sZW47DQo+ICAJdTMyIG9mZnNldCA9IDA7DQo+ICAJc3RydWN0IHNr
X2J1ZmYgKnNrYjsNCj4gLQl1MzIgdHhsZW4sIHR4X2Jsb2NrcyA9IDAsIHRyaWVzLCBsZW47DQo+
ICsJdTMyIHR4bGVuLCB0eF9ibG9ja3MgPSAwLCB0cmllcywgbGVuLCB2YWw7DQo+ICAJdTMyIGJs
b2NrX3JldHJ5X2NudCA9IDA7DQo+ICAJc3RydWN0IHBjaWVfc2VydmljZV9jYXJkICpjYXJkID0g
YWRhcHRlci0+Y2FyZDsNCj4gIAljb25zdCBzdHJ1Y3QgbXdpZmlleF9wY2llX2NhcmRfcmVnICpy
ZWcgPSBjYXJkLT5wY2llLnJlZzsgQEAgLTE5OTgsNg0KPiArMjA4NiwyNCBAQCBzdGF0aWMgaW50
IG13aWZpZXhfcHJvZ19md193X2hlbHBlcihzdHJ1Y3QgbXdpZmlleF9hZGFwdGVyDQo+ICphZGFw
dGVyLA0KPiAgCQlnb3RvIGRvbmU7DQo+ICAJfQ0KPiANCj4gKwlyZXQgPSBtd2lmaWV4X3JlYWRf
cmVnKGFkYXB0ZXIsIFBDSUVfU0NSQVRDSF8xM19SRUcsICZ2YWwpOw0KPiArCWlmIChyZXQpIHsN
Cj4gKwkJbXdpZmlleF9kYmcoYWRhcHRlciwgRkFUQUwsICJGYWlsZWQgdG8gcmVhZCBzY3JhdGNo
IHJlZ2lzdGVyIDEzXG4iKTsNCj4gKwkJZ290byBkb25lOw0KPiArCX0NCj4gKw0KPiArCS8qIFBD
SUUgRkxSIGNhc2U6IGV4dHJhY3Qgd2lmaSBwYXJ0IGZyb20gY29tYm8gZmlybXdhcmUqLw0KPiAr
CWlmICh2YWwgPT0gTVdJRklFWF9QQ0lFX0ZMUl9IQVBQRU5TKSB7DQo+ICsJCXJldCA9IG13aWZp
ZXhfZXh0cmFjdF93aWZpX2Z3KGFkYXB0ZXIsIGZpcm13YXJlLCBmaXJtd2FyZV9sZW4pOw0KPiAr
CQlpZiAocmV0IDwgMCkgew0KPiArCQkJbXdpZmlleF9kYmcoYWRhcHRlciwgRVJST1IsICJGYWls
ZWQgdG8gZXh0cmFjdCB3aWZpIGZ3XG4iKTsNCj4gKwkJCWdvdG8gZG9uZTsNCj4gKwkJfQ0KPiAr
CQlvZmZzZXQgPSByZXQ7DQo+ICsJCW13aWZpZXhfZGJnKGFkYXB0ZXIsIE1TRywNCj4gKwkJCSAg
ICAiaW5mbzogZG5sZCB3aWZpIGZpcm13YXJlIGZyb20gJWQgYnl0ZXNcbiIsIG9mZnNldCk7DQo+
ICsJfQ0KPiArDQo+ICAJLyogUGVyZm9ybSBmaXJtd2FyZSBkYXRhIHRyYW5zZmVyICovDQo+ICAJ
ZG8gew0KPiAgCQl1MzIgaXJlZ19pbnRyID0gMDsNCj4gQEAgLTMwNzAsMTIgKzMxNzYsNiBAQCBz
dGF0aWMgdm9pZCBtd2lmaWV4X3BjaWVfdXBfZGV2KHN0cnVjdA0KPiBtd2lmaWV4X2FkYXB0ZXIg
KmFkYXB0ZXIpDQo+ICAJc3RydWN0IHBjaV9kZXYgKnBkZXYgPSBjYXJkLT5kZXY7DQo+ICAJY29u
c3Qgc3RydWN0IG13aWZpZXhfcGNpZV9jYXJkX3JlZyAqcmVnID0gY2FyZC0+cGNpZS5yZWc7DQo+
IA0KPiAtCS8qIEJsdWV0b290aCBpcyBub3Qgb24gcGNpZSBpbnRlcmZhY2UuIERvd25sb2FkIFdp
Zmkgb25seSBmaXJtd2FyZQ0KPiAtCSAqIGR1cmluZyBwY2llIEZMUiwgc28gdGhhdCBibHVldG9v
dGggcGFydCBvZiBmaXJtd2FyZSB3aGljaCBpcw0KPiAtCSAqIGFscmVhZHkgcnVubmluZyBkb2Vz
bid0IGdldCBhZmZlY3RlZC4NCj4gLQkgKi8NCj4gLQlzdHJjcHkoYWRhcHRlci0+ZndfbmFtZSwg
UENJRTg5OTdfREVGQVVMVF9XSUZJRldfTkFNRSk7DQo+IC0NCj4gIAkvKiB0eF9idWZfc2l6ZSBt
aWdodCBiZSBjaGFuZ2VkIHRvIDM1ODQgYnkgZmlybXdhcmUgZHVyaW5nDQo+ICAJICogZGF0YSB0
cmFuc2Zlciwgd2Ugc2hvdWxkIHJlc2V0IGl0IHRvIGRlZmF1bHQgc2l6ZS4NCj4gIAkgKi8NCj4g
ZGlmZiAtLWdpdCBhL2RyaXZlcnMvbmV0L3dpcmVsZXNzL21hcnZlbGwvbXdpZmlleC9wY2llLmgN
Cj4gYi9kcml2ZXJzL25ldC93aXJlbGVzcy9tYXJ2ZWxsL213aWZpZXgvcGNpZS5oDQo+IGluZGV4
IDdlMjQ1MGNlNzlkMy4uZjdjZTliNmRiNmI0IDEwMDY0NA0KPiAtLS0gYS9kcml2ZXJzL25ldC93
aXJlbGVzcy9tYXJ2ZWxsL213aWZpZXgvcGNpZS5oDQo+ICsrKyBiL2RyaXZlcnMvbmV0L3dpcmVs
ZXNzL21hcnZlbGwvbXdpZmlleC9wY2llLmgNCj4gQEAgLTM1LDcgKzM1LDYgQEANCj4gICNkZWZp
bmUgUENJRTg4OTdfQjBfRldfTkFNRSAibXJ2bC9wY2llODg5N191YXBzdGEuYmluIg0KPiAgI2Rl
ZmluZSBQQ0lFVUFSVDg5OTdfRldfTkFNRV9WNCAibXJ2bC9wY2lldWFydDg5OTdfY29tYm9fdjQu
YmluIg0KPiAgI2RlZmluZSBQQ0lFVVNCODk5N19GV19OQU1FX1Y0ICJtcnZsL3BjaWV1c2I4OTk3
X2NvbWJvX3Y0LmJpbiINCj4gLSNkZWZpbmUgUENJRTg5OTdfREVGQVVMVF9XSUZJRldfTkFNRSAi
bXJ2bC9wY2llODk5N193bGFuX3Y0LmJpbiINCj4gDQo+ICAjZGVmaW5lIFBDSUVfVkVORE9SX0lE
X01BUlZFTEwgICAgICAgICAgICAgICgweDExYWIpDQo+ICAjZGVmaW5lIFBDSUVfVkVORE9SX0lE
X1YyX01BUlZFTEwgICAgICAgICAgICgweDFiNGIpDQo+IEBAIC0xMjAsNiArMTE5LDggQEANCj4g
ICNkZWZpbmUgTVdJRklFWF9TTEVFUF9DT09LSUVfU0laRQkJCTQNCj4gICNkZWZpbmUgTVdJRklF
WF9NQVhfREVMQVlfQ09VTlQJCQkJMTAwDQo+IA0KPiArI2RlZmluZSBNV0lGSUVYX1BDSUVfRkxS
X0hBUFBFTlMgMHhGRURDQkFCQQ0KPiArDQo+ICBzdHJ1Y3QgbXdpZmlleF9wY2llX2NhcmRfcmVn
IHsNCj4gIAl1MTYgY21kX2FkZHJfbG87DQo+ICAJdTE2IGNtZF9hZGRyX2hpOw0KPiAtLQ0KPiAy
LjEyLjIuNzYyDQo=
Hi Xinming,
On Thu, Apr 13, 2017 at 06:48:22AM +0000, Xinming Hu wrote:
> From: Xinming Hu <[email protected]>
>
> A seprate wifi-only firmware was download during pcie function level reset.
> It is in fact the tail part of wifi/bt combo firmware. Per Brian's and
> Dmitry's suggestion, this patch extract the wifi part from combo firmware.
>
> After that, we can discard the redudant image in linux-firmware repo.
>
> Signed-off-by: Xinming Hu <[email protected]>
> Signed-off-by: Ganapathi Bhat <[email protected]>
> Signed-off-by: Cathy Luo <[email protected]>
> Reviewed-by: Brian Norris <[email protected]>
Please don't add my Reviewed-by tag unless I've provided it explicitly.
And especially not if you have to change the patch significantly. (It's
fair to carry an old tag I've provided, if you only have to make minor
changes, or if I suggest *exactly* what needs changed, along with a
conditional 'Reviewed-by'.)
As it stands, this patch is worse than the previous one. I replied to
some of your commnets on v3, but I'll carry some here.
> ---
> v2: extract wifi part from combo firmware(Dimtry and Brain)
> add more description(Kalle)
> v3: same as v2
> v4: add sequence comments, code enhance(Brain)
> ---
> drivers/net/wireless/marvell/mwifiex/fw.h | 18 ++++++
> drivers/net/wireless/marvell/mwifiex/pcie.c | 93 ++++++++++++++++++++++++++---
> drivers/net/wireless/marvell/mwifiex/pcie.h | 3 +-
> 3 files changed, 106 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/net/wireless/marvell/mwifiex/fw.h b/drivers/net/wireless/marvell/mwifiex/fw.h
> index 0b68374..6cf9ab9 100644
> --- a/drivers/net/wireless/marvell/mwifiex/fw.h
> +++ b/drivers/net/wireless/marvell/mwifiex/fw.h
> @@ -43,6 +43,24 @@ struct tx_packet_hdr {
> struct rfc_1042_hdr rfc1042_hdr;
> } __packed;
>
> +struct mwifiex_fw_header {
> + __le32 dnld_cmd;
> + __le32 base_addr;
> + __le32 data_length;
> + __le32 crc;
> +} __packed;
> +
> +struct mwifiex_fw_data {
> + struct mwifiex_fw_header header;
> + __le32 seq_num;
> + u8 data[1];
> +} __packed;
> +
> +#define MWIFIEX_FW_DNLD_CMD_1 0x1
> +#define MWIFIEX_FW_DNLD_CMD_5 0x5
> +#define MWIFIEX_FW_DNLD_CMD_6 0x6
> +#define MWIFIEX_FW_DNLD_CMD_7 0x7
> +
> #define B_SUPPORTED_RATES 5
> #define G_SUPPORTED_RATES 9
> #define BG_SUPPORTED_RATES 13
> diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
> index a07cb0a..7b24bb4 100644
> --- a/drivers/net/wireless/marvell/mwifiex/pcie.c
> +++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
> @@ -1956,6 +1956,73 @@ static int mwifiex_pcie_event_complete(struct mwifiex_adapter *adapter,
> return ret;
> }
>
> +/* Combo firmware image is a combination of
> + * (1) combo crc heaer, start with CMD5
> + * (2) bluetooth image, start with CMD7, end with CMD6, data wrapped in CMD1.
> + * (3) wifi image.
> + *
> + * This function bypass the header and bluetooth part, return
> + * the offset of tail wifi-only part.
> + */
> +
> +static int mwifiex_extract_wifi_fw(struct mwifiex_adapter *adapter,
> + const void *firmware, u32 firmware_len) {
> + const struct mwifiex_fw_data *fwdata;
> + u32 offset = 0, data_len, dnld_cmd;
> + int ret = 0;
> + bool cmd7_before = false;
> +
> + while (1) {
> + if (offset >= firmware_len) {
This is worse than what you used to have. This should still be:
if (offset + sizeof(fwdata->header) >= firmware_len) {
And you might add an overflow check here too, so:
/* Check for integer and buffer overflow */
if (offset + sizeof(fwdata->header) < sizeof(fwdata->header) ||
offset + sizeof(fwdata->header) >= firmware_len) {
> + mwifiex_dbg(adapter, ERROR,
> + "extract wifi-only fw failure!");
Needs a '\n'.
> + ret = -1;
> + goto done;
> + }
> +
> + fwdata = firmware + offset;
> + dnld_cmd = le32_to_cpu(fwdata->header.dnld_cmd);
> + data_len = le32_to_cpu(fwdata->header.data_length);
> +
Then:
offset += sizeof(fwdata->header);
> + switch (dnld_cmd) {
> + case MWIFIEX_FW_DNLD_CMD_1:
> + if (!cmd7_before) {
> + mwifiex_dbg(adapter, ERROR,
> + "no cmd7 before cmd1!");
Needs a '\n'.
> + ret = -1;
> + goto done;
> + }
> + offset += data_len + sizeof(fwdata->header);
Replace with:
if (offset + data_len < data_len) {
mwifiex_dbg(adapter, ERROR, "bad firmware\n");
ret = -1;
goto done;
}
offset += data_len;
> + break;
> + case MWIFIEX_FW_DNLD_CMD_5:
> + offset += data_len + sizeof(fwdata->header);
Replace with:
if (offset + data_len < data_len) {
mwifiex_dbg(adapter, ERROR, "bad firmware\n");
ret = -1;
goto done;
}
offset += data_len;
> + break;
> + case MWIFIEX_FW_DNLD_CMD_6:
> + offset += data_len + sizeof(fwdata->header);
Replace with:
if (offset + data_len < data_len) {
mwifiex_dbg(adapter, ERROR, "bad firmware\n");
ret = -1;
goto done;
}
offset += data_len;
> + if (offset >= firmware_len) {
> + mwifiex_dbg(adapter, ERROR,
> + "extract wifi-only fw failure!");
Needs a '\n'.
> + ret = -1;
> + } else {
> + ret = offset;
> + }
> + goto done;
> + case MWIFIEX_FW_DNLD_CMD_7:
> + cmd7_before = true;
> + offset += sizeof(fwdata->header);
Now you can delete this line.
> + break;
> + default:
> + mwifiex_dbg(adapter, ERROR, "unknown dnld_cmd %d\n",
> + dnld_cmd);
> + ret = -1;
> + goto done;
> + }
> + }
> +
> +done:
> + return ret;
> +}
> +
> /*
> * This function downloads the firmware to the card.
> *
[...]
I might just rewrite this and send it myself, if I get the time.
Brian
From: Xinming Hu <[email protected]>
This patch correct pcie scratch register name, to keep the same with
chipset side definition.
Signed-off-by: Xinming Hu <[email protected]>
---
v2: code clean and prepare for next patch 4/4
v4: same as v2, v3
---
drivers/net/wireless/marvell/mwifiex/pcie.c | 4 ++--
drivers/net/wireless/marvell/mwifiex/pcie.h | 13 +++++++------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
index f45ab12..a07cb0a 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -2494,8 +2494,8 @@ static int mwifiex_pcie_host_to_card(struct mwifiex_adapter *adapter, u8 type,
struct pcie_service_card *card = adapter->card;
const struct mwifiex_pcie_card_reg *reg = card->pcie.reg;
int pcie_scratch_reg[] = {PCIE_SCRATCH_12_REG,
- PCIE_SCRATCH_13_REG,
- PCIE_SCRATCH_14_REG};
+ PCIE_SCRATCH_14_REG,
+ PCIE_SCRATCH_15_REG};
if (!p)
return 0;
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.h b/drivers/net/wireless/marvell/mwifiex/pcie.h
index 00e8ee5..7e2450c 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.h
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.h
@@ -77,8 +77,9 @@
#define PCIE_SCRATCH_10_REG 0xCE8
#define PCIE_SCRATCH_11_REG 0xCEC
#define PCIE_SCRATCH_12_REG 0xCF0
-#define PCIE_SCRATCH_13_REG 0xCF8
-#define PCIE_SCRATCH_14_REG 0xCFC
+#define PCIE_SCRATCH_13_REG 0xCF4
+#define PCIE_SCRATCH_14_REG 0xCF8
+#define PCIE_SCRATCH_15_REG 0xCFC
#define PCIE_RD_DATA_PTR_Q0_Q1 0xC08C
#define PCIE_WR_DATA_PTR_Q0_Q1 0xC05C
@@ -217,8 +218,8 @@ struct mwifiex_pcie_card_reg {
.ring_tx_start_ptr = MWIFIEX_BD_FLAG_TX_START_PTR,
.pfu_enabled = 1,
.sleep_cookie = 0,
- .fw_dump_ctrl = 0xcf4,
- .fw_dump_start = 0xcf8,
+ .fw_dump_ctrl = PCIE_SCRATCH_13_REG,
+ .fw_dump_start = PCIE_SCRATCH_14_REG,
.fw_dump_end = 0xcff,
.fw_dump_host_ready = 0xee,
.fw_dump_read_done = 0xfe,
@@ -254,8 +255,8 @@ struct mwifiex_pcie_card_reg {
.ring_tx_start_ptr = MWIFIEX_BD_FLAG_TX_START_PTR,
.pfu_enabled = 1,
.sleep_cookie = 0,
- .fw_dump_ctrl = 0xcf4,
- .fw_dump_start = 0xcf8,
+ .fw_dump_ctrl = PCIE_SCRATCH_13_REG,
+ .fw_dump_start = PCIE_SCRATCH_14_REG,
.fw_dump_end = 0xcff,
.fw_dump_host_ready = 0xcc,
.fw_dump_read_done = 0xdd,
--
1.8.1.4
Xinming Hu <[email protected]> wrote:
> From: Xinming Hu <[email protected]>
>
> If wakeup interrupt handler is called, we know that the wakeup
> interrupt number is valid, there is no need to check it.
>
> Signed-off-by: Xinming Hu <[email protected]>
> Signed-off-by: Cathy Luo <[email protected]>
> Reviewed-by: Dmitry Torokhov <[email protected]>
> Reviewed-by: Brian Norris <[email protected]>
3 patches applied to wireless-drivers-next.git, thanks.
625b4dba57b2 mwifiex: remove unnecessary wakeup interrupt number sanity check
ef6c7d3cb731 mwifiex: fall back mwifiex_dbg to pr_info when adapter->dev not set
127ee1db0970 mwifiex: pcie: correct scratch register name
--
https://patchwork.kernel.org/patch/9678763/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
Brian Norris <[email protected]> wrote:
> From: Xinming Hu <[email protected]>
>
> A separate wifi-only firmware was download during pcie function level
> reset. It is in fact the tail part of wifi/bt combo firmware. Per
> Brian's and Dmitry's suggestion, this patch extract the wifi part from
> combo firmware.
>
> After that, the mrvl/pcie8997_wlan_v4.bin image in linux-firmware repo
> is redundant (though I guess we keep it around to support older
> kernels).
>
> Signed-off-by: Xinming Hu <[email protected]>
> Signed-off-by: Ganapathi Bhat <[email protected]>
> Signed-off-by: Cathy Luo <[email protected]>
> Signed-off-by: Brian Norris <[email protected]>
Patch applied to wireless-drivers-next.git, thanks.
efde6648a618 mwifiex: pcie: extract wifi part from combo firmware during function level reset
--
https://patchwork.kernel.org/patch/9679957/
https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches
From: Xinming Hu <[email protected]>
mwifiex_dbg will do nothing before adapter->dev get assigned. several logs
lost in this case. it can be avoided by fall back to pr_info.
Signed-off-by: Xinming Hu <[email protected]>
Reviewed-by: Brian Norris <[email protected]>
Reviewed-by: Dmitry Torokhov <[email protected]>
---
v2: enhance adapter->dev null case.(Brain)
v3: use va_list in pr_info.(Dmitry)
v4: same as v3
---
drivers/net/wireless/marvell/mwifiex/main.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/marvell/mwifiex/main.c b/drivers/net/wireless/marvell/mwifiex/main.c
index 98fd491..16cd14e 100644
--- a/drivers/net/wireless/marvell/mwifiex/main.c
+++ b/drivers/net/wireless/marvell/mwifiex/main.c
@@ -1750,7 +1750,7 @@ void _mwifiex_dbg(const struct mwifiex_adapter *adapter, int mask,
struct va_format vaf;
va_list args;
- if (!adapter->dev || !(adapter->debug_mask & mask))
+ if (!(adapter->debug_mask & mask))
return;
va_start(args, fmt);
@@ -1758,7 +1758,10 @@ void _mwifiex_dbg(const struct mwifiex_adapter *adapter, int mask,
vaf.fmt = fmt;
vaf.va = &args;
- dev_info(adapter->dev, "%pV", &vaf);
+ if (adapter->dev)
+ dev_info(adapter->dev, "%pV", &vaf);
+ else
+ pr_info("%pV", &vaf);
va_end(args);
}
--
1.8.1.4
From: Xinming Hu <[email protected]>
A separate wifi-only firmware was download during pcie function level
reset. It is in fact the tail part of wifi/bt combo firmware. Per
Brian's and Dmitry's suggestion, this patch extract the wifi part from
combo firmware.
After that, the mrvl/pcie8997_wlan_v4.bin image in linux-firmware repo
is redundant (though I guess we keep it around to support older
kernels).
Signed-off-by: Xinming Hu <[email protected]>
Signed-off-by: Ganapathi Bhat <[email protected]>
Signed-off-by: Cathy Luo <[email protected]>
Signed-off-by: Brian Norris <[email protected]>
---
On Thu, Apr 13, 2017 at 11:46:30AM -0700, Brian Norris wrote:
> I might just rewrite this and send it myself, if I get the time.
Done.
v2: extract wifi part from combo firmware(Dmitry and Brian)
add more description(Kalle)
v3: same as v2
v4: add sequence comments, code enhance(Brian)
v5: (Brian) fix overflow errors
(Brian) add missing newline chars
(Brian) consolidate header-skipping logic
Note: I only resubmitted the 4th patch, as the others look fine
---
drivers/net/wireless/marvell/mwifiex/fw.h | 18 +++++
drivers/net/wireless/marvell/mwifiex/pcie.c | 114 ++++++++++++++++++++++++++--
drivers/net/wireless/marvell/mwifiex/pcie.h | 3 +-
3 files changed, 127 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/marvell/mwifiex/fw.h b/drivers/net/wireless/marvell/mwifiex/fw.h
index 0b683742e30c..6cf9ab9133ea 100644
--- a/drivers/net/wireless/marvell/mwifiex/fw.h
+++ b/drivers/net/wireless/marvell/mwifiex/fw.h
@@ -43,6 +43,24 @@ struct tx_packet_hdr {
struct rfc_1042_hdr rfc1042_hdr;
} __packed;
+struct mwifiex_fw_header {
+ __le32 dnld_cmd;
+ __le32 base_addr;
+ __le32 data_length;
+ __le32 crc;
+} __packed;
+
+struct mwifiex_fw_data {
+ struct mwifiex_fw_header header;
+ __le32 seq_num;
+ u8 data[1];
+} __packed;
+
+#define MWIFIEX_FW_DNLD_CMD_1 0x1
+#define MWIFIEX_FW_DNLD_CMD_5 0x5
+#define MWIFIEX_FW_DNLD_CMD_6 0x6
+#define MWIFIEX_FW_DNLD_CMD_7 0x7
+
#define B_SUPPORTED_RATES 5
#define G_SUPPORTED_RATES 9
#define BG_SUPPORTED_RATES 13
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
index 061223149bed..63102efb388e 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -1956,6 +1956,94 @@ static int mwifiex_pcie_event_complete(struct mwifiex_adapter *adapter,
return ret;
}
+/* Combo firmware image is a combination of
+ * (1) combo crc heaer, start with CMD5
+ * (2) bluetooth image, start with CMD7, end with CMD6, data wrapped in CMD1.
+ * (3) wifi image.
+ *
+ * This function bypass the header and bluetooth part, return
+ * the offset of tail wifi-only part.
+ */
+
+static int mwifiex_extract_wifi_fw(struct mwifiex_adapter *adapter,
+ const void *firmware, u32 firmware_len) {
+ const struct mwifiex_fw_data *fwdata;
+ u32 offset = 0, data_len, dnld_cmd;
+ int ret = 0;
+ bool cmd7_before = false;
+
+ while (1) {
+ /* Check for integer and buffer overflow */
+ if (offset + sizeof(fwdata->header) < sizeof(fwdata->header) ||
+ offset + sizeof(fwdata->header) >= firmware_len) {
+ mwifiex_dbg(adapter, ERROR,
+ "extract wifi-only fw failure!\n");
+ ret = -1;
+ goto done;
+ }
+
+ fwdata = firmware + offset;
+ dnld_cmd = le32_to_cpu(fwdata->header.dnld_cmd);
+ data_len = le32_to_cpu(fwdata->header.data_length);
+
+ /* Skip past header */
+ offset += sizeof(fwdata->header);
+
+ switch (dnld_cmd) {
+ case MWIFIEX_FW_DNLD_CMD_1:
+ if (!cmd7_before) {
+ mwifiex_dbg(adapter, ERROR,
+ "no cmd7 before cmd1!\n");
+ ret = -1;
+ goto done;
+ }
+ if (offset + data_len < data_len) {
+ mwifiex_dbg(adapter, ERROR, "bad FW parse\n");
+ ret = -1;
+ goto done;
+ }
+ offset += data_len;
+ break;
+ case MWIFIEX_FW_DNLD_CMD_5:
+ /* Check for integer overflow */
+ if (offset + data_len < data_len) {
+ mwifiex_dbg(adapter, ERROR, "bad FW parse\n");
+ ret = -1;
+ goto done;
+ }
+ offset += data_len;
+ break;
+ case MWIFIEX_FW_DNLD_CMD_6:
+ /* Check for integer overflow */
+ if (offset + data_len < data_len) {
+ mwifiex_dbg(adapter, ERROR, "bad FW parse\n");
+ ret = -1;
+ goto done;
+ }
+ offset += data_len;
+ if (offset >= firmware_len) {
+ mwifiex_dbg(adapter, ERROR,
+ "extract wifi-only fw failure!\n");
+ ret = -1;
+ } else {
+ ret = offset;
+ }
+ goto done;
+ case MWIFIEX_FW_DNLD_CMD_7:
+ cmd7_before = true;
+ break;
+ default:
+ mwifiex_dbg(adapter, ERROR, "unknown dnld_cmd %d\n",
+ dnld_cmd);
+ ret = -1;
+ goto done;
+ }
+ }
+
+done:
+ return ret;
+}
+
/*
* This function downloads the firmware to the card.
*
@@ -1971,7 +2059,7 @@ static int mwifiex_prog_fw_w_helper(struct mwifiex_adapter *adapter,
u32 firmware_len = fw->fw_len;
u32 offset = 0;
struct sk_buff *skb;
- u32 txlen, tx_blocks = 0, tries, len;
+ u32 txlen, tx_blocks = 0, tries, len, val;
u32 block_retry_cnt = 0;
struct pcie_service_card *card = adapter->card;
const struct mwifiex_pcie_card_reg *reg = card->pcie.reg;
@@ -1998,6 +2086,24 @@ static int mwifiex_prog_fw_w_helper(struct mwifiex_adapter *adapter,
goto done;
}
+ ret = mwifiex_read_reg(adapter, PCIE_SCRATCH_13_REG, &val);
+ if (ret) {
+ mwifiex_dbg(adapter, FATAL, "Failed to read scratch register 13\n");
+ goto done;
+ }
+
+ /* PCIE FLR case: extract wifi part from combo firmware*/
+ if (val == MWIFIEX_PCIE_FLR_HAPPENS) {
+ ret = mwifiex_extract_wifi_fw(adapter, firmware, firmware_len);
+ if (ret < 0) {
+ mwifiex_dbg(adapter, ERROR, "Failed to extract wifi fw\n");
+ goto done;
+ }
+ offset = ret;
+ mwifiex_dbg(adapter, MSG,
+ "info: dnld wifi firmware from %d bytes\n", offset);
+ }
+
/* Perform firmware data transfer */
do {
u32 ireg_intr = 0;
@@ -3070,12 +3176,6 @@ static void mwifiex_pcie_up_dev(struct mwifiex_adapter *adapter)
struct pci_dev *pdev = card->dev;
const struct mwifiex_pcie_card_reg *reg = card->pcie.reg;
- /* Bluetooth is not on pcie interface. Download Wifi only firmware
- * during pcie FLR, so that bluetooth part of firmware which is
- * already running doesn't get affected.
- */
- strcpy(adapter->fw_name, PCIE8997_DEFAULT_WIFIFW_NAME);
-
/* tx_buf_size might be changed to 3584 by firmware during
* data transfer, we should reset it to default size.
*/
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.h b/drivers/net/wireless/marvell/mwifiex/pcie.h
index 7e2450ce79d3..f7ce9b6db6b4 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.h
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.h
@@ -35,7 +35,6 @@
#define PCIE8897_B0_FW_NAME "mrvl/pcie8897_uapsta.bin"
#define PCIEUART8997_FW_NAME_V4 "mrvl/pcieuart8997_combo_v4.bin"
#define PCIEUSB8997_FW_NAME_V4 "mrvl/pcieusb8997_combo_v4.bin"
-#define PCIE8997_DEFAULT_WIFIFW_NAME "mrvl/pcie8997_wlan_v4.bin"
#define PCIE_VENDOR_ID_MARVELL (0x11ab)
#define PCIE_VENDOR_ID_V2_MARVELL (0x1b4b)
@@ -120,6 +119,8 @@
#define MWIFIEX_SLEEP_COOKIE_SIZE 4
#define MWIFIEX_MAX_DELAY_COUNT 100
+#define MWIFIEX_PCIE_FLR_HAPPENS 0xFEDCBABA
+
struct mwifiex_pcie_card_reg {
u16 cmd_addr_lo;
u16 cmd_addr_hi;
--
2.12.2.762
SGkgS2FsbGUsDQoNCj4gLS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0NCj4gRnJvbTogS2FsbGUg
VmFsbyBbbWFpbHRvOmt2YWxvQGNvZGVhdXJvcmEub3JnXQ0KPiBTZW50OiAyMDE3xOo01MIxM8jV
IDIxOjU5DQo+IFRvOiBYaW5taW5nIEh1DQo+IENjOiBMaW51eCBXaXJlbGVzczsgQnJpYW4gTm9y
cmlzOyBEbWl0cnkgVG9yb2tob3Y7IHJhamF0amFAZ29vZ2xlLmNvbTsNCj4gQW1pdGt1bWFyIEth
cndhcjsgQ2F0aHkgTHVvOyBYaW5taW5nIEh1OyBHYW5hcGF0aGkgQmhhdA0KPiBTdWJqZWN0OiBb
RVhUXSBSZTogW1BBVENIIHY0IDQvNF0gbXdpZmlleDogcGNpZTogZXh0cmFjdCB3aWZpIHBhcnQg
ZnJvbSBjb21ibw0KPiBmaXJtd2FyZSBkdXJpbmcgZnVuY3Rpb24gbGV2ZWwgcmVzZXQNCj4gDQo+
IEV4dGVybmFsIEVtYWlsDQo+IA0KPiAtLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tDQo+IFhpbm1pbmcgSHUgPGh1eGlu
bWluZzgyMEBnbWFpbC5jb20+IHdyaXRlczoNCj4gDQo+ID4gRnJvbTogWGlubWluZyBIdSA8aHV4
bUBtYXJ2ZWxsLmNvbT4NCj4gPg0KPiA+IEEgc2VwcmF0ZSB3aWZpLW9ubHkgZmlybXdhcmUgd2Fz
IGRvd25sb2FkIGR1cmluZyBwY2llIGZ1bmN0aW9uIGxldmVsIHJlc2V0Lg0KPiA+IEl0IGlzIGlu
IGZhY3QgdGhlIHRhaWwgcGFydCBvZiB3aWZpL2J0IGNvbWJvIGZpcm13YXJlLiBQZXIgQnJpYW4n
cyBhbmQNCj4gPiBEbWl0cnkncyBzdWdnZXN0aW9uLCB0aGlzIHBhdGNoIGV4dHJhY3QgdGhlIHdp
ZmkgcGFydCBmcm9tIGNvbWJvIGZpcm13YXJlLg0KPiA+DQo+ID4gQWZ0ZXIgdGhhdCwgd2UgY2Fu
IGRpc2NhcmQgdGhlIHJlZHVkYW50IGltYWdlIGluIGxpbnV4LWZpcm13YXJlIHJlcG8uDQo+IA0K
PiBJZiB5b3UgbWVhbiB3aXRoIGRpc2NhcmRpbmcgcmVtb3ZpbmcgdGhlIGFjdHVhbCBpbWFnZSBm
cm9tIGxpbnV4LWZpcm13YXJlLA0KPiB0aGVuIHlvdSBjYW5ub3QgZG8gdGhhdC4gVGhlIGltYWdl
IGlzIHN0aWxsIG5lZWRlZCBzbyB0aGF0IGxpbnV4LWZpcm13YXJlDQo+IHdvcmtzIHdpdGggb2xk
ZXIga2VybmVscy4NCj4gDQpZZXMsIHdlIHdpbGwga2VlcCBpdC4NCg0KVGhhbmtzLA0KU2ltb24N
Cj4gLS0NCj4gS2FsbGUgVmFsbw0K
From: Xinming Hu <[email protected]>
A seprate wifi-only firmware was download during pcie function level reset.
It is in fact the tail part of wifi/bt combo firmware. Per Brian's and
Dmitry's suggestion, this patch extract the wifi part from combo firmware.
After that, we can discard the redudant image in linux-firmware repo.
Signed-off-by: Xinming Hu <[email protected]>
Signed-off-by: Ganapathi Bhat <[email protected]>
Signed-off-by: Cathy Luo <[email protected]>
Reviewed-by: Brian Norris <[email protected]>
---
v2: extract wifi part from combo firmware(Dimtry and Brain)
add more description(Kalle)
v3: same as v2
v4: add sequence comments, code enhance(Brain)
---
drivers/net/wireless/marvell/mwifiex/fw.h | 18 ++++++
drivers/net/wireless/marvell/mwifiex/pcie.c | 93 ++++++++++++++++++++++++++---
drivers/net/wireless/marvell/mwifiex/pcie.h | 3 +-
3 files changed, 106 insertions(+), 8 deletions(-)
diff --git a/drivers/net/wireless/marvell/mwifiex/fw.h b/drivers/net/wireless/marvell/mwifiex/fw.h
index 0b68374..6cf9ab9 100644
--- a/drivers/net/wireless/marvell/mwifiex/fw.h
+++ b/drivers/net/wireless/marvell/mwifiex/fw.h
@@ -43,6 +43,24 @@ struct tx_packet_hdr {
struct rfc_1042_hdr rfc1042_hdr;
} __packed;
+struct mwifiex_fw_header {
+ __le32 dnld_cmd;
+ __le32 base_addr;
+ __le32 data_length;
+ __le32 crc;
+} __packed;
+
+struct mwifiex_fw_data {
+ struct mwifiex_fw_header header;
+ __le32 seq_num;
+ u8 data[1];
+} __packed;
+
+#define MWIFIEX_FW_DNLD_CMD_1 0x1
+#define MWIFIEX_FW_DNLD_CMD_5 0x5
+#define MWIFIEX_FW_DNLD_CMD_6 0x6
+#define MWIFIEX_FW_DNLD_CMD_7 0x7
+
#define B_SUPPORTED_RATES 5
#define G_SUPPORTED_RATES 9
#define BG_SUPPORTED_RATES 13
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
index a07cb0a..7b24bb4 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -1956,6 +1956,73 @@ static int mwifiex_pcie_event_complete(struct mwifiex_adapter *adapter,
return ret;
}
+/* Combo firmware image is a combination of
+ * (1) combo crc heaer, start with CMD5
+ * (2) bluetooth image, start with CMD7, end with CMD6, data wrapped in CMD1.
+ * (3) wifi image.
+ *
+ * This function bypass the header and bluetooth part, return
+ * the offset of tail wifi-only part.
+ */
+
+static int mwifiex_extract_wifi_fw(struct mwifiex_adapter *adapter,
+ const void *firmware, u32 firmware_len) {
+ const struct mwifiex_fw_data *fwdata;
+ u32 offset = 0, data_len, dnld_cmd;
+ int ret = 0;
+ bool cmd7_before = false;
+
+ while (1) {
+ if (offset >= firmware_len) {
+ mwifiex_dbg(adapter, ERROR,
+ "extract wifi-only fw failure!");
+ ret = -1;
+ goto done;
+ }
+
+ fwdata = firmware + offset;
+ dnld_cmd = le32_to_cpu(fwdata->header.dnld_cmd);
+ data_len = le32_to_cpu(fwdata->header.data_length);
+
+ switch (dnld_cmd) {
+ case MWIFIEX_FW_DNLD_CMD_1:
+ if (!cmd7_before) {
+ mwifiex_dbg(adapter, ERROR,
+ "no cmd7 before cmd1!");
+ ret = -1;
+ goto done;
+ }
+ offset += data_len + sizeof(fwdata->header);
+ break;
+ case MWIFIEX_FW_DNLD_CMD_5:
+ offset += data_len + sizeof(fwdata->header);
+ break;
+ case MWIFIEX_FW_DNLD_CMD_6:
+ offset += data_len + sizeof(fwdata->header);
+ if (offset >= firmware_len) {
+ mwifiex_dbg(adapter, ERROR,
+ "extract wifi-only fw failure!");
+ ret = -1;
+ } else {
+ ret = offset;
+ }
+ goto done;
+ case MWIFIEX_FW_DNLD_CMD_7:
+ cmd7_before = true;
+ offset += sizeof(fwdata->header);
+ break;
+ default:
+ mwifiex_dbg(adapter, ERROR, "unknown dnld_cmd %d\n",
+ dnld_cmd);
+ ret = -1;
+ goto done;
+ }
+ }
+
+done:
+ return ret;
+}
+
/*
* This function downloads the firmware to the card.
*
@@ -1971,7 +2038,7 @@ static int mwifiex_prog_fw_w_helper(struct mwifiex_adapter *adapter,
u32 firmware_len = fw->fw_len;
u32 offset = 0;
struct sk_buff *skb;
- u32 txlen, tx_blocks = 0, tries, len;
+ u32 txlen, tx_blocks = 0, tries, len, val;
u32 block_retry_cnt = 0;
struct pcie_service_card *card = adapter->card;
const struct mwifiex_pcie_card_reg *reg = card->pcie.reg;
@@ -1998,6 +2065,24 @@ static int mwifiex_prog_fw_w_helper(struct mwifiex_adapter *adapter,
goto done;
}
+ ret = mwifiex_read_reg(adapter, PCIE_SCRATCH_13_REG, &val);
+ if (ret) {
+ mwifiex_dbg(adapter, FATAL, "Failed to read scratch register 13\n");
+ goto done;
+ }
+
+ /* PCIE FLR case: extract wifi part from combo firmware*/
+ if (val == MWIFIEX_PCIE_FLR_HAPPENS) {
+ ret = mwifiex_extract_wifi_fw(adapter, firmware, firmware_len);
+ if (ret < 0) {
+ mwifiex_dbg(adapter, ERROR, "Failed to extract wifi fw\n");
+ goto done;
+ }
+ offset = ret;
+ mwifiex_dbg(adapter, MSG,
+ "info: dnld wifi firmware from %d bytes\n", offset);
+ }
+
/* Perform firmware data transfer */
do {
u32 ireg_intr = 0;
@@ -3060,12 +3145,6 @@ static void mwifiex_pcie_up_dev(struct mwifiex_adapter *adapter)
struct pci_dev *pdev = card->dev;
const struct mwifiex_pcie_card_reg *reg = card->pcie.reg;
- /* Bluetooth is not on pcie interface. Download Wifi only firmware
- * during pcie FLR, so that bluetooth part of firmware which is
- * already running doesn't get affected.
- */
- strcpy(adapter->fw_name, PCIE8997_DEFAULT_WIFIFW_NAME);
-
/* tx_buf_size might be changed to 3584 by firmware during
* data transfer, we should reset it to default size.
*/
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.h b/drivers/net/wireless/marvell/mwifiex/pcie.h
index 7e2450c..f7ce9b6 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.h
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.h
@@ -35,7 +35,6 @@
#define PCIE8897_B0_FW_NAME "mrvl/pcie8897_uapsta.bin"
#define PCIEUART8997_FW_NAME_V4 "mrvl/pcieuart8997_combo_v4.bin"
#define PCIEUSB8997_FW_NAME_V4 "mrvl/pcieusb8997_combo_v4.bin"
-#define PCIE8997_DEFAULT_WIFIFW_NAME "mrvl/pcie8997_wlan_v4.bin"
#define PCIE_VENDOR_ID_MARVELL (0x11ab)
#define PCIE_VENDOR_ID_V2_MARVELL (0x1b4b)
@@ -120,6 +119,8 @@
#define MWIFIEX_SLEEP_COOKIE_SIZE 4
#define MWIFIEX_MAX_DELAY_COUNT 100
+#define MWIFIEX_PCIE_FLR_HAPPENS 0xFEDCBABA
+
struct mwifiex_pcie_card_reg {
u16 cmd_addr_lo;
u16 cmd_addr_hi;
--
1.9.1