Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-7]: src Apply patch (requested by nonaka in ticket #1413):



details:   https://anonhg.NetBSD.org/src/rev/8e9ecb4851c0
branches:  netbsd-7
changeset: 800268:8e9ecb4851c0
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Jul 25 19:43:00 2017 +0000

description:
Apply patch (requested by nonaka in ticket #1413):
iwm(4): Add a driver for Intel Wireless 726x, 316x, 826x and 416x series.
Ported from OpenBSD.

diffstat:

 distrib/sets/lists/base/mi                                       |    22 +-
 etc/mtree/NetBSD.dist.base                                       |     3 +-
 external/intel-fw-public/Makefile                                |     6 +-
 external/intel-fw-public/iwl3160/Makefile                        |    10 +
 external/intel-fw-public/iwl3160/dist/LICENSE.iwlwifi-3160-ucode |    39 +
 external/intel-fw-public/iwl3160/dist/README.iwlwifi-3160-ucode  |   113 +
 external/intel-fw-public/iwl3160/dist/iwlwifi-3160-17.ucode      |   Bin 
 external/intel-fw-public/iwl3168/Makefile                        |    10 +
 external/intel-fw-public/iwl3168/dist/LICENSE.iwlwifi-3168-ucode |    39 +
 external/intel-fw-public/iwl3168/dist/README.iwlwifi-3168-ucode  |   112 +
 external/intel-fw-public/iwl3168/dist/iwlwifi-3168-22.ucode      |   Bin 
 external/intel-fw-public/iwl7260/Makefile                        |    10 +
 external/intel-fw-public/iwl7260/dist/LICENSE.iwlwifi-7260-ucode |    39 +
 external/intel-fw-public/iwl7260/dist/README.iwlwifi-7260-ucode  |   113 +
 external/intel-fw-public/iwl7260/dist/iwlwifi-7260-17.ucode      |   Bin 
 external/intel-fw-public/iwl7265/Makefile                        |    10 +
 external/intel-fw-public/iwl7265/dist/LICENSE.iwlwifi-7265-ucode |    39 +
 external/intel-fw-public/iwl7265/dist/README.iwlwifi-7265-ucode  |   113 +
 external/intel-fw-public/iwl7265/dist/iwlwifi-7265-17.ucode      |   Bin 
 external/intel-fw-public/iwl7265/dist/iwlwifi-7265D-22.ucode     |   Bin 
 external/intel-fw-public/iwl8000/Makefile                        |    10 +
 external/intel-fw-public/iwl8000/dist/LICENSE.iwlwifi-8000-ucode |    39 +
 external/intel-fw-public/iwl8000/dist/README.iwlwifi-8000-ucode  |   113 +
 external/intel-fw-public/iwl8000/dist/iwlwifi-8000C-22.ucode     |   Bin 
 external/intel-fw-public/iwl8265/Makefile                        |    10 +
 external/intel-fw-public/iwl8265/dist/LICENSE.iwlwifi-8265-ucode |    39 +
 external/intel-fw-public/iwl8265/dist/README.iwlwifi-8265-ucode  |   112 +
 external/intel-fw-public/iwl8265/dist/iwlwifi-8265-22.ucode      |   Bin 
 sys/arch/amd64/conf/GENERIC                                      |     5 +-
 sys/arch/i386/conf/GENERIC                                       |     5 +-
 sys/dev/pci/files.pci                                            |     7 +-
 sys/dev/pci/if_iwm.c                                             |  8367 ++++++++++
 sys/dev/pci/if_iwmreg.h                                          |  6615 +++++++
 sys/dev/pci/if_iwmvar.h                                          |   531 +
 sys/dev/pci/pcidevs                                              |     4 +-
 35 files changed, 16525 insertions(+), 10 deletions(-)

diffs (truncated from 16739 to 300 lines):

diff -r 55e5fa719c8f -r 8e9ecb4851c0 distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi        Sun Jul 23 06:29:48 2017 +0000
+++ b/distrib/sets/lists/base/mi        Tue Jul 25 19:43:00 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1087.2.10 2017/03/02 07:46:02 snj Exp $
+# $NetBSD: mi,v 1.1087.2.11 2017/07/25 19:43:00 snj Exp $
 #
 # Note:        Don't delete entries from here - mark them as "obsolete" instead,
 #      unless otherwise stated below.
@@ -145,6 +145,26 @@
 ./libdata/firmware/if_iwi/ipw2200-bss.fw       base-firmware-root
 ./libdata/firmware/if_iwi/ipw2200-ibss.fw      base-firmware-root
 ./libdata/firmware/if_iwi/ipw2200-sniffer.fw   base-firmware-root
+./libdata/firmware/if_iwm                      base-firmware-root
+./libdata/firmware/if_iwm/LICENSE.iwlwifi-3160-ucode   base-firmware-root
+./libdata/firmware/if_iwm/LICENSE.iwlwifi-3168-ucode   base-firmware-root
+./libdata/firmware/if_iwm/LICENSE.iwlwifi-7260-ucode   base-firmware-root
+./libdata/firmware/if_iwm/LICENSE.iwlwifi-7265-ucode   base-firmware-root
+./libdata/firmware/if_iwm/LICENSE.iwlwifi-8000-ucode   base-firmware-root
+./libdata/firmware/if_iwm/LICENSE.iwlwifi-8265-ucode   base-firmware-root
+./libdata/firmware/if_iwm/README.iwlwifi-3160-ucode    base-firmware-root
+./libdata/firmware/if_iwm/README.iwlwifi-3168-ucode    base-firmware-root
+./libdata/firmware/if_iwm/README.iwlwifi-7260-ucode    base-firmware-root
+./libdata/firmware/if_iwm/README.iwlwifi-7265-ucode    base-firmware-root
+./libdata/firmware/if_iwm/README.iwlwifi-8000-ucode    base-firmware-root
+./libdata/firmware/if_iwm/README.iwlwifi-8265-ucode    base-firmware-root
+./libdata/firmware/if_iwm/iwlwifi-3160-17.ucode        base-firmware-root
+./libdata/firmware/if_iwm/iwlwifi-3168-22.ucode        base-firmware-root
+./libdata/firmware/if_iwm/iwlwifi-7260-17.ucode        base-firmware-root
+./libdata/firmware/if_iwm/iwlwifi-7265-17.ucode        base-firmware-root
+./libdata/firmware/if_iwm/iwlwifi-7265D-22.ucode       base-firmware-root
+./libdata/firmware/if_iwm/iwlwifi-8000C-22.ucode       base-firmware-root
+./libdata/firmware/if_iwm/iwlwifi-8265-22.ucode        base-firmware-root
 ./libdata/firmware/if_iwn                      base-firmware-root
 ./libdata/firmware/if_iwn/LICENSE.iwlwifi-100-ucode    base-firmware-root
 ./libdata/firmware/if_iwn/LICENSE.iwlwifi-1000-ucode   base-firmware-root
diff -r 55e5fa719c8f -r 8e9ecb4851c0 etc/mtree/NetBSD.dist.base
--- a/etc/mtree/NetBSD.dist.base        Sun Jul 23 06:29:48 2017 +0000
+++ b/etc/mtree/NetBSD.dist.base        Tue Jul 25 19:43:00 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: NetBSD.dist.base,v 1.139.2.2 2015/05/07 03:48:27 snj Exp $
+#      $NetBSD: NetBSD.dist.base,v 1.139.2.3 2017/07/25 19:43:00 snj Exp $
 #      @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -68,6 +68,7 @@
 ./libdata/firmware/if_athn
 ./libdata/firmware/if_ipw
 ./libdata/firmware/if_iwi
+./libdata/firmware/if_iwm
 ./libdata/firmware/if_iwn
 ./libdata/firmware/if_otus
 ./libdata/firmware/if_urtwn
diff -r 55e5fa719c8f -r 8e9ecb4851c0 external/intel-fw-public/Makefile
--- a/external/intel-fw-public/Makefile Sun Jul 23 06:29:48 2017 +0000
+++ b/external/intel-fw-public/Makefile Tue Jul 25 19:43:00 2017 +0000
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.7.4.1 2015/01/28 19:00:29 martin Exp $
+# $NetBSD: Makefile,v 1.7.4.2 2017/07/25 19:43:01 snj Exp $
 
 SUBDIR+=       ipw3945 iwl100 iwl105 iwl135 iwl1000 iwl2000 iwl2030 \
-               iwl4965 iwl5000 iwl5150 iwl6000 iwl6005 iwl6030 iwl6050
+               iwl3160 iwl3168 \
+               iwl4965 iwl5000 iwl5150 iwl6000 iwl6005 iwl6030 iwl6050 \
+               iwl7260 iwl7265 iwl8000 iwl8265
 
 .include <bsd.subdir.mk>
diff -r 55e5fa719c8f -r 8e9ecb4851c0 external/intel-fw-public/iwl3160/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/intel-fw-public/iwl3160/Makefile Tue Jul 25 19:43:00 2017 +0000
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.4.8.2 2017/07/25 19:43:01 snj Exp $
+
+NOMAN= # define
+
+FILES= dist/LICENSE.iwlwifi-3160-ucode dist/README.iwlwifi-3160-ucode \
+       dist/iwlwifi-3160-17.ucode
+
+FILESDIR=      /libdata/firmware/if_iwm
+
+.include <bsd.files.mk>
diff -r 55e5fa719c8f -r 8e9ecb4851c0 external/intel-fw-public/iwl3160/dist/LICENSE.iwlwifi-3160-ucode
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/intel-fw-public/iwl3160/dist/LICENSE.iwlwifi-3160-ucode  Tue Jul 25 19:43:00 2017 +0000
@@ -0,0 +1,39 @@
+Copyright (c) 2014, Intel Corporation.
+All rights reserved.
+
+Redistribution.  Redistribution and use in binary form, without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions must reproduce the above copyright notice and the
+  following disclaimer in the documentation and/or other materials
+  provided with the distribution.
+* Neither the name of Intel Corporation nor the names of its suppliers
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
+* No reverse engineering, decompilation, or disassembly of this software
+  is permitted.
+
+Limited patent license.  Intel Corporation grants a world-wide,
+royalty-free, non-exclusive license under patents it now or hereafter
+owns or controls to make, have made, use, import, offer to sell and
+sell ("Utilize") this software, but solely to the extent that any
+such patent is necessary to Utilize the software alone, or in
+combination with an operating system licensed under an approved Open
+Source license as listed by the Open Source Initiative at
+http://opensource.org/licenses.  The patent license shall not apply to
+any other combinations which include this software.  No hardware per
+se is licensed hereunder.
+
+DISCLAIMER.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
diff -r 55e5fa719c8f -r 8e9ecb4851c0 external/intel-fw-public/iwl3160/dist/README.iwlwifi-3160-ucode
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/intel-fw-public/iwl3160/dist/README.iwlwifi-3160-ucode   Tue Jul 25 19:43:00 2017 +0000
@@ -0,0 +1,113 @@
+Intel Wireless WiFi Link 3160 AC Adapter
+Copyright (C) 2014 Intel Corporation.  All rights reserved.
+
+Microcode Package README.iwlwifi-3160-ucode
+
+INDEX
+
+1. OVERVIEW
+2. INSTALLATION
+3. LICENSE
+
+
+1. OVERVIEW
+
+The file iwlwifi-3160-9.ucode provided in this package must be
+present on your system in order for the Intel Wireless WiFi Link
+AGN driver for Linux (iwlwifi) to operate on your system.
+
+The "-9" in the filename reflects an interface/architecture version number.
+It will change only when changes in new uCode releases make the new uCode
+incompatible with earlier drivers.
+
+On adapter initialization, and at varying times during the uptime of
+the adapter, the microcode is loaded into the memory on the network
+adapter.  The microcode provides the low level MAC features including
+radio control and high precision timing events (backoff, transmit,
+etc.) while also providing varying levels of packet filtering which can
+be used to keep the host from having to handle packets that are not of
+interest given the current operating mode of the device.
+
+2. INSTALLATION
+
+The iwlwifi driver will look for the file iwlwifi-3160-9.ucode using the
+kernel's firmware_class infrastructure. More information can be found under
+Documentation/firmware_class in kernel source. In order to function
+correctly, you need to have this support enabled in your kernel.  When
+you configure the kernel, you can find this option in the following
+location:
+
+        Device Drivers ->
+                Generic Driver Options ->
+                        Userspace firmware loading support
+
+
+You can determine if your kernel currently has firmware loader support
+by looking for the CONFIG_FW_LOADER definition on your kernel's
+.config.
+
+In addition to having the firmware_class support in your kernel, you
+must also have a working udev and uevent infrastructure configured.
+The steps for installing and configuring udev are very
+distribution specific.
+
+Once you have the firmware loader in place (or if you aren't sure and
+you just want to try things to see if it works), you need to install
+the microcode file into the appropriate location.
+
+Where that appropriate location is depends (again) on your system
+distribution.  You can typically find this location by looking in the
+udev scripts of your distro, the default is /lib/firmware.
+
+Installation of the firmware is simply:
+
+        % cp iwlwifi-3160-9.ucode /lib/firmware
+
+You can now load the driver (see the INSTALL and README.iwlwifi provided with
+the iwlwifi package for information on building and using that driver.)
+
+3. LICENSE
+
+The microcode in this package (iwlwifi-3160-9.ucode) is provided under the
+terms of the following license (available in the file
+LICENSE.iwlwifi-3160-ucode):
+
+Copyright (c) 2014, Intel Corporation.
+All rights reserved.
+
+Redistribution.  Redistribution and use in binary form, without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions must reproduce the above copyright notice and the
+  following disclaimer in the documentation and/or other materials
+  provided with the distribution.
+* Neither the name of Intel Corporation nor the names of its suppliers
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
+* No reverse engineering, decompilation, or disassembly of this software
+  is permitted.
+
+Limited patent license.  Intel Corporation grants a world-wide,
+royalty-free, non-exclusive license under patents it now or hereafter
+owns or controls to make, have made, use, import, offer to sell and
+sell ("Utilize") this software, but solely to the extent that any
+such patent is necessary to Utilize the software alone, or in
+combination with an operating system licensed under an approved Open
+Source license as listed by the Open Source Initiative at
+http://opensource.org/licenses.  The patent license shall not apply to
+any other combinations which include this software.  No hardware per
+se is licensed hereunder.
+
+DISCLAIMER.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.
diff -r 55e5fa719c8f -r 8e9ecb4851c0 external/intel-fw-public/iwl3160/dist/iwlwifi-3160-17.ucode
Binary file external/intel-fw-public/iwl3160/dist/iwlwifi-3160-17.ucode has changed
diff -r 55e5fa719c8f -r 8e9ecb4851c0 external/intel-fw-public/iwl3168/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/intel-fw-public/iwl3168/Makefile Tue Jul 25 19:43:00 2017 +0000
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1.12.2 2017/07/25 19:43:01 snj Exp $
+
+NOMAN= # define
+
+FILES= dist/LICENSE.iwlwifi-3168-ucode dist/README.iwlwifi-3168-ucode \
+       dist/iwlwifi-3168-22.ucode
+
+FILESDIR=      /libdata/firmware/if_iwm
+
+.include <bsd.files.mk>
diff -r 55e5fa719c8f -r 8e9ecb4851c0 external/intel-fw-public/iwl3168/dist/LICENSE.iwlwifi-3168-ucode
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/external/intel-fw-public/iwl3168/dist/LICENSE.iwlwifi-3168-ucode  Tue Jul 25 19:43:00 2017 +0000
@@ -0,0 +1,39 @@
+Copyright (c) 2016, Intel Corporation.
+All rights reserved.
+
+Redistribution.  Redistribution and use in binary form, without
+modification, are permitted provided that the following conditions are
+met:
+
+* Redistributions must reproduce the above copyright notice and the
+  following disclaimer in the documentation and/or other materials
+  provided with the distribution.
+* Neither the name of Intel Corporation nor the names of its suppliers
+  may be used to endorse or promote products derived from this software
+  without specific prior written permission.
+* No reverse engineering, decompilation, or disassembly of this software
+  is permitted.
+
+Limited patent license.  Intel Corporation grants a world-wide,
+royalty-free, non-exclusive license under patents it now or hereafter
+owns or controls to make, have made, use, import, offer to sell and
+sell ("Utilize") this software, but solely to the extent that any
+such patent is necessary to Utilize the software alone, or in
+combination with an operating system licensed under an approved Open
+Source license as listed by the Open Source Initiative at
+http://opensource.org/licenses.  The patent license shall not apply to
+any other combinations which include this software.  No hardware per
+se is licensed hereunder.
+
+DISCLAIMER.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGE.



Home | Main Index | Thread Index | Old Index