svn commit: r324434 - in head/sys: dev/iwm modules/iwmfw/iwm8265fw

[Eitan Adler]

Hi all,

I was looking what it would take to MFC this and it seems to be spread
across several commits.

The following is an incomplete list:
- r314073
- r314074
- r314076
- r314082
- r314192
- r321508
- r321509
- r321510

(a) What other commits am I missing?
(b) How much of this is actually safe to MFC? Many of the commits are
not marked as 'mfc after' and it seems to be undergoing a lot of
change.



On 9 October 2017 at 08:48, George V. Neville-Neil <gnn at freebsd.org> wrote:
> Author: gnn
> Date: Mon Oct  9 15:48:56 2017
> New Revision: 324434
> URL: https://svnweb.freebsd.org/changeset/base/324434
>
> Log:
>   Add support for Intel 8265 WiFi
>
>   Obtained from:        OpenBSD
>   MFC after:    1 month
>
> Added:
>   head/sys/modules/iwmfw/iwm8265fw/
>   head/sys/modules/iwmfw/iwm8265fw/Makefile   (contents, props changed)
> Modified:
>   head/sys/dev/iwm/if_iwm.c
>   head/sys/dev/iwm/if_iwm_8000.c
>   head/sys/dev/iwm/if_iwm_config.h
>
> Modified: head/sys/dev/iwm/if_iwm.c
> ==============================================================================
> --- head/sys/dev/iwm/if_iwm.c   Mon Oct  9 15:39:43 2017        (r324433)
> +++ head/sys/dev/iwm/if_iwm.c   Mon Oct  9 15:48:56 2017        (r324434)
> @@ -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>
> @@ -5690,6 +5690,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;
> @@ -5705,6 +5706,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: head/sys/dev/iwm/if_iwm_8000.c
> ==============================================================================
> --- head/sys/dev/iwm/if_iwm_8000.c      Mon Oct  9 15:39:43 2017        (r324433)
> +++ head/sys/dev/iwm/if_iwm_8000.c      Mon Oct  9 15:48:56 2017        (r324434)
> @@ -79,6 +79,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
>
> @@ -90,6 +91,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: head/sys/dev/iwm/if_iwm_config.h
> ==============================================================================
> --- head/sys/dev/iwm/if_iwm_config.h    Mon Oct  9 15:39:43 2017        (r324433)
> +++ head/sys/dev/iwm/if_iwm_config.h    Mon Oct  9 15:48:56 2017        (r324434)
> @@ -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__ */
>
> Added: head/sys/modules/iwmfw/iwm8265fw/Makefile
> ==============================================================================
> --- /dev/null   00:00:00 1970   (empty, because file is newly added)
> +++ head/sys/modules/iwmfw/iwm8265fw/Makefile   Mon Oct  9 15:48:56 2017        (r324434)
> @@ -0,0 +1,6 @@
> +# $FreeBSD$
> +
> +KMOD=  iwm8265fw
> +IMG=   iwm-8265-22
> +
> +.include <bsd.kmod.mk>
> _______________________________________________
> svn-src-all at freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/svn-src-all
> To unsubscribe, send any mail to "svn-src-all-unsubscribe at freebsd.org"



-- 
Eitan Adler