Module Name: src Committed By: msaitoh Date: Fri May 20 01:59:15 UTC 2011
Modified Files: src/distrib/sets/lists/base: mi src/external/intel-fw-public: Makefile src/sys/dev/pci: if_iwn.c Added Files: src/external/intel-fw-public/iwl6005: Makefile src/external/intel-fw-public/iwl6005/dist: LICENSE.iwlwifi-6000g2a-ucode README.iwlwifi-6000g2a-ucode iwlwifi-6000g2a-5.ucode src/external/intel-fw-public/iwl6050: Makefile src/external/intel-fw-public/iwl6050/dist: LICENSE.iwlwifi-6050-ucode README.iwlwifi-6050-ucode iwlwifi-6050-5.ucode Log Message: Add support for 6050(6250 and 6150) and 6005(6205). TODO: update iwn.4 manpage. To generate a diff of this commit: cvs rdiff -u -r1.938 -r1.939 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.5 -r1.6 src/external/intel-fw-public/Makefile cvs rdiff -u -r0 -r1.1 src/external/intel-fw-public/iwl6005/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/intel-fw-public/iwl6005/dist/LICENSE.iwlwifi-6000g2a-ucode \ src/external/intel-fw-public/iwl6005/dist/README.iwlwifi-6000g2a-ucode \ src/external/intel-fw-public/iwl6005/dist/iwlwifi-6000g2a-5.ucode cvs rdiff -u -r0 -r1.1 src/external/intel-fw-public/iwl6050/Makefile cvs rdiff -u -r0 -r1.1 \ src/external/intel-fw-public/iwl6050/dist/LICENSE.iwlwifi-6050-ucode \ src/external/intel-fw-public/iwl6050/dist/README.iwlwifi-6050-ucode \ src/external/intel-fw-public/iwl6050/dist/iwlwifi-6050-5.ucode cvs rdiff -u -r1.54 -r1.55 src/sys/dev/pci/if_iwn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.938 src/distrib/sets/lists/base/mi:1.939 --- src/distrib/sets/lists/base/mi:1.938 Mon May 9 17:13:19 2011 +++ src/distrib/sets/lists/base/mi Fri May 20 01:59:14 2011 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.938 2011/05/09 17:13:19 manu Exp $ +# $NetBSD: mi,v 1.939 2011/05/20 01:59:14 msaitoh Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -152,6 +152,12 @@ ./libdata/firmware/if_iwn/LICENSE.iwlwifi-6000-ucode base-firmware-root ./libdata/firmware/if_iwn/README.iwlwifi-6000-ucode base-firmware-root ./libdata/firmware/if_iwn/iwlwifi-6000-4.ucode base-firmware-root +./libdata/firmware/if_iwn/LICENSE.iwlwifi-6000g2a-ucode base-firmware-root +./libdata/firmware/if_iwn/README.iwlwifi-6000g2a-ucode base-firmware-root +./libdata/firmware/if_iwn/iwlwifi-6000g2a-5.ucode base-firmware-root +./libdata/firmware/if_iwn/LICENSE.iwlwifi-6050-ucode base-firmware-root +./libdata/firmware/if_iwn/README.iwlwifi-6050-ucode base-firmware-root +./libdata/firmware/if_iwn/iwlwifi-6050-5.ucode base-firmware-root ./libdata/firmware/if_otus base-firmware-root ./libdata/firmware/if_otus/otus-init base-firmware-root ./libdata/firmware/if_otus/otus-license base-firmware-root Index: src/external/intel-fw-public/Makefile diff -u src/external/intel-fw-public/Makefile:1.5 src/external/intel-fw-public/Makefile:1.6 --- src/external/intel-fw-public/Makefile:1.5 Thu Jul 1 17:25:27 2010 +++ src/external/intel-fw-public/Makefile Fri May 20 01:59:14 2011 @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2010/07/01 17:25:27 christos Exp $ +# $NetBSD: Makefile,v 1.6 2011/05/20 01:59:14 msaitoh Exp $ -SUBDIR+= ipw3945 iwl1000 iwl4965 iwl5000 iwl5150 iwl6000 +SUBDIR+= ipw3945 iwl1000 iwl4965 iwl5000 iwl5150 iwl6000 iwl6005 \ + iwl6050 .include <bsd.subdir.mk> Index: src/sys/dev/pci/if_iwn.c diff -u src/sys/dev/pci/if_iwn.c:1.54 src/sys/dev/pci/if_iwn.c:1.55 --- src/sys/dev/pci/if_iwn.c:1.54 Wed May 18 01:02:43 2011 +++ src/sys/dev/pci/if_iwn.c Fri May 20 01:59:15 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: if_iwn.c,v 1.54 2011/05/18 01:02:43 dyoung Exp $ */ +/* $NetBSD: if_iwn.c,v 1.55 2011/05/20 01:59:15 msaitoh Exp $ */ /* $OpenBSD: if_iwn.c,v 1.96 2010/05/13 09:25:03 damien Exp $ */ /*- @@ -22,7 +22,7 @@ * adapters. */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.54 2011/05/18 01:02:43 dyoung Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_iwn.c,v 1.55 2011/05/20 01:59:15 msaitoh Exp $"); #define IWN_USE_RBUF /* Use local storage for RX */ #undef IWN_HWCRYPTO /* XXX does not even compile yet */ @@ -156,7 +156,6 @@ static int iwn_read_eeprom(struct iwn_softc *); static void iwn4965_read_eeprom(struct iwn_softc *); -#define IWN_DEBUG 1 #ifdef IWN_DEBUG static void iwn4965_print_power_group(struct iwn_softc *, int); #endif @@ -724,11 +723,11 @@ break; case IWN_HW_REV_TYPE_6050: sc->limits = &iwn6000_sensitivity_limits; - sc->fwname = "iwlwifi-6050-2.ucode"; + sc->fwname = "iwlwifi-6050-5.ucode"; break; case IWN_HW_REV_TYPE_6005: sc->limits = &iwn6000_sensitivity_limits; - sc->fwname = "iwlwifi-6005-2.ucode"; + sc->fwname = "iwlwifi-6000g2a-5.ucode"; break; default: aprint_normal(": adapter type %d not supported\n", sc->hw_type); Added files: Index: src/external/intel-fw-public/iwl6005/Makefile diff -u /dev/null src/external/intel-fw-public/iwl6005/Makefile:1.1 --- /dev/null Fri May 20 01:59:15 2011 +++ src/external/intel-fw-public/iwl6005/Makefile Fri May 20 01:59:14 2011 @@ -0,0 +1,10 @@ +# $NetBSD: Makefile,v 1.1 2011/05/20 01:59:14 msaitoh Exp $ + +NOMAN= # define + +FILES= dist/LICENSE.iwlwifi-6000g2a-ucode dist/README.iwlwifi-6000g2a-ucode \ + dist/iwlwifi-6000g2a-5.ucode + +FILESDIR= /libdata/firmware/if_iwn + +.include <bsd.files.mk> Index: src/external/intel-fw-public/iwl6005/dist/LICENSE.iwlwifi-6000g2a-ucode diff -u /dev/null src/external/intel-fw-public/iwl6005/dist/LICENSE.iwlwifi-6000g2a-ucode:1.1 --- /dev/null Fri May 20 01:59:15 2011 +++ src/external/intel-fw-public/iwl6005/dist/LICENSE.iwlwifi-6000g2a-ucode Fri May 20 01:59:14 2011 @@ -0,0 +1,39 @@ +Copyright (c) 2006-2011, 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. Index: src/external/intel-fw-public/iwl6005/dist/README.iwlwifi-6000g2a-ucode diff -u /dev/null src/external/intel-fw-public/iwl6005/dist/README.iwlwifi-6000g2a-ucode:1.1 --- /dev/null Fri May 20 01:59:15 2011 +++ src/external/intel-fw-public/iwl6005/dist/README.iwlwifi-6000g2a-ucode Fri May 20 01:59:14 2011 @@ -0,0 +1,113 @@ +Intel Wireless WiFi Link 6000G2A AGN Adapter +Copyright (C) 2006-2011 Intel Corporation. All rights reserved. + +Microcode Package README.iwlwifi-6000g2a-ucode + +INDEX + +1. OVERVIEW +2. INSTALLATION +3. LICENSE + + +1. OVERVIEW + +The file iwlwifi-6000g2a-5.ucode provided in this package must be +present on your system in order for the Intel Wireless WiFi Link +AGN driver for Linux (iwlagn) to operate on your system. + +The "-5" 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 iwlagn driver will look for the file iwlwifi-6000g2a-5.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-6000g2a-5.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-6000g2a-5.ucode) is provided under the +terms of the following license (available in the file +LICENSE.iwlwifi-6000g2a-ucode): + +Copyright (c) 2006-2011, 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. Index: src/external/intel-fw-public/iwl6005/dist/iwlwifi-6000g2a-5.ucode Index: src/external/intel-fw-public/iwl6050/Makefile diff -u /dev/null src/external/intel-fw-public/iwl6050/Makefile:1.1 --- /dev/null Fri May 20 01:59:15 2011 +++ src/external/intel-fw-public/iwl6050/Makefile Fri May 20 01:59:14 2011 @@ -0,0 +1,10 @@ +# $NetBSD: Makefile,v 1.1 2011/05/20 01:59:14 msaitoh Exp $ + +NOMAN= # define + +FILES= dist/LICENSE.iwlwifi-6050-ucode dist/README.iwlwifi-6050-ucode \ + dist/iwlwifi-6050-5.ucode + +FILESDIR= /libdata/firmware/if_iwn + +.include <bsd.files.mk> Index: src/external/intel-fw-public/iwl6050/dist/LICENSE.iwlwifi-6050-ucode diff -u /dev/null src/external/intel-fw-public/iwl6050/dist/LICENSE.iwlwifi-6050-ucode:1.1 --- /dev/null Fri May 20 01:59:15 2011 +++ src/external/intel-fw-public/iwl6050/dist/LICENSE.iwlwifi-6050-ucode Fri May 20 01:59:15 2011 @@ -0,0 +1,39 @@ +Copyright (c) 2006-2010, 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. Index: src/external/intel-fw-public/iwl6050/dist/README.iwlwifi-6050-ucode diff -u /dev/null src/external/intel-fw-public/iwl6050/dist/README.iwlwifi-6050-ucode:1.1 --- /dev/null Fri May 20 01:59:15 2011 +++ src/external/intel-fw-public/iwl6050/dist/README.iwlwifi-6050-ucode Fri May 20 01:59:15 2011 @@ -0,0 +1,113 @@ +Intel Wireless WiFi Link 6150BGN and 6250AGN Adapter +Copyright (C) 2006-2010 Intel Corporation. All rights reserved. + +Microcode Package README.iwlwifi-6050-ucode + +INDEX + +1. OVERVIEW +2. INSTALLATION +3. LICENSE + + +1. OVERVIEW + +The file iwlwifi-6050-5.ucode provided in this package must be +present on your system in order for the Intel Wireless WiFi Link +AGN driver for Linux (iwlagn) to operate on your system. + +The "-5" 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 iwlagn driver will look for the file iwlwifi-6050-5.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-6050-5.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-6050-5.ucode) is provided under the +terms of the following license (available in the file +LICENSE.iwlwifi-6050-ucode): + +Copyright (c) 2006-2010, 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. Index: src/external/intel-fw-public/iwl6050/dist/iwlwifi-6050-5.ucode