The following changes since commit 97649b1e5449029c845ebf7500e780a8867c3e89:
linux-firmware: Add a new FW 7.0.20.0 (2011-06-15 11:38:11 +0100)
are available in the git repository at:
git://lunge.queued.net/git/linux-firmware master
Andres Salomon (1):
libertas: add OLPC libertas blobs
LICENCE.OLPC | 33 +++++++++++++++++++++++++++++++++
WHENCE | 20 ++++++++++++++++++++
libertas/lbtf_sdio.bin | Bin 0 -> 120924 bytes
libertas/lbtf_usb.bin | Bin 0 -> 118888 bytes
libertas/sd8686_v9_OLPC.bin | Bin 0 -> 124244 bytes
libertas/usb8388_v5_OLPC.bin | Bin 0 -> 127824 bytes
6 files changed, 53 insertions(+), 0 deletions(-)
create mode 100644 LICENCE.OLPC
create mode 100644 libertas/lbtf_sdio.bin
create mode 100644 libertas/lbtf_usb.bin
create mode 100644 libertas/sd8686_v9_OLPC.bin
create mode 100644 libertas/usb8388_v5_OLPC.bin
On Sat, 18 Jun 2011 21:38:03 -0700
Andres Salomon <[email protected]> wrote:
> The following changes since commit
> 97649b1e5449029c845ebf7500e780a8867c3e89:
>
> linux-firmware: Add a new FW 7.0.20.0 (2011-06-15 11:38:11 +0100)
>
> are available in the git repository at:
> git://lunge.queued.net/git/linux-firmware master
>
> Andres Salomon (1):
> libertas: add OLPC libertas blobs
>
> LICENCE.OLPC | 33 +++++++++++++++++++++++++++++++++
> WHENCE | 20 ++++++++++++++++++++
> libertas/lbtf_sdio.bin | Bin 0 -> 120924 bytes
> libertas/lbtf_usb.bin | Bin 0 -> 118888 bytes
> libertas/sd8686_v9_OLPC.bin | Bin 0 -> 124244 bytes
> libertas/usb8388_v5_OLPC.bin | Bin 0 -> 127824 bytes
Of course, if people would prefer the OLPC version to supersede the
ones currently in the linux-firmware tree, I can do that instead. I
don't know what versions of sd8686.bin and usb8388.bin are actually in
the tree. I also don't know if the OLPC versions improve or make things
worse for people using those chips on non-OLPC systems.
These blobs are released by the OLPC project, and drive Marvell
libertas chips. OLPC hardware has additional features and quirks,
which makes special firmware necessary.
The firmware was downloaded from
http://dev.laptop.org/pub/firmware/libertas/.
Signed-off-by: Andres Salomon <[email protected]>
---
LICENCE.OLPC | 33 +++++++++++++++++++++++++++++++++
WHENCE | 20 ++++++++++++++++++++
libertas/lbtf_sdio.bin | Bin 0 -> 120924 bytes
libertas/lbtf_usb.bin | Bin 0 -> 118888 bytes
libertas/sd8686_v9_OLPC.bin | Bin 0 -> 124244 bytes
libertas/usb8388_v5_OLPC.bin | Bin 0 -> 127824 bytes
6 files changed, 53 insertions(+), 0 deletions(-)
create mode 100644 LICENCE.OLPC
create mode 100644 libertas/lbtf_sdio.bin
create mode 100644 libertas/lbtf_usb.bin
create mode 100644 libertas/sd8686_v9_OLPC.bin
create mode 100644 libertas/usb8388_v5_OLPC.bin
diff --git a/LICENCE.OLPC b/LICENCE.OLPC
new file mode 100644
index 0000000..a740952
--- /dev/null
+++ b/LICENCE.OLPC
@@ -0,0 +1,33 @@
+Copyright (c) 2006, One Laptop per Child and Marvell 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 Marvell 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.
+* You may not use or attempt to use this software in conjunction with
+ any product that is offered by a third party as a replacement,
+ substitute or alternative to a Marvell Product where a Marvell Product
+ is defined as a proprietary wireless LAN embedded client solution of
+ Marvell or a Marvell Affiliate.
+
+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 --git a/WHENCE b/WHENCE
index 4c51b23..f43f347 100644
--- a/WHENCE
+++ b/WHENCE
@@ -644,6 +644,26 @@ Linux driver tarballs downloaded from Marvell's "Extranet" with permission.
--------------------------------------------------------------------------
+Driver: libertas - Marvell Libertas 802.11b/g cards, OLPC firmware
+
+File: libertas/lbtf_sdio.bin
+Info: v9.0.7.p4
+
+File: libertas/lbtf_usb.bin
+Info: v5.132.3.p1
+
+File: libertas/sd8686_v9_OLPC.bin
+Info: v9.70.7.p0
+
+File: libertas/usb8388_v5_OLPC.bin
+Info: v5.110.22.p23
+
+Licence: Redistributable. See LICENCE.OLPC for details.
+
+Available from http://dev.laptop.org/pub/firmware/libertas/
+
+--------------------------------------------------------------------------
+
Driver: mwl8k - Marvell Libertas softmac-type 802.11b/g cards
File: mwl8k/fmimage_8687.fw
diff --git a/libertas/lbtf_sdio.bin b/libertas/lbtf_sdio.bin
new file mode 100644
index 0000000..a93d765
Binary files /dev/null and b/libertas/lbtf_sdio.bin differ
diff --git a/libertas/lbtf_usb.bin b/libertas/lbtf_usb.bin
new file mode 100644
index 0000000..8ee231a
Binary files /dev/null and b/libertas/lbtf_usb.bin differ
diff --git a/libertas/sd8686_v9_OLPC.bin b/libertas/sd8686_v9_OLPC.bin
new file mode 100644
index 0000000..8f877a7
Binary files /dev/null and b/libertas/sd8686_v9_OLPC.bin differ
diff --git a/libertas/usb8388_v5_OLPC.bin b/libertas/usb8388_v5_OLPC.bin
new file mode 100644
index 0000000..e01b6c2
Binary files /dev/null and b/libertas/usb8388_v5_OLPC.bin differ
--
1.7.2.5
On 19 June 2011 05:42, Andres Salomon <[email protected]> wrote:
>> ?LICENCE.OLPC ? ? ? ? ? ? ? ? | ? 33 +++++++++++++++++++++++++++++++++
>> ?WHENCE ? ? ? ? ? ? ? ? ? ? ? | ? 20 ++++++++++++++++++++
>> ?libertas/lbtf_sdio.bin ? ? ? | ?Bin 0 -> 120924 bytes
>> ?libertas/lbtf_usb.bin ? ? ? ?| ?Bin 0 -> 118888 bytes
>> ?libertas/sd8686_v9_OLPC.bin ?| ?Bin 0 -> 124244 bytes
>> ?libertas/usb8388_v5_OLPC.bin | ?Bin 0 -> 127824 bytes
>
> Of course, if people would prefer the OLPC version to supersede the
> ones currently in the linux-firmware tree, I can do that instead. ?I
> don't know what versions of sd8686.bin and usb8388.bin are actually in
> the tree. ?I also don't know if the OLPC versions improve or make things
> worse for people using those chips on non-OLPC systems.
This overlaps with a submission I made the other day (of usb8388
firmware), sorry for the lack of coordination there.
I don't think the OLPC hardware has any quirks or special features
that mean it requires special firmware.
However, for the usb8388 we do use a special firmware developed by
Cozybit (not Marvell), the one you submitted, which has its own
versioning scheme. The main difference is that it includes mesh
support. I am pretty sure it would run on any usb8388 but OLPC is the
only user of the hardware anyway. See
http://lists.infradead.org/pipermail/libertas-dev/2010-November/003330.html
and the rest of the discussion.
As for sd8686, I thought our firmware was standard, from Marvell, and
simply a newer version of what is in linux-firmware. Do you have
reason to believe otherwise?
Thanks,
Daniel
On Sun, 19 Jun 2011 10:41:22 +0100
Daniel Drake <[email protected]> wrote:
> On 19 June 2011 05:42, Andres Salomon <[email protected]> wrote:
> >> ?LICENCE.OLPC ? ? ? ? ? ? ? ? | ? 33
> >> +++++++++++++++++++++++++++++++++ WHENCE ? ? ? ? ? ? ? ? ? ? ? |
> >> 20 ++++++++++++++++++++ libertas/lbtf_sdio.bin ? ? ? | ?Bin 0 ->
> >> 120924 bytes libertas/lbtf_usb.bin ? ? ? ?| ?Bin 0 -> 118888 bytes
> >> ?libertas/sd8686_v9_OLPC.bin ?| ?Bin 0 -> 124244 bytes
> >> ?libertas/usb8388_v5_OLPC.bin | ?Bin 0 -> 127824 bytes
> >
> > Of course, if people would prefer the OLPC version to supersede the
> > ones currently in the linux-firmware tree, I can do that instead. ?I
> > don't know what versions of sd8686.bin and usb8388.bin are actually
> > in the tree. ?I also don't know if the OLPC versions improve or
> > make things worse for people using those chips on non-OLPC systems.
>
> This overlaps with a submission I made the other day (of usb8388
> firmware), sorry for the lack of coordination there.
Ah, sorry, I didn't know you were on top of this. I'm wanting to
kill off the Debian OLPC-specific libertas package, and finally found
some time to put together a pull request.
>
> I don't think the OLPC hardware has any quirks or special features
> that mean it requires special firmware.
>
> However, for the usb8388 we do use a special firmware developed by
> Cozybit (not Marvell), the one you submitted, which has its own
> versioning scheme. The main difference is that it includes mesh
> support. I am pretty sure it would run on any usb8388 but OLPC is the
> only user of the hardware anyway. See
> http://lists.infradead.org/pipermail/libertas-dev/2010-November/003330.html
> and the rest of the discussion.
>
> As for sd8686, I thought our firmware was standard, from Marvell, and
> simply a newer version of what is in linux-firmware. Do you have
> reason to believe otherwise?
>
I was just playing it safe. I have changelogs for the usb8388 firmware
releases, but not for sd8686. I'll defer to you for XO-1.5 stuff.
I'm more interested in the lbtf stuff anyways, as I don't see much use
for the on-chip mesh.
On Sun, 2011-06-19 at 10:41 +0100, Daniel Drake wrote:
> On 19 June 2011 05:42, Andres Salomon <[email protected]> wrote:
> >> LICENCE.OLPC | 33 +++++++++++++++++++++++++++++++++
> >> WHENCE | 20 ++++++++++++++++++++
> >> libertas/lbtf_sdio.bin | Bin 0 -> 120924 bytes
> >> libertas/lbtf_usb.bin | Bin 0 -> 118888 bytes
> >> libertas/sd8686_v9_OLPC.bin | Bin 0 -> 124244 bytes
> >> libertas/usb8388_v5_OLPC.bin | Bin 0 -> 127824 bytes
> >
> > Of course, if people would prefer the OLPC version to supersede the
> > ones currently in the linux-firmware tree, I can do that instead. I
> > don't know what versions of sd8686.bin and usb8388.bin are actually in
> > the tree. I also don't know if the OLPC versions improve or make things
> > worse for people using those chips on non-OLPC systems.
>
> This overlaps with a submission I made the other day (of usb8388
> firmware), sorry for the lack of coordination there.
>
> I don't think the OLPC hardware has any quirks or special features
> that mean it requires special firmware.
>
> However, for the usb8388 we do use a special firmware developed by
> Cozybit (not Marvell), the one you submitted, which has its own
> versioning scheme. The main difference is that it includes mesh
> support. I am pretty sure it would run on any usb8388 but OLPC is the
> only user of the hardware anyway. See
> http://lists.infradead.org/pipermail/libertas-dev/2010-November/003330.html
> and the rest of the discussion.
>
> As for sd8686, I thought our firmware was standard, from Marvell, and
> simply a newer version of what is in linux-firmware. Do you have
> reason to believe otherwise?
For usb8388 I don't think we really care which firmware is default since
OLPC was about the only consumer of that chip that I've ever heard of.
For the other firmware I periodically trawled Marvell's Extranet and
grabbed latest firmware from there. If you guys have a newer micro
version of the firmware then great, push it. Latest I have access to
for 8686 is SD-8686-FEDORA26FC6-SYSKT-9.70.20.p0-26409.p64 so if you've
got something newer great.
Dan
On Mon, 20 Jun 2011 23:47:13 -0500
Dan Williams <[email protected]> wrote:
> On Sun, 2011-06-19 at 10:41 +0100, Daniel Drake wrote:
> > On 19 June 2011 05:42, Andres Salomon <[email protected]> wrote:
> > >> LICENCE.OLPC | 33
> > >> +++++++++++++++++++++++++++++++++ WHENCE
> > >> | 20 ++++++++++++++++++++ libertas/lbtf_sdio.bin | Bin
> > >> 0 -> 120924 bytes libertas/lbtf_usb.bin | Bin 0 ->
> > >> 118888 bytes libertas/sd8686_v9_OLPC.bin | Bin 0 -> 124244
> > >> bytes libertas/usb8388_v5_OLPC.bin | Bin 0 -> 127824 bytes
> > >
> > > Of course, if people would prefer the OLPC version to supersede
> > > the ones currently in the linux-firmware tree, I can do that
> > > instead. I don't know what versions of sd8686.bin and
> > > usb8388.bin are actually in the tree. I also don't know if the
> > > OLPC versions improve or make things worse for people using those
> > > chips on non-OLPC systems.
> >
> > This overlaps with a submission I made the other day (of usb8388
> > firmware), sorry for the lack of coordination there.
> >
> > I don't think the OLPC hardware has any quirks or special features
> > that mean it requires special firmware.
> >
> > However, for the usb8388 we do use a special firmware developed by
> > Cozybit (not Marvell), the one you submitted, which has its own
> > versioning scheme. The main difference is that it includes mesh
> > support. I am pretty sure it would run on any usb8388 but OLPC is
> > the only user of the hardware anyway. See
> > http://lists.infradead.org/pipermail/libertas-dev/2010-November/003330.html
> > and the rest of the discussion.
> >
> > As for sd8686, I thought our firmware was standard, from Marvell,
> > and simply a newer version of what is in linux-firmware. Do you have
> > reason to believe otherwise?
>
> For usb8388 I don't think we really care which firmware is default
> since OLPC was about the only consumer of that chip that I've ever
> heard of.
>
> For the other firmware I periodically trawled Marvell's Extranet and
> grabbed latest firmware from there. If you guys have a newer micro
> version of the firmware then great, push it. Latest I have access to
> for 8686 is SD-8686-FEDORA26FC6-SYSKT-9.70.20.p0-26409.p64 so if
> you've got something newer great.
Looks like the one on dev.l.o is older (9.70.7.p0). Shall I redo the
pull request a) ignoring sd8686, b) replacing usb8388 v5 with the OLPC
version, and c) including both thinfirm blobs as well, then?
On 21 June 2011 08:18, Andres Salomon <[email protected]> wrote:
> Looks like the one on dev.l.o is older (9.70.7.p0). ?Shall I redo the
> pull request a) ignoring sd8686, b) replacing usb8388 v5 with the OLPC
> version, and c) including both thinfirm blobs as well, then?
That sounds good to me. The only thing I'm a bit unsure about is the
usb8388 thing. If you replace usb8388_v5.bin with the latest OLPC one,
we would like to have that at the top of the list, higher than
usb8388_v9, so that OLPC firmware gets preferred. That might be a bit
strange. On the other hand, if usb8388_olpc_v5.bin is at the top its
less odd, since it looks like a separate branch.
The other changes look fine, and we will figure out sd8686 and send a
later pull request for that. Dan, can you send over
SD-8686-FEDORA26FC6-SYSKT-9.70.20.p0-26409.p64, and any release
notes/changelog you may have? I wasn't aware of this release.
Thanks,
Daniel
On 21 June 2011 09:05, Daniel Drake <[email protected]> wrote:
> The other changes look fine, and we will figure out sd8686 and send a
> later pull request for that. Dan, can you send over
> SD-8686-FEDORA26FC6-SYSKT-9.70.20.p0-26409.p64, and any release
> notes/changelog you may have? I wasn't aware of this release.
Also, could you take a look and see if there is some kind of archived
changelog or release history that would link the 3 firmware versions
in question to the same release stream? If it seems obvious that one
follows on from the other it would avoid me having to pester Marvell
about this.
The 3 versions in question are:
1. The version in linux-firmware
$Id: sd8686-B0, RF868X, FP4, 9.70.3.p36 $
RC: , yhou, 2008/09/08, 19:11:06
md5sum: 20208583d441d1ecd7a05d5e5cda5856
2. The OLPC version, shipped in Fedora:
$Id: sd8686-B0, RF868X, FP4, 9.70.7.p0 $
RC: , yhou, 2008/11/11, 13:10:01
md5sum: b4f8be61e19780a14836f146c538c5dd
3. The latest version that you've found
SD-8686-FEDORA26FC6-SYSKT-9.70.20.p0-26409.p64
Thanks,
Daniel