[OpenWrt-Devel] [PATCH] mac80211: install new firmware for ath9k-htc on target

[Alexey Brodkin]

For quite some time new firmware for ath9k-htc devices
is available in
http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/tree/ath9k_htc/

Moreover ath9k-htc kernel driver expects this new v1.4
firmware to exist in /lib/firmware/ath9k_htc.

What happens currently:
---------------------------->8--------------------------
[ 7.830000] usb 1-1: ath9k_htc: Firmware ath9k_htc/htc_9271-1.4.0.fw
requested
[ 7.840000] usb 1-1: Direct firmware load for
ath9k_htc/htc_9271-1.4.0.fw failed with error -2
[ 7.850000] usb 1-1: Falling back to user helper
[ 7.870000] usbcore: registered new interface driver ath9k_htc
[ 7.880000] firmware ath9k_htc!htc_9271-1.4.0.fw:
firmware_loading_store: map pages failed
[ 7.890000] usb 1-1: ath9k_htc: Firmware htc_9271.fw requested
[ 8.200000] usb 1-1: ath9k_htc: Transferred FW: htc_9271.fw, size:
50980
[ 8.440000] ath9k_htc 1-1:1.0: ath9k_htc: HTC initialized with 33
credits
[ 10.720000] ath9k_htc 1-1:1.0: ath9k_htc: FW Version: 1.3
[ 10.740000] ath9k_htc 1-1:1.0: FW RMW support: Off
[ 10.760000] ieee80211 phy0: Atheros AR9271 Rev:1
---------------------------->8--------------------------

And with that patch new firmware is used instead:
---------------------------->8--------------------------
[ 33.920000] usb 1-1: ath9k_htc: Firmware ath9k_htc/htc_9271-1.4.0.fw
requested
[ 34.230000] usb 1-1: ath9k_htc: Transferred FW:
ath9k_htc/htc_9271-1.4.0.fw, size: 51008
[ 34.480000] ath9k_htc 1-1:1.0: ath9k_htc: HTC initialized with 33
credits
[ 34.740000] ath9k_htc 1-1:1.0: ath9k_htc: FW Version: 1.4
[ 34.750000] ath9k_htc 1-1:1.0: FW RMW support: On
---------------------------->8--------------------------

Signed-off-by: Alexey Brodkin <***@synopsys.com>
Cc: Felix Fietkau <***@openwrt.org>
---
package/kernel/mac80211/Makefile | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index 4b4f774..7165fc3 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -1828,6 +1828,11 @@ define KernelPackage/ath9k-htc/install
$(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/htc_9271.fw \
$(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/htc_7010.fw \
$(1)/lib/firmware/
+ $(INSTALL_DIR) $(1)/lib/firmware/ath9k_htc
+ $(INSTALL_DATA) \
+ $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ath9k_htc/htc_9271-1.4.0.fw \
+ $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ath9k_htc/htc_7010-1.4.0.fw \
+ $(1)/lib/firmware/ath9k_htc
endef

define KernelPackage/b43/install

[Hauke Mehrtens]

Post by Alexey Brodkin
For quite some time new firmware for ath9k-htc devices
is available in
http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/tree/ath9k_htc/
Moreover ath9k-htc kernel driver expects this new v1.4
firmware to exist in /lib/firmware/ath9k_htc.
---------------------------->8--------------------------
[ 7.830000] usb 1-1: ath9k_htc: Firmware ath9k_htc/htc_9271-1.4.0.fw
requested
[ 7.840000] usb 1-1: Direct firmware load for
ath9k_htc/htc_9271-1.4.0.fw failed with error -2
[ 7.850000] usb 1-1: Falling back to user helper
[ 7.870000] usbcore: registered new interface driver ath9k_htc
firmware_loading_store: map pages failed
[ 7.890000] usb 1-1: ath9k_htc: Firmware htc_9271.fw requested
50980
[ 8.440000] ath9k_htc 1-1:1.0: ath9k_htc: HTC initialized with 33
credits
[ 10.720000] ath9k_htc 1-1:1.0: ath9k_htc: FW Version: 1.3
[ 10.740000] ath9k_htc 1-1:1.0: FW RMW support: Off
[ 10.760000] ieee80211 phy0: Atheros AR9271 Rev:1
---------------------------->8--------------------------
---------------------------->8--------------------------
[ 33.920000] usb 1-1: ath9k_htc: Firmware ath9k_htc/htc_9271-1.4.0.fw
requested
ath9k_htc/htc_9271-1.4.0.fw, size: 51008
[ 34.480000] ath9k_htc 1-1:1.0: ath9k_htc: HTC initialized with 33
credits
[ 34.740000] ath9k_htc 1-1:1.0: ath9k_htc: FW Version: 1.4
[ 34.750000] ath9k_htc 1-1:1.0: FW RMW support: On
---------------------------->8--------------------------
---
package/kernel/mac80211/Makefile | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index 4b4f774..7165fc3 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -1828,6 +1828,11 @@ define KernelPackage/ath9k-htc/install
$(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/htc_9271.fw \
$(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/htc_7010.fw \
$(1)/lib/firmware/
+ $(INSTALL_DIR) $(1)/lib/firmware/ath9k_htc
+ $(INSTALL_DATA) \
+ $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ath9k_htc/htc_9271-1.4.0.fw \
+ $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ath9k_htc/htc_7010-1.4.0.fw \
+ $(1)/lib/firmware/ath9k_htc
endef
define KernelPackage/b43/install

...

Are the old files needed by this driver any more? If the new firmware
files are supporting all devices which are supported by the old ones,
please do not include the old firmware files any more.

Hauke

[Felix Fietkau]

Post by Alexey Brodkin
For quite some time new firmware for ath9k-htc devices
is available in
http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/tree/ath9k_htc/
Moreover ath9k-htc kernel driver expects this new v1.4
firmware to exist in /lib/firmware/ath9k_htc.
[...]
package/kernel/mac80211/Makefile | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index 4b4f774..7165fc3 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -1828,6 +1828,11 @@ define KernelPackage/ath9k-htc/install
$(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/htc_9271.fw \
$(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/htc_7010.fw \
$(1)/lib/firmware/
+ $(INSTALL_DIR) $(1)/lib/firmware/ath9k_htc
+ $(INSTALL_DATA) \
+ $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ath9k_htc/htc_9271-1.4.0.fw \
+ $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ath9k_htc/htc_7010-1.4.0.fw \
+ $(1)/lib/firmware/ath9k_htc
endef

...

Please remove the install commands for the old firmware.

- Felix