Validated FW loading on a Ubuntu Natty alpha image, on a pandaboard
(embedding a WL1271).
Signed-off-by: Sebastien Jan <[email protected]>
---
Applies on a 2.6.38-rc5 kernel
drivers/net/wireless/wl12xx/wl12xx.h | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
index 9050dd9..8ceb6a0 100644
--- a/drivers/net/wireless/wl12xx/wl12xx.h
+++ b/drivers/net/wireless/wl12xx/wl12xx.h
@@ -112,8 +112,8 @@ extern u32 wl12xx_debug_level;
CFG_RX_CTL_EN | CFG_RX_BCN_EN | \
CFG_RX_AUTH_EN | CFG_RX_ASSOC_EN)
-#define WL1271_FW_NAME "wl1271-fw.bin"
-#define WL1271_NVS_NAME "wl1271-nvs.bin"
+#define WL1271_FW_NAME "ti-connectivity/wl1271-fw.bin"
+#define WL1271_NVS_NAME "ti-connectivity/wl1271-nvs.bin"
#define WL1271_TX_SECURITY_LO16(s) ((u16)((s) & 0xffff))
#define WL1271_TX_SECURITY_HI32(s) ((u32)(((s) >> 16) & 0xffffffff))
--
1.7.1
On Wed, Feb 23, 2011 at 04:33:19PM +0200, Luciano Coelho wrote:
> Hi Sebastien,
>
> On Wed, 2011-02-23 at 14:25 +0100, Sebastien Jan wrote:
> > Validated FW loading on a Ubuntu Natty alpha image, on a pandaboard
> > (embedding a WL1271).
> >
> > Signed-off-by: Sebastien Jan <[email protected]>
> > ---
>
> Thanks for working on getting the wl12xx driver to work on the
> pandaboard!
>
> > diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
> > index 9050dd9..8ceb6a0 100644
> > --- a/drivers/net/wireless/wl12xx/wl12xx.h
> > +++ b/drivers/net/wireless/wl12xx/wl12xx.h
> > @@ -112,8 +112,8 @@ extern u32 wl12xx_debug_level;
> > CFG_RX_CTL_EN | CFG_RX_BCN_EN | \
> > CFG_RX_AUTH_EN | CFG_RX_ASSOC_EN)
> >
> > -#define WL1271_FW_NAME "wl1271-fw.bin"
> > -#define WL1271_NVS_NAME "wl1271-nvs.bin"
> > +#define WL1271_FW_NAME "ti-connectivity/wl1271-fw.bin"
> > +#define WL1271_NVS_NAME "ti-connectivity/wl1271-nvs.bin"
>
> You're right. Our firmware is (unfortunately) inside the
> ti-connectivity in linux-firmware.git. So it would make sense to
> include the ti-connectivity/ directory when requesting for the firmware,
> but it's just damn ugly. :( The driver should not care at all where the
> firmware is to be fetched from, that should be up to the userspace.
>
> Dunno what is the best thing to do about this. Add the directory to the
> driver? Move the wl1271*.bin files to the root of linux-firmware? Does
> anybody have opinions about it?
I think there are a number of other drivers with embedded pathnames.
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.
On Wed, 2011-02-23 at 09:41 -0500, John W. Linville wrote:
> > > diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
> > > index 9050dd9..8ceb6a0 100644
> > > --- a/drivers/net/wireless/wl12xx/wl12xx.h
> > > +++ b/drivers/net/wireless/wl12xx/wl12xx.h
> > > @@ -112,8 +112,8 @@ extern u32 wl12xx_debug_level;
> > > CFG_RX_CTL_EN | CFG_RX_BCN_EN | \
> > > CFG_RX_AUTH_EN | CFG_RX_ASSOC_EN)
> > >
> > > -#define WL1271_FW_NAME "wl1271-fw.bin"
> > > -#define WL1271_NVS_NAME "wl1271-nvs.bin"
> > > +#define WL1271_FW_NAME "ti-connectivity/wl1271-fw.bin"
> > > +#define WL1271_NVS_NAME "ti-connectivity/wl1271-nvs.bin"
> >
> > You're right. Our firmware is (unfortunately) inside the
> > ti-connectivity in linux-firmware.git. So it would make sense to
> > include the ti-connectivity/ directory when requesting for the firmware,
> > but it's just damn ugly. :( The driver should not care at all where the
> > firmware is to be fetched from, that should be up to the userspace.
> >
> > Dunno what is the best thing to do about this. Add the directory to the
> > driver? Move the wl1271*.bin files to the root of linux-firmware? Does
> > anybody have opinions about it?
>
> I think there are a number of other drivers with embedded pathnames.
Indeed. And, as discussed with Johannes on IRC, the / will be just one
more character in the FW name, regardless of whether it means a
subdirectory or not. It's just part of the FW name string.
When I apply the patch, I just need to brace for the loads of people
complaining that the FW cannot be found anymore and explain the issue a
hundred times. ;)
--
Cheers,
Luca.
Hi Sebastien,
On Wed, 2011-02-23 at 14:25 +0100, Sebastien Jan wrote:
> Validated FW loading on a Ubuntu Natty alpha image, on a pandaboard
> (embedding a WL1271).
>
> Signed-off-by: Sebastien Jan <[email protected]>
> ---
Thanks for working on getting the wl12xx driver to work on the
pandaboard!
> diff --git a/drivers/net/wireless/wl12xx/wl12xx.h b/drivers/net/wireless/wl12xx/wl12xx.h
> index 9050dd9..8ceb6a0 100644
> --- a/drivers/net/wireless/wl12xx/wl12xx.h
> +++ b/drivers/net/wireless/wl12xx/wl12xx.h
> @@ -112,8 +112,8 @@ extern u32 wl12xx_debug_level;
> CFG_RX_CTL_EN | CFG_RX_BCN_EN | \
> CFG_RX_AUTH_EN | CFG_RX_ASSOC_EN)
>
> -#define WL1271_FW_NAME "wl1271-fw.bin"
> -#define WL1271_NVS_NAME "wl1271-nvs.bin"
> +#define WL1271_FW_NAME "ti-connectivity/wl1271-fw.bin"
> +#define WL1271_NVS_NAME "ti-connectivity/wl1271-nvs.bin"
You're right. Our firmware is (unfortunately) inside the
ti-connectivity in linux-firmware.git. So it would make sense to
include the ti-connectivity/ directory when requesting for the firmware,
but it's just damn ugly. :( The driver should not care at all where the
firmware is to be fetched from, that should be up to the userspace.
Dunno what is the best thing to do about this. Add the directory to the
driver? Move the wl1271*.bin files to the root of linux-firmware? Does
anybody have opinions about it?
--
Cheers,
Luca.
On 02/23/2011 08:54 AM, Luciano Coelho wrote:
> On Wed, 2011-02-23 at 09:41 -0500, John W. Linville wrote:
>>
>> I think there are a number of other drivers with embedded pathnames.
>
> Indeed. And, as discussed with Johannes on IRC, the / will be just one
> more character in the FW name, regardless of whether it means a
> subdirectory or not. It's just part of the FW name string.
>
> When I apply the patch, I just need to brace for the loads of people
> complaining that the FW cannot be found anymore and explain the issue a
> hundred times. ;)
You could keep the old path as a fallback for a couple of cycles and log a
message warning users to move their firmware.
Larry
On Wed, 2011-02-23 at 14:25 +0100, Sebastien Jan wrote:
> Validated FW loading on a Ubuntu Natty alpha image, on a pandaboard
> (embedding a WL1271).
>
> Signed-off-by: Sebastien Jan <[email protected]>
> ---
Applied with small modifications: merged with the latest code and
changed the description to something more generic (this is not only
about pandaboard).
Thanks Jan!
--
Cheers,
Luca.