The following changes since commit 52d77db9f133afe4d2b26aeccfd603745f45fda1:
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/egrumbach/linux-firmware (2013-12-30 15:22:40 +0100)
are available in the git repository at:
git://git.marvell.com/mwifiex-firmware.git master
for you to fetch changes up to 2d4aa2037a7015c4d78cde40006f80b8012537a6:
linux-firmware: add Marvell USB8897-B0 firmware combo image (2014-01-09 19:17:35 -0800)
----------------------------------------------------------------
Bing Zhao (3):
linux-firmware: update Marvell USB8797-B0 firmware image
linux-firmware: update Marvell SD8897-B0 firmware combo image
linux-firmware: add Marvell USB8897-B0 firmware combo image
WHENCE | 7 +++++--
mrvl/sd8897_uapsta.bin | Bin 639012 -> 668028 bytes
mrvl/usb8797_uapsta.bin | Bin 508372 -> 541048 bytes
mrvl/usb8897_uapsta.bin | Bin 0 -> 705364 bytes
4 files changed, 5 insertions(+), 2 deletions(-)
create mode 100644 mrvl/usb8897_uapsta.bin
diff --git a/WHENCE b/WHENCE
index 4f87d8a..23faafa 100644
--- a/WHENCE
+++ b/WHENCE
@@ -730,10 +730,13 @@ File: mrvl/sd8797_uapsta.bin
Version: 14.66.11.p151
File: mrvl/sd8897_uapsta.bin
-Version: 15.69.2.p11
+Version: 15.68.201.p113
File: mrvl/usb8797_uapsta.bin
-Version: 14.69.11.p179
+Version: 14.68.29.p26
+
+File: mrvl/usb8897_uapsta.bin
+Version: 15.68.201.p113
File: mrvl/pcie8897_uapsta.bin
Version: 15.69.2.p11
diff --git a/mrvl/sd8897_uapsta.bin b/mrvl/sd8897_uapsta.bin
index 70732a6..e68a049 100644
Binary files a/mrvl/sd8897_uapsta.bin and b/mrvl/sd8897_uapsta.bin differ
diff --git a/mrvl/usb8797_uapsta.bin b/mrvl/usb8797_uapsta.bin
index bd7c07c..1963798 100644
Binary files a/mrvl/usb8797_uapsta.bin and b/mrvl/usb8797_uapsta.bin differ
diff --git a/mrvl/usb8897_uapsta.bin b/mrvl/usb8897_uapsta.bin
new file mode 100644
index 0000000..59aef78
Binary files /dev/null and b/mrvl/usb8897_uapsta.bin differ
On Mon, Jan 20, 2014 at 12:26:47PM -0800, Bing Zhao wrote:
> Hi Ben,
>
> > > > > File: mrvl/usb8797_uapsta.bin
> > > > > -Version: 14.69.11.p179
> > > > > +Version: 14.68.29.p26
> > > > [...]
> > > >
> > > > Why are these updates rolling the version number backward? Did the
> > > > later versions cause regressions?
> > >
> > > These images are newer firmware versions actually.
> > >
> > > The 2nd (69 or 68) and 3rd (11 or 29) numbers in the version string do
> > > not necessarily mean the version increasing or decreasing. Only when
> > > first 3 numbers are fixed, a smaller 4th number will mean that the
> > > version is rolling backward. For examples,
> >
> > So what do you they mean and why are they in the version number?
>
> The first 3 numbers altogether identifies the firmware branch/features. The 4th number is the firmware revision.
This is a uniquely confusing way of generating version numbers. If
only the current 4th part (what you call firmware revision) follows
the usual version ordering, then I think that should be used as the
(public) version number.
Ben.
--
Ben Hutchings
Gates has joked that everything goes on and off unexepectedly in the house,
which is run by a high-end PC network built on Windows NT. - Seattle Times
SGkgQmVuLA0KDQo+ID4gPiA+ICBGaWxlOiBtcnZsL3VzYjg3OTdfdWFwc3RhLmJpbg0KPiA+ID4g
PiAtVmVyc2lvbjogMTQuNjkuMTEucDE3OQ0KPiA+ID4gPiArVmVyc2lvbjogMTQuNjguMjkucDI2
DQo+ID4gPiBbLi4uXQ0KPiA+ID4NCj4gPiA+IFdoeSBhcmUgdGhlc2UgdXBkYXRlcyByb2xsaW5n
IHRoZSB2ZXJzaW9uIG51bWJlciBiYWNrd2FyZD8gIERpZCB0aGUNCj4gPiA+IGxhdGVyIHZlcnNp
b25zIGNhdXNlIHJlZ3Jlc3Npb25zPw0KPiA+DQo+ID4gVGhlc2UgaW1hZ2VzIGFyZSBuZXdlciBm
aXJtd2FyZSB2ZXJzaW9ucyBhY3R1YWxseS4NCj4gPg0KPiA+IFRoZSAybmQgKDY5IG9yIDY4KSBh
bmQgM3JkICgxMSBvciAyOSkgbnVtYmVycyBpbiB0aGUgdmVyc2lvbiBzdHJpbmcgZG8NCj4gPiBu
b3QgbmVjZXNzYXJpbHkgbWVhbiB0aGUgdmVyc2lvbiBpbmNyZWFzaW5nIG9yIGRlY3JlYXNpbmcu
IE9ubHkgd2hlbg0KPiA+IGZpcnN0IDMgbnVtYmVycyBhcmUgZml4ZWQsIGEgc21hbGxlciA0dGgg
bnVtYmVyIHdpbGwgbWVhbiB0aGF0IHRoZQ0KPiA+IHZlcnNpb24gaXMgcm9sbGluZyBiYWNrd2Fy
ZC4gRm9yIGV4YW1wbGVzLA0KPiANCj4gU28gd2hhdCBkbyB5b3UgdGhleSBtZWFuIGFuZCB3aHkg
YXJlIHRoZXkgaW4gdGhlIHZlcnNpb24gbnVtYmVyPw0KDQpUaGUgZmlyc3QgMyBudW1iZXJzIGFs
dG9nZXRoZXIgaWRlbnRpZmllcyB0aGUgZmlybXdhcmUgYnJhbmNoL2ZlYXR1cmVzLiBUaGUgNHRo
IG51bWJlciBpcyB0aGUgZmlybXdhcmUgcmV2aXNpb24uDQoNClRoYW5rcywNCkJpbmcNCg0K
Hi James,
> On Sun, Jan 19, 2014 at 06:10:03PM -0800, Bing Zhao wrote:
> > The 2nd (69 or 68) and 3rd (11 or 29) numbers in the version string
> > do not necessarily mean the version increasing or decreasing. Only
> > when first 3 numbers are fixed, a smaller 4th number will mean that
> > the version is rolling backward.
>
> Ah, light dawns. I've been dealing with these version numbers for
> years now, for 8388, 8686 and 8787, and I didn't know that. Is this
> documented anywhere else? Have the 2nd and 3rd numbers any meaning or
> are they random?
They're not random. They represent firmware branch and features built in.
Thanks,
Bing
On Sun, 2014-01-19 at 18:10 -0800, Bing Zhao wrote:
> Hi Ben,
>
> > > @@ -730,10 +730,13 @@ File: mrvl/sd8797_uapsta.bin
> > > Version: 14.66.11.p151
> > >
> > > File: mrvl/sd8897_uapsta.bin
> > > -Version: 15.69.2.p11
> > > +Version: 15.68.201.p113
> > >
> > > File: mrvl/usb8797_uapsta.bin
> > > -Version: 14.69.11.p179
> > > +Version: 14.68.29.p26
> > [...]
> >
> > Why are these updates rolling the version number backward? Did the
> > later versions cause regressions?
>
> These images are newer firmware versions actually.
>
> The 2nd (69 or 68) and 3rd (11 or 29) numbers in the version string do
> not necessarily mean the version increasing or decreasing. Only when
> first 3 numbers are fixed, a smaller 4th number will mean that the
> version is rolling backward. For examples,
So what do you they mean and why are they in the version number?
> File: mrvl/sd8797_uapsta.bin
> -Version: 14.66.11.p100
> +Version: 14.66.11.p151
>
> The version is moving forward.
>
> But if we do,
>
> -Version: 14.66.11.p100
> +Version: 14.66.11.p99
>
> this will be rolling backward.
>
>
> Each firmware image contains a timestamp such as "2013/12/06, 21:28:31".
> If you think that is informative I can add the timestamps in commit
> logs and resend the pull request.
I don't think it is.
Ben.
--
Ben Hutchings
One of the nice things about standards is that there are so many of them.
On Sun, Jan 19, 2014 at 06:10:03PM -0800, Bing Zhao wrote:
> The 2nd (69 or 68) and 3rd (11 or 29) numbers in the version string
> do not necessarily mean the version increasing or decreasing. Only
> when first 3 numbers are fixed, a smaller 4th number will mean that
> the version is rolling backward.
Ah, light dawns. I've been dealing with these version numbers for
years now, for 8388, 8686 and 8787, and I didn't know that. Is this
documented anywhere else? Have the 2nd and 3rd numbers any meaning or
are they random?
--
James Cameron
http://quozl.linux.org.au/
SGkgQmVuLA0KDQo+ID4gQEAgLTczMCwxMCArNzMwLDEzIEBAIEZpbGU6IG1ydmwvc2Q4Nzk3X3Vh
cHN0YS5iaW4NCj4gPiAgVmVyc2lvbjogMTQuNjYuMTEucDE1MQ0KPiA+DQo+ID4gIEZpbGU6IG1y
dmwvc2Q4ODk3X3VhcHN0YS5iaW4NCj4gPiAtVmVyc2lvbjogMTUuNjkuMi5wMTENCj4gPiArVmVy
c2lvbjogMTUuNjguMjAxLnAxMTMNCj4gPg0KPiA+ICBGaWxlOiBtcnZsL3VzYjg3OTdfdWFwc3Rh
LmJpbg0KPiA+IC1WZXJzaW9uOiAxNC42OS4xMS5wMTc5DQo+ID4gK1ZlcnNpb246IDE0LjY4LjI5
LnAyNg0KPiBbLi4uXQ0KPiANCj4gV2h5IGFyZSB0aGVzZSB1cGRhdGVzIHJvbGxpbmcgdGhlIHZl
cnNpb24gbnVtYmVyIGJhY2t3YXJkPyAgRGlkIHRoZQ0KPiBsYXRlciB2ZXJzaW9ucyBjYXVzZSBy
ZWdyZXNzaW9ucz8NCg0KVGhlc2UgaW1hZ2VzIGFyZSBuZXdlciBmaXJtd2FyZSB2ZXJzaW9ucyBh
Y3R1YWxseS4NCg0KVGhlIDJuZCAoNjkgb3IgNjgpIGFuZCAzcmQgKDExIG9yIDI5KSBudW1iZXJz
IGluIHRoZSB2ZXJzaW9uIHN0cmluZyBkbyBub3QgbmVjZXNzYXJpbHkgbWVhbiB0aGUgdmVyc2lv
biBpbmNyZWFzaW5nIG9yIGRlY3JlYXNpbmcuIE9ubHkgd2hlbiBmaXJzdCAzIG51bWJlcnMgYXJl
IGZpeGVkLCBhIHNtYWxsZXIgNHRoIG51bWJlciB3aWxsIG1lYW4gdGhhdCB0aGUgdmVyc2lvbiBp
cyByb2xsaW5nIGJhY2t3YXJkLiBGb3IgZXhhbXBsZXMsDQoNCkZpbGU6IG1ydmwvc2Q4Nzk3X3Vh
cHN0YS5iaW4NCi1WZXJzaW9uOiAxNC42Ni4xMS5wMTAwDQorVmVyc2lvbjogMTQuNjYuMTEucDE1
MQ0KDQpUaGUgdmVyc2lvbiBpcyBtb3ZpbmcgZm9yd2FyZC4NCg0KQnV0IGlmIHdlIGRvLA0KDQot
VmVyc2lvbjogMTQuNjYuMTEucDEwMA0KK1ZlcnNpb246IDE0LjY2LjExLnA5OQ0KDQp0aGlzIHdp
bGwgYmUgcm9sbGluZyBiYWNrd2FyZC4NCg0KDQpFYWNoIGZpcm13YXJlIGltYWdlIGNvbnRhaW5z
IGEgdGltZXN0YW1wIHN1Y2ggYXMgIjIwMTMvMTIvMDYsIDIxOjI4OjMxIi4NCklmIHlvdSB0aGlu
ayB0aGF0IGlzIGluZm9ybWF0aXZlIEkgY2FuIGFkZCB0aGUgdGltZXN0YW1wcyBpbiBjb21taXQg
bG9ncyBhbmQgcmVzZW5kIHRoZSBwdWxsIHJlcXVlc3QuDQoNClRoYW5rcywNCkJpbmcNCg0K
On Thu, 2014-01-09 at 19:48 -0800, Bing Zhao wrote:
> The following changes since commit 52d77db9f133afe4d2b26aeccfd603745f45fda1:
>
> Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/egrumbach/linux-firmware (2013-12-30 15:22:40 +0100)
>
> are available in the git repository at:
>
>
> git://git.marvell.com/mwifiex-firmware.git master
>
> for you to fetch changes up to 2d4aa2037a7015c4d78cde40006f80b8012537a6:
>
> linux-firmware: add Marvell USB8897-B0 firmware combo image (2014-01-09 19:17:35 -0800)
>
> ----------------------------------------------------------------
> Bing Zhao (3):
> linux-firmware: update Marvell USB8797-B0 firmware image
> linux-firmware: update Marvell SD8897-B0 firmware combo image
> linux-firmware: add Marvell USB8897-B0 firmware combo image
>
> WHENCE | 7 +++++--
> mrvl/sd8897_uapsta.bin | Bin 639012 -> 668028 bytes
> mrvl/usb8797_uapsta.bin | Bin 508372 -> 541048 bytes
> mrvl/usb8897_uapsta.bin | Bin 0 -> 705364 bytes
> 4 files changed, 5 insertions(+), 2 deletions(-)
> create mode 100644 mrvl/usb8897_uapsta.bin
>
> diff --git a/WHENCE b/WHENCE
> index 4f87d8a..23faafa 100644
> --- a/WHENCE
> +++ b/WHENCE
> @@ -730,10 +730,13 @@ File: mrvl/sd8797_uapsta.bin
> Version: 14.66.11.p151
>
> File: mrvl/sd8897_uapsta.bin
> -Version: 15.69.2.p11
> +Version: 15.68.201.p113
>
> File: mrvl/usb8797_uapsta.bin
> -Version: 14.69.11.p179
> +Version: 14.68.29.p26
[...]
Why are these updates rolling the version number backward? Did the
later versions cause regressions?
Ben.
--
Ben Hutchings
friends: People who know you well, but like you anyway.