[PATCH 0/2] ar9170: 1-stage firmware support / AVM fritz

[PATCH 0/2] ar9170: 1-stage firmware support / AVM fritz

[Luis R. Rodriguez]

This series now works for me on my WNDA31000, it took a newer shiny
1-stage firmware to work. I'll push the firmware into linux-firmware
next.

Should work with the AVM Fritz devices now, haven't tested it but
I think it should work.

Luis R. Rodriguez (2):
  ar9170: add support for 1-stage firmware
  ar9170: add AVM FRITZ devices

 drivers/net/wireless/ath/ar9170/usb.c |   47 +++++++++++++++++++++++++++++---
 drivers/net/wireless/ath/ar9170/usb.h |    2 +
 2 files changed, 44 insertions(+), 5 deletions(-)

[PATCH 1/2] ar9170: add support for 1-stage firmware

[Luis R. Rodriguez]

You can get the stage 1 firmware from here:

http://www.kernel.org/pub/linux/kernel/people/mcgrof/firmware/ar9170/ar9170.fw

md5sum: 34feec4ec0eae3bb92c7c1ea2dfb4530
sha1sum: 6e5250498b815c2940d97242de31e054ae44e079

Its license:

http://www.kernel.org/pub/linux/kernel/people/mcgrof/firmware/ar9170/LICENSE

This is a new firmware, tested with WNDA3100.

Cc: Peter Grabienski <Peter.Grabienski@Atheros.com>
Cc: Stephen Chen <Stephen.Chen@Atheros.com>
Cc: Michael Fortin <Michael.Fortin@Atheros.com>
Cc: Johnny Cheng <Johnny.Cheng@Atheros.com>
Cc: Yuan-Gu Wei <Yuan-Gu.Wei@atheros.com>
Cc: Joerg Albert <jal2@gmx.de>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
 drivers/net/wireless/ath/ar9170/usb.c |   22 +++++++++++++++++-----
 1 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/ath/ar9170/usb.c b/drivers/net/wireless/ath/ar9170/usb.c
index d7c13c0..3c97c09 100644
--- a/drivers/net/wireless/ath/ar9170/usb.c
+++ b/drivers/net/wireless/ath/ar9170/usb.c
@@ -51,6 +51,7 @@ MODULE_AUTHOR("Johannes Berg <johannes@sipsolutions.net>");
 MODULE_AUTHOR("Christian Lamparter <chunkeey@web.de>");
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Atheros AR9170 802.11n USB wireless");
+MODULE_FIRMWARE("ar9170.fw");
 MODULE_FIRMWARE("ar9170-1.fw");
 MODULE_FIRMWARE("ar9170-2.fw");
 
@@ -504,17 +505,23 @@ static int ar9170_usb_request_firmware(struct ar9170_usb *aru)
 {
 	int err = 0;
 
-	err = request_firmware(&aru->init_values, "ar9170-1.fw",
+	err = request_firmware(&aru->firmware, "ar9170.fw",
 			       &aru->udev->dev);
-	if (err) {
-		dev_err(&aru->udev->dev, "file with init values not found.\n");
-		return err;
+	if (!err) {
+		aru->init_values = NULL;
+		return 0;
 	}
 
+	dev_err(&aru->udev->dev, "ar9170.fw firmware file "
+		"not found, trying old firmware...\n");
+
+	err = request_firmware(&aru->init_values, "ar9170-1.fw",
+			       &aru->udev->dev);
+
 	err = request_firmware(&aru->firmware, "ar9170-2.fw", &aru->udev->dev);
 	if (err) {
 		release_firmware(aru->init_values);
-		dev_err(&aru->udev->dev, "firmware file not found.\n");
+		dev_err(&aru->udev->dev, "file with init values not found.\n");
 		return err;
 	}
 
@@ -548,6 +555,9 @@ static int ar9170_usb_upload_firmware(struct ar9170_usb *aru)
 {
 	int err;
 
+	if (!aru->init_values)
+		goto upload_fw_start;
+
 	/* First, upload initial values to device RAM */
 	err = ar9170_usb_upload(aru, aru->init_values->data,
 				aru->init_values->size, 0x102800, false);
@@ -557,6 +567,8 @@ static int ar9170_usb_upload_firmware(struct ar9170_usb *aru)
 		return err;
 	}
 
+upload_fw_start:
+
 	/* Then, upload the firmware itself and start it */
 	return ar9170_usb_upload(aru, aru->firmware->data, aru->firmware->size,
 				0x200000, true);
-- 
1.6.0.6

[PATCH 2/2] ar9170: add AVM FRITZ devices

[Luis R. Rodriguez]

This adds:

USB 0x057C:0x8401       AVM FRITZ!WLAN USB Stick N
USB 0x057C:0x8402       AVM FRITZ!WLAN USB Stick N 2.4

These devices require the 1-stage firmware, if not present we
don't continue.

Cc: Peter Grabienski <Peter.Grabienski@Atheros.com>
Cc: Stephen Chen <Stephen.Chen@Atheros.com>
Cc: Michael Fortin <Michael.Fortin@Atheros.com>
Cc: Johnny Cheng <Johnny.Cheng@Atheros.com>
Cc: Yuan-Gu Wei <Yuan-Gu.Wei@atheros.com>
Cc: Joerg Albert <jal2@gmx.de>
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
 drivers/net/wireless/ath/ar9170/usb.c |   25 +++++++++++++++++++++++++
 drivers/net/wireless/ath/ar9170/usb.h |    2 ++
 2 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/drivers/net/wireless/ath/ar9170/usb.c b/drivers/net/wireless/ath/ar9170/usb.c
index 3c97c09..71579e4 100644
--- a/drivers/net/wireless/ath/ar9170/usb.c
+++ b/drivers/net/wireless/ath/ar9170/usb.c
@@ -55,6 +55,10 @@ MODULE_FIRMWARE("ar9170.fw");
 MODULE_FIRMWARE("ar9170-1.fw");
 MODULE_FIRMWARE("ar9170-2.fw");
 
+enum ar9170_requirements {
+	AR9170_REQ_FW1_ONLY = 1,
+};
+
 static struct usb_device_id ar9170_usb_ids[] = {
 	/* Atheros 9170 */
 	{ USB_DEVICE(0x0cf3, 0x9170) },
@@ -82,6 +86,10 @@ static struct usb_device_id ar9170_usb_ids[] = {
 	{ USB_DEVICE(0x2019, 0x5304) },
 	/* IO-Data WNGDNUS2 */
 	{ USB_DEVICE(0x04bb, 0x093f) },
+	/* AVM FRITZ!WLAN USB Stick N */
+	{ USB_DEVICE(0x057C, 0x8401) },
+	/* AVM FRITZ!WLAN USB Stick N 2.4 */
+	{ USB_DEVICE(0x057C, 0x8402), .driver_info = AR9170_REQ_FW1_ONLY },
 
 	/* terminate */
 	{}
@@ -512,6 +520,12 @@ static int ar9170_usb_request_firmware(struct ar9170_usb *aru)
 		return 0;
 	}
 
+	if (aru->req_one_stage_fw) {
+		dev_err(&aru->udev->dev, "ar9170.fw firmware file "
+			"not found and is required for this device\n");
+		return -EINVAL;
+	}
+
 	dev_err(&aru->udev->dev, "ar9170.fw firmware file "
 		"not found, trying old firmware...\n");
 
@@ -668,6 +682,15 @@ err_out:
 	return err;
 }
 
+static bool ar9170_requires_one_stage(const struct usb_device_id *id)
+{
+	if (!id->driver_info)
+		return false;
+	if (id->driver_info == AR9170_REQ_FW1_ONLY)
+		return true;
+	return false;
+}
+
 static int ar9170_usb_probe(struct usb_interface *intf,
 			const struct usb_device_id *id)
 {
@@ -688,6 +711,8 @@ static int ar9170_usb_probe(struct usb_interface *intf,
 	aru->intf = intf;
 	ar = &aru->common;
 
+	aru->req_one_stage_fw = ar9170_requires_one_stage(id);
+
 	usb_set_intfdata(intf, aru);
 	SET_IEEE80211_DEV(ar->hw, &udev->dev);
 
diff --git a/drivers/net/wireless/ath/ar9170/usb.h b/drivers/net/wireless/ath/ar9170/usb.h
index ac42586..69f4bce 100644
--- a/drivers/net/wireless/ath/ar9170/usb.h
+++ b/drivers/net/wireless/ath/ar9170/usb.h
@@ -62,6 +62,8 @@ struct ar9170_usb {
 	struct usb_anchor rx_submitted;
 	struct usb_anchor tx_submitted;
 
+	bool req_one_stage_fw;
+
 	spinlock_t cmdlock;
 	struct completion cmd_wait;
 	int readlen;
-- 
1.6.0.6

Re: [PATCH 0/2] ar9170: 1-stage firmware support / AVM fritz

[Marcel Holtmann]

Hi Luis,

> This series now works for me on my WNDA31000, it took a newer shiny
> 1-stage firmware to work. I'll push the firmware into linux-firmware
> next.
> 
> Should work with the AVM Fritz devices now, haven't tested it but
> I think it should work.

I happened to have one of these AVM devices. With ar9170.fw firmware it
does work fine with the other ones it doesn't.

The ar9170.fw is still not in linux-firmware.git, any reason for that?

Also since ar9170-1.fw and ar9170-2.fw are not working at all, we better
not even try and give the user a crypted error message that the device
is in a bad state. Just printk that the firmware might be too old.

Regards

Marcel

Re: [PATCH 0/2] ar9170: 1-stage firmware support / AVM fritz

[Luis R. Rodriguez]

On Sun, Jun 14, 2009 at 08:11:48AM -0700, Marcel Holtmann wrote:
> Hi Luis,
> 
> > This series now works for me on my WNDA31000, it took a newer shiny
> > 1-stage firmware to work. I'll push the firmware into linux-firmware
> > next.
> >
> > Should work with the AVM Fritz devices now, haven't tested it but
> > I think it should work.
> 
> I happened to have one of these AVM devices. With ar9170.fw firmware it
> does work fine with the other ones it doesn't.

Excellent, that was the idea behind the patch, to enable these
devices. Thanks for testing.

> The ar9170.fw is still not in linux-firmware.git, any reason for that?

Yes, the patch I sent to David has some funk as objcopy to ihex seems
to have some trailing white space. I sent a new patch to him without
the ihex file though.

> Also since ar9170-1.fw and ar9170-2.fw are not working at all,

They work, they won't work for the AVM device though.

> we better
> not even try and give the user a crypted error message that the device
> is in a bad state. Just printk that the firmware might be too old.

Agreed, but as I sent the patch in we *require* the 1-stage firmware
for the AVM devices, if that is not present we should be bailing out.
Is that not what happens?

  Luis

Re: [PATCH 0/2] ar9170: 1-stage firmware support / AVM fritz

[Marcel Holtmann]

Hi Luis,

> > > This series now works for me on my WNDA31000, it took a newer shiny
> > > 1-stage firmware to work. I'll push the firmware into linux-firmware
> > > next.
> > >
> > > Should work with the AVM Fritz devices now, haven't tested it but
> > > I think it should work.
> > 
> > I happened to have one of these AVM devices. With ar9170.fw firmware it
> > does work fine with the other ones it doesn't.
> 
> Excellent, that was the idea behind the patch, to enable these
> devices. Thanks for testing.
> 
> > The ar9170.fw is still not in linux-firmware.git, any reason for that?
> 
> Yes, the patch I sent to David has some funk as objcopy to ihex seems
> to have some trailing white space. I sent a new patch to him without
> the ihex file though.
> 
> > Also since ar9170-1.fw and ar9170-2.fw are not working at all,
> 
> They work, they won't work for the AVM device though.
> 
> > we better
> > not even try and give the user a crypted error message that the device
> > is in a bad state. Just printk that the firmware might be too old.
> 
> Agreed, but as I sent the patch in we *require* the 1-stage firmware
> for the AVM devices, if that is not present we should be bailing out.
> Is that not what happens?

nope, it tries ar9170-1.fw and then tries to load that and fails with a
timeout (-110) and a weird message that the device might be in a bad
state.

Regards

Marcel

Re: [PATCH 0/2] ar9170: 1-stage firmware support / AVM fritz

[Luis R. Rodriguez]

On Mon, Jun 15, 2009 at 11:57 AM, Marcel Holtmann<marcel@holtmann.org> wrote:
> Hi Luis,
>
>> > > This series now works for me on my WNDA31000, it took a newer shiny
>> > > 1-stage firmware to work. I'll push the firmware into linux-firmware
>> > > next.
>> > >
>> > > Should work with the AVM Fritz devices now, haven't tested it but
>> > > I think it should work.
>> >
>> > I happened to have one of these AVM devices. With ar9170.fw firmware it
>> > does work fine with the other ones it doesn't.
>>
>> Excellent, that was the idea behind the patch, to enable these
>> devices. Thanks for testing.
>>
>> > The ar9170.fw is still not in linux-firmware.git, any reason for that?
>>
>> Yes, the patch I sent to David has some funk as objcopy to ihex seems
>> to have some trailing white space. I sent a new patch to him without
>> the ihex file though.
>>
>> > Also since ar9170-1.fw and ar9170-2.fw are not working at all,
>>
>> They work, they won't work for the AVM device though.
>>
>> > we better
>> > not even try and give the user a crypted error message that the device
>> > is in a bad state. Just printk that the firmware might be too old.
>>
>> Agreed, but as I sent the patch in we *require* the 1-stage firmware
>> for the AVM devices, if that is not present we should be bailing out.
>> Is that not what happens?
>
> nope, it tries ar9170-1.fw and then tries to load that and fails with a
> timeout (-110) and a weird message that the device might be in a bad
> state.

Oh interesting, hm, ok doe sit go into a loop with that?

  Luis

Re: [PATCH 0/2] ar9170: 1-stage firmware support / AVM fritz

[Marcel Holtmann]

Hi Luis,

> >> > > This series now works for me on my WNDA31000, it took a newer shiny
> >> > > 1-stage firmware to work. I'll push the firmware into linux-firmware
> >> > > next.
> >> > >
> >> > > Should work with the AVM Fritz devices now, haven't tested it but
> >> > > I think it should work.
> >> >
> >> > I happened to have one of these AVM devices. With ar9170.fw firmware it
> >> > does work fine with the other ones it doesn't.
> >>
> >> Excellent, that was the idea behind the patch, to enable these
> >> devices. Thanks for testing.
> >>
> >> > The ar9170.fw is still not in linux-firmware.git, any reason for that?
> >>
> >> Yes, the patch I sent to David has some funk as objcopy to ihex seems
> >> to have some trailing white space. I sent a new patch to him without
> >> the ihex file though.
> >>
> >> > Also since ar9170-1.fw and ar9170-2.fw are not working at all,
> >>
> >> They work, they won't work for the AVM device though.
> >>
> >> > we better
> >> > not even try and give the user a crypted error message that the device
> >> > is in a bad state. Just printk that the firmware might be too old.
> >>
> >> Agreed, but as I sent the patch in we *require* the 1-stage firmware
> >> for the AVM devices, if that is not present we should be bailing out.
> >> Is that not what happens?
> >
> > nope, it tries ar9170-1.fw and then tries to load that and fails with a
> > timeout (-110) and a weird message that the device might be in a bad
> > state.
> 
> Oh interesting, hm, ok doe sit go into a loop with that?

it bails out of probe, but with are crypted error message. And in the
end it should not even try the other firmware files if it is an AVM
device since we know they won't work. So lets give a proper error
message and bail out.

Regards

Marcel

Re: [PATCH 0/2] ar9170: 1-stage firmware support / AVM fritz

[Luis R. Rodriguez]

On Mon, Jun 15, 2009 at 12:54:20PM -0700, Marcel Holtmann wrote:
> Hi Luis,
> 
> > >> > > This series now works for me on my WNDA31000, it took a newer shiny
> > >> > > 1-stage firmware to work. I'll push the firmware into linux-firmware
> > >> > > next.
> > >> > >
> > >> > > Should work with the AVM Fritz devices now, haven't tested it but
> > >> > > I think it should work.
> > >> >
> > >> > I happened to have one of these AVM devices. With ar9170.fw firmware it
> > >> > does work fine with the other ones it doesn't.
> > >>
> > >> Excellent, that was the idea behind the patch, to enable these
> > >> devices. Thanks for testing.
> > >>
> > >> > The ar9170.fw is still not in linux-firmware.git, any reason for that?
> > >>
> > >> Yes, the patch I sent to David has some funk as objcopy to ihex seems
> > >> to have some trailing white space. I sent a new patch to him without
> > >> the ihex file though.
> > >>
> > >> > Also since ar9170-1.fw and ar9170-2.fw are not working at all,
> > >>
> > >> They work, they won't work for the AVM device though.
> > >>
> > >> > we better
> > >> > not even try and give the user a crypted error message that the device
> > >> > is in a bad state. Just printk that the firmware might be too old.
> > >>
> > >> Agreed, but as I sent the patch in we *require* the 1-stage firmware
> > >> for the AVM devices, if that is not present we should be bailing out.
> > >> Is that not what happens?
> > >
> > > nope, it tries ar9170-1.fw and then tries to load that and fails with a
> > > timeout (-110) and a weird message that the device might be in a bad
> > > state.
> >
> > Oh interesting, hm, ok doe sit go into a loop with that?
> 
> it bails out of probe, but with are crypted error message. And in the
> end it should not even try the other firmware files if it is an AVM
> device since we know they won't work. So lets give a proper error
> message and bail out.

Heh yeah that was the goal.

  Luis