Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src iwm(4): Sync with OpenBSD.
details: https://anonhg.NetBSD.org/src/rev/678c47d4e8c4
branches: trunk
changeset: 819804:678c47d4e8c4
user: nonaka <nonaka%NetBSD.org@localhost>
date: Sun Dec 18 02:18:28 2016 +0000
description:
iwm(4): Sync with OpenBSD.
7265 works fine.
7260 and 3160 maybe work.
7265D, 3165 and 8260 not work yet.
if_iwm.c: r1.147.
if_iwmreg.h: r1.19 without r1.16.
if_iwmvar.h: r1.24.
firmware is taken from https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi
- iwlwifi-7260-ucode-16.242414.0.tgz
- iwlwifi-3160-ucode-16.242414.0.tgz
- iwlwifi-7265-ucode-16.242414.0.tgz
- iwlwifi-8000-ucode-16.242414.0.tgz
diffstat:
distrib/sets/lists/base/mi | 9 +-
external/intel-fw-public/Makefile | 4 +-
external/intel-fw-public/iwl7260/Makefile | 4 +-
external/intel-fw-public/iwl7260/dist/iwlwifi-7260-16.ucode | Bin
external/intel-fw-public/iwl7265/Makefile | 5 +-
external/intel-fw-public/iwl7265/dist/iwlwifi-7265-16.ucode | Bin
external/intel-fw-public/iwl7265/dist/iwlwifi-7265D-16.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-16.ucode | Bin
sys/dev/pci/if_iwm.c | 6019 +++++----
sys/dev/pci/if_iwmreg.h | 1854 ++-
sys/dev/pci/if_iwmvar.h | 91 +-
14 files changed, 5142 insertions(+), 3006 deletions(-)
diffs (truncated from 11765 to 300 lines):
diff -r a275f1991abc -r 678c47d4e8c4 distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi Sun Dec 18 01:30:54 2016 +0000
+++ b/distrib/sets/lists/base/mi Sun Dec 18 02:18:28 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1141 2016/12/03 15:18:41 riastradh Exp $
+# $NetBSD: mi,v 1.1142 2016/12/18 02:18:28 nonaka Exp $
#
# Note: Don't delete entries from here - mark them as "obsolete" instead,
# unless otherwise stated below.
@@ -151,12 +151,19 @@
./libdata/firmware/if_iwm/LICENSE.iwlwifi-3160-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/README.iwlwifi-3160-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/iwlwifi-3160-16.ucode base-firmware-root
./libdata/firmware/if_iwm/iwlwifi-3160-9.ucode base-firmware-root
+./libdata/firmware/if_iwm/iwlwifi-7260-16.ucode base-firmware-root
./libdata/firmware/if_iwm/iwlwifi-7260-9.ucode base-firmware-root
+./libdata/firmware/if_iwm/iwlwifi-7265-16.ucode base-firmware-root
./libdata/firmware/if_iwm/iwlwifi-7265-9.ucode base-firmware-root
+./libdata/firmware/if_iwm/iwlwifi-7265D-16.ucode base-firmware-root
+./libdata/firmware/if_iwm/iwlwifi-8000C-16.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 a275f1991abc -r 678c47d4e8c4 external/intel-fw-public/Makefile
--- a/external/intel-fw-public/Makefile Sun Dec 18 01:30:54 2016 +0000
+++ b/external/intel-fw-public/Makefile Sun Dec 18 02:18:28 2016 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2015/02/13 18:57:47 nonaka Exp $
+# $NetBSD: Makefile,v 1.10 2016/12/18 02:18:29 nonaka Exp $
SUBDIR+= ipw3945 iwl100 iwl105 iwl135 iwl1000 iwl2000 iwl2030 iwl3160 \
iwl4965 iwl5000 iwl5150 iwl6000 iwl6005 iwl6030 iwl6050 \
- iwl7260 iwl7265
+ iwl7260 iwl7265 iwl8000
.include <bsd.subdir.mk>
diff -r a275f1991abc -r 678c47d4e8c4 external/intel-fw-public/iwl7260/Makefile
--- a/external/intel-fw-public/iwl7260/Makefile Sun Dec 18 01:30:54 2016 +0000
+++ b/external/intel-fw-public/iwl7260/Makefile Sun Dec 18 02:18:28 2016 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2015/02/13 18:57:47 nonaka Exp $
+# $NetBSD: Makefile,v 1.2 2016/12/18 02:18:29 nonaka Exp $
NOMAN= # define
FILES= dist/LICENSE.iwlwifi-7260-ucode dist/README.iwlwifi-7260-ucode \
- dist/iwlwifi-7260-9.ucode
+ dist/iwlwifi-7260-9.ucode dist/iwlwifi-7260-16.ucode
FILESDIR= /libdata/firmware/if_iwm
diff -r a275f1991abc -r 678c47d4e8c4 external/intel-fw-public/iwl7260/dist/iwlwifi-7260-16.ucode
Binary file external/intel-fw-public/iwl7260/dist/iwlwifi-7260-16.ucode has changed
diff -r a275f1991abc -r 678c47d4e8c4 external/intel-fw-public/iwl7265/Makefile
--- a/external/intel-fw-public/iwl7265/Makefile Sun Dec 18 01:30:54 2016 +0000
+++ b/external/intel-fw-public/iwl7265/Makefile Sun Dec 18 02:18:28 2016 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2015/02/13 18:57:47 nonaka Exp $
+# $NetBSD: Makefile,v 1.2 2016/12/18 02:18:29 nonaka Exp $
NOMAN= # define
FILES= dist/LICENSE.iwlwifi-7265-ucode dist/README.iwlwifi-7265-ucode \
- dist/iwlwifi-7265-9.ucode
+ dist/iwlwifi-7265-9.ucode \
+ dist/iwlwifi-7265-16.ucode dist/iwlwifi-7265D-16.ucode
FILESDIR= /libdata/firmware/if_iwm
diff -r a275f1991abc -r 678c47d4e8c4 external/intel-fw-public/iwl7265/dist/iwlwifi-7265-16.ucode
Binary file external/intel-fw-public/iwl7265/dist/iwlwifi-7265-16.ucode has changed
diff -r a275f1991abc -r 678c47d4e8c4 external/intel-fw-public/iwl7265/dist/iwlwifi-7265D-16.ucode
Binary file external/intel-fw-public/iwl7265/dist/iwlwifi-7265D-16.ucode has changed
diff -r a275f1991abc -r 678c47d4e8c4 external/intel-fw-public/iwl8000/Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/intel-fw-public/iwl8000/Makefile Sun Dec 18 02:18:28 2016 +0000
@@ -0,0 +1,10 @@
+# $NetBSD: Makefile,v 1.1 2016/12/18 02:18:29 nonaka Exp $
+
+NOMAN= # define
+
+FILES= dist/LICENSE.iwlwifi-8000-ucode dist/README.iwlwifi-8000-ucode \
+ dist/iwlwifi-8000C-16.ucode
+
+FILESDIR= /libdata/firmware/if_iwm
+
+.include <bsd.files.mk>
diff -r a275f1991abc -r 678c47d4e8c4 external/intel-fw-public/iwl8000/dist/LICENSE.iwlwifi-8000-ucode
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/intel-fw-public/iwl8000/dist/LICENSE.iwlwifi-8000-ucode Sun Dec 18 02:18:28 2016 +0000
@@ -0,0 +1,39 @@
+Copyright (c) 2015, 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 a275f1991abc -r 678c47d4e8c4 external/intel-fw-public/iwl8000/dist/README.iwlwifi-8000-ucode
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/external/intel-fw-public/iwl8000/dist/README.iwlwifi-8000-ucode Sun Dec 18 02:18:28 2016 +0000
@@ -0,0 +1,113 @@
+Intel Wireless WiFi Link 8260 AC Adapter
+Copyright (C) 2015 Intel Corporation. All rights reserved.
+
+Microcode Package README.iwlwifi-8000-ucode
+
+INDEX
+
+1. OVERVIEW
+2. INSTALLATION
+3. LICENSE
+
+
+1. OVERVIEW
+
+The files iwlwifi-8000C-16.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 "-16" 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-8000C-16.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-8000C-16.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-8000C-16.ucode) is provided
+under the terms of the following license (available in the file
+LICENSE.iwlwifi-8000-ucode):
+
+Copyright (c) 2015, 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 a275f1991abc -r 678c47d4e8c4 external/intel-fw-public/iwl8000/dist/iwlwifi-8000C-16.ucode
Binary file external/intel-fw-public/iwl8000/dist/iwlwifi-8000C-16.ucode has changed
diff -r a275f1991abc -r 678c47d4e8c4 sys/dev/pci/if_iwm.c
--- a/sys/dev/pci/if_iwm.c Sun Dec 18 01:30:54 2016 +0000
+++ b/sys/dev/pci/if_iwm.c Sun Dec 18 02:18:28 2016 +0000
@@ -1,8 +1,9 @@
-/* $NetBSD: if_iwm.c,v 1.44 2016/12/08 01:12:01 ozaki-r Exp $ */
-/* OpenBSD: if_iwm.c,v 1.41 2015/05/22 06:50:54 kettenis Exp */
-
+/* $NetBSD: if_iwm.c,v 1.45 2016/12/18 02:18:29 nonaka Exp $ */
+/* OpenBSD: if_iwm.c,v 1.147 2016/11/17 14:12:33 stsp Exp */
+#define IEEE80211_NO_HT
/*
- * Copyright (c) 2014 genua mbh <info%genua.de@localhost>
+ * Copyright (c) 2014, 2016 genua gmbh <info%genua.de@localhost>
+ * Author: Stefan Sperling <stsp%openbsd.org@localhost>
* Copyright (c) 2014 Fixup Software Ltd.
*
* Permission to use, copy, modify, and distribute this software for any
@@ -22,9 +23,6 @@
* Based on BSD-licensed source modules in the Linux iwlwifi driver,
* which were used as the reference documentation for this implementation.
*
- * Driver version we are currently based off of is
- * Linux 3.14.3 (tag id a2df521e42b1d9a23f620ac79dbfe8655a8391dd)
- *
***********************************************************************
*
* This file is provided under a dual BSD/GPLv2 license. When using or
@@ -33,6 +31,8 @@
* GPL LICENSE SUMMARY
*
* Copyright(c) 2007 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
+ * Copyright(c) 2016 Intel Deutschland GmbH
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of version 2 of the GNU General Public License as
@@ -59,6 +59,8 @@
* BSD LICENSE
*
* Copyright(c) 2005 - 2013 Intel Corporation. All rights reserved.
+ * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
+ * Copyright(c) 2016 Intel Deutschland GmbH
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Home |
Main Index |
Thread Index |
Old Index