[PATCH 1/2] rtw88: fix uninitialized 'tim_offset' warning

[PATCH 1/2] rtw88: fix uninitialized 'tim_offset' warning

[Ping-Ke Shih]

From: Po-Hao Huang <phhuang@realtek.com>

This avoids below warning and makes compiler happy.
error: uninitialized symbol 'tim_offset'

Signed-off-by: Po-Hao Huang <phhuang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
 drivers/net/wireless/realtek/rtw88/fw.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/wireless/realtek/rtw88/fw.c b/drivers/net/wireless/realtek/rtw88/fw.c
index c1af2704bb866..3545d51c6951a 100644
--- a/drivers/net/wireless/realtek/rtw88/fw.c
+++ b/drivers/net/wireless/realtek/rtw88/fw.c
@@ -1047,7 +1047,7 @@ static struct sk_buff *rtw_get_rsvd_page_skb(struct ieee80211_hw *hw,
 	struct rtw_vif *rtwvif;
 	struct sk_buff *skb_new;
 	struct cfg80211_ssid *ssid;
-	u16 tim_offset;
+	u16 tim_offset = 0;
 
 	if (rsvd_pkt->type == RSVD_DUMMY) {
 		skb_new = alloc_skb(1, GFP_KERNEL);
-- 
2.25.1

[PATCH 2/2] rtw88: pci: 8821c: Disable 21ce completion timeout

[Ping-Ke Shih]

From: Po-Hao Huang <phhuang@realtek.com>

Disable this capability to avoid timeout errors on certain platforms.
Without it, pci bus might stuck and leads to disconnection.

Signed-off-by: Po-Hao Huang <phhuang@realtek.com>
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
---
 drivers/net/wireless/realtek/rtw88/pci.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/drivers/net/wireless/realtek/rtw88/pci.c b/drivers/net/wireless/realtek/rtw88/pci.c
index 33042b63a151e..3ef0de70af328 100644
--- a/drivers/net/wireless/realtek/rtw88/pci.c
+++ b/drivers/net/wireless/realtek/rtw88/pci.c
@@ -1482,12 +1482,15 @@ static void rtw_pci_interface_cfg(struct rtw_dev *rtwdev)
 
 static void rtw_pci_phy_cfg(struct rtw_dev *rtwdev)
 {
+	struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev->priv;
 	struct rtw_chip_info *chip = rtwdev->chip;
+	struct pci_dev *pdev = rtwpci->pdev;
 	const struct rtw_intf_phy_para *para;
 	u16 cut;
 	u16 value;
 	u16 offset;
 	int i;
+	int ret;
 
 	cut = BIT(0) << rtwdev->hal.cut_version;
 
@@ -1520,6 +1523,15 @@ static void rtw_pci_phy_cfg(struct rtw_dev *rtwdev)
 	}
 
 	rtw_pci_link_cfg(rtwdev);
+
+	/* Disable 8821ce completion timeout by default */
+	if (chip->id == RTW_CHIP_TYPE_8821C) {
+		ret = pcie_capability_set_word(pdev, PCI_EXP_DEVCTL2,
+					       PCI_EXP_DEVCTL2_COMP_TMOUT_DIS);
+		if (ret)
+			rtw_err(rtwdev, "failed to set PCI cap, ret = %d\n",
+				ret);
+	}
 }
 
 static int __maybe_unused rtw_pci_suspend(struct device *dev)
-- 
2.25.1

Re: [PATCH 2/2] rtw88: pci: 8821c: Disable 21ce completion timeout

[Chris Chiu]

On 2022/4/20 17:30, Ping-Ke Shih wrote:
> From: Po-Hao Huang <phhuang@realtek.com>
>
> Disable this capability to avoid timeout errors on certain platforms.
> Without it, pci bus might stuck and leads to disconnection.
>
> Signed-off-by: Po-Hao Huang <phhuang@realtek.com>
> Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
> ---

Tested-by: Chris Chiu <chris.chiu@canonical.com>

>   drivers/net/wireless/realtek/rtw88/pci.c | 12 ++++++++++++
>   1 file changed, 12 insertions(+)
>
> diff --git a/drivers/net/wireless/realtek/rtw88/pci.c b/drivers/net/wireless/realtek/rtw88/pci.c
> index 33042b63a151e..3ef0de70af328 100644
> --- a/drivers/net/wireless/realtek/rtw88/pci.c
> +++ b/drivers/net/wireless/realtek/rtw88/pci.c
> @@ -1482,12 +1482,15 @@ static void rtw_pci_interface_cfg(struct rtw_dev *rtwdev)
>   
>   static void rtw_pci_phy_cfg(struct rtw_dev *rtwdev)
>   {
> +	struct rtw_pci *rtwpci = (struct rtw_pci *)rtwdev->priv;
>   	struct rtw_chip_info *chip = rtwdev->chip;
> +	struct pci_dev *pdev = rtwpci->pdev;
>   	const struct rtw_intf_phy_para *para;
>   	u16 cut;
>   	u16 value;
>   	u16 offset;
>   	int i;
> +	int ret;
>   
>   	cut = BIT(0) << rtwdev->hal.cut_version;
>   
> @@ -1520,6 +1523,15 @@ static void rtw_pci_phy_cfg(struct rtw_dev *rtwdev)
>   	}
>   
>   	rtw_pci_link_cfg(rtwdev);
> +
> +	/* Disable 8821ce completion timeout by default */
> +	if (chip->id == RTW_CHIP_TYPE_8821C) {
> +		ret = pcie_capability_set_word(pdev, PCI_EXP_DEVCTL2,
> +					       PCI_EXP_DEVCTL2_COMP_TMOUT_DIS);
> +		if (ret)
> +			rtw_err(rtwdev, "failed to set PCI cap, ret = %d\n",
> +				ret);
> +	}
>   }
>   
>   static int __maybe_unused rtw_pci_suspend(struct device *dev)

Re: [PATCH 1/2] rtw88: fix uninitialized 'tim_offset' warning

[Kalle Valo]

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

> From: Po-Hao Huang <phhuang@realtek.com>
> 
> This avoids below warning and makes compiler happy.
> error: uninitialized symbol 'tim_offset'
> 
> Signed-off-by: Po-Hao Huang <phhuang@realtek.com>
> Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>

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

9cbdadf0097f rtw88: fix uninitialized 'tim_offset' warning
9ebacb1e7e75 rtw88: pci: 8821c: Disable 21ce completion timeout

-- 
https://patchwork.kernel.org/project/linux-wireless/patch/20220420093058.31646-1-pkshih@realtek.com/

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