[PATCH 0/4] rtl8xxxu: minor fixes

[PATCH 0/4] rtl8xxxu: minor fixes

[Jes.Sorensen]

From: Jes Sorensen <Jes.Sorensen@redhat.com>

Hi,

This is a couple of minor fixes for the rtl8xxxu driver. Nothing crazy
urgent, but nice to get in anyway.

Cheers,
Jes


Jes Sorensen (3):
  rtl8xxxu: Reduce console noise when removing the kernel module
  rtl8xxxu: Mark 0x20f4:0x648b as tested
  rtl8xxxu: Mark 0x2001:0x3308 as tested

Luis de Bethencourt (1):
  rtl8xxxu: remove unneeded assignments

 .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c   |  2 --
 .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c    | 20 +++++++++++++++-----
 2 files changed, 15 insertions(+), 7 deletions(-)

-- 
2.7.4

[PATCH 1/4] rtl8xxxu: remove unneeded assignments

[Jes.Sorensen]

From: Luis de Bethencourt <luisbg@osg.samsung.com>

reg_eac and reg_ecc are only used if candidate is bigger than 0, and in
that case new values will be given to them. Removing the unused
assignments.

Signed-off-by: Luis de Bethencourt <luisbg@osg.samsung.com>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
---
 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
index 5b825fa..9a1994f 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
@@ -1244,11 +1244,9 @@ static void rtl8192eu_phy_iq_calibrate(struct rtl8xxxu_priv *priv)
 		reg_e94 = result[i][0];
 		reg_e9c = result[i][1];
 		reg_ea4 = result[i][2];
-		reg_eac = result[i][3];
 		reg_eb4 = result[i][4];
 		reg_ebc = result[i][5];
 		reg_ec4 = result[i][6];
-		reg_ecc = result[i][7];
 	}
 
 	if (candidate >= 0) {
-- 
2.7.4

[PATCH 2/4] rtl8xxxu: Reduce console noise when removing the kernel module

[Jes.Sorensen]

From: Jes Sorensen <Jes.Sorensen@redhat.com>

USB urbs will return with a status != 0 when rmmod'ing the driver. No
need to fill the log with messages from rtl8xxxu_int_complete()

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
---
 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
index 9f6dbb4..cfa5528 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
@@ -5267,7 +5267,7 @@ static void rtl8xxxu_int_complete(struct urb *urb)
 		if (ret)
 			usb_unanchor_urb(urb);
 	} else {
-		dev_info(dev, "%s: Error %i\n", __func__, urb->status);
+		dev_dbg(dev, "%s: Error %i\n", __func__, urb->status);
 	}
 }
 
-- 
2.7.4

[PATCH 3/4] rtl8xxxu: Mark 0x20f4:0x648b as tested

[Jes.Sorensen]

From: Jes Sorensen <Jes.Sorensen@redhat.com>

Successfully tested by Jocelyn Mayer

Reported-by: J. Mayer <l_indien@magic.fr>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
---
 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
index cfa5528..90d21c3 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
@@ -5852,6 +5852,10 @@ static int rtl8xxxu_probe(struct usb_interface *interface,
 		if (id->idProduct == 0x1004)
 			untested = 0;
 		break;
+	case 0x20f4:
+		if (id->idProduct == 0x648b)
+			untested = 0;
+		break;
 	default:
 		break;
 	}
@@ -6021,6 +6025,9 @@ static struct usb_device_id dev_table[] = {
 /* Tested by Andrea Merello */
 {USB_DEVICE_AND_INTERFACE_INFO(0x050d, 0x1004, 0xff, 0xff, 0xff),
 	.driver_info = (unsigned long)&rtl8192cu_fops},
+/* Tested by Jocelyn Mayer */
+{USB_DEVICE_AND_INTERFACE_INFO(0x20f4, 0x648b, 0xff, 0xff, 0xff),
+	.driver_info = (unsigned long)&rtl8192cu_fops},
 /* Currently untested 8188 series devices */
 {USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0x8191, 0xff, 0xff, 0xff),
 	.driver_info = (unsigned long)&rtl8192cu_fops},
@@ -6080,8 +6087,6 @@ static struct usb_device_id dev_table[] = {
 	.driver_info = (unsigned long)&rtl8192cu_fops},
 {USB_DEVICE_AND_INTERFACE_INFO(0x2019, 0xed17, 0xff, 0xff, 0xff),
 	.driver_info = (unsigned long)&rtl8192cu_fops},
-{USB_DEVICE_AND_INTERFACE_INFO(0x20f4, 0x648b, 0xff, 0xff, 0xff),
-	.driver_info = (unsigned long)&rtl8192cu_fops},
 {USB_DEVICE_AND_INTERFACE_INFO(0x4855, 0x0090, 0xff, 0xff, 0xff),
 	.driver_info = (unsigned long)&rtl8192cu_fops},
 {USB_DEVICE_AND_INTERFACE_INFO(0x4856, 0x0091, 0xff, 0xff, 0xff),
-- 
2.7.4

[PATCH 4/4] rtl8xxxu: Mark 0x2001:0x3308 as tested

[Jes.Sorensen]

From: Jes Sorensen <Jes.Sorensen@redhat.com>

D-Link DWA-121 is reported as working.

Reported-by: Stefano Bravi <stefanobravi69@libero.it>
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
---
 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
index 90d21c3..dfe61e4 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
@@ -5856,6 +5856,10 @@ static int rtl8xxxu_probe(struct usb_interface *interface,
 		if (id->idProduct == 0x648b)
 			untested = 0;
 		break;
+	case 0x2001:
+		if (id->idProduct == 0x3308)
+			untested = 0;
+		break;
 	default:
 		break;
 	}
@@ -6028,6 +6032,9 @@ static struct usb_device_id dev_table[] = {
 /* Tested by Jocelyn Mayer */
 {USB_DEVICE_AND_INTERFACE_INFO(0x20f4, 0x648b, 0xff, 0xff, 0xff),
 	.driver_info = (unsigned long)&rtl8192cu_fops},
+/* Tested by Stefano Bravi */
+{USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x3308, 0xff, 0xff, 0xff),
+	.driver_info = (unsigned long)&rtl8192cu_fops},
 /* Currently untested 8188 series devices */
 {USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0x8191, 0xff, 0xff, 0xff),
 	.driver_info = (unsigned long)&rtl8192cu_fops},
@@ -6075,8 +6082,6 @@ static struct usb_device_id dev_table[] = {
 	.driver_info = (unsigned long)&rtl8192cu_fops},
 {USB_DEVICE_AND_INTERFACE_INFO(0x13d3, 0x3357, 0xff, 0xff, 0xff),
 	.driver_info = (unsigned long)&rtl8192cu_fops},
-{USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x3308, 0xff, 0xff, 0xff),
-	.driver_info = (unsigned long)&rtl8192cu_fops},
 {USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x330b, 0xff, 0xff, 0xff),
 	.driver_info = (unsigned long)&rtl8192cu_fops},
 {USB_DEVICE_AND_INTERFACE_INFO(0x2019, 0x4902, 0xff, 0xff, 0xff),
-- 
2.7.4

Re: [PATCH 3/4] rtl8xxxu: Mark 0x20f4:0x648b as tested

[Kalle Valo]

Jes.Sorensen@redhat.com writes:

> From: Jes Sorensen <Jes.Sorensen@redhat.com>
>
> Successfully tested by Jocelyn Mayer
>
> Reported-by: J. Mayer <l_indien@magic.fr>
> Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
> ---
>  drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
> index cfa5528..90d21c3 100644
> --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
> +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
> @@ -5852,6 +5852,10 @@ static int rtl8xxxu_probe(struct usb_interface *interface,
>  		if (id->idProduct == 0x1004)
>  			untested = 0;
>  		break;
> +	case 0x20f4:
> +		if (id->idProduct == 0x648b)
> +			untested = 0;
> +		break;
>  	default:
>  		break;
>  	}
> @@ -6021,6 +6025,9 @@ static struct usb_device_id dev_table[] = {
>  /* Tested by Andrea Merello */
>  {USB_DEVICE_AND_INTERFACE_INFO(0x050d, 0x1004, 0xff, 0xff, 0xff),
>  	.driver_info = (unsigned long)&rtl8192cu_fops},
> +/* Tested by Jocelyn Mayer */
> +{USB_DEVICE_AND_INTERFACE_INFO(0x20f4, 0x648b, 0xff, 0xff, 0xff),
> +	.driver_info = (unsigned long)&rtl8192cu_fops},
>  /* Currently untested 8188 series devices */
>  {USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0x8191, 0xff, 0xff, 0xff),
>  	.driver_info = (unsigned long)&rtl8192cu_fops},
> @@ -6080,8 +6087,6 @@ static struct usb_device_id dev_table[] = {
>  	.driver_info = (unsigned long)&rtl8192cu_fops},
>  {USB_DEVICE_AND_INTERFACE_INFO(0x2019, 0xed17, 0xff, 0xff, 0xff),
>  	.driver_info = (unsigned long)&rtl8192cu_fops},
> -{USB_DEVICE_AND_INTERFACE_INFO(0x20f4, 0x648b, 0xff, 0xff, 0xff),
> -	.driver_info = (unsigned long)&rtl8192cu_fops},
>  {USB_DEVICE_AND_INTERFACE_INFO(0x4855, 0x0090, 0xff, 0xff, 0xff),
>  	.driver_info = (unsigned long)&rtl8192cu_fops},
>  {USB_DEVICE_AND_INTERFACE_INFO(0x4856, 0x0091, 0xff, 0xff, 0xff),

But will this now conflict with rtlwifi?

drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c:    {RTL_USB_DEVICE(0x20f4, 0x648b, rtl92cu_hal_cfg)}, /*TRENDnet - Cameo*/

Like discussed before, I don't like having two drivers support same
hardware and users more or less randomly using either of them.

-- 
Kalle Valo

Re: [PATCH 4/4] rtl8xxxu: Mark 0x2001:0x3308 as tested

[Kalle Valo]

Jes.Sorensen@redhat.com writes:

> From: Jes Sorensen <Jes.Sorensen@redhat.com>
>
> D-Link DWA-121 is reported as working.
>
> Reported-by: Stefano Bravi <stefanobravi69@libero.it>
> Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
> ---
>  drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
> index 90d21c3..dfe61e4 100644
> --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
> +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
> @@ -5856,6 +5856,10 @@ static int rtl8xxxu_probe(struct usb_interface *interface,
>  		if (id->idProduct == 0x648b)
>  			untested = 0;
>  		break;
> +	case 0x2001:
> +		if (id->idProduct == 0x3308)
> +			untested = 0;
> +		break;
>  	default:
>  		break;
>  	}
> @@ -6028,6 +6032,9 @@ static struct usb_device_id dev_table[] = {
>  /* Tested by Jocelyn Mayer */
>  {USB_DEVICE_AND_INTERFACE_INFO(0x20f4, 0x648b, 0xff, 0xff, 0xff),
>  	.driver_info = (unsigned long)&rtl8192cu_fops},
> +/* Tested by Stefano Bravi */
> +{USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x3308, 0xff, 0xff, 0xff),
> +	.driver_info = (unsigned long)&rtl8192cu_fops},
>  /* Currently untested 8188 series devices */
>  {USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0x8191, 0xff, 0xff, 0xff),
>  	.driver_info = (unsigned long)&rtl8192cu_fops},
> @@ -6075,8 +6082,6 @@ static struct usb_device_id dev_table[] = {
>  	.driver_info = (unsigned long)&rtl8192cu_fops},
>  {USB_DEVICE_AND_INTERFACE_INFO(0x13d3, 0x3357, 0xff, 0xff, 0xff),
>  	.driver_info = (unsigned long)&rtl8192cu_fops},
> -{USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x3308, 0xff, 0xff, 0xff),
> -	.driver_info = (unsigned long)&rtl8192cu_fops},

Isn't this also supported by rtlwifi?

drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c:    {RTL_USB_DEVICE(0x2001, 0x3308, rtl92cu_hal_cfg)}, /*D-Link - Alpha*/

-- 
Kalle Valo

Re: [1/4] rtl8xxxu: remove unneeded assignments

[Kalle Valo]

Jes Sorensen <Jes.Sorensen@redhat.com> wrote:
> From: Luis de Bethencourt <luisbg@osg.samsung.com>
> 
> reg_eac and reg_ecc are only used if candidate is bigger than 0, and in
> that case new values will be given to them. Removing the unused
> assignments.
> 
> Signed-off-by: Luis de Bethencourt <luisbg@osg.samsung.com>
> Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>

Thanks, 2 patches applied to wireless-drivers-next.git:

efcb32883f36 rtl8xxxu: remove unneeded assignments
78383ac95181 rtl8xxxu: Reduce console noise when removing the kernel module

-- 
Sent by pwcli
https://patchwork.kernel.org/patch/9195753/

Re: [PATCH 3/4] rtl8xxxu: Mark 0x20f4:0x648b as tested

[Jes Sorensen]

Kalle Valo <kvalo@codeaurora.org> writes:
> Jes.Sorensen@redhat.com writes:
>
>> From: Jes Sorensen <Jes.Sorensen@redhat.com>
>>
>> Successfully tested by Jocelyn Mayer
>>
>> Reported-by: J. Mayer <l_indien@magic.fr>
>> Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
>> ---
>>  drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 9 +++++++--
>>  1 file changed, 7 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
>> index cfa5528..90d21c3 100644
>> --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
>> +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
>> @@ -5852,6 +5852,10 @@ static int rtl8xxxu_probe(struct usb_interface *interface,
>>  		if (id->idProduct == 0x1004)
>>  			untested = 0;
>>  		break;
>> +	case 0x20f4:
>> +		if (id->idProduct == 0x648b)
>> +			untested = 0;
>> +		break;
>>  	default:
>>  		break;
>>  	}
>> @@ -6021,6 +6025,9 @@ static struct usb_device_id dev_table[] = {
>>  /* Tested by Andrea Merello */
>>  {USB_DEVICE_AND_INTERFACE_INFO(0x050d, 0x1004, 0xff, 0xff, 0xff),
>>  	.driver_info = (unsigned long)&rtl8192cu_fops},
>> +/* Tested by Jocelyn Mayer */
>> +{USB_DEVICE_AND_INTERFACE_INFO(0x20f4, 0x648b, 0xff, 0xff, 0xff),
>> +	.driver_info = (unsigned long)&rtl8192cu_fops},
>>  /* Currently untested 8188 series devices */
>>  {USB_DEVICE_AND_INTERFACE_INFO(USB_VENDOR_ID_REALTEK, 0x8191, 0xff, 0xff, 0xff),
>>  	.driver_info = (unsigned long)&rtl8192cu_fops},
>> @@ -6080,8 +6087,6 @@ static struct usb_device_id dev_table[] = {
>>  	.driver_info = (unsigned long)&rtl8192cu_fops},
>>  {USB_DEVICE_AND_INTERFACE_INFO(0x2019, 0xed17, 0xff, 0xff, 0xff),
>>  	.driver_info = (unsigned long)&rtl8192cu_fops},
>> -{USB_DEVICE_AND_INTERFACE_INFO(0x20f4, 0x648b, 0xff, 0xff, 0xff),
>> -	.driver_info = (unsigned long)&rtl8192cu_fops},
>>  {USB_DEVICE_AND_INTERFACE_INFO(0x4855, 0x0090, 0xff, 0xff, 0xff),
>>  	.driver_info = (unsigned long)&rtl8192cu_fops},
>>  {USB_DEVICE_AND_INTERFACE_INFO(0x4856, 0x0091, 0xff, 0xff, 0xff),
>
> But will this now conflict with rtlwifi?
>
> drivers/net/wireless/realtek/rtlwifi/rtl8192cu/sw.c:
> {RTL_USB_DEVICE(0x20f4, 0x648b, rtl92cu_hal_cfg)}, /*TRENDnet -
> Cameo*/
>
> Like discussed before, I don't like having two drivers support same
> hardware and users more or less randomly using either of them.

Same procedure as last time - these are still listed under UNTESTED so
only get configured it people explicitly enable them.

There is no change here from how the code was prior.

Jes