[PATCHi V2] wifi: rtw88: Add missing VID/PIDs doe 8811CU and 8821CU

[PATCHi V2] wifi: rtw88: Add missing VID/PIDs doe 8811CU and 8821CU

[Larry Finger]

From: Nick Morrow <morrownr@gmail.com>

Purpose: Add VID/PIDs that are known to be missing for this driver.
- removed  /* 8811CU */ and /* 8821CU */ as they are redundant
since the file is specific to those chips.
- removed /* TOTOLINK A650UA v3 */ as the manufacturer. It has a REALTEK
VID so it may not be specific to this adapter.

Source is https://1EHFQ.trk.elasticemail.com/tracking/click?d=I82H0YR_W_h175Lb3Nkb0D8i6IqvuhESe0WLnY6P7IVwR1UKvB0SPxd1Olp3PNJEJTqsu4kyqBXayE0BVd_k7uLFvlTe65Syx2uqLUB-UQSfsKKLkuyE-frMZXSCL7q824UG3Oer614GGEeEz-DNEWHh43p_e8oz7OouS6gRBEng0
Verified and tested.

Signed-off-by: Nick Morrow <morrownr@gmail.com>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Acked-by: Ping-Ke Shih <pkshih@realtek.com>

Cc: stable@vger.kernel.org
---
 .../net/wireless/realtek/rtw88/rtw8821cu.c    | 40 ++++++++++++-------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821cu.c b/drivers/net/wireless/realtek/rtw88/rtw8821cu.c
index 7a5cbdc31ef7..e2c7d9f87683 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8821cu.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8821cu.c
@@ -9,24 +9,36 @@
 #include "usb.h"
 
 static const struct usb_device_id rtw_8821cu_id_table[] = {
-	{ USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xb82b, 0xff, 0xff, 0xff),
-	  .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */
+	{ USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x2006, 0xff, 0xff, 0xff),
+	  .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) },
+	{ USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x8731, 0xff, 0xff, 0xff),
+	  .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) },
+	{ USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x8811, 0xff, 0xff, 0xff),
+	  .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xb820, 0xff, 0xff, 0xff),
-	  .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */
-	{ USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc821, 0xff, 0xff, 0xff),
-	  .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */
+	  .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) },
+	{ USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xb82b, 0xff, 0xff, 0xff),
+	  .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) },
+	{ USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc80c, 0xff, 0xff, 0xff),
+	  .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) },
+	{ USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc811, 0xff, 0xff, 0xff),
+	  .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc820, 0xff, 0xff, 0xff),
-	  .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */
+	  .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) },
+	{ USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc821, 0xff, 0xff, 0xff),
+	  .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc82a, 0xff, 0xff, 0xff),
-	  .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */
+	  .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc82b, 0xff, 0xff, 0xff),
-	  .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8821CU */
-	{ USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc811, 0xff, 0xff, 0xff),
-	  .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8811CU */
-	{ USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x8811, 0xff, 0xff, 0xff),
-	  .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* 8811CU */
-	{ USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0x2006, 0xff, 0xff, 0xff),
-	  .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* TOTOLINK A650UA v3 */
+	  .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) },
+	{ USB_DEVICE_AND_INTERFACE_INFO(RTW_USB_VENDOR_ID_REALTEK, 0xc82c, 0xff, 0xff, 0xff),
+	  .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) },
+	{ USB_DEVICE_AND_INTERFACE_INFO(0x2001, 0x331d, 0xff, 0xff, 0xff),
+	  .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* D-Link */
+	{ USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xc811, 0xff, 0xff, 0xff),
+	  .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* Edimax */
+	{ USB_DEVICE_AND_INTERFACE_INFO(0x7392, 0xd811, 0xff, 0xff, 0xff),
+	  .driver_info = (kernel_ulong_t)&(rtw8821c_hw_spec) }, /* Edimax */
 	{},
 };
 MODULE_DEVICE_TABLE(usb, rtw_8821cu_id_table);
-- 
2.43.2


https://1EHFQ.trk.elasticemail.com/tracking/unsubscribe?d=jAGPtWFGE8Soc3kz_2nkgV0cg1priCNwuAVMrjYRIIiyeRrym-Tm6C3M27-APNufjA0z4dvvT_-3HEXC4V8xVw1rFgNCZcEZuumX4JNEE9UE0

RE: [PATCHi V2] wifi: rtw88: Add missing VID/PIDs doe 8811CU and 8821CU

[Ping-Ke Shih]

Hi Larry,

> -----Original Message-----
> From: Larry Finger <Larry.Finger@gmail.com>
> Sent: Tuesday, February 27, 2024 10:35 AM
> To: Kalle Valo <kvalo@kernel.org>
> Cc: Johannes Berg <johannes@sipsolutions.net>; linux-wireless@vger.kernel.org; Nick Morrow
> <morrownr@gmail.com>; Larry Finger <Larry.Finger@lwfinger.net>; Ping-Ke Shih <pkshih@realtek.com>;
> stable@vger.kernel.org
> Subject: [PATCHi V2] wifi: rtw88: Add missing VID/PIDs doe 8811CU and 8821CU

Not sure if "doe" is typo?

> 
> From: Nick Morrow <morrownr@gmail.com>
> 
> Purpose: Add VID/PIDs that are known to be missing for this driver.
> - removed  /* 8811CU */ and /* 8821CU */ as they are redundant
> since the file is specific to those chips.
> - removed /* TOTOLINK A650UA v3 */ as the manufacturer. It has a REALTEK
> VID so it may not be specific to this adapter.
> 
> Source is
> https://1EHFQ.trk.elasticemail.com/tracking/click?d=I82H0YR_W_h175Lb3Nkb0D8i6IqvuhESe0WLnY6P7IVwR1UKvB
> 0SPxd1Olp3PNJEJTqsu4kyqBXayE0BVd_k7uLFvlTe65Syx2uqLUB-UQSfsKKLkuyE-frMZXSCL7q824UG3Oer614GGEeEz-DNEWHh
> 43p_e8oz7OouS6gRBEng0
> Verified and tested.
> 
> Signed-off-by: Nick Morrow <morrownr@gmail.com>
> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
> Acked-by: Ping-Ke Shih <pkshih@realtek.com>
> 

Did you keep a blank line intentionally? 

> Cc: stable@vger.kernel.org

Re: [PATCHi V2] wifi: rtw88: Add missing VID/PIDs doe 8811CU and 8821CU

[Kalle Valo]

Ping-Ke Shih <pkshih@realtek.com> writes:

> Hi Larry,
>
>> -----Original Message-----
>> From: Larry Finger <Larry.Finger@gmail.com>
>> Sent: Tuesday, February 27, 2024 10:35 AM
>> To: Kalle Valo <kvalo@kernel.org>
>> Cc: Johannes Berg <johannes@sipsolutions.net>; linux-wireless@vger.kernel.org; Nick Morrow
>> <morrownr@gmail.com>; Larry Finger <Larry.Finger@lwfinger.net>; Ping-Ke Shih <pkshih@realtek.com>;
>> stable@vger.kernel.org
>> Subject: [PATCHi V2] wifi: rtw88: Add missing VID/PIDs doe 8811CU and 8821CU
>
> Not sure if "doe" is typo?

I think it means "for" but Larry's finger was one key off to the left :) I can fix that.

>> From: Nick Morrow <morrownr@gmail.com>
>> 
>> Purpose: Add VID/PIDs that are known to be missing for this driver.
>> - removed  /* 8811CU */ and /* 8821CU */ as they are redundant
>> since the file is specific to those chips.
>> - removed /* TOTOLINK A650UA v3 */ as the manufacturer. It has a REALTEK
>> VID so it may not be specific to this adapter.
>> 
>> Source is
>> https://1EHFQ.trk.elasticemail.com/tracking/click?d=I82H0YR_W_h175Lb3Nkb0D8i6IqvuhESe0WLnY6P7IVwR1UKvB
>> 0SPxd1Olp3PNJEJTqsu4kyqBXayE0BVd_k7uLFvlTe65Syx2uqLUB-UQSfsKKLkuyE-frMZXSCL7q824UG3Oer614GGEeEz-DNEWHh
>> 43p_e8oz7OouS6gRBEng0
>> Verified and tested.
>> 
>> Signed-off-by: Nick Morrow <morrownr@gmail.com>
>> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
>> Acked-by: Ping-Ke Shih <pkshih@realtek.com>
>> 
>
> Did you keep a blank line intentionally? 

I can fix this as well. I'll also move 'cc: stable' to the beginning of
tags.

-- 
https://patchwork.kernel.org/project/linux-wireless/list/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches

Re: [PATCHi V2] wifi: rtw88: Add missing VID/PIDs doe 8811CU and 8821CU

[Larry Finger]

On 2/27/24 00:38, Kalle Valo wrote:
> Ping-Ke Shih <pkshih@realtek.com> writes:
> 
>> Hi Larry,
>>
>>> -----Original Message-----
>>> From: Larry Finger <Larry.Finger@gmail.com>
>>> Sent: Tuesday, February 27, 2024 10:35 AM
>>> To: Kalle Valo <kvalo@kernel.org>
>>> Cc: Johannes Berg <johannes@sipsolutions.net>; linux-wireless@vger.kernel.org; Nick Morrow
>>> <morrownr@gmail.com>; Larry Finger <Larry.Finger@lwfinger.net>; Ping-Ke Shih <pkshih@realtek.com>;
>>> stable@vger.kernel.org
>>> Subject: [PATCHi V2] wifi: rtw88: Add missing VID/PIDs doe 8811CU and 8821CU
>>
>> Not sure if "doe" is typo?
> 
> I think it means "for" but Larry's finger was one key off to the left :) I can fix that.
> 
>>> From: Nick Morrow <morrownr@gmail.com>
>>>
>>> Purpose: Add VID/PIDs that are known to be missing for this driver.
>>> - removed  /* 8811CU */ and /* 8821CU */ as they are redundant
>>> since the file is specific to those chips.
>>> - removed /* TOTOLINK A650UA v3 */ as the manufacturer. It has a REALTEK
>>> VID so it may not be specific to this adapter.
>>>
>>> Source is
>>> https://1EHFQ.trk.elasticemail.com/tracking/click?d=I82H0YR_W_h175Lb3Nkb0D8i6IqvuhESe0WLnY6P7IVwR1UKvB
>>> 0SPxd1Olp3PNJEJTqsu4kyqBXayE0BVd_k7uLFvlTe65Syx2uqLUB-UQSfsKKLkuyE-frMZXSCL7q824UG3Oer614GGEeEz-DNEWHh
>>> 43p_e8oz7OouS6gRBEng0
>>> Verified and tested.
>>>
>>> Signed-off-by: Nick Morrow <morrownr@gmail.com>
>>> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
>>> Acked-by: Ping-Ke Shih <pkshih@realtek.com>
>>>
>>
>> Did you keep a blank line intentionally?
> 
> I can fix this as well. I'll also move 'cc: stable' to the beginning of
> tags.
> 
Kalle,

Thanks for correcting my mistakes.

Larry

Re: [PATCH,V2] wifi: rtw88: Add missing VID/PIDs for 8811CU and 8821CU

[Kalle Valo]

Larry Finger <Larry.Finger@gmail.com> wrote:

> From: Nick Morrow <morrownr@gmail.com>
> 
> Add VID/PIDs that are known to be missing for this driver.
> 
> Removed /* 8811CU */ and /* 8821CU */ as they are redundant
> since the file is specific to those chips.
> 
> Removed /* TOTOLINK A650UA v3 */ as the manufacturer. It has a REALTEK
> VID so it may not be specific to this adapter.
> 
> Verified and tested.
> 
> Cc: stable@vger.kernel.org
> Signed-off-by: Nick Morrow <morrownr@gmail.com>
> Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
> Acked-by: Ping-Ke Shih <pkshih@realtek.com>

Patch applied to wireless-next.git, thanks.

b8a62478f3b1 wifi: rtw88: Add missing VID/PIDs for 8811CU and 8821CU

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/4ume7mjw63u7.XlMUvUuacW2ErhOCdqlLkw2@1EHFQ.trk.elasticemail.com/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches