linux-kernel - [PATCH v3] usb: xHCI: add XHCI_RESET_ON

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <51AD65BA61BA0881+20240830043509.31019-1-wangyuli@uniontech.com>
Date: Fri, 30 Aug 2024 12:35:09 +0800
From: WangYuli <wangyuli@...ontech.com>
To: mathias.nyman@...el.com,
	gregkh@...uxfoundation.org,
	sergei.shtylyov@...il.com,
	helgaas@...nel.org,
	yuzenghui@...wei.com
Cc: linux-usb@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	linux-pci@...r.kernel.org,
	guanwentao@...ontech.com,
	WangYuli <wangyuli@...ontech.com>,
	Chen Baozi <chenbaozi@...tium.com.cn>,
	Wang Zhimin <wangzhimin1179@...tium.com.cn>,
	Chen Zhenhua <chenzhenhua@...tium.com.cn>,
	Wang Yinfeng <wangyinfeng@...tium.com.cn>,
	Jiakun Shuai <shuaijiakun1288@...tium.com.cn>
Subject: [PATCH v3] usb: xHCI: add XHCI_RESET_ON_RESUME quirk for Phytium xHCI host

The resume operation of Phytium Px210 xHCI host would failed
to restore state. Use the XHCI_RESET_ON_RESUME quirk to skip
it and reset the controller after resume.

Changlog:
 *v1 -> v2: Move the PCI_VENDOR_ID_PHYTIUM form pci_ids.h to xhci-pci.c
  v2 -> v3: Change "||" to "&&", that was a mistake.

Co-developed-by: Chen Baozi <chenbaozi@...tium.com.cn>
Signed-off-by: Chen Baozi <chenbaozi@...tium.com.cn>
Co-developed-by: Wang Zhimin <wangzhimin1179@...tium.com.cn>
Signed-off-by: Wang Zhimin <wangzhimin1179@...tium.com.cn>
Co-developed-by: Chen Zhenhua <chenzhenhua@...tium.com.cn>
Signed-off-by: Chen Zhenhua <chenzhenhua@...tium.com.cn>
Co-developed-by: Wang Yinfeng <wangyinfeng@...tium.com.cn>
Signed-off-by: Wang Yinfeng <wangyinfeng@...tium.com.cn>
Co-developed-by: Jiakun Shuai <shuaijiakun1288@...tium.com.cn>
Signed-off-by: Jiakun Shuai <shuaijiakun1288@...tium.com.cn>
Signed-off-by: WangYuli <wangyuli@...ontech.com>
---
 drivers/usb/host/xhci-pci.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c
index b5705ed01d83..bfb8f0699475 100644
--- a/drivers/usb/host/xhci-pci.c
+++ b/drivers/usb/host/xhci-pci.c
@@ -55,6 +55,9 @@
 #define PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI		0x51ed
 #define PCI_DEVICE_ID_INTEL_ALDER_LAKE_N_PCH_XHCI	0x54ed
 
+#define PCI_VENDOR_ID_PHYTIUM		0x1db7
+#define PCI_DEVICE_ID_PHYTIUM_XHCI			0xdc27
+
 /* Thunderbolt */
 #define PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_XHCI		0x1138
 #define PCI_DEVICE_ID_INTEL_ALPINE_RIDGE_2C_XHCI	0x15b5
@@ -407,6 +410,10 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci)
 	if (pdev->vendor == PCI_VENDOR_ID_VIA)
 		xhci->quirks |= XHCI_RESET_ON_RESUME;
 
+	if (pdev->vendor == PCI_VENDOR_ID_PHYTIUM &&
+	    pdev->device == PCI_DEVICE_ID_PHYTIUM_XHCI)
+		xhci->quirks |= XHCI_RESET_ON_RESUME;
+
 	/* See https://bugzilla.kernel.org/show_bug.cgi?id=79511 */
 	if (pdev->vendor == PCI_VENDOR_ID_VIA &&
 			pdev->device == 0x3432)
-- 
2.43.4