| Message ID | 20221202081224.2779981-2-s.hauer@pengutronix.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1d89660494402168565e0637268486ae28bad642 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | RTW88: Add support for USB variants | expand |
Sascha Hauer <s.hauer@pengutronix.de> wrote: > It's confusing to read two different firmware versions in the syslog > for the same device: > > rtw_8822cu 2-1:1.2: Firmware version 9.9.4, H2C version 15 > rtw_8822cu 2-1:1.2: Firmware version 9.9.11, H2C version 15 > > Print the firmware type in this message to make clear these are really > two different firmwares for different purposes: > > rtw_8822cu 1-1.4:1.2: WOW Firmware version 9.9.4, H2C version 15 > rtw_8822cu 1-1.4:1.2: Firmware version 9.9.11, H2C version 15 > > Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> > Reviewed-by: Ping-Ke Shih <pkshih@realtek.com> 11 patches applied to wireless-next.git, thanks. 1d8966049440 wifi: rtw88: print firmware type in info message 69020957bcb7 wifi: rtw88: Call rtw_fw_beacon_filter_config() with rtwdev->mutex held d57ca103e54e wifi: rtw88: Drop rf_lock 1e2701f4079a wifi: rtw88: Drop h2c.lock 8647f7f0b908 wifi: rtw88: Drop coex mutex 78d5bf925f30 wifi: rtw88: iterate over vif/sta list non-atomically a82dfd33d123 wifi: rtw88: Add common USB chip support aff5ffd718de wifi: rtw88: Add rtw8821cu chipset support 45794099f5e1 wifi: rtw88: Add rtw8822bu chipset support 07cef03b8d44 wifi: rtw88: Add rtw8822cu chipset support 87caeef032fc wifi: rtw88: Add rtw8723du chipset support
diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c index 67151dbf83842..a7331872e8530 100644 --- a/drivers/net/wireless/realtek/rtw88/main.c +++ b/drivers/net/wireless/realtek/rtw88/main.c @@ -1731,7 +1731,8 @@ static void rtw_load_firmware_cb(const struct firmware *firmware, void *context) update_firmware_info(rtwdev, fw); complete_all(&fw->completion); - rtw_info(rtwdev, "Firmware version %u.%u.%u, H2C version %u\n", + rtw_info(rtwdev, "%sFirmware version %u.%u.%u, H2C version %u\n", + fw->type == RTW_WOWLAN_FW ? "WOW " : "", fw->version, fw->sub_version, fw->sub_index, fw->h2c_version); } @@ -1757,6 +1758,7 @@ static int rtw_load_firmware(struct rtw_dev *rtwdev, enum rtw_fw_type type) return -ENOENT; } + fw->type = type; fw->rtwdev = rtwdev; init_completion(&fw->completion); diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h index bccd7b28f60c7..6e5875f6d07f4 100644 --- a/drivers/net/wireless/realtek/rtw88/main.h +++ b/drivers/net/wireless/realtek/rtw88/main.h @@ -1851,6 +1851,7 @@ struct rtw_fw_state { u16 h2c_version; u32 feature; u32 feature_ext; + enum rtw_fw_type type; }; enum rtw_sar_sources {