Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <aef304a3-beab-71f4-7967-a8a5fa8e1371@canonical.com>
Date:   Thu, 21 Apr 2022 11:45:42 +0800
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.7.0
Subject: Re: [PATCH 2/2] rtw88: pci: 8821c: Disable 21ce completion timeout
Content-Language: en-US
To:     Ping-Ke Shih <pkshih@realtek.com>, tony0620emma@gmail.com,
        kvalo@kernel.org
Cc:     linux-wireless@vger.kernel.org, phhuang@realtek.com
References: <20220420093058.31646-1-pkshih@realtek.com>
 <20220420093058.31646-2-pkshih@realtek.com>
From:   Chris Chiu <chris.chiu@canonical.com>
In-Reply-To: <20220420093058.31646-2-pkshih@realtek.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk


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)