The patch corrects the revision id register and uses it along with
magic value and chip version registers to download appropriate firmware
image.
PCIe8997 Z chipset variant code has been removed, as it won't be used in
production.
Signed-off-by: Amitkumar Karwar <[email protected]>
---
drivers/net/wireless/marvell/mwifiex/pcie.c | 35 ++++++++++-------------------
drivers/net/wireless/marvell/mwifiex/pcie.h | 14 +++++-------
2 files changed, 18 insertions(+), 31 deletions(-)
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.c b/drivers/net/wireless/marvell/mwifiex/pcie.c
index 81bceef..9aec9a9 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.c
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.c
@@ -2910,7 +2910,7 @@ static int mwifiex_pcie_request_irq(struct mwifiex_adapter *adapter)
static void mwifiex_pcie_get_fw_name(struct mwifiex_adapter *adapter)
{
int revision_id = 0;
- int version;
+ int version, magic;
struct pcie_service_card *card = adapter->card;
switch (card->dev->device) {
@@ -2935,30 +2935,19 @@ static void mwifiex_pcie_get_fw_name(struct mwifiex_adapter *adapter)
}
break;
case PCIE_DEVICE_ID_MARVELL_88W8997:
- mwifiex_read_reg(adapter, 0x0c48, &revision_id);
+ mwifiex_read_reg(adapter, 0x8, &revision_id);
mwifiex_read_reg(adapter, 0x0cd0, &version);
+ mwifiex_read_reg(adapter, 0x0cd4, &magic);
+ revision_id &= 0xff;
version &= 0x7;
- switch (revision_id) {
- case PCIE8997_V2:
- if (version == CHIP_VER_PCIEUART)
- strcpy(adapter->fw_name,
- PCIEUART8997_FW_NAME_V2);
- else
- strcpy(adapter->fw_name,
- PCIEUSB8997_FW_NAME_V2);
- break;
- case PCIE8997_Z:
- if (version == CHIP_VER_PCIEUART)
- strcpy(adapter->fw_name,
- PCIEUART8997_FW_NAME_Z);
- else
- strcpy(adapter->fw_name,
- PCIEUSB8997_FW_NAME_Z);
- break;
- default:
- strcpy(adapter->fw_name, PCIE8997_DEFAULT_FW_NAME);
- break;
- }
+ magic &= 0xff;
+ if (revision_id == PCIE8997_A1 &&
+ magic == CHIP_MAGIC_VALUE &&
+ version == CHIP_VER_PCIEUART)
+ strcpy(adapter->fw_name, PCIEUART8997_FW_NAME_V4);
+ else
+ strcpy(adapter->fw_name, PCIEUSB8997_FW_NAME_V4);
+ break;
default:
break;
}
diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.h b/drivers/net/wireless/marvell/mwifiex/pcie.h
index f6992f0..46f99ca 100644
--- a/drivers/net/wireless/marvell/mwifiex/pcie.h
+++ b/drivers/net/wireless/marvell/mwifiex/pcie.h
@@ -32,12 +32,9 @@
#define PCIE8897_DEFAULT_FW_NAME "mrvl/pcie8897_uapsta.bin"
#define PCIE8897_A0_FW_NAME "mrvl/pcie8897_uapsta_a0.bin"
#define PCIE8897_B0_FW_NAME "mrvl/pcie8897_uapsta.bin"
-#define PCIE8997_DEFAULT_FW_NAME "mrvl/pcieusb8997_combo_v2.bin"
-#define PCIEUART8997_FW_NAME_Z "mrvl/pcieuart8997_combo.bin"
-#define PCIEUART8997_FW_NAME_V2 "mrvl/pcieuart8997_combo_v2.bin"
-#define PCIEUSB8997_FW_NAME_Z "mrvl/pcieusb8997_combo.bin"
-#define PCIEUSB8997_FW_NAME_V2 "mrvl/pcieusb8997_combo_v2.bin"
-#define PCIE8997_DEFAULT_WIFIFW_NAME "mrvl/pcie8997_wlan.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)
@@ -47,9 +44,10 @@
#define PCIE8897_A0 0x1100
#define PCIE8897_B0 0x1200
-#define PCIE8997_Z 0x0
-#define PCIE8997_V2 0x471
+#define PCIE8997_A0 0x10
+#define PCIE8997_A1 0x11
#define CHIP_VER_PCIEUART 0x3
+#define CHIP_MAGIC_VALUE 0x24
/* Constants for Buffer Descriptor (BD) rings */
#define MWIFIEX_MAX_TXRX_BD 0x20
--
1.9.1
SGkgU3RldmUsDQoNCj4gRnJvbTogU3RldmUgZGVSb3NpZXIgW21haWx0bzpkZXJvc2llckBnbWFp
bC5jb21dDQo+IFNlbnQ6IFRodXJzZGF5LCBBdWd1c3QgMTEsIDIwMTYgMjozOSBBTQ0KPiBUbzog
QW1pdGt1bWFyIEthcndhcg0KPiBDYzogQnJpYW4gTm9ycmlzOyBsaW51eC13aXJlbGVzc0B2Z2Vy
Lmtlcm5lbC5vcmc7IENhdGh5IEx1bzsgTmlzaGFudA0KPiBTYXJtdWthZGFtOyBsaW51eC1rZXJu
ZWxAdmdlci5rZXJuZWwub3JnOyBXZWktTmluZyBIdWFuZw0KPiBTdWJqZWN0OiBSZTogbXdpZmll
eDogUENJZTg5OTcgY2hpcCBzcGVjaWZpYyBoYW5kbGluZw0KPiANCj4gSGksDQo+IA0KPiBPbiBX
ZWQsIEF1ZyAxMCwgMjAxNiBhdCAxMjowNyBBTSwgQW1pdGt1bWFyIEthcndhciA8YWthcndhckBt
YXJ2ZWxsLmNvbT4NCj4gd3JvdGU6DQo+ID4gSGkgQnJpYW4sDQo+ID4NCj4gPj4gRnJvbTogQnJp
YW4gTm9ycmlzIFttYWlsdG86YnJpYW5ub3JyaXNAY2hyb21pdW0ub3JnXQ0KPiA+PiBTZW50OiBX
ZWRuZXNkYXksIEF1Z3VzdCAxMCwgMjAxNiAxMjoxNCBBTQ0KPiA+PiBUbzogQW1pdGt1bWFyIEth
cndhcg0KPiA+PiBDYzogbGludXgtd2lyZWxlc3NAdmdlci5rZXJuZWwub3JnOyBDYXRoeSBMdW87
IE5pc2hhbnQgU2FybXVrYWRhbTsNCj4gPj4gbGludXgta2VybmVsQHZnZXIua2VybmVsLm9yZw0K
PiA+PiBTdWJqZWN0OiBSZTogbXdpZmlleDogUENJZTg5OTcgY2hpcCBzcGVjaWZpYyBoYW5kbGlu
Zw0KPiA+Pg0KPiA+PiBIaSwNCj4gPj4NCj4gPj4gT24gRnJpLCBKdWwgMjksIDIwMTYgYXQgMDQ6
MDg6NTFQTSArMDUzMCwgQW1pdGt1bWFyIEthcndhciB3cm90ZToNCj4gPj4gPiBUaGUgcGF0Y2gg
Y29ycmVjdHMgdGhlIHJldmlzaW9uIGlkIHJlZ2lzdGVyIGFuZCB1c2VzIGl0IGFsb25nIHdpdGgN
Cj4gPj4gPiBtYWdpYyB2YWx1ZSBhbmQgY2hpcCB2ZXJzaW9uIHJlZ2lzdGVycyB0byBkb3dubG9h
ZCBhcHByb3ByaWF0ZQ0KPiA+PiA+IGZpcm13YXJlIGltYWdlLg0KPiA+PiA+DQo+ID4+ID4gUENJ
ZTg5OTcgWiBjaGlwc2V0IHZhcmlhbnQgY29kZSBoYXMgYmVlbiByZW1vdmVkLCBhcyBpdCB3b24n
dCBiZQ0KPiA+PiA+IHVzZWQgaW4gcHJvZHVjdGlvbi4NCj4gPj4gPg0KPiA+PiA+IFNpZ25lZC1v
ZmYtYnk6IEFtaXRrdW1hciBLYXJ3YXIgPGFrYXJ3YXJAbWFydmVsbC5jb20+DQo+ID4+ID4gLS0t
DQo+ID4+ID4gIGRyaXZlcnMvbmV0L3dpcmVsZXNzL21hcnZlbGwvbXdpZmlleC9wY2llLmMgfCAz
NQ0KPiA+PiA+ICsrKysrKysrKystLS0tLS0tLS0tLS0tLS0tLS0tDQo+ID4+ID4gZHJpdmVycy9u
ZXQvd2lyZWxlc3MvbWFydmVsbC9td2lmaWV4L3BjaWUuaCB8IDE0ICsrKysrLS0tLS0tLQ0KPiA+
PiA+ICAyIGZpbGVzIGNoYW5nZWQsIDE4IGluc2VydGlvbnMoKyksIDMxIGRlbGV0aW9ucygtKQ0K
PiA+Pg0KPiA+PiBbLi4uXQ0KPiA+Pg0KPiA+PiA+IGRpZmYgLS1naXQgYS9kcml2ZXJzL25ldC93
aXJlbGVzcy9tYXJ2ZWxsL213aWZpZXgvcGNpZS5oDQo+ID4+ID4gYi9kcml2ZXJzL25ldC93aXJl
bGVzcy9tYXJ2ZWxsL213aWZpZXgvcGNpZS5oDQo+ID4+ID4gaW5kZXggZjY5OTJmMC4uNDZmOTlj
YSAxMDA2NDQNCj4gPj4gPiAtLS0gYS9kcml2ZXJzL25ldC93aXJlbGVzcy9tYXJ2ZWxsL213aWZp
ZXgvcGNpZS5oDQo+ID4+ID4gKysrIGIvZHJpdmVycy9uZXQvd2lyZWxlc3MvbWFydmVsbC9td2lm
aWV4L3BjaWUuaA0KPiA+PiA+IEBAIC0zMiwxMiArMzIsOSBAQA0KPiA+PiA+ICAjZGVmaW5lIFBD
SUU4ODk3X0RFRkFVTFRfRldfTkFNRSAibXJ2bC9wY2llODg5N191YXBzdGEuYmluIg0KPiA+PiA+
ICAjZGVmaW5lIFBDSUU4ODk3X0EwX0ZXX05BTUUgIm1ydmwvcGNpZTg4OTdfdWFwc3RhX2EwLmJp
biINCj4gPj4gPiAgI2RlZmluZSBQQ0lFODg5N19CMF9GV19OQU1FICJtcnZsL3BjaWU4ODk3X3Vh
cHN0YS5iaW4iDQo+ID4+ID4gLSNkZWZpbmUgUENJRTg5OTdfREVGQVVMVF9GV19OQU1FICJtcnZs
L3BjaWV1c2I4OTk3X2NvbWJvX3YyLmJpbiINCj4gPj4gPiAtI2RlZmluZSBQQ0lFVUFSVDg5OTdf
RldfTkFNRV9aICJtcnZsL3BjaWV1YXJ0ODk5N19jb21iby5iaW4iDQo+ID4+ID4gLSNkZWZpbmUg
UENJRVVBUlQ4OTk3X0ZXX05BTUVfVjIgIm1ydmwvcGNpZXVhcnQ4OTk3X2NvbWJvX3YyLmJpbiIN
Cj4gPj4gPiAtI2RlZmluZSBQQ0lFVVNCODk5N19GV19OQU1FX1ogIm1ydmwvcGNpZXVzYjg5OTdf
Y29tYm8uYmluIg0KPiA+PiA+IC0jZGVmaW5lIFBDSUVVU0I4OTk3X0ZXX05BTUVfVjIgIm1ydmwv
cGNpZXVzYjg5OTdfY29tYm9fdjIuYmluIg0KPiA+PiA+IC0jZGVmaW5lIFBDSUU4OTk3X0RFRkFV
TFRfV0lGSUZXX05BTUUgIm1ydmwvcGNpZTg5OTdfd2xhbi5iaW4iDQo+ID4+ID4gKyNkZWZpbmUg
UENJRVVBUlQ4OTk3X0ZXX05BTUVfVjQgIm1ydmwvcGNpZXVhcnQ4OTk3X2NvbWJvX3Y0LmJpbiIN
Cj4gPj4gPiArI2RlZmluZSBQQ0lFVVNCODk5N19GV19OQU1FX1Y0ICJtcnZsL3BjaWV1c2I4OTk3
X2NvbWJvX3Y0LmJpbiINCj4gPj4gPiArI2RlZmluZSBQQ0lFODk5N19ERUZBVUxUX1dJRklGV19O
QU1FICJtcnZsL3BjaWU4OTk3X3dsYW5fdjQuYmluIg0KPiA+Pg0KPiA+PiBXaHkgZG8gdmVyc2lv
biBidW1wcyByZXF1aXJlIGZpcm13YXJlIHJlbmFtZXM/IElzIHRoaXMganVzdCB0byBtYWtlDQo+
ID4+IHN1cmUgeW91IGRvbid0IGxvYWQgdGhlIG5ldyBmaXJtd2FyZSBvbiBvbGQgY2hpcCByZXZz
IHRoYXQgeW91IGRvbid0DQo+ID4+IHBsYW4gdG8gc3VwcG9ydCBmb3IgcHJvZHVjdGlvbiAoaS5l
Liwgb25seSBlYXJseSByZXZzIGxpa2UgdGhlIF9aDQo+ID4+IHlvdSdyZSBkcm9wcGluZyk/IFRo
aXMgZG9lc24ndCBzZWVtcyBsaWtlIGEgZ29vZCBsb25nLXRlcm0gc29sdXRpb24sDQo+ID4+IGF0
IGxlYXN0IG9uY2UgeW91IHN0YXJ0IGdldHRpbmcgdGhpcyBzaWxpY29uIG91dCBpbiB0aGUgd2ls
ZC4gQXQgc29tZQ0KPiA+PiBwb2ludCwgSSdkIGV4cGVjdCB0byBzZWUgYSBzdGFibGUgZmlsZSBu
YW1lLg0KPiA+Pg0KPiA+PiBCcmlhbg0KPiA+Pg0KPiA+DQo+ID4gV2UgaGF2ZW4ndCB5ZXQgc3Vi
bWl0dGVkIGFueSBmaXJtd2FyZSBpbWFnZSB1cHN0cmVhbSBmb3IgODk5NyBjaGlwc2V0Lg0KPiA+
IHBjaWV1YXJ0ODk5N19jb21ib192NC5iaW4vcGNpZXVzYjg5OTdfY29tYm9fdjQuYmluIHdvdWxk
IGJlIG91cg0KPiBmaXJtd2FyZSBjYW5kaWRhdGUgZm9yIHVwc3RyZWFtIHN1Ym1pc3Npb24uIFRo
ZSBmaWxlbmFtZSB3b3VsZCByZW1haW4NCj4gc2FtZSBoZXJlYWZ0ZXIuDQo+ID4NCj4gPiBwY2ll
Kjg5OTdfY29tYm9fdjIuYmluIGhhZCBzdXBwb3J0IG9ubHkgZm9yIEEwIGNoaXBzZXQNCj4gPiBw
Y2llKjg5OTdfY29tYm9fdjMuYmluIHdhcyBvdXIgaW50ZXJuYWwgZGV2ZWxvcG1lbnQgdmVyc2lv
biB3aGljaCBoYWQNCj4gPiBzdXBwb3J0IGZvciBBMSBjaGlwc2V0IHBjaWUqODk5N19jb21ib192
NC5iaW4gaGFzIHN1cHBvcnQgZm9yIGJvdGggQTANCj4gYW5kIEExIGNoaXBzZXRzIGFuZCB0aGlz
IGlzIHRoZSB2ZXJzaW9uIHRoYXQgc2hhbGwgYmUgcmVsZWFzZWQgdG8NCj4gY3VzdG9tZXJzL3Vw
c3RyZWFtIGZyb20gbm93IG9uLg0KPiA+DQo+IA0KPiBTZWVtcyB0byBtZSB0aGVuIGl0IHNob3Vs
ZCBqdXN0IGJlIG5hbWVkIHBjaWUqODk5N193bGFuLmJpbi4gIEEgdmVyc2lvbg0KPiBudW1iZXIg
c2hvdWxkbid0IGJlIHBhcnQgb2YgdGhlIGZpbGUgbmFtZSBpbiB0aGlzIGNhc2UuIEhhdmluZyB0
byB1cGRhdGUNCj4gdGhlIGRyaXZlciBmb3IgYSBmaXJtd2FyZSBuYW1lIGNoYW5nZSBpcyBzaWxs
eS4gTW9zdCB3aXJlbGVzcyBkcml2ZXJzDQo+IGhhdmUgZGlmZmVyZW50IG5hbWVzIGZvciBkaWZm
ZXJlbnQgaGFyZHdhcmUvY2hpcCByZXZzIGFuZC9vciBhbg0KPiBpbmNvbXBhdGlibGUgQVBJIGNo
YW5nZS4gIE1vc3QgZGlzdHJpYnV0aW9ucyB3b3VsZCB0eXBpY2FsbHkgb25seSBjYXJyeQ0KPiBh
IHNpbmdsZSBpbnN0YW5jZSBvZiB0aGUgZmlybXdhcmUgZm9yIGEgcGFydGljdWxhciBjaGlwLg0K
PiBTcGVha2luZyBmb3IgdGhlIG9uZXMgSSB3b3JrIHdpdGgsIEkgdXN1YWxseSBrZWVwIHRoZSBv
cmlnaW5hbCBmaWxlbmFtZQ0KPiBpbnRhY3QgKHdpdGggYSB2ZXJzaW9uIG51bWJlcikgYW5kIG1h
a2UgYSBzeW1saW5rIHRvIGl0IHdpdGggdGhlIG5hbWUNCj4gdGhlIGRyaXZlciBleHBlY3RzLiAg
ZWc6DQo+IA0KPiBmdy00LmJpbiAtPiBmd192My40LjAuOTQuYmluDQo+IGZ3X3YzLjIuMC4xNDQu
YmluDQo+IGZ3X3YzLjQuMC45NC5iaW4NCj4gDQo+IFRoYXQgd2F5IEkgY2FuIGtlZXAgdHJhY2sg
b2YgdGhlIHZlcnNpb24gaW4gbXkgZmlsZXN5c3RlbSwgYnV0IEknbSBub3QNCj4gaGFja2luZyB0
aGUgZHJpdmVyIGV2ZXJ5IGNvdXBsZSBvZiB3ZWVrcy4gIEFuZCB3ZSBkbyBpc3N1ZSBuZXcgZmly
bXdhcmUNCj4gZXZlcnkgZmV3IHdlZWtzLiBJIGNhbid0IGltYWdpbmUgYXNraW5nIG91ciBjdXN0
b21lcnMgdG8ga2VlcCB1cGRhdGluZw0KPiB0aGUgZHJpdmVyIGZvciBlYWNoIGZpcm13YXJlIGVu
aGFuY2VtZW50Lg0KPiANCj4gSU1ITyBjaGFuZ2luZyB0aGUgZHJpdmVyIHRvIHJlbmFtZSB0aGUg
ZmlybXdhcmVzIG9uIG5ldyB2ZXJzaW9ucyBzZWVtcw0KPiBib3RoIGluY29udmVuaWVudCB0byBw
ZW9wbGUgdXNpbmcgaXQsIGFuZCBleHRyYSBub24tdXNlZnVsIGNvbW1pdCBub2lzZS4NCj4gDQoN
ClRoYW5rcy4gSSBhZ3JlZSB3aXRoIHlvdS4gV2UgaGF2ZSBhbHNvIG1haW50YWluZWQgc2luZ2xl
IGluc3RhbmNlL25hbWUgZm9yIGFsbCBvdXIgY2hpcHNldHMgZm9yIGxhc3QgZmV3IHllYXJzLiBX
ZSBkbyByZWxlYXNlIG5ldyBmaXJtd2FyZSBwZXJpb2RpY2FsbHkgZm9yIHRoZXNlIGNoaXBzZXRz
LCBidXQgZmlybXdhcmUgbmFtZSBhbHdheXMgcmVtYWlucyB0aGUgc2FtZS4NCg0KLS0tLS0tLS0N
CnJvb3RAcGUtbHQ5NDk6L2xpbnV4LWZpcm13YXJlL21ydmwjIGxzDQpwY2llODg5N191YXBzdGEu
YmluICBzZDg2ODhfaGVscGVyLmJpbiAgc2Q4Nzk3X3VhcHN0YS5iaW4gIHNkODg5N191YXBzdGEu
YmluICAgdXNiODc5N191YXBzdGEuYmluDQpzZDg2ODguYmluICAgICAgICAgICBzZDg3ODdfdWFw
c3RhLmJpbiAgc2Q4ODg3X3VhcHN0YS5iaW4gIHVzYjg3NjZfdWFwc3RhLmJpbiAgdXNiODg5N191
YXBzdGEuYmluDQotLS0tLS0tLS0NCg0KSXTigJlzIGp1c3QgdGhhdCBmb3Igb3VyIG5ldyBjaGlw
c2V0IDg5OTcgZm9yIHdoaWNoIHdlIGhhdmVuJ3QgeWV0IHN1Ym1pdHRlZCB0aGUgZmlybXdhcmUg
aW1hZ2UgdXBzdHJlYW0sIHdlIHdhbnQgdG8gZmluYWxpemUgdGhlIG5hbWUgYXMgcGNpZSo4OTk3
X2NvbWJvX3Y0LmJpbg0KDQpSZWdhcmRzLA0KQW1pdGt1bWFyIEthcndhcg0K
Hi Brian,
> From: Brian Norris [mailto:[email protected]]
> Sent: Wednesday, August 10, 2016 12:14 AM
> To: Amitkumar Karwar
> Cc: [email protected]; Cathy Luo; Nishant Sarmukadam;
> [email protected]
> Subject: Re: mwifiex: PCIe8997 chip specific handling
>
> Hi,
>
> On Fri, Jul 29, 2016 at 04:08:51PM +0530, Amitkumar Karwar wrote:
> > The patch corrects the revision id register and uses it along with
> > magic value and chip version registers to download appropriate
> > firmware image.
> >
> > PCIe8997 Z chipset variant code has been removed, as it won't be used
> > in production.
> >
> > Signed-off-by: Amitkumar Karwar <[email protected]>
> > ---
> > drivers/net/wireless/marvell/mwifiex/pcie.c | 35
> > ++++++++++-------------------
> > drivers/net/wireless/marvell/mwifiex/pcie.h | 14 +++++-------
> > 2 files changed, 18 insertions(+), 31 deletions(-)
>
> [...]
>
> > diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.h
> > b/drivers/net/wireless/marvell/mwifiex/pcie.h
> > index f6992f0..46f99ca 100644
> > --- a/drivers/net/wireless/marvell/mwifiex/pcie.h
> > +++ b/drivers/net/wireless/marvell/mwifiex/pcie.h
> > @@ -32,12 +32,9 @@
> > #define PCIE8897_DEFAULT_FW_NAME "mrvl/pcie8897_uapsta.bin"
> > #define PCIE8897_A0_FW_NAME "mrvl/pcie8897_uapsta_a0.bin"
> > #define PCIE8897_B0_FW_NAME "mrvl/pcie8897_uapsta.bin"
> > -#define PCIE8997_DEFAULT_FW_NAME "mrvl/pcieusb8997_combo_v2.bin"
> > -#define PCIEUART8997_FW_NAME_Z "mrvl/pcieuart8997_combo.bin"
> > -#define PCIEUART8997_FW_NAME_V2 "mrvl/pcieuart8997_combo_v2.bin"
> > -#define PCIEUSB8997_FW_NAME_Z "mrvl/pcieusb8997_combo.bin"
> > -#define PCIEUSB8997_FW_NAME_V2 "mrvl/pcieusb8997_combo_v2.bin"
> > -#define PCIE8997_DEFAULT_WIFIFW_NAME "mrvl/pcie8997_wlan.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"
>
> Why do version bumps require firmware renames? Is this just to make sure
> you don't load the new firmware on old chip revs that you don't plan to
> support for production (i.e., only early revs like the _Z you're
> dropping)? This doesn't seems like a good long-term solution, at least
> once you start getting this silicon out in the wild. At some point, I'd
> expect to see a stable file name.
>
> Brian
>
We haven't yet submitted any firmware image upstream for 8997 chipset.
pcieuart8997_combo_v4.bin/pcieusb8997_combo_v4.bin would be our firmware candidate for upstream submission. The filename would remain same hereafter.
pcie*8997_combo_v2.bin had support only for A0 chipset
pcie*8997_combo_v3.bin was our internal development version which had support for A1 chipset
pcie*8997_combo_v4.bin has support for both A0 and A1 chipsets and this is the version that shall be released to customers/upstream from now on.
Regards,
Amitkumar Karwar
Hi,
On Wed, Aug 10, 2016 at 12:07 AM, Amitkumar Karwar <[email protected]> wrote:
> Hi Brian,
>
>> From: Brian Norris [mailto:[email protected]]
>> Sent: Wednesday, August 10, 2016 12:14 AM
>> To: Amitkumar Karwar
>> Cc: [email protected]; Cathy Luo; Nishant Sarmukadam;
>> [email protected]
>> Subject: Re: mwifiex: PCIe8997 chip specific handling
>>
>> Hi,
>>
>> On Fri, Jul 29, 2016 at 04:08:51PM +0530, Amitkumar Karwar wrote:
>> > The patch corrects the revision id register and uses it along with
>> > magic value and chip version registers to download appropriate
>> > firmware image.
>> >
>> > PCIe8997 Z chipset variant code has been removed, as it won't be used
>> > in production.
>> >
>> > Signed-off-by: Amitkumar Karwar <[email protected]>
>> > ---
>> > drivers/net/wireless/marvell/mwifiex/pcie.c | 35
>> > ++++++++++-------------------
>> > drivers/net/wireless/marvell/mwifiex/pcie.h | 14 +++++-------
>> > 2 files changed, 18 insertions(+), 31 deletions(-)
>>
>> [...]
>>
>> > diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.h
>> > b/drivers/net/wireless/marvell/mwifiex/pcie.h
>> > index f6992f0..46f99ca 100644
>> > --- a/drivers/net/wireless/marvell/mwifiex/pcie.h
>> > +++ b/drivers/net/wireless/marvell/mwifiex/pcie.h
>> > @@ -32,12 +32,9 @@
>> > #define PCIE8897_DEFAULT_FW_NAME "mrvl/pcie8897_uapsta.bin"
>> > #define PCIE8897_A0_FW_NAME "mrvl/pcie8897_uapsta_a0.bin"
>> > #define PCIE8897_B0_FW_NAME "mrvl/pcie8897_uapsta.bin"
>> > -#define PCIE8997_DEFAULT_FW_NAME "mrvl/pcieusb8997_combo_v2.bin"
>> > -#define PCIEUART8997_FW_NAME_Z "mrvl/pcieuart8997_combo.bin"
>> > -#define PCIEUART8997_FW_NAME_V2 "mrvl/pcieuart8997_combo_v2.bin"
>> > -#define PCIEUSB8997_FW_NAME_Z "mrvl/pcieusb8997_combo.bin"
>> > -#define PCIEUSB8997_FW_NAME_V2 "mrvl/pcieusb8997_combo_v2.bin"
>> > -#define PCIE8997_DEFAULT_WIFIFW_NAME "mrvl/pcie8997_wlan.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"
>>
>> Why do version bumps require firmware renames? Is this just to make sure
>> you don't load the new firmware on old chip revs that you don't plan to
>> support for production (i.e., only early revs like the _Z you're
>> dropping)? This doesn't seems like a good long-term solution, at least
>> once you start getting this silicon out in the wild. At some point, I'd
>> expect to see a stable file name.
>>
>> Brian
>>
>
> We haven't yet submitted any firmware image upstream for 8997 chipset.
> pcieuart8997_combo_v4.bin/pcieusb8997_combo_v4.bin would be our firmware candidate for upstream submission. The filename would remain same hereafter.
>
> pcie*8997_combo_v2.bin had support only for A0 chipset
> pcie*8997_combo_v3.bin was our internal development version which had support for A1 chipset
> pcie*8997_combo_v4.bin has support for both A0 and A1 chipsets and this is the version that shall be released to customers/upstream from now on.
>
Seems to me then it should just be named pcie*8997_wlan.bin. A
version number shouldn't be part of the file name in this case. Having
to update the driver for a firmware name change is silly. Most
wireless drivers have different names for different hardware/chip revs
and/or an incompatible API change. Most distributions would typically
only carry a single instance of the firmware for a particular chip.
Speaking for the ones I work with, I usually keep the original
filename intact (with a version number) and make a symlink to it with
the name the driver expects. eg:
fw-4.bin -> fw_v3.4.0.94.bin
fw_v3.2.0.144.bin
fw_v3.4.0.94.bin
That way I can keep track of the version in my filesystem, but I'm not
hacking the driver every couple of weeks. And we do issue new
firmware every few weeks. I can't imagine asking our customers to keep
updating the driver for each firmware enhancement.
IMHO changing the driver to rename the firmwares on new versions seems
both inconvenient to people using it, and extra non-useful commit
noise.
- Steve
Hi,
On Fri, Jul 29, 2016 at 04:08:51PM +0530, Amitkumar Karwar wrote:
> The patch corrects the revision id register and uses it along with
> magic value and chip version registers to download appropriate firmware
> image.
>
> PCIe8997 Z chipset variant code has been removed, as it won't be used in
> production.
>
> Signed-off-by: Amitkumar Karwar <[email protected]>
> ---
> drivers/net/wireless/marvell/mwifiex/pcie.c | 35 ++++++++++-------------------
> drivers/net/wireless/marvell/mwifiex/pcie.h | 14 +++++-------
> 2 files changed, 18 insertions(+), 31 deletions(-)
[...]
> diff --git a/drivers/net/wireless/marvell/mwifiex/pcie.h b/drivers/net/wireless/marvell/mwifiex/pcie.h
> index f6992f0..46f99ca 100644
> --- a/drivers/net/wireless/marvell/mwifiex/pcie.h
> +++ b/drivers/net/wireless/marvell/mwifiex/pcie.h
> @@ -32,12 +32,9 @@
> #define PCIE8897_DEFAULT_FW_NAME "mrvl/pcie8897_uapsta.bin"
> #define PCIE8897_A0_FW_NAME "mrvl/pcie8897_uapsta_a0.bin"
> #define PCIE8897_B0_FW_NAME "mrvl/pcie8897_uapsta.bin"
> -#define PCIE8997_DEFAULT_FW_NAME "mrvl/pcieusb8997_combo_v2.bin"
> -#define PCIEUART8997_FW_NAME_Z "mrvl/pcieuart8997_combo.bin"
> -#define PCIEUART8997_FW_NAME_V2 "mrvl/pcieuart8997_combo_v2.bin"
> -#define PCIEUSB8997_FW_NAME_Z "mrvl/pcieusb8997_combo.bin"
> -#define PCIEUSB8997_FW_NAME_V2 "mrvl/pcieusb8997_combo_v2.bin"
> -#define PCIE8997_DEFAULT_WIFIFW_NAME "mrvl/pcie8997_wlan.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"
Why do version bumps require firmware renames? Is this just to make sure
you don't load the new firmware on old chip revs that you don't plan to
support for production (i.e., only early revs like the _Z you're
dropping)? This doesn't seems like a good long-term solution, at least
once you start getting this silicon out in the wild. At some point, I'd
expect to see a stable file name.
Brian
>
> #define PCIE_VENDOR_ID_MARVELL (0x11ab)
> #define PCIE_VENDOR_ID_V2_MARVELL (0x1b4b)
> @@ -47,9 +44,10 @@
>
> #define PCIE8897_A0 0x1100
> #define PCIE8897_B0 0x1200
> -#define PCIE8997_Z 0x0
> -#define PCIE8997_V2 0x471
> +#define PCIE8997_A0 0x10
> +#define PCIE8997_A1 0x11
> #define CHIP_VER_PCIEUART 0x3
> +#define CHIP_MAGIC_VALUE 0x24
>
> /* Constants for Buffer Descriptor (BD) rings */
> #define MWIFIEX_MAX_TXRX_BD 0x20
SGkgS2FsbGUsDQoNCj4gRnJvbTogbGludXgtd2lyZWxlc3Mtb3duZXJAdmdlci5rZXJuZWwub3Jn
IFttYWlsdG86bGludXgtd2lyZWxlc3MtDQo+IG93bmVyQHZnZXIua2VybmVsLm9yZ10gT24gQmVo
YWxmIE9mIEFtaXRrdW1hciBLYXJ3YXINCj4gU2VudDogVGh1cnNkYXksIEF1Z3VzdCAxMSwgMjAx
NiA0OjExIFBNDQo+IFRvOiBTdGV2ZSBkZVJvc2llcg0KPiBDYzogQnJpYW4gTm9ycmlzOyBsaW51
eC13aXJlbGVzc0B2Z2VyLmtlcm5lbC5vcmc7IENhdGh5IEx1bzsgTmlzaGFudA0KPiBTYXJtdWth
ZGFtOyBsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnOyBXZWktTmluZyBIdWFuZw0KPiBTdWJq
ZWN0OiBSRTogbXdpZmlleDogUENJZTg5OTcgY2hpcCBzcGVjaWZpYyBoYW5kbGluZw0KPiANCj4g
SGkgU3RldmUsDQo+IA0KPiA+IEZyb206IFN0ZXZlIGRlUm9zaWVyIFttYWlsdG86ZGVyb3NpZXJA
Z21haWwuY29tXQ0KPiA+IFNlbnQ6IFRodXJzZGF5LCBBdWd1c3QgMTEsIDIwMTYgMjozOSBBTQ0K
PiA+IFRvOiBBbWl0a3VtYXIgS2Fyd2FyDQo+ID4gQ2M6IEJyaWFuIE5vcnJpczsgbGludXgtd2ly
ZWxlc3NAdmdlci5rZXJuZWwub3JnOyBDYXRoeSBMdW87IE5pc2hhbnQNCj4gPiBTYXJtdWthZGFt
OyBsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnOyBXZWktTmluZyBIdWFuZw0KPiA+IFN1Ympl
Y3Q6IFJlOiBtd2lmaWV4OiBQQ0llODk5NyBjaGlwIHNwZWNpZmljIGhhbmRsaW5nDQo+ID4NCj4g
PiBIaSwNCj4gPg0KPiA+IE9uIFdlZCwgQXVnIDEwLCAyMDE2IGF0IDEyOjA3IEFNLCBBbWl0a3Vt
YXIgS2Fyd2FyDQo+ID4gPGFrYXJ3YXJAbWFydmVsbC5jb20+DQo+ID4gd3JvdGU6DQo+ID4gPiBI
aSBCcmlhbiwNCj4gPiA+DQo+ID4gPj4gRnJvbTogQnJpYW4gTm9ycmlzIFttYWlsdG86YnJpYW5u
b3JyaXNAY2hyb21pdW0ub3JnXQ0KPiA+ID4+IFNlbnQ6IFdlZG5lc2RheSwgQXVndXN0IDEwLCAy
MDE2IDEyOjE0IEFNDQo+ID4gPj4gVG86IEFtaXRrdW1hciBLYXJ3YXINCj4gPiA+PiBDYzogbGlu
dXgtd2lyZWxlc3NAdmdlci5rZXJuZWwub3JnOyBDYXRoeSBMdW87IE5pc2hhbnQgU2FybXVrYWRh
bTsNCj4gPiA+PiBsaW51eC1rZXJuZWxAdmdlci5rZXJuZWwub3JnDQo+ID4gPj4gU3ViamVjdDog
UmU6IG13aWZpZXg6IFBDSWU4OTk3IGNoaXAgc3BlY2lmaWMgaGFuZGxpbmcNCj4gPiA+Pg0KPiA+
ID4+IEhpLA0KPiA+ID4+DQo+ID4gPj4gT24gRnJpLCBKdWwgMjksIDIwMTYgYXQgMDQ6MDg6NTFQ
TSArMDUzMCwgQW1pdGt1bWFyIEthcndhciB3cm90ZToNCj4gPiA+PiA+IFRoZSBwYXRjaCBjb3Jy
ZWN0cyB0aGUgcmV2aXNpb24gaWQgcmVnaXN0ZXIgYW5kIHVzZXMgaXQgYWxvbmcNCj4gPiA+PiA+
IHdpdGggbWFnaWMgdmFsdWUgYW5kIGNoaXAgdmVyc2lvbiByZWdpc3RlcnMgdG8gZG93bmxvYWQN
Cj4gPiA+PiA+IGFwcHJvcHJpYXRlIGZpcm13YXJlIGltYWdlLg0KPiA+ID4+ID4NCj4gPiA+PiA+
IFBDSWU4OTk3IFogY2hpcHNldCB2YXJpYW50IGNvZGUgaGFzIGJlZW4gcmVtb3ZlZCwgYXMgaXQg
d29uJ3QgYmUNCj4gPiA+PiA+IHVzZWQgaW4gcHJvZHVjdGlvbi4NCj4gPiA+PiA+DQo+ID4gPj4g
PiBTaWduZWQtb2ZmLWJ5OiBBbWl0a3VtYXIgS2Fyd2FyIDxha2Fyd2FyQG1hcnZlbGwuY29tPg0K
PiA+ID4+ID4gLS0tDQo+ID4gPj4gPiAgZHJpdmVycy9uZXQvd2lyZWxlc3MvbWFydmVsbC9td2lm
aWV4L3BjaWUuYyB8IDM1DQo+ID4gPj4gPiArKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLQ0K
PiA+ID4+ID4gZHJpdmVycy9uZXQvd2lyZWxlc3MvbWFydmVsbC9td2lmaWV4L3BjaWUuaCB8IDE0
ICsrKysrLS0tLS0tLQ0KPiA+ID4+ID4gIDIgZmlsZXMgY2hhbmdlZCwgMTggaW5zZXJ0aW9ucygr
KSwgMzEgZGVsZXRpb25zKC0pDQo+ID4gPj4NCj4gPiA+PiBbLi4uXQ0KPiA+ID4+DQo+ID4gPj4g
PiBkaWZmIC0tZ2l0IGEvZHJpdmVycy9uZXQvd2lyZWxlc3MvbWFydmVsbC9td2lmaWV4L3BjaWUu
aA0KPiA+ID4+ID4gYi9kcml2ZXJzL25ldC93aXJlbGVzcy9tYXJ2ZWxsL213aWZpZXgvcGNpZS5o
DQo+ID4gPj4gPiBpbmRleCBmNjk5MmYwLi40NmY5OWNhIDEwMDY0NA0KPiA+ID4+ID4gLS0tIGEv
ZHJpdmVycy9uZXQvd2lyZWxlc3MvbWFydmVsbC9td2lmaWV4L3BjaWUuaA0KPiA+ID4+ID4gKysr
IGIvZHJpdmVycy9uZXQvd2lyZWxlc3MvbWFydmVsbC9td2lmaWV4L3BjaWUuaA0KPiA+ID4+ID4g
QEAgLTMyLDEyICszMiw5IEBADQo+ID4gPj4gPiAgI2RlZmluZSBQQ0lFODg5N19ERUZBVUxUX0ZX
X05BTUUgIm1ydmwvcGNpZTg4OTdfdWFwc3RhLmJpbiINCj4gPiA+PiA+ICAjZGVmaW5lIFBDSUU4
ODk3X0EwX0ZXX05BTUUgIm1ydmwvcGNpZTg4OTdfdWFwc3RhX2EwLmJpbiINCj4gPiA+PiA+ICAj
ZGVmaW5lIFBDSUU4ODk3X0IwX0ZXX05BTUUgIm1ydmwvcGNpZTg4OTdfdWFwc3RhLmJpbiINCj4g
PiA+PiA+IC0jZGVmaW5lIFBDSUU4OTk3X0RFRkFVTFRfRldfTkFNRSAibXJ2bC9wY2lldXNiODk5
N19jb21ib192Mi5iaW4iDQo+ID4gPj4gPiAtI2RlZmluZSBQQ0lFVUFSVDg5OTdfRldfTkFNRV9a
ICJtcnZsL3BjaWV1YXJ0ODk5N19jb21iby5iaW4iDQo+ID4gPj4gPiAtI2RlZmluZSBQQ0lFVUFS
VDg5OTdfRldfTkFNRV9WMiAibXJ2bC9wY2lldWFydDg5OTdfY29tYm9fdjIuYmluIg0KPiA+ID4+
ID4gLSNkZWZpbmUgUENJRVVTQjg5OTdfRldfTkFNRV9aICJtcnZsL3BjaWV1c2I4OTk3X2NvbWJv
LmJpbiINCj4gPiA+PiA+IC0jZGVmaW5lIFBDSUVVU0I4OTk3X0ZXX05BTUVfVjIgIm1ydmwvcGNp
ZXVzYjg5OTdfY29tYm9fdjIuYmluIg0KPiA+ID4+ID4gLSNkZWZpbmUgUENJRTg5OTdfREVGQVVM
VF9XSUZJRldfTkFNRSAibXJ2bC9wY2llODk5N193bGFuLmJpbiINCj4gPiA+PiA+ICsjZGVmaW5l
IFBDSUVVQVJUODk5N19GV19OQU1FX1Y0ICJtcnZsL3BjaWV1YXJ0ODk5N19jb21ib192NC5iaW4i
DQo+ID4gPj4gPiArI2RlZmluZSBQQ0lFVVNCODk5N19GV19OQU1FX1Y0ICJtcnZsL3BjaWV1c2I4
OTk3X2NvbWJvX3Y0LmJpbiINCj4gPiA+PiA+ICsjZGVmaW5lIFBDSUU4OTk3X0RFRkFVTFRfV0lG
SUZXX05BTUUgIm1ydmwvcGNpZTg5OTdfd2xhbl92NC5iaW4iDQo+ID4gPj4NCj4gPiA+PiBXaHkg
ZG8gdmVyc2lvbiBidW1wcyByZXF1aXJlIGZpcm13YXJlIHJlbmFtZXM/IElzIHRoaXMganVzdCB0
byBtYWtlDQo+ID4gPj4gc3VyZSB5b3UgZG9uJ3QgbG9hZCB0aGUgbmV3IGZpcm13YXJlIG9uIG9s
ZCBjaGlwIHJldnMgdGhhdCB5b3UNCj4gPiA+PiBkb24ndCBwbGFuIHRvIHN1cHBvcnQgZm9yIHBy
b2R1Y3Rpb24gKGkuZS4sIG9ubHkgZWFybHkgcmV2cyBsaWtlDQo+ID4gPj4gdGhlIF9aIHlvdSdy
ZSBkcm9wcGluZyk/IFRoaXMgZG9lc24ndCBzZWVtcyBsaWtlIGEgZ29vZCBsb25nLXRlcm0NCj4g
PiA+PiBzb2x1dGlvbiwgYXQgbGVhc3Qgb25jZSB5b3Ugc3RhcnQgZ2V0dGluZyB0aGlzIHNpbGlj
b24gb3V0IGluIHRoZQ0KPiA+ID4+IHdpbGQuIEF0IHNvbWUgcG9pbnQsIEknZCBleHBlY3QgdG8g
c2VlIGEgc3RhYmxlIGZpbGUgbmFtZS4NCj4gPiA+Pg0KPiA+ID4+IEJyaWFuDQo+ID4gPj4NCj4g
PiA+DQo+ID4gPiBXZSBoYXZlbid0IHlldCBzdWJtaXR0ZWQgYW55IGZpcm13YXJlIGltYWdlIHVw
c3RyZWFtIGZvciA4OTk3DQo+IGNoaXBzZXQuDQo+ID4gPiBwY2lldWFydDg5OTdfY29tYm9fdjQu
YmluL3BjaWV1c2I4OTk3X2NvbWJvX3Y0LmJpbiB3b3VsZCBiZSBvdXINCj4gPiBmaXJtd2FyZSBj
YW5kaWRhdGUgZm9yIHVwc3RyZWFtIHN1Ym1pc3Npb24uIFRoZSBmaWxlbmFtZSB3b3VsZCByZW1h
aW4NCj4gPiBzYW1lIGhlcmVhZnRlci4NCj4gPiA+DQo+ID4gPiBwY2llKjg5OTdfY29tYm9fdjIu
YmluIGhhZCBzdXBwb3J0IG9ubHkgZm9yIEEwIGNoaXBzZXQNCj4gPiA+IHBjaWUqODk5N19jb21i
b192My5iaW4gd2FzIG91ciBpbnRlcm5hbCBkZXZlbG9wbWVudCB2ZXJzaW9uIHdoaWNoDQo+ID4g
PiBoYWQgc3VwcG9ydCBmb3IgQTEgY2hpcHNldCBwY2llKjg5OTdfY29tYm9fdjQuYmluIGhhcyBz
dXBwb3J0IGZvcg0KPiA+ID4gYm90aCBBMA0KPiA+IGFuZCBBMSBjaGlwc2V0cyBhbmQgdGhpcyBp
cyB0aGUgdmVyc2lvbiB0aGF0IHNoYWxsIGJlIHJlbGVhc2VkIHRvDQo+ID4gY3VzdG9tZXJzL3Vw
c3RyZWFtIGZyb20gbm93IG9uLg0KPiA+ID4NCj4gPg0KPiA+IFNlZW1zIHRvIG1lIHRoZW4gaXQg
c2hvdWxkIGp1c3QgYmUgbmFtZWQgcGNpZSo4OTk3X3dsYW4uYmluLiAgQQ0KPiA+IHZlcnNpb24g
bnVtYmVyIHNob3VsZG4ndCBiZSBwYXJ0IG9mIHRoZSBmaWxlIG5hbWUgaW4gdGhpcyBjYXNlLiBI
YXZpbmcNCj4gPiB0byB1cGRhdGUgdGhlIGRyaXZlciBmb3IgYSBmaXJtd2FyZSBuYW1lIGNoYW5n
ZSBpcyBzaWxseS4gTW9zdA0KPiA+IHdpcmVsZXNzIGRyaXZlcnMgaGF2ZSBkaWZmZXJlbnQgbmFt
ZXMgZm9yIGRpZmZlcmVudCBoYXJkd2FyZS9jaGlwIHJldnMNCj4gPiBhbmQvb3IgYW4gaW5jb21w
YXRpYmxlIEFQSSBjaGFuZ2UuICBNb3N0IGRpc3RyaWJ1dGlvbnMgd291bGQgdHlwaWNhbGx5DQo+
ID4gb25seSBjYXJyeSBhIHNpbmdsZSBpbnN0YW5jZSBvZiB0aGUgZmlybXdhcmUgZm9yIGEgcGFy
dGljdWxhciBjaGlwLg0KPiA+IFNwZWFraW5nIGZvciB0aGUgb25lcyBJIHdvcmsgd2l0aCwgSSB1
c3VhbGx5IGtlZXAgdGhlIG9yaWdpbmFsDQo+ID4gZmlsZW5hbWUgaW50YWN0ICh3aXRoIGEgdmVy
c2lvbiBudW1iZXIpIGFuZCBtYWtlIGEgc3ltbGluayB0byBpdCB3aXRoDQo+ID4gdGhlIG5hbWUg
dGhlIGRyaXZlciBleHBlY3RzLiAgZWc6DQo+ID4NCj4gPiBmdy00LmJpbiAtPiBmd192My40LjAu
OTQuYmluDQo+ID4gZndfdjMuMi4wLjE0NC5iaW4NCj4gPiBmd192My40LjAuOTQuYmluDQo+ID4N
Cj4gPiBUaGF0IHdheSBJIGNhbiBrZWVwIHRyYWNrIG9mIHRoZSB2ZXJzaW9uIGluIG15IGZpbGVz
eXN0ZW0sIGJ1dCBJJ20gbm90DQo+ID4gaGFja2luZyB0aGUgZHJpdmVyIGV2ZXJ5IGNvdXBsZSBv
ZiB3ZWVrcy4gIEFuZCB3ZSBkbyBpc3N1ZSBuZXcNCj4gPiBmaXJtd2FyZSBldmVyeSBmZXcgd2Vl
a3MuIEkgY2FuJ3QgaW1hZ2luZSBhc2tpbmcgb3VyIGN1c3RvbWVycyB0byBrZWVwDQo+ID4gdXBk
YXRpbmcgdGhlIGRyaXZlciBmb3IgZWFjaCBmaXJtd2FyZSBlbmhhbmNlbWVudC4NCj4gPg0KPiA+
IElNSE8gY2hhbmdpbmcgdGhlIGRyaXZlciB0byByZW5hbWUgdGhlIGZpcm13YXJlcyBvbiBuZXcg
dmVyc2lvbnMgc2VlbXMNCj4gPiBib3RoIGluY29udmVuaWVudCB0byBwZW9wbGUgdXNpbmcgaXQs
IGFuZCBleHRyYSBub24tdXNlZnVsIGNvbW1pdA0KPiBub2lzZS4NCj4gPg0KPiANCj4gVGhhbmtz
LiBJIGFncmVlIHdpdGggeW91LiBXZSBoYXZlIGFsc28gbWFpbnRhaW5lZCBzaW5nbGUgaW5zdGFu
Y2UvbmFtZQ0KPiBmb3IgYWxsIG91ciBjaGlwc2V0cyBmb3IgbGFzdCBmZXcgeWVhcnMuIFdlIGRv
IHJlbGVhc2UgbmV3IGZpcm13YXJlDQo+IHBlcmlvZGljYWxseSBmb3IgdGhlc2UgY2hpcHNldHMs
IGJ1dCBmaXJtd2FyZSBuYW1lIGFsd2F5cyByZW1haW5zIHRoZQ0KPiBzYW1lLg0KPiANCj4gLS0t
LS0tLS0NCj4gcm9vdEBwZS1sdDk0OTovbGludXgtZmlybXdhcmUvbXJ2bCMgbHMNCj4gcGNpZTg4
OTdfdWFwc3RhLmJpbiAgc2Q4Njg4X2hlbHBlci5iaW4gIHNkODc5N191YXBzdGEuYmluDQo+IHNk
ODg5N191YXBzdGEuYmluICAgdXNiODc5N191YXBzdGEuYmluDQo+IHNkODY4OC5iaW4gICAgICAg
ICAgIHNkODc4N191YXBzdGEuYmluICBzZDg4ODdfdWFwc3RhLmJpbg0KPiB1c2I4NzY2X3VhcHN0
YS5iaW4gIHVzYjg4OTdfdWFwc3RhLmJpbg0KPiAtLS0tLS0tLS0NCj4gDQo+IEl04oCZcyBqdXN0
IHRoYXQgZm9yIG91ciBuZXcgY2hpcHNldCA4OTk3IGZvciB3aGljaCB3ZSBoYXZlbid0IHlldA0K
PiBzdWJtaXR0ZWQgdGhlIGZpcm13YXJlIGltYWdlIHVwc3RyZWFtLCB3ZSB3YW50IHRvIGZpbmFs
aXplIHRoZSBuYW1lIGFzDQo+IHBjaWUqODk5N19jb21ib192NC5iaW4NCj4gDQoNCkNvdWxkIHlv
dSBwbGVhc2UgYWNjZXB0IHRoaXMgcGF0Y2g/DQpJIHdhbnRlZCB0byBzdWJtaXQgb3VyIGZpcnN0
IGZpcm13YXJlIGZvciA4OTk3IGNoaXBzZXQuDQoNClJlZ2FyZHMsDQpBbWl0a3VtYXIgDQo=
Amitkumar Karwar <[email protected]> wrote:
> The patch corrects the revision id register and uses it along with
> magic value and chip version registers to download appropriate firmware
> image.
>
> PCIe8997 Z chipset variant code has been removed, as it won't be used in
> production.
>
> Signed-off-by: Amitkumar Karwar <[email protected]>
Does apply, please rebase:
Applying: mwifiex: PCIe8997 chip specific handling
fatal: sha1 information is lacking or useless (drivers/net/wireless/marvell/mwifiex/pcie.c).
Repository lacks necessary blobs to fall back on 3-way merge.
Cannot fall back to three-way merge.
Patch failed at 0001 mwifiex: PCIe8997 chip specific handling
--
Sent by pwcli
https://patchwork.kernel.org/patch/9252431/
Amitkumar Karwar <[email protected]> writes:
> Hi Kalle,
>
>> -----Original Message-----
>> From: [email protected] [mailto:linux-wireless-
>> [email protected]] On Behalf Of Kalle Valo
>> Sent: Friday, September 09, 2016 2:45 PM
>> To: Amitkumar Karwar
>> Cc: [email protected]; Cathy Luo; Nishant Sarmukadam;
>> Amitkumar Karwar
>> Subject: Re: mwifiex: PCIe8997 chip specific handling
>>
>> Amitkumar Karwar <[email protected]> wrote:
>> > The patch corrects the revision id register and uses it along with
>> > magic value and chip version registers to download appropriate
>> > firmware image.
>> >
>> > PCIe8997 Z chipset variant code has been removed, as it won't be used
>> > in production.
>> >
>> > Signed-off-by: Amitkumar Karwar <[email protected]>
>>
>> Does apply, please rebase:
>>
>> Applying: mwifiex: PCIe8997 chip specific handling
>> fatal: sha1 information is lacking or useless
>> (drivers/net/wireless/marvell/mwifiex/pcie.c).
>> Repository lacks necessary blobs to fall back on 3-way merge.
>> Cannot fall back to three-way merge.
>> Patch failed at 0001 mwifiex: PCIe8997 chip specific handling
>>
>
> The patch now smoothly applies to top of the tree. It had a dependency
> with "mwifiex: add PCIe function level reset support" which is merged.
> Let me know if there is still a problem.
Ok, I applied it now. But if there's a dependency to another patch
please document it after the "---" line, a lot easier that way.
--
Kalle Valo
> From: Kalle Valo [mailto:[email protected]]
> Sent: Friday, September 09, 2016 4:58 PM
> To: Amitkumar Karwar
> Cc: [email protected]; Cathy Luo; Nishant Sarmukadam
> Subject: Re: mwifiex: PCIe8997 chip specific handling
>
> Amitkumar Karwar <[email protected]> writes:
>
> > Hi Kalle,
> >
> >> -----Original Message-----
> >> From: [email protected] [mailto:linux-wireless-
> >> [email protected]] On Behalf Of Kalle Valo
> >> Sent: Friday, September 09, 2016 2:45 PM
> >> To: Amitkumar Karwar
> >> Cc: [email protected]; Cathy Luo; Nishant Sarmukadam;
> >> Amitkumar Karwar
> >> Subject: Re: mwifiex: PCIe8997 chip specific handling
> >>
> >> Amitkumar Karwar <[email protected]> wrote:
> >> > The patch corrects the revision id register and uses it along with
> >> > magic value and chip version registers to download appropriate
> >> > firmware image.
> >> >
> >> > PCIe8997 Z chipset variant code has been removed, as it won't be
> >> > used in production.
> >> >
> >> > Signed-off-by: Amitkumar Karwar <[email protected]>
> >>
> >> Does apply, please rebase:
> >>
> >> Applying: mwifiex: PCIe8997 chip specific handling
> >> fatal: sha1 information is lacking or useless
> >> (drivers/net/wireless/marvell/mwifiex/pcie.c).
> >> Repository lacks necessary blobs to fall back on 3-way merge.
> >> Cannot fall back to three-way merge.
> >> Patch failed at 0001 mwifiex: PCIe8997 chip specific handling
> >>
> >
> > The patch now smoothly applies to top of the tree. It had a dependency
> > with "mwifiex: add PCIe function level reset support" which is merged.
> > Let me know if there is still a problem.
>
> Ok, I applied it now. But if there's a dependency to another patch
> please document it after the "---" line, a lot easier that way.
>
Thanks. Sure. I will use "---" and take care of this for future patches.
Regards,
Amitkumar
SGkgS2FsbGUsDQoNCj4gLS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0NCj4gRnJvbTogbGludXgt
d2lyZWxlc3Mtb3duZXJAdmdlci5rZXJuZWwub3JnIFttYWlsdG86bGludXgtd2lyZWxlc3MtDQo+
IG93bmVyQHZnZXIua2VybmVsLm9yZ10gT24gQmVoYWxmIE9mIEthbGxlIFZhbG8NCj4gU2VudDog
RnJpZGF5LCBTZXB0ZW1iZXIgMDksIDIwMTYgMjo0NSBQTQ0KPiBUbzogQW1pdGt1bWFyIEthcndh
cg0KPiBDYzogbGludXgtd2lyZWxlc3NAdmdlci5rZXJuZWwub3JnOyBDYXRoeSBMdW87IE5pc2hh
bnQgU2FybXVrYWRhbTsNCj4gQW1pdGt1bWFyIEthcndhcg0KPiBTdWJqZWN0OiBSZTogbXdpZmll
eDogUENJZTg5OTcgY2hpcCBzcGVjaWZpYyBoYW5kbGluZw0KPiANCj4gQW1pdGt1bWFyIEthcndh
ciA8YWthcndhckBtYXJ2ZWxsLmNvbT4gd3JvdGU6DQo+ID4gVGhlIHBhdGNoIGNvcnJlY3RzIHRo
ZSByZXZpc2lvbiBpZCByZWdpc3RlciBhbmQgdXNlcyBpdCBhbG9uZyB3aXRoDQo+ID4gbWFnaWMg
dmFsdWUgYW5kIGNoaXAgdmVyc2lvbiByZWdpc3RlcnMgdG8gZG93bmxvYWQgYXBwcm9wcmlhdGUN
Cj4gPiBmaXJtd2FyZSBpbWFnZS4NCj4gPg0KPiA+IFBDSWU4OTk3IFogY2hpcHNldCB2YXJpYW50
IGNvZGUgaGFzIGJlZW4gcmVtb3ZlZCwgYXMgaXQgd29uJ3QgYmUgdXNlZA0KPiA+IGluIHByb2R1
Y3Rpb24uDQo+ID4NCj4gPiBTaWduZWQtb2ZmLWJ5OiBBbWl0a3VtYXIgS2Fyd2FyIDxha2Fyd2Fy
QG1hcnZlbGwuY29tPg0KPiANCj4gRG9lcyBhcHBseSwgcGxlYXNlIHJlYmFzZToNCj4gDQo+IEFw
cGx5aW5nOiBtd2lmaWV4OiBQQ0llODk5NyBjaGlwIHNwZWNpZmljIGhhbmRsaW5nDQo+IGZhdGFs
OiBzaGExIGluZm9ybWF0aW9uIGlzIGxhY2tpbmcgb3IgdXNlbGVzcw0KPiAoZHJpdmVycy9uZXQv
d2lyZWxlc3MvbWFydmVsbC9td2lmaWV4L3BjaWUuYykuDQo+IFJlcG9zaXRvcnkgbGFja3MgbmVj
ZXNzYXJ5IGJsb2JzIHRvIGZhbGwgYmFjayBvbiAzLXdheSBtZXJnZS4NCj4gQ2Fubm90IGZhbGwg
YmFjayB0byB0aHJlZS13YXkgbWVyZ2UuDQo+IFBhdGNoIGZhaWxlZCBhdCAwMDAxIG13aWZpZXg6
IFBDSWU4OTk3IGNoaXAgc3BlY2lmaWMgaGFuZGxpbmcNCj4gDQoNClRoZSBwYXRjaCBub3cgc21v
b3RobHkgYXBwbGllcyB0byB0b3Agb2YgdGhlIHRyZWUuIEl0IGhhZCBhIGRlcGVuZGVuY3kgd2l0
aCAibXdpZmlleDogYWRkIFBDSWUgZnVuY3Rpb24gbGV2ZWwgcmVzZXQgc3VwcG9ydCIgd2hpY2gg
aXMgbWVyZ2VkLg0KTGV0IG1lIGtub3cgaWYgdGhlcmUgaXMgc3RpbGwgYSBwcm9ibGVtLg0KDQpS
ZWdhcmRzLA0KQW1pdGt1bWFyDQo=
Amitkumar Karwar <[email protected]> wrote:
> The patch corrects the revision id register and uses it along with
> magic value and chip version registers to download appropriate firmware
> image.
>
> PCIe8997 Z chipset variant code has been removed, as it won't be used in
> production.
>
> Signed-off-by: Amitkumar Karwar <[email protected]>
Thanks, 1 patch applied to wireless-drivers-next.git:
75696fe70477 mwifiex: PCIe8997 chip specific handling
--
Sent by pwcli
https://patchwork.kernel.org/patch/9252431/