Missing device IDs in rt2870

Missing device IDs in rt2870

[Jakob Gruber]

>From http://bugzilla.kernel.org/show_bug.cgi?id=13459#c3

In rt2870.h, there are 2 lists of USB devices. One is within 

#ifndef RT30xx
#endif

and the other in 

#ifdef RT30xx
#endif

Since I'm not sure whether to add the devices to both lists or only the first,
I'm posting a patch for both variations.

Patch 1, add devices only to first list:

--- a/drivers/staging/rt2870/rt2870.h
+++ b/drivers/staging/rt2870/rt2870.h
@@ -77,6 +77,9 @@
 #ifndef RT30xx
 #define RT2870_USB_DEVICES    \
 {    \
+    {USB_DEVICE(0x2019,0xED14)}, /* Planex Communications, Inc. */
+    {USB_DEVICE(0x1737,0x0070)}, /* Linksys */
+    {USB_DEVICE(0x050D,0x815C)}, /* Belkin */        \
     {USB_DEVICE(0x148F,0x2770)}, /* Ralink */        \
     {USB_DEVICE(0x1737,0x0071)}, /* Linksys WUSB600N */    \
     {USB_DEVICE(0x148F,0x2870)}, /* Ralink */        \

Patch 2, add devices to both lists:

--- a/drivers/staging/rt2870/rt2870.h
+++ b/drivers/staging/rt2870/rt2870.h
@@ -77,6 +77,9 @@
 #ifndef RT30xx
 #define RT2870_USB_DEVICES    \
 {    \
+    {USB_DEVICE(0x2019,0xED14)}, /* Planex Communications, Inc. */
+    {USB_DEVICE(0x1737,0x0070)}, /* Linksys */
+    {USB_DEVICE(0x050D,0x815C)}, /* Belkin */        \
     {USB_DEVICE(0x148F,0x2770)}, /* Ralink */        \
     {USB_DEVICE(0x1737,0x0071)}, /* Linksys WUSB600N */    \
     {USB_DEVICE(0x148F,0x2870)}, /* Ralink */        \
@@ -144,6 +147,9 @@
 #ifdef RT30xx
 #define RT2870_USB_DEVICES    \
 {    \
+    {USB_DEVICE(0x2019,0xED14)}, /* Planex Communications, Inc. */
+    {USB_DEVICE(0x1737,0x0070)}, /* Linksys */
+    {USB_DEVICE(0x050D,0x815C)}, /* Belkin */        \
     {USB_DEVICE(0x148F,0x2770)}, /* Ralink */        \
     {USB_DEVICE(0x148F,0x2870)}, /* Ralink */        \
     {USB_DEVICE(0x148F,0x3070)}, /* Ralink 3070 */    \

Thanks!

-- 
Jakob Gruber <jakob.gruber@kabelnet.at>

Re: Missing device IDs in rt2870

[Greg KH]

On Tue, Jul 28, 2009 at 11:01:17PM +0200, Jakob Gruber wrote:
> >From http://bugzilla.kernel.org/show_bug.cgi?id=13459#c3
> 
> In rt2870.h, there are 2 lists of USB devices. One is within 
> 
> #ifndef RT30xx
> #endif
> 
> and the other in 
> 
> #ifdef RT30xx
> #endif

That kind of implies that the 2870 driver should not support this
device, right?

> 
> Since I'm not sure whether to add the devices to both lists or only the first,
> I'm posting a patch for both variations.
> 
> Patch 1, add devices only to first list:

Well, pick one :)

I'd prefer someone with one of these devices to test the patch and
verify that it works before blindly applying.  Fair enough?

thanks,

greg k-h

Re: Missing device IDs in rt2870

[Jakob Gruber]

[-- Attachment #1: Type: text/plain, Size: 1999 bytes --]

On Tue, 28 Jul 2009 14:12:16 -0700
Greg KH <gregkh@suse.de> wrote:

> On Tue, Jul 28, 2009 at 11:01:17PM +0200, Jakob Gruber wrote:
> > >From http://bugzilla.kernel.org/show_bug.cgi?id=13459#c3
> > 
> > In rt2870.h, there are 2 lists of USB devices. One is within 
> > 
> > #ifndef RT30xx
> > #endif
> > 
> > and the other in 
> > 
> > #ifdef RT30xx
> > #endif
> 
> That kind of implies that the 2870 driver should not support this
> device, right?

I think there's been a misunderstanding - I wasn't saying that the device ID is included in one block but not in another. I wanted to point out that I wasn't sure whether to add the ID to both lists or just the first one.

> 
> > 
> > Since I'm not sure whether to add the devices to both lists or only the first,
> > I'm posting a patch for both variations.
> > 
> > Patch 1, add devices only to first list:
> 
> Well, pick one :)
> 
> I'd prefer someone with one of these devices to test the patch and
> verify that it works before blindly applying.  Fair enough?

I own the Belkin device in question (0x050D,0x815C), and it worked perfectly with kernel 2.6.29 after adding the device ID to rt2870.h.
The patch is also included in the Archlinux kernel, see 
http://projects.archlinux.org/?p=linux-2.6-ARCH.git;a=tree;f=patches;hb=HEAD

I haven't tested rt2870 in 2.6.30 thoroughly because of this bug (http://bugzilla.kernel.org/show_bug.cgi?id=13638), which forces me to use the driver from the Ralink website instead of the kernel module.
However, I can confirm that - until running into the bug - the Belkin card also works in 2.6.30. 

A patch for adding the Belkin device ID is attached. I removed the other 2 IDs from http://bugzilla.kernel.org/show_bug.cgi?id=13459 since I do not own these devices and cannot verify them. The ID is only added to the "#ifndef RT30xx" block, same as the patch applied to the Archlinux kernel.

> 
> thanks,
> 
> greg k-h

Thanks for your work, it's appreciated.

-- 
Jakob Gruber <jakob.gruber@kabelnet.at>

[-- Attachment #2: rt2870_missing_id.patch --]
[-- Type: text/plain, Size: 868 bytes --]

From 9268d208454824d0b5aafff6875662191dceccff Mon Sep 17 00:00:00 2001
From: Jakob Gruber <jakob.gruber@kabelnet.at>
Date: Wed, 29 Jul 2009 16:53:15 +0200
Subject: [PATCH] RT2870 missing device ID

---
 drivers/staging/rt2870/rt2870.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/staging/rt2870/rt2870.h b/drivers/staging/rt2870/rt2870.h
index 29e3b53..62b6ef2 100644
--- a/drivers/staging/rt2870/rt2870.h
+++ b/drivers/staging/rt2870/rt2870.h
@@ -99,6 +99,7 @@
 	{USB_DEVICE(0x14B2,0x3C07)}, /* AL */			\
 	{USB_DEVICE(0x14B2,0x3C12)}, /* AL */           \
 	{USB_DEVICE(0x050D,0x8053)}, /* Belkin */		\
+	{USB_DEVICE(0x050D,0x815C)}, /* Belkin */		\
 	{USB_DEVICE(0x14B2,0x3C23)}, /* Airlink */		\
 	{USB_DEVICE(0x14B2,0x3C27)}, /* Airlink */		\
 	{USB_DEVICE(0x07AA,0x002F)}, /* Corega */		\
-- 
1.6.3.3

Re: Missing device IDs in rt2870

[Greg KH]

On Wed, Jul 29, 2009 at 05:11:07PM +0200, Jakob Gruber wrote:
> On Tue, 28 Jul 2009 14:12:16 -0700
> Greg KH <gregkh@suse.de> wrote:
> 
> > On Tue, Jul 28, 2009 at 11:01:17PM +0200, Jakob Gruber wrote:
> > > >From http://bugzilla.kernel.org/show_bug.cgi?id=13459#c3
> > > 
> > > In rt2870.h, there are 2 lists of USB devices. One is within 
> > > 
> > > #ifndef RT30xx
> > > #endif
> > > 
> > > and the other in 
> > > 
> > > #ifdef RT30xx
> > > #endif
> > 
> > That kind of implies that the 2870 driver should not support this
> > device, right?
> 
> I think there's been a misunderstanding - I wasn't saying that the
> device ID is included in one block but not in another. I wanted to
> point out that I wasn't sure whether to add the ID to both lists or
> just the first one.

Ah, ok.  It looks like you just need the first one.

> > > Since I'm not sure whether to add the devices to both lists or only the first,
> > > I'm posting a patch for both variations.
> > > 
> > > Patch 1, add devices only to first list:
> > 
> > Well, pick one :)
> > 
> > I'd prefer someone with one of these devices to test the patch and
> > verify that it works before blindly applying.  Fair enough?
> 
> I own the Belkin device in question (0x050D,0x815C), and it worked
> perfectly with kernel 2.6.29 after adding the device ID to rt2870.h.
> The patch is also included in the Archlinux kernel, see 
> http://projects.archlinux.org/?p=linux-2.6-ARCH.git;a=tree;f=patches;hb=HEAD
> 
> I haven't tested rt2870 in 2.6.30 thoroughly because of this bug
> (http://bugzilla.kernel.org/show_bug.cgi?id=13638), which forces me to
> use the driver from the Ralink website instead of the kernel module.
> However, I can confirm that - until running into the bug - the Belkin
> card also works in 2.6.30. 

Ah, that sucks.  I should revert that patch, if you do that, does the
device work properly for you?

> A patch for adding the Belkin device ID is attached. I removed the
> other 2 IDs from http://bugzilla.kernel.org/show_bug.cgi?id=13459
> since I do not own these devices and cannot verify them. The ID is
> only added to the "#ifndef RT30xx" block, same as the patch applied to
> the Archlinux kernel.

I'll take the other two ids, now that it makes more sense.

Care to respin with the 2 new ids, and add a "Signed-off-by:" to the
patch so I can properly apply it?

thanks,

greg k-h

Re: Missing device IDs in rt2870

[Jakob Gruber]

[-- Attachment #1: Type: text/plain, Size: 1333 bytes --]

On Wed, 29 Jul 2009 09:16:43 -0700
Greg KH <gregkh@suse.de> wrote:

<snip>
> > 
> > I haven't tested rt2870 in 2.6.30 thoroughly because of this bug
> > (http://bugzilla.kernel.org/show_bug.cgi?id=13638), which forces me to
> > use the driver from the Ralink website instead of the kernel module.
> > However, I can confirm that - until running into the bug - the Belkin
> > card also works in 2.6.30. 
> 
> Ah, that sucks.  I should revert that patch, if you do that, does the
> device work properly for you?

'git revert' didn't work out of the box, and I don't think I'm skilled enough to revert it manually :)
However, I posted some more information at http://bugzilla.kernel.org/show_bug.cgi?id=13638#c9 , including everything.log during the crash.

> 
> > A patch for adding the Belkin device ID is attached. I removed the
> > other 2 IDs from http://bugzilla.kernel.org/show_bug.cgi?id=13459
> > since I do not own these devices and cannot verify them. The ID is
> > only added to the "#ifndef RT30xx" block, same as the patch applied to
> > the Archlinux kernel.
> 
> I'll take the other two ids, now that it makes more sense.
> 
> Care to respin with the 2 new ids, and add a "Signed-off-by:" to the
> patch so I can properly apply it?

Done, patch is attached. 

Thanks again.

-- 
Jakob Gruber <jakob.gruber@kabelnet.at>


[-- Attachment #2: 0001-Staging-rt2870-Add-USB-ID-for-Linksys-Planex-Communi.patch --]
[-- Type: text/plain, Size: 1745 bytes --]

>From f3f763c05dac00b97aaa8d16dc61a509b098fadd Mon Sep 17 00:00:00 2001
From: Jakob Gruber <jakob.gruber@kabelnet.at>
Date: Thu, 30 Jul 2009 20:25:47 +0200
Subject: [PATCH] Staging: rt2870: Add USB ID for Linksys, Planex Communications, Belkin

Linksys WUSB100, Belkin F5D8053 N, Planex Communications unknown model.

Signed-off-by: Jakob Gruber <jakob.gruber@kabelnet.at>
---
 drivers/staging/rt2870/rt2870.h |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/drivers/staging/rt2870/rt2870.h b/drivers/staging/rt2870/rt2870.h
index 29e3b53..10e1640 100644
--- a/drivers/staging/rt2870/rt2870.h
+++ b/drivers/staging/rt2870/rt2870.h
@@ -79,6 +79,7 @@
 {	\
 	{USB_DEVICE(0x148F,0x2770)}, /* Ralink */		\
 	{USB_DEVICE(0x1737,0x0071)}, /* Linksys WUSB600N */	\
+	{USB_DEVICE(0x1737,0x0070)}, /* Linksys */	\
 	{USB_DEVICE(0x148F,0x2870)}, /* Ralink */		\
 	{USB_DEVICE(0x148F,0x3070)}, /* Ralink */		\
 	{USB_DEVICE(0x0B05,0x1731)}, /* Asus */			\
@@ -93,12 +94,14 @@
 	{USB_DEVICE(0x14B2,0x3C06)}, /* Conceptronic */		\
 	{USB_DEVICE(0x14B2,0x3C28)}, /* Conceptronic */		\
 	{USB_DEVICE(0x2019,0xED06)}, /* Planex Communications, Inc. */		\
+	{USB_DEVICE(0x2019,0xED14)}, /* Planex Communications, Inc. */		\
 	{USB_DEVICE(0x2019,0xAB25)}, /* Planex Communications, Inc. RT3070 */		\
 	{USB_DEVICE(0x07D1,0x3C09)}, /* D-Link */		\
 	{USB_DEVICE(0x07D1,0x3C11)}, /* D-Link */		\
 	{USB_DEVICE(0x14B2,0x3C07)}, /* AL */			\
 	{USB_DEVICE(0x14B2,0x3C12)}, /* AL */           \
 	{USB_DEVICE(0x050D,0x8053)}, /* Belkin */		\
+	{USB_DEVICE(0x050D,0x815C)}, /* Belkin */		\
 	{USB_DEVICE(0x14B2,0x3C23)}, /* Airlink */		\
 	{USB_DEVICE(0x14B2,0x3C27)}, /* Airlink */		\
 	{USB_DEVICE(0x07AA,0x002F)}, /* Corega */		\
-- 
1.6.4

Re: Missing device IDs in rt2870

[Greg KH]

On Thu, Jul 30, 2009 at 08:37:36PM +0200, Jakob Gruber wrote:
> On Wed, 29 Jul 2009 09:16:43 -0700
> Greg KH <gregkh@suse.de> wrote:
> 
> <snip>
> > > 
> > > I haven't tested rt2870 in 2.6.30 thoroughly because of this bug
> > > (http://bugzilla.kernel.org/show_bug.cgi?id=13638), which forces me to
> > > use the driver from the Ralink website instead of the kernel module.
> > > However, I can confirm that - until running into the bug - the Belkin
> > > card also works in 2.6.30. 
> > 
> > Ah, that sucks.  I should revert that patch, if you do that, does the
> > device work properly for you?
> 
> 'git revert' didn't work out of the box, and I don't think I'm skilled
> enough to revert it manually :) However, I posted some more
> information at http://bugzilla.kernel.org/show_bug.cgi?id=13638#c9 ,
> including everything.log during the crash.

I just got confirmation from someone else on lkml that reverting this on
2.6.30.1 worked for them, so I'll port it to mainline and apply it there
as well as get it into the .30-stable tree.

> 
> > 
> > > A patch for adding the Belkin device ID is attached. I removed the
> > > other 2 IDs from http://bugzilla.kernel.org/show_bug.cgi?id=13459
> > > since I do not own these devices and cannot verify them. The ID is
> > > only added to the "#ifndef RT30xx" block, same as the patch applied to
> > > the Archlinux kernel.
> > 
> > I'll take the other two ids, now that it makes more sense.
> > 
> > Care to respin with the 2 new ids, and add a "Signed-off-by:" to the
> > patch so I can properly apply it?
> 
> Done, patch is attached. 

Looks good, I'll queue it up.

thanks,

greg k-h