| Message ID | 20130925132359.GE10746@radagast (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Wed, 2013-09-25 at 08:23 -0500, Felipe Balbi wrote: > On Wed, Sep 25, 2013 at 02:07:58PM +0300, Luca Coelho wrote: > > On Wed, 2013-09-25 at 14:04 +0300, Luca Coelho wrote: > > > When sending big binary blobs, it's generally better to send pull > > > requests instead of patches. If you add the -p option when calling git > > > pull-request, the text will include all the readable parts but will omit > > > the binary stuff. > > > > > > Thank you very much for following up on this! > > > > Ah, and I forgot to say that you should update the WHENCE file > > accordingly too. Check the wl12xx and wl18xx drivers for examples. > > I'll send a pull request, but how about this ? I don't think we can > change the license. It seems like the other firmwares are using the > older license, I'd argue those should be changed to the new one, but > that's another discussion. Cool, in general it looks good! Though it would be nice to know if the same "new" license could be used for all the firmwares to avoid almost identical licenses. More comments below... > diff --git a/WHENCE b/WHENCE > index e66fea5..4e9e2ed 100644 > --- a/WHENCE > +++ b/WHENCE > @@ -1705,6 +1705,19 @@ Licence: Redistributable. See LICENCE.tda7706-firmware.txt for details. > > -------------------------------------------------------------------------- > > +Driver: wl1251 - Texas Instruments 802.11 WLAN driver for WiLink4 chips > + > +File: ti-connectivity/wl1251-fw.bin > +File: ti-connectivity/wl1251-nvs.bin Don't you have the firmware version number to add here with "Version:" tags like the other ones? I think you can easily find the version by running strings on the binary and grepping for "Rev" (at least with the newer WiLinks, this works). > +Licence: See LICENCE.wl1251 for details. > + > +The driver expects to find the firmwares under a ti-connectivity subdirectory. > +So if your system looks for firmwares in /lib/firmware, the firmwares for > +wl12xx chips must be located in /lib/firmware/ti-connectivity/. It's a bit stupid that this was never changed in wl1251, but it still expects the driver in the "root" firmwares directory (ie. in /lib/firmware/wl1251-fw.bin, not in /lib/firmware/ti-connectivity/wl1251-fw.bin). Maybe now is the right time to change the driver appropriately to keep consistency? ;) -- Luca. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Sep 25, 2013 at 04:42:15PM +0300, Luca Coelho wrote: > On Wed, 2013-09-25 at 08:23 -0500, Felipe Balbi wrote: > > On Wed, Sep 25, 2013 at 02:07:58PM +0300, Luca Coelho wrote: > > > On Wed, 2013-09-25 at 14:04 +0300, Luca Coelho wrote: > > > > When sending big binary blobs, it's generally better to send pull > > > > requests instead of patches. If you add the -p option when calling git > > > > pull-request, the text will include all the readable parts but will omit > > > > the binary stuff. > > > > > > > > Thank you very much for following up on this! > > > > > > Ah, and I forgot to say that you should update the WHENCE file > > > accordingly too. Check the wl12xx and wl18xx drivers for examples. > > > > I'll send a pull request, but how about this ? I don't think we can > > change the license. It seems like the other firmwares are using the > > older license, I'd argue those should be changed to the new one, but > > that's another discussion. > > Cool, in general it looks good! > > Though it would be nice to know if the same "new" license could be used > for all the firmwares to avoid almost identical licenses. well, i'm not a lawyer :-s > > diff --git a/WHENCE b/WHENCE > > index e66fea5..4e9e2ed 100644 > > --- a/WHENCE > > +++ b/WHENCE > > @@ -1705,6 +1705,19 @@ Licence: Redistributable. See LICENCE.tda7706-firmware.txt for details. > > > > -------------------------------------------------------------------------- > > > > +Driver: wl1251 - Texas Instruments 802.11 WLAN driver for WiLink4 chips > > + > > +File: ti-connectivity/wl1251-fw.bin > > +File: ti-connectivity/wl1251-nvs.bin > > Don't you have the firmware version number to add here with "Version:" > tags like the other ones? I think you can easily find the version by > running strings on the binary and grepping for "Rev" (at least with the > newer WiLinks, this works). Done :-) thanks for the tip. > > +Licence: See LICENCE.wl1251 for details. > > + > > +The driver expects to find the firmwares under a ti-connectivity subdirectory. > > +So if your system looks for firmwares in /lib/firmware, the firmwares for > > +wl12xx chips must be located in /lib/firmware/ti-connectivity/. > > It's a bit stupid that this was never changed in wl1251, but it still > expects the driver in the "root" firmwares directory (ie. > in /lib/firmware/wl1251-fw.bin, not > in /lib/firmware/ti-connectivity/wl1251-fw.bin). Maybe now is the right > time to change the driver appropriately to keep consistency? ;) alright, will do...
On Wed, 2013-09-25 at 08:23 -0500, Felipe Balbi wrote: > Hi, > > On Wed, Sep 25, 2013 at 02:07:58PM +0300, Luca Coelho wrote: [...] > > Ah, and I forgot to say that you should update the WHENCE file > > accordingly too. Check the wl12xx and wl18xx drivers for examples. > > I'll send a pull request, but how about this ? I don't think we can > change the license. It seems like the other firmwares are using the > older license, I'd argue those should be changed to the new one, but > that's another discussion. [...] I haven't seen this pull request, so it looks like there is nothing for me to apply at the moment. Ben.
On Mon, Sep 30, 2013 at 04:37:49AM +0100, Ben Hutchings wrote: > On Wed, 2013-09-25 at 08:23 -0500, Felipe Balbi wrote: > > Hi, > > > > On Wed, Sep 25, 2013 at 02:07:58PM +0300, Luca Coelho wrote: > [...] > > > Ah, and I forgot to say that you should update the WHENCE file > > > accordingly too. Check the wl12xx and wl18xx drivers for examples. > > > > I'll send a pull request, but how about this ? I don't think we can > > change the license. It seems like the other firmwares are using the > > older license, I'd argue those should be changed to the new one, but > > that's another discussion. > [...] > > I haven't seen this pull request, so it looks like there is nothing for > me to apply at the moment. yeah, give me a couple more days, I need to finish something up here. cheers
Hi Felipe, On Wed, 2013-10-02 at 07:55 -0500, Felipe Balbi wrote: > Hi, > > here's a pull request for wl4 firmware. I'll send a patch for wl1251 > driver updating firmware load path. > > The following changes since commit b8ac7c7e27dcd13fa3c843aaf62457e9c57ea4db: > > linux-firmware: Add Brocade FC/FCOE Adapter firmware files (2013-09-30 04:53:32 +0100) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/balbi/linux-firmware.git wilink4 > > for you to fetch changes up to d726804dbc8dad88587b6be17716714cd91ed86c: > > ti-connectivity: add wl1251 firmware and license (2013-10-02 06:55:39 -0500) > > ---------------------------------------------------------------- > Felipe Balbi (1): > ti-connectivity: add wl1251 firmware and license > > LICENCE.wl1251 | 59 +++++++++++++++++++++++++++++++++++++++++ > WHENCE | 18 +++++++++++++ > ti-connectivity/wl1251-fw.bin | Bin 0 -> 194180 bytes > ti-connectivity/wl1251-nvs.bin | Bin 0 -> 752 bytes > 4 files changed, 77 insertions(+) > create mode 100644 LICENCE.wl1251 > create mode 100644 ti-connectivity/wl1251-fw.bin > create mode 100644 ti-connectivity/wl1251-nvs.bin Since you didn't send v2 of the patch, you could have used the -p option with git request-pull so we could see the changes you made here... -- Cheers, Luca. -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, 2013-10-02 at 07:55 -0500, Felipe Balbi wrote: > Hi, > > here's a pull request for wl4 firmware. I'll send a patch for wl1251 > driver updating firmware load path. > > The following changes since commit b8ac7c7e27dcd13fa3c843aaf62457e9c57ea4db: > > linux-firmware: Add Brocade FC/FCOE Adapter firmware files (2013-09-30 04:53:32 +0100) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/balbi/linux-firmware.git wilink4 > > for you to fetch changes up to d726804dbc8dad88587b6be17716714cd91ed86c: > > ti-connectivity: add wl1251 firmware and license (2013-10-02 06:55:39 -0500) > > ---------------------------------------------------------------- > Felipe Balbi (1): > ti-connectivity: add wl1251 firmware and license > > LICENCE.wl1251 | 59 +++++++++++++++++++++++++++++++++++++++++ > WHENCE | 18 +++++++++++++ > ti-connectivity/wl1251-fw.bin | Bin 0 -> 194180 bytes > ti-connectivity/wl1251-nvs.bin | Bin 0 -> 752 bytes > 4 files changed, 77 insertions(+) > create mode 100644 LICENCE.wl1251 > create mode 100644 ti-connectivity/wl1251-fw.bin > create mode 100644 ti-connectivity/wl1251-nvs.bin Pulled, thanks. Ben.
diff --git a/LICENCE.wl1251 b/LICENCE.wl1251 new file mode 100644 index 0000000..bd0f5f1 --- /dev/null +++ b/LICENCE.wl1251 @@ -0,0 +1,59 @@ +Copyright (c) 2000 – 2013 Texas Instruments Incorporated + +All rights reserved not granted herein. + +Limited License. + +Texas Instruments Incorporated grants a world-wide, royalty-free, non-exclusive +license under copyrights and patents it now or hereafter owns or controls to +make, have made, use, import, offer to sell and sell ("Utilize") this software +subject to the terms herein. With respect to the foregoing patent license, +such license is granted solely to the extent that any such patent is necessary +to Utilize the software alone. The patent license shall not apply to any +combinations which include this software, other than combinations with devices +manufactured by or for TI (“TI Devices”). No hardware patent is licensed +hereunder. + +Redistributions must preserve existing copyright notices and reproduce this +license (including the above copyright notice and the disclaimer and (if +applicable) source code license limitations below) in the documentation and/or +other materials provided with the distribution + +Redistribution and use in binary form, without modification, are permitted +provided that the following conditions are met: + +* No reverse engineering, decompilation, or disassembly of this software + is permitted with respect to any software provided in binary form. + +* any redistribution and use are licensed by TI for use only with TI + Devices. + +* Nothing shall obligate TI to provide you with source code for the + software licensed and provided to you in object code. + +If software source code is provided to you, modification and redistribution of +the source code are permitted provided that the following conditions are met: + +* any redistribution and use of the source code, including any resulting + derivative works, are licensed by TI for use only with TI Devices. + +* any redistribution and use of any object code compiled from the source + code and any resulting derivative works, are licensed by TI for use + only with TI Devices. + +Neither the name of Texas Instruments Incorporated nor the names of its +suppliers may be used to endorse or promote products derived from this software +without specific prior written permission. + +DISCLAIMER. + +THIS SOFTWARE IS PROVIDED BY TI AND TI’S LICENSORS "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 TI AND TI’S LICENSORS 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 --git a/WHENCE b/WHENCE index e66fea5..4e9e2ed 100644 --- a/WHENCE +++ b/WHENCE @@ -1705,6 +1705,19 @@ Licence: Redistributable. See LICENCE.tda7706-firmware.txt for details. -------------------------------------------------------------------------- +Driver: wl1251 - Texas Instruments 802.11 WLAN driver for WiLink4 chips + +File: ti-connectivity/wl1251-fw.bin +File: ti-connectivity/wl1251-nvs.bin + +Licence: See LICENCE.wl1251 for details. + +The driver expects to find the firmwares under a ti-connectivity subdirectory. +So if your system looks for firmwares in /lib/firmware, the firmwares for +wl12xx chips must be located in /lib/firmware/ti-connectivity/. + +-------------------------------------------------------------------------- + Driver: wl12xx - Texas Instruments 802.11 WLAN driver for WiLink6/7 chips File: ti-connectivity/wl1271-fw.bin