[PATCH v2] rtlwifi: rtl8821ae: fix firmware is not ready to run

[PATCH v2] rtlwifi: rtl8821ae: fix firmware is not ready to run

[pkshih]

From: Ping-Ke Shih <pkshih@realtek.com>

rtl8821ae uses two kinds of firmwares for normal and WoWlan cases, and
each firmware has firmware data buffer and size individually. Original
code always overwrite size of normal firmware rtlpriv->rtlhal.fwsize, and
this mismatch causes firmware checksum error, then firmware can't start.

In this situation, driver gives message "Firmware is not ready to run!".

Fixes: fe89707f0afa ("rtlwifi: rtl8821ae: Simplify loading of WOWLAN firmware")
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
v2: fix commit log typo.
---
 drivers/net/wireless/realtek/rtlwifi/core.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c
index a3f46203ee7a..4bf7967590ca 100644
--- a/drivers/net/wireless/realtek/rtlwifi/core.c
+++ b/drivers/net/wireless/realtek/rtlwifi/core.c
@@ -130,7 +130,6 @@ static void rtl_fw_do_work(const struct firmware *firmware, void *context,
 		       firmware->size);
 		rtlpriv->rtlhal.wowlan_fwsize = firmware->size;
 	}
-	rtlpriv->rtlhal.fwsize = firmware->size;
 	release_firmware(firmware);
 }
 
-- 
2.15.1

Re: [PATCH v2] rtlwifi: rtl8821ae: fix firmware is not ready to run

[Larry Finger]

On 06/27/2018 03:01 AM, pkshih@realtek.com wrote:
> From: Ping-Ke Shih <pkshih@realtek.com>
> 
> rtl8821ae uses two kinds of firmwares for normal and WoWlan cases, and
> each firmware has firmware data buffer and size individually. Original
> code always overwrite size of normal firmware rtlpriv->rtlhal.fwsize, and
> this mismatch causes firmware checksum error, then firmware can't start.
> 
> In this situation, driver gives message "Firmware is not ready to run!".
> 
> Fixes: fe89707f0afa ("rtlwifi: rtl8821ae: Simplify loading of WOWLAN firmware")
> Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
> ---
> v2: fix commit log typo.
> ---
>   drivers/net/wireless/realtek/rtlwifi/core.c | 1 -
>   1 file changed, 1 deletion(-)

This change is a good one, and I approve of it. The only change is that it 
should have a Cc to stable as this code was added in kernel 4.0!

Larry

Re: [PATCH v2] rtlwifi: rtl8821ae: fix firmware is not ready to run

[Pkshih]

T24gV2VkLCAyMDE4LTA2LTI3IGF0IDA4OjM2IC0wNTAwLCBMYXJyeSBGaW5nZXIgd3JvdGU6DQo+
IE9uIDA2LzI3LzIwMTggMDM6MDEgQU0sIHBrc2hpaEByZWFsdGVrLmNvbSB3cm90ZToNCj4gPiBG
cm9tOiBQaW5nLUtlIFNoaWggPHBrc2hpaEByZWFsdGVrLmNvbT4NCj4gPsKgDQo+ID4gcnRsODgy
MWFlIHVzZXMgdHdvIGtpbmRzIG9mIGZpcm13YXJlcyBmb3Igbm9ybWFsIGFuZCBXb1dsYW4gY2Fz
ZXMsIGFuZA0KPiA+IGVhY2ggZmlybXdhcmUgaGFzIGZpcm13YXJlIGRhdGEgYnVmZmVyIGFuZCBz
aXplIGluZGl2aWR1YWxseS4gT3JpZ2luYWwNCj4gPiBjb2RlIGFsd2F5cyBvdmVyd3JpdGUgc2l6
ZSBvZiBub3JtYWwgZmlybXdhcmUgcnRscHJpdi0+cnRsaGFsLmZ3c2l6ZSwgYW5kDQo+ID4gdGhp
cyBtaXNtYXRjaCBjYXVzZXMgZmlybXdhcmUgY2hlY2tzdW0gZXJyb3IsIHRoZW4gZmlybXdhcmUg
Y2FuJ3Qgc3RhcnQuDQo+ID7CoA0KPiA+IEluIHRoaXMgc2l0dWF0aW9uLCBkcml2ZXIgZ2l2ZXMg
bWVzc2FnZSAiRmlybXdhcmUgaXMgbm90IHJlYWR5IHRvIHJ1biEiLg0KPiA+wqANCj4gPiBGaXhl
czogZmU4OTcwN2YwYWZhICgicnRsd2lmaTogcnRsODgyMWFlOiBTaW1wbGlmeSBsb2FkaW5nIG9m
IFdPV0xBTiBmaXJtd2FyZSIpDQo+ID4gU2lnbmVkLW9mZi1ieTogUGluZy1LZSBTaGloIDxwa3No
aWhAcmVhbHRlay5jb20+DQo+ID4gLS0tDQo+ID4gdjI6IGZpeCBjb21taXQgbG9nIHR5cG8uDQo+
ID4gLS0tDQo+ID7CoMKgwqBkcml2ZXJzL25ldC93aXJlbGVzcy9yZWFsdGVrL3J0bHdpZmkvY29y
ZS5jIHwgMSAtDQo+ID7CoMKgwqAxIGZpbGUgY2hhbmdlZCwgMSBkZWxldGlvbigtKQ0KPiANCj4g
VGhpcyBjaGFuZ2UgaXMgYSBnb29kIG9uZSwgYW5kIEkgYXBwcm92ZSBvZiBpdC4gVGhlIG9ubHkg
Y2hhbmdlIGlzIHRoYXQgaXTCoA0KPiBzaG91bGQgaGF2ZSBhIENjIHRvIHN0YWJsZSBhcyB0aGlz
IGNvZGUgd2FzIGFkZGVkIGluIGtlcm5lbCA0LjAhDQo+IA0KSSdsbCBDYyB0byBzdGFibGUgaW4g
djMuDQoNClRoYW5rcw0KUEsNCg0K