svn commit: r330227 - in stable/11/sys: dev/iwm modules/iwmfw/iwm8265fw

[Eitan Adler]

Author: eadler
Date: Thu Mar  1 06:57:38 2018
New Revision: 330227
URL: https://svnweb.freebsd.org/changeset/base/330227

Log:
  MFC r324434:
  
  Add support for Intel 8265 WiFi
  
  Obtained from:	OpenBSD

Added:
  stable/11/sys/modules/iwmfw/iwm8265fw/
     - copied from r324434, head/sys/modules/iwmfw/iwm8265fw/
Modified:
  stable/11/sys/dev/iwm/if_iwm.c
  stable/11/sys/dev/iwm/if_iwm_8000.c
  stable/11/sys/dev/iwm/if_iwm_config.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/dev/iwm/if_iwm.c
==============================================================================
--- stable/11/sys/dev/iwm/if_iwm.c	Thu Mar  1 06:57:02 2018	(r330226)
+++ stable/11/sys/dev/iwm/if_iwm.c	Thu Mar  1 06:57:38 2018	(r330227)
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_iwm.c,v 1.42 2015/05/30 02:49:23 deraadt Exp $	*/
+/*	$OpenBSD: if_iwm.c,v 1.167 2017/04/04 00:40:52 claudio Exp $	*/
 
 /*
  * Copyright (c) 2014 genua mbh <info at genua.de>
@@ -5848,6 +5848,7 @@ iwm_intr(void *arg)
 #define	PCI_PRODUCT_INTEL_WL_7265_2	0x095b
 #define	PCI_PRODUCT_INTEL_WL_8260_1	0x24f3
 #define	PCI_PRODUCT_INTEL_WL_8260_2	0x24f4
+#define	PCI_PRODUCT_INTEL_WL_8265_1	0x24fd
 
 static const struct iwm_devices {
 	uint16_t		device;
@@ -5863,6 +5864,7 @@ static const struct iwm_devices {
 	{ PCI_PRODUCT_INTEL_WL_7265_2, &iwm7265_cfg },
 	{ PCI_PRODUCT_INTEL_WL_8260_1, &iwm8260_cfg },
 	{ PCI_PRODUCT_INTEL_WL_8260_2, &iwm8260_cfg },
+	{ PCI_PRODUCT_INTEL_WL_8265_1, &iwm8265_cfg },
 };
 
 static int

Modified: stable/11/sys/dev/iwm/if_iwm_8000.c
==============================================================================
--- stable/11/sys/dev/iwm/if_iwm_8000.c	Thu Mar  1 06:57:02 2018	(r330226)
+++ stable/11/sys/dev/iwm/if_iwm_8000.c	Thu Mar  1 06:57:38 2018	(r330227)
@@ -76,6 +76,7 @@ __FBSDID("$FreeBSD$");
 #include "if_iwm_config.h"
 
 #define IWM8000_FW	"iwm8000Cfw"
+#define IWM8265_FW	"iwm8265fw"
 
 #define IWM_NVM_HW_SECTION_NUM_FAMILY_8000	10
 
@@ -87,6 +88,13 @@ __FBSDID("$FreeBSD$");
 const struct iwm_cfg iwm8260_cfg = {
 	.name = "Intel(R) Dual Band Wireless AC 8260",
 	.fw_name = IWM8000_FW,
+	IWM_DEVICE_8000_COMMON,
+	.host_interrupt_operation_mode = 0,
+};
+
+const struct iwm_cfg iwm8265_cfg = {
+	.name = "Intel(R) Dual Band Wireless AC 8265",
+	.fw_name = IWM8265_FW,
 	IWM_DEVICE_8000_COMMON,
 	.host_interrupt_operation_mode = 0,
 };

Modified: stable/11/sys/dev/iwm/if_iwm_config.h
==============================================================================
--- stable/11/sys/dev/iwm/if_iwm_config.h	Thu Mar  1 06:57:02 2018	(r330226)
+++ stable/11/sys/dev/iwm/if_iwm_config.h	Thu Mar  1 06:57:38 2018	(r330227)
@@ -131,5 +131,6 @@ extern const struct iwm_cfg iwm3165_cfg;
 extern const struct iwm_cfg iwm7265_cfg;
 extern const struct iwm_cfg iwm7265d_cfg;
 extern const struct iwm_cfg iwm8260_cfg;
+extern const struct iwm_cfg iwm8265_cfg;
 
 #endif /* __IWM_CONFIG_H__ */