Patchwork Maverick pull request (V2), lp589304 bnx2 udeb firmware updates

login
register
mail settings
Submitter Tim Gardner
Date June 4, 2010, 6:40 p.m.
Message ID <20100604184057.6F5ADF8A34@sepang.rtg.net>
Download mbox | patch
Permalink /patch/54666/
State Accepted
Delegated to: Leann Ogasawara
Headers show

Comments

Tim Gardner - June 4, 2010, 6:40 p.m.
The following changes since commit 47610554ba876acbd2dff621bc05e188753dbd5b:
  Leann Ogasawara (1):
        UBUNTU: Ubuntu-2.6.34-5.14

are available in the git repository at:

  git://kernel.ubuntu.com/rtg/ubuntu-maverick.git bnx2-lp589304

Tim Gardner (1):
      UBUNTU: [Config] Update bnx2 udeb firmware files

 debian.master/d-i/firmware/nic-modules |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
From 18104400ad8a12c14c3f141e083a7b2ba1b45da5 Mon Sep 17 00:00:00 2001
From: Tim Gardner <tim.gardner@canonical.com>
Date: Fri, 4 Jun 2010 12:22:29 -0600
Subject: [PATCH] UBUNTU: [Config] Update bnx2 udeb firmware files

BugLink: http://bugs.launchpad.net/bugs/589304

Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
---
 debian.master/d-i/firmware/nic-modules |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
Tim Gardner - June 4, 2010, 6:50 p.m.
On 06/04/2010 12:40 PM, Tim Gardner wrote:
> The following changes since commit 47610554ba876acbd2dff621bc05e188753dbd5b:
>    Leann Ogasawara (1):
>          UBUNTU: Ubuntu-2.6.34-5.14
>
> are available in the git repository at:
>
>    git://kernel.ubuntu.com/rtg/ubuntu-maverick.git bnx2-lp589304
>
> Tim Gardner (1):
>        UBUNTU: [Config] Update bnx2 udeb firmware files
>
>   debian.master/d-i/firmware/nic-modules |   14 +++++++-------
>   1 files changed, 7 insertions(+), 7 deletions(-)
>  From 18104400ad8a12c14c3f141e083a7b2ba1b45da5 Mon Sep 17 00:00:00 2001
> From: Tim Gardner<tim.gardner@canonical.com>
> Date: Fri, 4 Jun 2010 12:22:29 -0600
> Subject: [PATCH] UBUNTU: [Config] Update bnx2 udeb firmware files
>
> BugLink: http://bugs.launchpad.net/bugs/589304
>
> Signed-off-by: Tim Gardner<tim.gardner@canonical.com>
> ---
>   debian.master/d-i/firmware/nic-modules |   14 +++++++-------
>   1 files changed, 7 insertions(+), 7 deletions(-)
>
> diff --git a/debian.master/d-i/firmware/nic-modules b/debian.master/d-i/firmware/nic-modules
> index bf601e5..75cc3a0 100644
> --- a/debian.master/d-i/firmware/nic-modules
> +++ b/debian.master/d-i/firmware/nic-modules
> @@ -1,10 +1,10 @@
> -bnx2/bnx2-mips-06-5.0.0.j3.fw ?
> -bnx2/bnx2-rv2p-06-5.0.0.j3.fw ?
> -bnx2/bnx2-mips-09-5.0.0.j3.fw ?
> -bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw ?
> -bnx2/bnx2-rv2p-09-5.0.0.j3.fw ?
> -bnx2x-e1-5.0.21.0.fw ?
> -bnx2x-e1h-5.0.21.0.fw ?
> +bnx2/bnx2-mips-06-5.0.0.j6.fw
> +bnx2/bnx2-mips-09-5.0.0.j9.fw
> +bnx2/bnx2-rv2p-06-5.0.0.j3.fw
> +bnx2/bnx2-rv2p-09-5.0.0.j10.fw
> +bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw
> +bnx2x-e1-5.2.13.0.fw
> +bnx2x-e1h-5.2.13.0.fw
>   e100/d101m_ucode.bin
>   e100/d101s_ucode.bin
>   e100/d102e_ucode.bin

Its worth noting that firmware files, unlike modules, are not generated 
and should never be marked optional. Had they not been marked optional, 
then we'd have encountered this issue of the firmware file names 
changing much earlier because those changes would have broken the build.

rtg
Chase Douglas - June 4, 2010, 7:55 p.m.
On Fri, 2010-06-04 at 12:40 -0600, Tim Gardner wrote:
> From 18104400ad8a12c14c3f141e083a7b2ba1b45da5 Mon Sep 17 00:00:00 2001
> From: Tim Gardner <tim.gardner@canonical.com>
> Date: Fri, 4 Jun 2010 12:22:29 -0600
> Subject: [PATCH] UBUNTU: [Config] Update bnx2 udeb firmware files
> 
> BugLink: http://bugs.launchpad.net/bugs/589304
> 
> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
> ---
>  debian.master/d-i/firmware/nic-modules |   14 +++++++-------
>  1 files changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/debian.master/d-i/firmware/nic-modules b/debian.master/d-i/firmware/nic-modules
> index bf601e5..75cc3a0 100644
> --- a/debian.master/d-i/firmware/nic-modules
> +++ b/debian.master/d-i/firmware/nic-modules
> @@ -1,10 +1,10 @@
> -bnx2/bnx2-mips-06-5.0.0.j3.fw ?
> -bnx2/bnx2-rv2p-06-5.0.0.j3.fw ?
> -bnx2/bnx2-mips-09-5.0.0.j3.fw ?
> -bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw ?
> -bnx2/bnx2-rv2p-09-5.0.0.j3.fw ?
> -bnx2x-e1-5.0.21.0.fw ?
> -bnx2x-e1h-5.0.21.0.fw ?
> +bnx2/bnx2-mips-06-5.0.0.j6.fw 
> +bnx2/bnx2-mips-09-5.0.0.j9.fw
> +bnx2/bnx2-rv2p-06-5.0.0.j3.fw
> +bnx2/bnx2-rv2p-09-5.0.0.j10.fw
> +bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw
> +bnx2x-e1-5.2.13.0.fw
> +bnx2x-e1h-5.2.13.0.fw
>  e100/d101m_ucode.bin
>  e100/d101s_ucode.bin
>  e100/d102e_ucode.bin

Makes sense to me. Just updating the versions and making them mandatory
so the build breaks if they change again. It also seems that these are
the only firmware files marked with '?' in maverick, so we're good all
around now.

Acked-by: Chase Douglas <chase.douglas@canonical.com>
Leann Ogasawara - June 8, 2010, 7:07 p.m.
Applied to Maverick master with one slight modification (inlined in the
patch below).  The reason is that after having rebased to 2.6.35-rc1 one
of the firmware files was updated to a newer version:

commit a931d294042b5bbd8e390c59741b968c11856ac1
Author: Michael Chan <mchan@broadcom.com>
Date:   Mon May 17 17:33:31 2010 -0700

    bnx2: Update 5709 MIPS firmware and version to 2.0.15.

So I modified your patch to use the newer version to avoid build
failures:

missing firmware bnx2/bnx2-mips-09-5.0.0.j9.fw
command exited with status 1
make[1]: *** [do-binary-udebs] Error 2
make: *** [binary-udebs] Error 2
Failure(2)

Thanks,
Leann

On Fri, 2010-06-04 at 12:50 -0600, Tim Gardner wrote:
> On 06/04/2010 12:40 PM, Tim Gardner wrote:
> > The following changes since commit 47610554ba876acbd2dff621bc05e188753dbd5b:
> >    Leann Ogasawara (1):
> >          UBUNTU: Ubuntu-2.6.34-5.14
> >
> > are available in the git repository at:
> >
> >    git://kernel.ubuntu.com/rtg/ubuntu-maverick.git bnx2-lp589304
> >
> > Tim Gardner (1):
> >        UBUNTU: [Config] Update bnx2 udeb firmware files
> >
> >   debian.master/d-i/firmware/nic-modules |   14 +++++++-------
> >   1 files changed, 7 insertions(+), 7 deletions(-)
> >  From 18104400ad8a12c14c3f141e083a7b2ba1b45da5 Mon Sep 17 00:00:00 2001
> > From: Tim Gardner<tim.gardner@canonical.com>
> > Date: Fri, 4 Jun 2010 12:22:29 -0600
> > Subject: [PATCH] UBUNTU: [Config] Update bnx2 udeb firmware files
> >
> > BugLink: http://bugs.launchpad.net/bugs/589304
> >
> > Signed-off-by: Tim Gardner<tim.gardner@canonical.com>
> > ---
> >   debian.master/d-i/firmware/nic-modules |   14 +++++++-------
> >   1 files changed, 7 insertions(+), 7 deletions(-)
> >
> > diff --git a/debian.master/d-i/firmware/nic-modules b/debian.master/d-i/firmware/nic-modules
> > index bf601e5..75cc3a0 100644
> > --- a/debian.master/d-i/firmware/nic-modules
> > +++ b/debian.master/d-i/firmware/nic-modules
> > @@ -1,10 +1,10 @@
> > -bnx2/bnx2-mips-06-5.0.0.j3.fw ?
> > -bnx2/bnx2-rv2p-06-5.0.0.j3.fw ?
> > -bnx2/bnx2-mips-09-5.0.0.j3.fw ?
> > -bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw ?
> > -bnx2/bnx2-rv2p-09-5.0.0.j3.fw ?
> > -bnx2x-e1-5.0.21.0.fw ?
> > -bnx2x-e1h-5.0.21.0.fw ?
> > +bnx2/bnx2-mips-06-5.0.0.j6.fw
> > +bnx2/bnx2-mips-09-5.0.0.j9.fw

I replaced the line above with:

bnx2/bnx2-mips-09-5.0.0.j15.fw

> > +bnx2/bnx2-rv2p-06-5.0.0.j3.fw
> > +bnx2/bnx2-rv2p-09-5.0.0.j10.fw
> > +bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw
> > +bnx2x-e1-5.2.13.0.fw
> > +bnx2x-e1h-5.2.13.0.fw
> >   e100/d101m_ucode.bin
> >   e100/d101s_ucode.bin
> >   e100/d102e_ucode.bin
> 
> Its worth noting that firmware files, unlike modules, are not generated 
> and should never be marked optional. Had they not been marked optional, 
> then we'd have encountered this issue of the firmware file names 
> changing much earlier because those changes would have broken the build.
> 
> rtg

Patch

diff --git a/debian.master/d-i/firmware/nic-modules b/debian.master/d-i/firmware/nic-modules
index bf601e5..75cc3a0 100644
--- a/debian.master/d-i/firmware/nic-modules
+++ b/debian.master/d-i/firmware/nic-modules
@@ -1,10 +1,10 @@ 
-bnx2/bnx2-mips-06-5.0.0.j3.fw ?
-bnx2/bnx2-rv2p-06-5.0.0.j3.fw ?
-bnx2/bnx2-mips-09-5.0.0.j3.fw ?
-bnx2/bnx2-rv2p-09ax-5.0.0.j3.fw ?
-bnx2/bnx2-rv2p-09-5.0.0.j3.fw ?
-bnx2x-e1-5.0.21.0.fw ?
-bnx2x-e1h-5.0.21.0.fw ?
+bnx2/bnx2-mips-06-5.0.0.j6.fw 
+bnx2/bnx2-mips-09-5.0.0.j9.fw
+bnx2/bnx2-rv2p-06-5.0.0.j3.fw
+bnx2/bnx2-rv2p-09-5.0.0.j10.fw
+bnx2/bnx2-rv2p-09ax-5.0.0.j10.fw
+bnx2x-e1-5.2.13.0.fw
+bnx2x-e1h-5.2.13.0.fw
 e100/d101m_ucode.bin
 e100/d101s_ucode.bin
 e100/d102e_ucode.bin