[PATCH rtw-next v2] wifi: rtw88: Fill fw_version member of struct wiphy

[PATCH rtw-next v2] wifi: rtw88: Fill fw_version member of struct wiphy

[Bitterblue Smith]

Let userspace tools like lshw show the firmware version by filling the
fw_version member of struct wiphy.

Before:

configuration: broadcast=yes driver=rtw88_8814au
driverversion=6.19.6-arch1-1 firmware=N/A link=no multicast=yes
wireless=IEEE 802.11

After:

configuration: broadcast=yes driver=rtw88_8814au
driverversion=6.19.6-arch1-1 firmware=33.6.0 link=no multicast=yes
wireless=IEEE 802.11

Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
---
v2:
 - Use local wiphy variable.
---
 drivers/net/wireless/realtek/rtw88/main.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c
index c4f9758b4e96..cd9254370fcc 100644
--- a/drivers/net/wireless/realtek/rtw88/main.c
+++ b/drivers/net/wireless/realtek/rtw88/main.c
@@ -1805,6 +1805,7 @@ static void rtw_load_firmware_cb(const struct firmware *firmware, void *context)
 {
 	struct rtw_fw_state *fw = context;
 	struct rtw_dev *rtwdev = fw->rtwdev;
+	struct wiphy *wiphy = rtwdev->hw->wiphy;
 
 	if (!firmware || !firmware->data) {
 		rtw_err(rtwdev, "failed to request firmware\n");
@@ -1819,6 +1820,11 @@ static void rtw_load_firmware_cb(const struct firmware *firmware, void *context)
 	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);
+
+	if (fw->type == RTW_NORMAL_FW)
+		snprintf(wiphy->fw_version, sizeof(wiphy->fw_version),
+			 "%u.%u.%u",
+			 fw->version, fw->sub_version, fw->sub_index);
 }
 
 static int rtw_load_firmware(struct rtw_dev *rtwdev, enum rtw_fw_type type)
-- 
2.53.0

Re: [PATCH rtw-next v2] wifi: rtw88: Fill fw_version member of struct wiphy

[Jeff Johnson]

On 3/26/2026 8:21 AM, Bitterblue Smith wrote:
> Let userspace tools like lshw show the firmware version by filling the
> fw_version member of struct wiphy.
> 
> Before:
> 
> configuration: broadcast=yes driver=rtw88_8814au
> driverversion=6.19.6-arch1-1 firmware=N/A link=no multicast=yes
> wireless=IEEE 802.11
> 
> After:
> 
> configuration: broadcast=yes driver=rtw88_8814au
> driverversion=6.19.6-arch1-1 firmware=33.6.0 link=no multicast=yes
> wireless=IEEE 802.11
> 
> Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
> ---
> v2:
>  - Use local wiphy variable.
> ---
>  drivers/net/wireless/realtek/rtw88/main.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c
> index c4f9758b4e96..cd9254370fcc 100644
> --- a/drivers/net/wireless/realtek/rtw88/main.c
> +++ b/drivers/net/wireless/realtek/rtw88/main.c
> @@ -1805,6 +1805,7 @@ static void rtw_load_firmware_cb(const struct firmware *firmware, void *context)
>  {
>  	struct rtw_fw_state *fw = context;
>  	struct rtw_dev *rtwdev = fw->rtwdev;
> +	struct wiphy *wiphy = rtwdev->hw->wiphy;
>  
>  	if (!firmware || !firmware->data) {
>  		rtw_err(rtwdev, "failed to request firmware\n");
> @@ -1819,6 +1820,11 @@ static void rtw_load_firmware_cb(const struct firmware *firmware, void *context)
>  	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);
> +
> +	if (fw->type == RTW_NORMAL_FW)
> +		snprintf(wiphy->fw_version, sizeof(wiphy->fw_version),
> +			 "%u.%u.%u",
> +			 fw->version, fw->sub_version, fw->sub_index);
>  }
>  
>  static int rtw_load_firmware(struct rtw_dev *rtwdev, enum rtw_fw_type type)

generically speaking how useful is this?
with MLO and multi-radio wiphy there can be multiple underlying hardware with
different firmware versions. in recent ath drivers we are not filling this.

/jeff

RE: [PATCH rtw-next v2] wifi: rtw88: Fill fw_version member of struct wiphy

[Ping-Ke Shih]

Jeff Johnson <jeff.johnson@oss.qualcomm.com> wrote:
> 
> On 3/26/2026 8:21 AM, Bitterblue Smith wrote:
> > Let userspace tools like lshw show the firmware version by filling the
> > fw_version member of struct wiphy.
> >
> > Before:
> >
> > configuration: broadcast=yes driver=rtw88_8814au
> > driverversion=6.19.6-arch1-1 firmware=N/A link=no multicast=yes
> > wireless=IEEE 802.11
> >
> > After:
> >
> > configuration: broadcast=yes driver=rtw88_8814au
> > driverversion=6.19.6-arch1-1 firmware=33.6.0 link=no multicast=yes
> > wireless=IEEE 802.11
> >
> > Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>
> > ---
> > v2:
> >  - Use local wiphy variable.
> > ---
> >  drivers/net/wireless/realtek/rtw88/main.c | 6 ++++++
> >  1 file changed, 6 insertions(+)
> >
> > diff --git a/drivers/net/wireless/realtek/rtw88/main.c
> b/drivers/net/wireless/realtek/rtw88/main.c
> > index c4f9758b4e96..cd9254370fcc 100644
> > --- a/drivers/net/wireless/realtek/rtw88/main.c
> > +++ b/drivers/net/wireless/realtek/rtw88/main.c
> > @@ -1805,6 +1805,7 @@ static void rtw_load_firmware_cb(const struct firmware
> *firmware, void *context)
> >  {
> >       struct rtw_fw_state *fw = context;
> >       struct rtw_dev *rtwdev = fw->rtwdev;
> > +     struct wiphy *wiphy = rtwdev->hw->wiphy;
> >
> >       if (!firmware || !firmware->data) {
> >               rtw_err(rtwdev, "failed to request firmware\n");
> > @@ -1819,6 +1820,11 @@ static void rtw_load_firmware_cb(const struct firmware
> *firmware, void *context)
> >       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);
> > +
> > +     if (fw->type == RTW_NORMAL_FW)
> > +             snprintf(wiphy->fw_version, sizeof(wiphy->fw_version),
> > +                      "%u.%u.%u",
> > +                      fw->version, fw->sub_version, fw->sub_index);
> >  }
> >
> >  static int rtw_load_firmware(struct rtw_dev *rtwdev, enum rtw_fw_type type)
> 
> generically speaking how useful is this?
> with MLO and multi-radio wiphy there can be multiple underlying hardware with
> different firmware versions. in recent ath drivers we are not filling this.

Thanks for the info.

Realtek WiFi has single one firmware version, I'd check firmware version by
kernel log personally. By commit message, Bitterblue uses lshw tool to read
the version, and I personally don't object this patch.

Ping-Ke

Re: [PATCH rtw-next v2] wifi: rtw88: Fill fw_version member of struct wiphy

[Ping-Ke Shih]

Bitterblue Smith <rtl8821cerfe2@gmail.com> wrote:

> Let userspace tools like lshw show the firmware version by filling the
> fw_version member of struct wiphy.
> 
> Before:
> 
> configuration: broadcast=yes driver=rtw88_8814au
> driverversion=6.19.6-arch1-1 firmware=N/A link=no multicast=yes
> wireless=IEEE 802.11
> 
> After:
> 
> configuration: broadcast=yes driver=rtw88_8814au
> driverversion=6.19.6-arch1-1 firmware=33.6.0 link=no multicast=yes
> wireless=IEEE 802.11
> 
> Signed-off-by: Bitterblue Smith <rtl8821cerfe2@gmail.com>

1 patch(es) applied to rtw-next branch of rtw.git, thanks.

249716daa995 wifi: rtw88: Fill fw_version member of struct wiphy

---
https://github.com/pkshih/rtw.git