* [PATCH v2 1/2] rt2800usb:fix efuse detection
2014-06-12 17:33 [PATCH v2 0/2] rt2800usb: Fix support for USB 057c:8501 Michael Braun
@ 2014-06-12 17:33 ` Michael Braun
2014-06-13 13:10 ` Stanislaw Gruszka
2014-06-12 17:33 ` [PATCH v2 2/2] rt2800usb:fix hang during firmware load Michael Braun
2014-06-13 13:08 ` [PATCH v2 0/2] rt2800usb: Fix support for USB 057c:8501 Stanislaw Gruszka
2 siblings, 1 reply; 6+ messages in thread
From: Michael Braun @ 2014-06-12 17:33 UTC (permalink / raw)
To: Ivo van Doorn, Helmut Schaa
Cc: netdev, users, linux-wireless, John W. Linville, linux-kernel
The device 057c:8501 (AVM Fritz! WLAN v2 rev. B) currently does not
load. One thing observed is that the vendors driver detects EFUSE mode
for this device, but rt2800usb does not. This is due to rt2800usb
lacking a check for the firmware mode present in the vendors driver,
that this patch adopts for rt2800usb.
With this patch applied, the 'RF chipset' detection does no longer fail.
Signed-off-by: Michael Braun <michael-dev@fami-braun.de>
---
drivers/net/wireless/rt2x00/rt2800usb.c | 30 +++++++++++++++++++++++++++++-
drivers/net/wireless/rt2x00/rt2x00usb.h | 1 +
2 files changed, 30 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index a49c3d7..11583ca 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -229,6 +229,27 @@ static enum hrtimer_restart rt2800usb_tx_sta_fifo_timeout(struct hrtimer *timer)
/*
* Firmware functions
*/
+static int rt2800usb_autorun_detect(struct rt2x00_dev *rt2x00dev)
+{
+ __le32 reg;
+ u32 fw_mode;
+
+ /* cannot use rt2x00usb_register_read here as it uses different
+ * mode (MULTI_READ vs. DEVICE_MODE) and does not pass the
+ * magic value USB_MODE_AUTORUN (0x11) to the device, thus the
+ * returned value would be invalid.
+ */
+ rt2x00usb_vendor_request(rt2x00dev, USB_DEVICE_MODE,
+ USB_VENDOR_REQUEST_IN, 0, USB_MODE_AUTORUN,
+ ®, sizeof(reg), REGISTER_TIMEOUT_FIRMWARE);
+ fw_mode = le32_to_cpu(reg);
+
+ if ((fw_mode & 0x00000003) == 2)
+ return 1;
+
+ return 0;
+}
+
static char *rt2800usb_get_firmware_name(struct rt2x00_dev *rt2x00dev)
{
return FIRMWARE_RT2870;
@@ -735,11 +756,18 @@ static void rt2800usb_fill_rxdone(struct queue_entry *entry,
/*
* Device probe functions.
*/
+static int rt2800usb_efuse_detect(struct rt2x00_dev *rt2x00dev)
+{
+ if (rt2800usb_autorun_detect(rt2x00dev))
+ return 1;
+ return rt2800_efuse_detect(rt2x00dev);
+}
+
static int rt2800usb_read_eeprom(struct rt2x00_dev *rt2x00dev)
{
int retval;
- if (rt2800_efuse_detect(rt2x00dev))
+ if (rt2800usb_efuse_detect(rt2x00dev))
retval = rt2800_read_eeprom_efuse(rt2x00dev);
else
retval = rt2x00usb_eeprom_read(rt2x00dev, rt2x00dev->eeprom,
diff --git a/drivers/net/wireless/rt2x00/rt2x00usb.h b/drivers/net/wireless/rt2x00/rt2x00usb.h
index e7bcf62..831b65f 100644
--- a/drivers/net/wireless/rt2x00/rt2x00usb.h
+++ b/drivers/net/wireless/rt2x00/rt2x00usb.h
@@ -93,6 +93,7 @@ enum rt2x00usb_mode_offset {
USB_MODE_SLEEP = 7, /* RT73USB */
USB_MODE_FIRMWARE = 8, /* RT73USB */
USB_MODE_WAKEUP = 9, /* RT73USB */
+ USB_MODE_AUTORUN = 17, /* RT2800USB */
};
/**
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v2 1/2] rt2800usb:fix efuse detection
2014-06-12 17:33 ` [PATCH v2 1/2] rt2800usb:fix efuse detection Michael Braun
@ 2014-06-13 13:10 ` Stanislaw Gruszka
0 siblings, 0 replies; 6+ messages in thread
From: Stanislaw Gruszka @ 2014-06-13 13:10 UTC (permalink / raw)
To: Michael Braun
Cc: Ivo van Doorn, Helmut Schaa, netdev, users, linux-wireless,
John W. Linville, linux-kernel
On Thu, Jun 12, 2014 at 07:33:36PM +0200, Michael Braun wrote:
> The device 057c:8501 (AVM Fritz! WLAN v2 rev. B) currently does not
> load. One thing observed is that the vendors driver detects EFUSE mode
> for this device, but rt2800usb does not. This is due to rt2800usb
> lacking a check for the firmware mode present in the vendors driver,
> that this patch adopts for rt2800usb.
>
> With this patch applied, the 'RF chipset' detection does no longer fail.
>
> Signed-off-by: Michael Braun <michael-dev@fami-braun.de>
Acked-by: Stanislaw Gruszka <sgruszka@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 2/2] rt2800usb:fix hang during firmware load
2014-06-12 17:33 [PATCH v2 0/2] rt2800usb: Fix support for USB 057c:8501 Michael Braun
2014-06-12 17:33 ` [PATCH v2 1/2] rt2800usb:fix efuse detection Michael Braun
@ 2014-06-12 17:33 ` Michael Braun
2014-06-13 13:10 ` Stanislaw Gruszka
2014-06-13 13:08 ` [PATCH v2 0/2] rt2800usb: Fix support for USB 057c:8501 Stanislaw Gruszka
2 siblings, 1 reply; 6+ messages in thread
From: Michael Braun @ 2014-06-12 17:33 UTC (permalink / raw)
To: Ivo van Doorn, Helmut Schaa
Cc: netdev, users, linux-wireless, John W. Linville, linux-kernel
The device 057c:8501 (AVM Fritz! WLAN v2 rev. B) boots into a state that does
not actually require loading a firmware file. The vendors driver finds out
about this by checking a firmware state register, so this patch adds this here.
Finally, with this patch applied, my wifi dongle actually becomes
useful (scan + connect to wpa network works).
Signed-off-by: Michael Braun <michael-dev@fami-braun.de>
---
drivers/net/wireless/rt2x00/rt2800usb.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
index 11583ca..e11dab2 100644
--- a/drivers/net/wireless/rt2x00/rt2800usb.c
+++ b/drivers/net/wireless/rt2x00/rt2800usb.c
@@ -278,8 +278,13 @@ static int rt2800usb_write_firmware(struct rt2x00_dev *rt2x00dev,
/*
* Write firmware to device.
*/
- rt2x00usb_register_multiwrite(rt2x00dev, FIRMWARE_IMAGE_BASE,
- data + offset, length);
+ if (rt2800usb_autorun_detect(rt2x00dev)) {
+ rt2x00_info(rt2x00dev,
+ "Firmware loading not required - NIC in AutoRun mode\n");
+ } else {
+ rt2x00usb_register_multiwrite(rt2x00dev, FIRMWARE_IMAGE_BASE,
+ data + offset, length);
+ }
rt2x00usb_register_write(rt2x00dev, H2M_MAILBOX_CID, ~0);
rt2x00usb_register_write(rt2x00dev, H2M_MAILBOX_STATUS, ~0);
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v2 2/2] rt2800usb:fix hang during firmware load
2014-06-12 17:33 ` [PATCH v2 2/2] rt2800usb:fix hang during firmware load Michael Braun
@ 2014-06-13 13:10 ` Stanislaw Gruszka
0 siblings, 0 replies; 6+ messages in thread
From: Stanislaw Gruszka @ 2014-06-13 13:10 UTC (permalink / raw)
To: Michael Braun
Cc: Ivo van Doorn, Helmut Schaa, netdev, users, linux-wireless,
John W. Linville, linux-kernel
On Thu, Jun 12, 2014 at 07:33:41PM +0200, Michael Braun wrote:
> The device 057c:8501 (AVM Fritz! WLAN v2 rev. B) boots into a state that does
> not actually require loading a firmware file. The vendors driver finds out
> about this by checking a firmware state register, so this patch adds this here.
>
> Finally, with this patch applied, my wifi dongle actually becomes
> useful (scan + connect to wpa network works).
>
> Signed-off-by: Michael Braun <michael-dev@fami-braun.de>
Acked-by: Stanislaw Gruszka <sgruszka@redhat.com>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 0/2] rt2800usb: Fix support for USB 057c:8501
2014-06-12 17:33 [PATCH v2 0/2] rt2800usb: Fix support for USB 057c:8501 Michael Braun
2014-06-12 17:33 ` [PATCH v2 1/2] rt2800usb:fix efuse detection Michael Braun
2014-06-12 17:33 ` [PATCH v2 2/2] rt2800usb:fix hang during firmware load Michael Braun
@ 2014-06-13 13:08 ` Stanislaw Gruszka
2 siblings, 0 replies; 6+ messages in thread
From: Stanislaw Gruszka @ 2014-06-13 13:08 UTC (permalink / raw)
To: Michael Braun
Cc: Ivo van Doorn, Helmut Schaa, netdev, users, linux-wireless,
John W. Linville, linux-kernel
On Thu, Jun 12, 2014 at 07:33:31PM +0200, Michael Braun wrote:
> v2: fix endianness and coding style. Using rt2x00usb_register_read does not work for me.
I missed that it use USB_MULTI_READ request and you need
USB_DEVICE_MODE instead, sorry.
Stanislaw
^ permalink raw reply [flat|nested] 6+ messages in thread