master firmware version bumped to 1.4; 1.3 branched

[Eugene Krasnikov]

Hi,

Finally firmware for AR7010 and AR9271 is opensourced
https://github.com/KrasnikovEugene/open-ath9k-htc-firmware. Unfortunately
ath9k_htc driver does not support it yet because the version of opensource
fw is changed to 1.4. Driver must be updated to support both firmwares at
the same time.

Suggestion is to change the way driver check supported fw version like this:

diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.h
b/drivers/net/wireless/ath/ath9k/hif_usb.h
index 51496e7..3edcb93 100644
--- a/drivers/net/wireless/ath/ath9k/hif_usb.h
+++ b/drivers/net/wireless/ath/ath9k/hif_usb.h
@@ -19,6 +19,7 @@

 #define MAJOR_VERSION_REQ 1
 #define MINOR_VERSION_REQ 3
+#define MINOR_VERSION_OPEN_REQ 4

 #define IS_AR7010_DEVICE(_v) (((_v) == AR9280_USB) || ((_v) ==
AR9287_USB))

diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
index 716058b..7979bcf 100644
--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
+++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -796,7 +796,8 @@ static int ath9k_init_firmware_version(struct
ath9k_htc_priv *priv)
      * required version.
      */
     if (priv->fw_version_major != MAJOR_VERSION_REQ ||
-        priv->fw_version_minor != MINOR_VERSION_REQ) {
+        (priv->fw_version_minor != MINOR_VERSION_REQ &&
+        priv->fw_version_minor != MINOR_VERSION_OPEN_REQ)) {
         dev_err(priv->dev, "ath9k_htc: Please upgrade to FW version
%d.%d\n",
             MAJOR_VERSION_REQ, MINOR_VERSION_REQ);
         return -EINVAL;


2013/4/1 Adrian Chadd <adrian at freebsd.org>

> HIya,
>
> * I've branched 1.3 off of master;
> * The master firmware version for magpie/k2 is now 1.4, so ath9k_htc
> will need patching;
> * I've merged in the first round of build fixes.
>
> So!
>
> * Would someone please submit a fix to ath9k_htc to accept 1.3 and 1.4
> firmware? I don't plan on breaking the firmware API during 1.4.
> * I'd really appreciate some more testing of the build fixes in
> master. There's another round of changes that I'm going to review now
> and I'd like to make sure we have those tested as well.
>
> Thanks!
>
>
>
> Adrian
>
> _______________________________________________
> Ath9k_htc_fw mailing list
> Ath9k_htc_fw at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/ath9k_htc_fw
>



-- 
Best regards,
Eugene
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.infradead.org/pipermail/ath9k_htc_fw/attachments/20130404/5e1d3769/attachment-0001.html>