Commit 1d896604 authored by Sascha Hauer's avatar Sascha Hauer Committed by Kalle Valo
Browse files

wifi: rtw88: print firmware type in info message 



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: default avatarSascha Hauer <s.hauer@pengutronix.de>
Reviewed-by: default avatarPing-Ke Shih <pkshih@realtek.com>
Signed-off-by: default avatarKalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20221202081224.2779981-2-s.hauer@pengutronix.de
parent a0e78d5c

drivers/net/wireless/realtek/rtw88/main.c

+3 −1
Original line number Diff line number Diff line
@@ -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);

drivers/net/wireless/realtek/rtw88/main.h

+1 −0
Original line number Diff line number Diff line
@@ -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 {