[PATCH v2 0/2] rtw88: 8821ce: add support for device ID 0xb821

[PATCH v2 0/2] rtw88: 8821ce: add support for device ID 0xb821

[Jimmy Hon]

Jimmy Hon (2):
  rtw88: 8821ce: add support for device ID 0xb821
  rtw88: 8821ce: Disable PCIe ASPM L1 for 8821CE using chip ID

 drivers/net/wireless/realtek/rtw88/pci.c       | 2 +-
 drivers/net/wireless/realtek/rtw88/rtw8821ce.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

-- 
2.35.1

[PATCH 1/2] rtw88: 8821ce: add support for device ID 0xb821

[Jimmy Hon]

New device ID 0xb821 found on TP-Link T2E
Tested it with c821 driver. 2.4GHz and 5GHz works.

PCI id:
05:00.0 Network controller: Realtek Semiconductor Co., Ltd. Device b821
        Subsystem: Realtek Semiconductor Co., Ltd. Device b821

Signed-off-by: Jimmy Hon <honyuenkwun@gmail.com>
---
 drivers/net/wireless/realtek/rtw88/rtw8821ce.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/net/wireless/realtek/rtw88/rtw8821ce.c b/drivers/net/wireless/realtek/rtw88/rtw8821ce.c
index f34de115e4bc..56d22f9de904 100644
--- a/drivers/net/wireless/realtek/rtw88/rtw8821ce.c
+++ b/drivers/net/wireless/realtek/rtw88/rtw8821ce.c
@@ -8,6 +8,10 @@
 #include "rtw8821ce.h"
 
 static const struct pci_device_id rtw_8821ce_id_table[] = {
+	{
+		PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0xB821),
+		.driver_data = (kernel_ulong_t)&rtw8821c_hw_spec
+	},
 	{
 		PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0xC821),
 		.driver_data = (kernel_ulong_t)&rtw8821c_hw_spec
-- 
2.35.1

Re: [PATCH 1/2] rtw88: 8821ce: add support for device ID 0xb821

[Pkshih]

On Thu, 2022-04-07 at 02:51 -0500, Jimmy Hon wrote:
> New device ID 0xb821 found on TP-Link T2E
> Tested it with c821 driver. 2.4GHz and 5GHz works.
> 
> PCI id:
> 05:00.0 Network controller: Realtek Semiconductor Co., Ltd. Device b821
>         Subsystem: Realtek Semiconductor Co., Ltd. Device b821
> 
> Signed-off-by: Jimmy Hon <honyuenkwun@gmail.com>


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

Re: [PATCH 1/2] rtw88: 8821ce: add support for device ID 0xb821

[Kalle Valo]

Jimmy Hon <honyuenkwun@gmail.com> wrote:

> New device ID 0xb821 found on TP-Link T2E
> Tested it with c821 driver. 2.4GHz and 5GHz works.
> 
> PCI id:
> 05:00.0 Network controller: Realtek Semiconductor Co., Ltd. Device b821
>         Subsystem: Realtek Semiconductor Co., Ltd. Device b821
> 
> Signed-off-by: Jimmy Hon <honyuenkwun@gmail.com>
> Reviewed-by: Ping-Ke Shih <pkshih@realtek.com>

2 patches applied to wireless-next.git, thanks.

d5286826201e rtw88: 8821ce: add support for device ID 0xb821
b9eb5f0742d1 rtw88: 8821ce: Disable PCIe ASPM L1 for 8821CE using chip ID

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20220407075123.420696-2-honyuenkwun@gmail.com/

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

[PATCH 2/2] rtw88: 8821ce: Disable PCIe ASPM L1 for 8821CE using chip ID

[Jimmy Hon]

Make workaround work for other 8821CE devices with different PCI ID

Signed-off-by: Jimmy Hon <honyuenkwun@gmail.com>
---
 drivers/net/wireless/realtek/rtw88/pci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/realtek/rtw88/pci.c b/drivers/net/wireless/realtek/rtw88/pci.c
index a0991d3f15c0..0edb5711b546 100644
--- a/drivers/net/wireless/realtek/rtw88/pci.c
+++ b/drivers/net/wireless/realtek/rtw88/pci.c
@@ -1770,7 +1770,7 @@ int rtw_pci_probe(struct pci_dev *pdev,
 	}
 
 	/* Disable PCIe ASPM L1 while doing NAPI poll for 8821CE */
-	if (pdev->device == 0xc821 && bridge->vendor == PCI_VENDOR_ID_INTEL)
+	if (rtwdev->chip->id == RTW_CHIP_TYPE_8821C && bridge->vendor == PCI_VENDOR_ID_INTEL)
 		rtwpci->rx_no_aspm = true;
 
 	rtw_pci_phy_cfg(rtwdev);
-- 
2.35.1

Re: [PATCH 2/2] rtw88: 8821ce: Disable PCIe ASPM L1 for 8821CE using chip ID

[Pkshih]

On Thu, 2022-04-07 at 02:51 -0500, Jimmy Hon wrote:
> Make workaround work for other 8821CE devices with different PCI ID
> 
> Signed-off-by: Jimmy Hon <honyuenkwun@gmail.com>

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

> ---
>  drivers/net/wireless/realtek/rtw88/pci.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/wireless/realtek/rtw88/pci.c b/drivers/net/wireless/realtek/rtw88/pci.c
> index a0991d3f15c0..0edb5711b546 100644
> --- a/drivers/net/wireless/realtek/rtw88/pci.c
> +++ b/drivers/net/wireless/realtek/rtw88/pci.c
> @@ -1770,7 +1770,7 @@ int rtw_pci_probe(struct pci_dev *pdev,
>  	}
>  
>  	/* Disable PCIe ASPM L1 while doing NAPI poll for 8821CE */
> -	if (pdev->device == 0xc821 && bridge->vendor == PCI_VENDOR_ID_INTEL)
> +	if (rtwdev->chip->id == RTW_CHIP_TYPE_8821C && bridge->vendor == PCI_VENDOR_ID_INTEL)
>  		rtwpci->rx_no_aspm = true;
>  
>  	rtw_pci_phy_cfg(rtwdev);