From: Sascha Hauer <s.hauer@pengutronix.de>
To: linux-wireless@vger.kernel.org
Cc: Neo Jou <neojou@gmail.com>, Hans Ulli Kroll <linux@ulli-kroll.de>,
Ping-Ke Shih <pkshih@realtek.com>,
Yan-Hsuan Chuang <tony0620emma@gmail.com>,
Kalle Valo <kvalo@kernel.org>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
kernel@pengutronix.de, Johannes Berg <johannes@sipsolutions.net>,
Alexander Hochbaum <alex@appudo.com>, Da Xue <da@libre.computer>,
Po-Hao Huang <phhuang@realtek.com>,
Viktor Petrenko <g0000ga@gmail.com>,
Sascha Hauer <s.hauer@pengutronix.de>
Subject: [PATCH v4 01/11] wifi: rtw88: print firmware type in info message
Date: Tue, 29 Nov 2022 11:07:44 +0100 [thread overview]
Message-ID: <20221129100754.2753237-2-s.hauer@pengutronix.de> (raw)
In-Reply-To: <20221129100754.2753237-1-s.hauer@pengutronix.de>
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>
---
Notes:
Changes since v2:
- new patch
drivers/net/wireless/realtek/rtw88/main.c | 4 +++-
drivers/net/wireless/realtek/rtw88/main.h | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
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 {
--
2.30.2
next prev parent reply other threads:[~2022-11-29 10:08 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-29 10:07 [PATCH v4 00/11] RTW88: Add support for USB variants Sascha Hauer
2022-11-29 10:07 ` Sascha Hauer [this message]
2022-11-29 10:07 ` [PATCH v4 02/11] wifi: rtw88: Call rtw_fw_beacon_filter_config() with rtwdev->mutex held Sascha Hauer
2022-11-29 10:07 ` [PATCH v4 03/11] wifi: rtw88: Drop rf_lock Sascha Hauer
2022-11-29 10:07 ` [PATCH v4 04/11] wifi: rtw88: Drop h2c.lock Sascha Hauer
2022-11-29 10:07 ` [PATCH v4 05/11] wifi: rtw88: Drop coex mutex Sascha Hauer
2022-11-29 10:07 ` [PATCH v4 06/11] wifi: rtw88: iterate over vif/sta list non-atomically Sascha Hauer
2022-11-29 10:07 ` [PATCH v4 07/11] wifi: rtw88: Add common USB chip support Sascha Hauer
2022-11-30 1:40 ` Ping-Ke Shih
2022-11-30 8:13 ` Sascha Hauer
2022-11-30 8:35 ` Ping-Ke Shih
2022-11-29 10:07 ` [PATCH v4 08/11] wifi: rtw88: Add rtw8821cu chipset support Sascha Hauer
2022-11-29 16:17 ` Jakub Kicinski
2022-11-29 16:59 ` Larry Finger
2022-12-08 14:21 ` Kalle Valo
2022-12-09 3:17 ` Ping-Ke Shih
2022-12-02 8:09 ` Sascha Hauer
2022-12-02 12:36 ` Kalle Valo
2022-11-29 10:07 ` [PATCH v4 09/11] wifi: rtw88: Add rtw8822bu " Sascha Hauer
2022-11-29 10:07 ` [PATCH v4 10/11] wifi: rtw88: Add rtw8822cu " Sascha Hauer
2022-11-29 10:07 ` [PATCH v4 11/11] wifi: rtw88: Add rtw8723du " Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221129100754.2753237-2-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=alex@appudo.com \
--cc=da@libre.computer \
--cc=g0000ga@gmail.com \
--cc=johannes@sipsolutions.net \
--cc=kernel@pengutronix.de \
--cc=kvalo@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linux@ulli-kroll.de \
--cc=martin.blumenstingl@googlemail.com \
--cc=neojou@gmail.com \
--cc=netdev@vger.kernel.org \
--cc=phhuang@realtek.com \
--cc=pkshih@realtek.com \
--cc=tony0620emma@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).