From: "Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>
To: Kalle Valo <kvalo@kernel.org>
Cc: Johannes Berg <johannes.berg@intel.com>,
Michael Nemanov <michael.nemanov@ti.com>,
linux-kernel@vger.kernel.org, linux-wireless@vger.kernel.org
Subject: [PATCH wireless-next 8/8] wifi: wl18xx: allow firmwares > 8.9.0.x.58
Date: Tue, 28 May 2024 10:18:17 +0100 [thread overview]
Message-ID: <E1sBsyH-00E8w6-Vu@rmk-PC.armlinux.org.uk> (raw)
In-Reply-To: <ZlWhH4HleGILuUtN@shell.armlinux.org.uk>
wlcore firmware versions are structured thusly:
chip.if-type.major.sub-type.minor
e.g. 8 9 0 0 58
With WL18xx ignoring the major firmware version, looking for a
firmware version that conforms to:
chip >= 8
if-type >= 9
major (don't care)
sub-type (don't care)
minor >= 58
Each test is satisfied if the value read from the firmware is greater
than the minimum, but if it is equal (or we don't care about the
field), then the next field is checked.
Thus it doesn't recognise 8.9.1.x.0 as being newer than 8.9.0.x.58
since the major and sub-type numbers are "don't care" and the minor
needs to be greater or equal to 58.
We need to change the major version from "ignore" to "0" for this later
firmware to be correctly detected, and allow the dual-firmware version
support to work.
Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
---
drivers/net/wireless/ti/wl18xx/wl18xx.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ti/wl18xx/wl18xx.h b/drivers/net/wireless/ti/wl18xx/wl18xx.h
index 7fed96d71b27..de6c671c4be6 100644
--- a/drivers/net/wireless/ti/wl18xx/wl18xx.h
+++ b/drivers/net/wireless/ti/wl18xx/wl18xx.h
@@ -13,7 +13,7 @@
/* minimum FW required for driver */
#define WL18XX_CHIP_VER 8
#define WL18XX_IFTYPE_VER 9
-#define WL18XX_MAJOR_VER WLCORE_FW_VER_IGNORE
+#define WL18XX_MAJOR_VER 0
#define WL18XX_SUBTYPE_VER WLCORE_FW_VER_IGNORE
#define WL18XX_MINOR_VER 58
--
2.30.2
prev parent reply other threads:[~2024-05-28 9:18 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-28 9:17 [PATCH wireless-next 0/8] wifi: TI wilink8 updates Russell King (Oracle)
2024-05-28 9:17 ` [PATCH wireless-next 1/8] wifi: wlcore: correctness fix fwlog reading Russell King (Oracle)
2024-06-18 10:22 ` Kalle Valo
2024-05-28 9:17 ` [PATCH wireless-next 2/8] wifi: wl18xx: make wl18xx_tx_immediate_complete() more efficient Russell King (Oracle)
2024-05-28 9:17 ` [PATCH wireless-next 3/8] wifi: wlcore: improve code in wlcore_fw_status() Russell King (Oracle)
2024-05-28 9:17 ` [PATCH wireless-next 4/8] wifi: wlcore: pass "status" to wlcore_hw_convert_fw_status() Russell King (Oracle)
2024-05-29 13:15 ` Nemanov, Michael
2024-05-29 13:31 ` Russell King (Oracle)
2024-05-28 9:18 ` [PATCH wireless-next 5/8] wifi: wlcore: store AP encryption key type Russell King (Oracle)
2024-05-28 9:18 ` [PATCH wireless-next 6/8] wifi: wlcore: add pn16 support Russell King (Oracle)
2024-05-30 8:06 ` [EXTERNAL] " Nemanov, Michael
2024-05-30 8:20 ` Russell King (Oracle)
2024-05-30 12:25 ` Nemanov, Michael
2024-05-30 12:46 ` Nemanov, Michael
2024-05-28 9:18 ` [PATCH wireless-next 7/8] wifi: wl18xx: add support for reading 8.9.1 fw status Russell King (Oracle)
2024-05-28 9:18 ` Russell King (Oracle) [this message]
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=E1sBsyH-00E8w6-Vu@rmk-PC.armlinux.org.uk \
--to=rmk+kernel@armlinux.org.uk \
--cc=johannes.berg@intel.com \
--cc=kvalo@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=michael.nemanov@ti.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
all inboxes | Powered by JetHome®