diff mbox

[OpenWrt-Devel,4/7] mac80211: refresh Intel firmware

Message ID 1440327391-25355-5-git-send-email-dirkneukirchen@web.de
State Superseded
Headers show

Commit Message

Dirk Neukirchen Aug. 23, 2015, 10:56 a.m. UTC 
- sort firmware
- add newer firmware for Intel chipsets
- newer Intel MVM require firmware
- ucode 13 requires Kernel 4.1+

only compile tested

Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>
---
 package/kernel/mac80211/Makefile | 198 ++++++++++++++++++++++++++-------------
 1 file changed, 133 insertions(+), 65 deletions(-)

Comments

Hauke Mehrtens Aug. 23, 2015, 8:17 p.m. UTC | #1 
On 08/23/2015 12:56 PM, Dirk Neukirchen wrote:
> - sort firmware
> - add newer firmware for Intel chipsets
> - newer Intel MVM require firmware
> - ucode 13 requires Kernel 4.1+
> 
> only compile tested

Have you looked if this would close any open feature requests / issues
in OpenWrt trac?

> Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>
> ---
>  package/kernel/mac80211/Makefile | 198 ++++++++++++++++++++++++++-------------
>  1 file changed, 133 insertions(+), 65 deletions(-)
> 
> +
> +	config IWL3160_FW
> +		bool "Intel 3160 Firmware"
> +		default y
> +		help
> +		  Download and install firmware for:
> +		    Intel Wireless WiFi 3160
> +
> +	config IWL3160_13_FW
> +		bool "Intel 3160 Firmware ucode 13 (4.1+)"
> +		default y
> +		depends on LINUX_4_1
> +		help
> +		  Download and install firmware for:
> +		    Intel Wireless WiFi 3160

Does this really depend on the kernel version and not on the iwl driver
version? OpenWrt uses the driver from a very recent wireless tree, so it
should be equivalent to something between 4.2 and 4.3 now.

I would suggest just using the most recent firmware files for the Intel
wifi devices.

Hauke
Dirk Neukirchen Aug. 24, 2015, 4:12 p.m. UTC | #2 
On 23.08.2015 22:17, Hauke Mehrtens wrote:
> 
> 
> On 08/23/2015 12:56 PM, Dirk Neukirchen wrote:
>> - sort firmware
>> - add newer firmware for Intel chipsets
>> - newer Intel MVM require firmware
>> - ucode 13 requires Kernel 4.1+
>>
>> only compile tested
> 
> Have you looked if this would close any open feature requests / issues
> in OpenWrt trac?
> 

The first patch that adds IWLMVM should fix 
https://dev.openwrt.org/ticket/19459

Forum users try to use Intel cards - example:
https://forum.openwrt.org/viewtopic.php?id=54488
Also more IWLMVM symbol then firmware issues

>> Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>
>> ---
>>  package/kernel/mac80211/Makefile | 198 ++++++++++++++++++++++++++-------------
>>  1 file changed, 133 insertions(+), 65 deletions(-)
>>
>> +
>> +	config IWL3160_FW
>> +		bool "Intel 3160 Firmware"
>> +		default y
>> +		help
>> +		  Download and install firmware for:
>> +		    Intel Wireless WiFi 3160
>> +
>> +	config IWL3160_13_FW
>> +		bool "Intel 3160 Firmware ucode 13 (4.1+)"
>> +		default y
>> +		depends on LINUX_4_1
>> +		help
>> +		  Download and install firmware for:
>> +		    Intel Wireless WiFi 3160
> 
> Does this really depend on the kernel version and not on the iwl driver
> version? OpenWrt uses the driver from a very recent wireless tree, so it
> should be equivalent to something between 4.2 and 4.3 now.
> 
> I would suggest just using the most recent firmware files for the Intel
> wifi devices.
> 
I submitted an updated version of the patch - the kernel "version" only
means that the driver has *some* (?) git commits and a bump in the ABI version

Intel has some changelog for their firmware but the linux-firmware commits dont contain these.
Sometimes other firmware repos contain these but those differ from main linux-firmware
( https://chromium.googlesource.com/chromiumos/third_party/linux-firmware/ has ucode-14 
and sometimes include changelogs )

> Hauke
>
diff mbox

Patch

diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
index a3ecb5b..f2ea123 100644
--- a/package/kernel/mac80211/Makefile
+++ b/package/kernel/mac80211/Makefile
@@ -838,12 +838,84 @@  define KernelPackage/iwlagn
 endef
 
 define KernelPackage/iwlagn/description
- iwlagn kernel module for Intel 5000/5150/1000/6000/6050/6005/6030/100 support
+ iwlagn kernel module for
+ Intel Wireless WiFi Link 6250AGN Adapter
+ Intel 6000 Series Wi-Fi Adapters (6200AGN and 6300AGN)
+ Intel WiFi Link 1000BGN
+ Intel Wireless WiFi 5150AGN
+ Intel Wireless WiFi 5100AGN, 5300AGN, and 5350AGN
+ Intel 6005 Series Wi-Fi Adapters
+ Intel 6030 Series Wi-Fi Adapters
+ Intel Wireless WiFi Link 6150BGN 2 Adapter
+ Intel 100 Series Wi-Fi Adapters (100BGN and 130BGN)
+ Intel 2000 Series Wi-Fi Adapters
+ Intel 7260 Wi-Fi Adapter
+ Intel 3160 Wi-Fi Adapter
+ Intel 7265 Wi-Fi Adapter
+ Intel 8260 Wi-Fi Adapter
+ Intel 3165 Wi-Fi Adapter
 endef
 
 define KernelPackage/iwlagn/config
   if PACKAGE_kmod-iwlagn
 
+	config IWL100_FW
+		bool "Intel 100 Firmware"
+		default y
+		help
+		  Download and install firmware for:
+		    Intel Centrino Wireless-N 100
+
+	config IWL1000_FW
+		bool "Intel 1000 Firmware"
+		default y
+		help
+		  Download and install firmware for:
+		    Intel Centrino Wireless-N 1000
+
+	config IWL105_FW
+		bool "Intel 105 Firmware"
+		default y
+		help
+		  Download and install firmware for:
+		    Intel Centrino Wireless-N 105
+
+	config IWL135_FW
+		bool "Intel 135 Firmware"
+		default y
+		help
+		  Download and install firmware for:
+		    Intel Centrino Wireless-N 135
+
+	config IWL2000_FW
+		bool "Intel 2000 Firmware"
+		default y
+		help
+		  Download and install firmware for:
+		    Intel Centrino Wireless-N 2200
+
+	config IWL2030_FW
+		bool "Intel 2030 Firmware"
+		default y
+		help
+		  Download and install firmware for:
+		    Intel Centrino Wireless-N 2230
+
+	config IWL3160_FW
+		bool "Intel 3160 Firmware"
+		default y
+		help
+		  Download and install firmware for:
+		    Intel Wireless WiFi 3160
+
+	config IWL3160_13_FW
+		bool "Intel 3160 Firmware ucode 13 (4.1+)"
+		default y
+		depends on LINUX_4_1
+		help
+		  Download and install firmware for:
+		    Intel Wireless WiFi 3160
+
 	config IWL5000_FW
 		bool "Intel 5000 Firmware"
 		default y
@@ -858,13 +930,6 @@  define KernelPackage/iwlagn/config
 		  Download and install firmware for:
 		    Intel Wireless WiFi 5150AGN
 
-	config IWL1000_FW
-		bool "Intel 1000 Firmware"
-		default y
-		help
-		  Download and install firmware for:
-		    Intel Centrino Wireless-N 1000
-
 	config IWL6000_FW
 		bool "Intel 6000 Firmware"
 		default y
@@ -872,13 +937,6 @@  define KernelPackage/iwlagn/config
 		  Download and install firmware for:
 		    Intel Centrino Ultimate-N 6300 and Advanced-N 6200
 
-	config IWL6050_FW
-		bool "Intel 6050 Firmware"
-		default y
-		help
-		  Download and install firmware for:
-		    Intel Centrino Advanced-N + WiMAX 6250 and Wireless-N + WiMAX 6150
-
 	config IWL6005_FW
 		bool "Intel 6005 Firmware"
 		default y
@@ -893,61 +951,58 @@  define KernelPackage/iwlagn/config
 		  Download and install firmware for:
 		    Intel Centrino Advanced-N 6230, Wireless-N 1030, Wireless-N 130 and Advanced-N 6235
 
-	config IWL7260_FW
-		bool "Intel 7260 Firmware"
+	config IWL6050_FW
+		bool "Intel 6050 Firmware"
 		default y
 		help
 		  Download and install firmware for:
-		    Intel Dual Band Wireless-N 7260 and Intel Dual Band Wireless-AC 7260
+		    Intel Centrino Advanced-N + WiMAX 6250 and Wireless-N + WiMAX 6150
 
-	config IWL7265_FW
-		bool "Intel 7265 Firmware"
+	config IWL7260_FW
+		bool "Intel 7260 Firmware"
 		default y
 		help
 		  Download and install firmware for:
-		    Intel Wireless 7265
+		    Intel Dual Band Wireless-N 7260 and Intel Dual Band Wireless-AC 7260
 
-	config IWL100_FW
-		bool "Intel 100 Firmware"
+	config IWL7260_10_FW
+		bool "Intel 7260 Firmware ucode 10 (3.17+)"
 		default y
 		help
 		  Download and install firmware for:
-		    Intel Centrino Wireless-N 100
+		    Intel Dual Band Wireless-N 7260 and Intel Dual Band Wireless-AC 7260
 
-	config IWL2000_FW
-		bool "Intel 2000 Firmware"
+	config IWL7260_13_FW
+		bool "Intel 7260 Firmware ucode 13 (4.1+)"
 		default y
+		depends on LINUX_4_1
 		help
 		  Download and install firmware for:
-		    Intel Centrino Wireless-N 2200
+		    Intel Dual Band Wireless-N 7260 and Intel Dual Band Wireless-AC 7260
 
-	config IWL2030_FW
-		bool "Intel 2030 Firmware"
+	config IWL7265_FW
+		bool "Intel 7265 Firmware"
 		default y
 		help
 		  Download and install firmware for:
-		    Intel Centrino Wireless-N 2230
+		    Intel Wireless 7265
 
-	config IWL105_FW
-		bool "Intel 105 Firmware"
+	config IWL7265_13_FW
+		bool "Intel 7265 Firmware ucode 13 (4.1+)"
 		default y
+		depends on LINUX_4_1
 		help
 		  Download and install firmware for:
-		    Intel Centrino Wireless-N 105
+		    Intel Wireless 7265, 7265D, 3165
 
-	config IWL135_FW
-		bool "Intel 135 Firmware"
+	config IWL8000_FW
+		bool "Intel 8000 Series Firmware ucode 13 (4.1+)"
 		default y
+		depends on LINUX_4_1
 		help
 		  Download and install firmware for:
-		    Intel Centrino Wireless-N 135
+		    Intel Wireless Series 8260, 4165
 
-	config IWL3160_FW
-		bool "Intel 3160 Firmware"
-		default y
-		help
-		  Download and install firmware for:
-		    Intel Wireless 3160
   endif
 endef
 
@@ -1930,50 +1985,63 @@  endef
 
 define KernelPackage/iwlagn/install
 	$(INSTALL_DIR) $(1)/lib/firmware
+ifneq ($(CONFIG_IWL100_FW),)
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-100-5.ucode $(1)/lib/firmware
+endif
+ifneq ($(CONFIG_IWL1000_FW),)
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-1000-5.ucode $(1)/lib/firmware
+endif
+ifneq ($(CONFIG_IWL105_FW),)
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-105-6.ucode $(1)/lib/firmware
+endif
+ifneq ($(CONFIG_IWL135_FW),)
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-135-6.ucode $(1)/lib/firmware
+endif
+ifneq ($(CONFIG_IWL2000_FW),)
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-2000-6.ucode $(1)/lib/firmware
+endif
+ifneq ($(CONFIG_IWL2030_FW),)
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-2030-6.ucode $(1)/lib/firmware
+endif
+ifneq ($(CONFIG_IWL3160_FW),)
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-3160-9.ucode $(1)/lib/firmware
+endif
+ifneq ($(CONFIG_IWL3160_13_FW),)
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-3160-13.ucode $(1)/lib/firmware
+endif
 ifneq ($(CONFIG_IWL5000_FW),)
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-5000-5.ucode $(1)/lib/firmware
 endif
 ifneq ($(CONFIG_IWL5150_FW),)
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-5150-2.ucode $(1)/lib/firmware
 endif
-ifneq ($(CONFIG_IWL1000_FW),)
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-1000-5.ucode $(1)/lib/firmware
-endif
 ifneq ($(CONFIG_IWL6000_FW),)
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-6000-4.ucode $(1)/lib/firmware
 endif
-ifneq ($(CONFIG_IWL6050_FW),)
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-6050-5.ucode $(1)/lib/firmware
-endif
 ifneq ($(CONFIG_IWL6005_FW),)
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-6000g2a-6.ucode $(1)/lib/firmware
 endif
 ifneq ($(CONFIG_IWL6030_FW),)
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-6000g2b-6.ucode $(1)/lib/firmware
 endif
+ifneq ($(CONFIG_IWL6050_FW),)
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-6050-5.ucode $(1)/lib/firmware
+endif
 ifneq ($(CONFIG_IWL7260_FW),)
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-7260-9.ucode $(1)/lib/firmware
 endif
-ifneq ($(CONFIG_IWL7265_FW),)
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-7265-9.ucode $(1)/lib/firmware
-endif
-ifneq ($(CONFIG_IWL100_FW),)
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-100-5.ucode $(1)/lib/firmware
-endif
-ifneq ($(CONFIG_IWL2000_FW),)
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-2000-6.ucode $(1)/lib/firmware
-endif
-ifneq ($(CONFIG_IWL2030_FW),)
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-2030-6.ucode $(1)/lib/firmware
+ifneq ($(CONFIG_IWL7260_10_FW),)
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-7260-10.ucode $(1)/lib/firmware
 endif
-ifneq ($(CONFIG_IWL105_FW),)
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-105-6.ucode $(1)/lib/firmware
+ifneq ($(CONFIG_IWL7260_13_FW),)
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-7260-13.ucode $(1)/lib/firmware
 endif
-ifneq ($(CONFIG_IWL135_FW),)
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-135-6.ucode $(1)/lib/firmware
+ifneq ($(CONFIG_IWL7265_13_FW),)
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-7265-13.ucode $(1)/lib/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-7265D-13.ucode $(1)/lib/firmware
 endif
-ifneq ($(CONFIG_IWL3160_FW),)
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-3160-9.ucode $(1)/lib/firmware
+ifneq ($(CONFIG_IWL8000_13_FW),)
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/iwlwifi-8000C-13.ucode $(1)/lib/firmware
 endif
 endef