From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4FF541CFEDB; Wed, 2 Oct 2024 13:47:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727876872; cv=none; b=kFzZNGiHyDmgo+W1bAryR+KPh1Jwnaw64BpzF0TcSSwodLX1QHY0+68wsKzHVD+VFQEqokL8XtUZPyvP4f7Bz+wJLmKu3YOIIeWZjUWQ5pctVUYwFWtSQ1T57KvbT9HI/scAtUw+PQFm4CbIja/yTmLY0yW+l7ZwYFf6lLEj22c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727876872; c=relaxed/simple; bh=s99xaMF4zt+meiKA3L7yxlEn/NNoCPyIniu8jP1cBr4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iTjaOG/LuUeEbh0/+z76cXCf5/wtTtv8JZWxxbno4SPnq+GOpWNfPGkJ9QsU7RCPAuymugqY+c4MK53zb7PbL8KDVIgJq8VnhsEdPlBhLc8rhKEYqn9cVRz9L2NtutXNP+McZjobFcU2n0UQkL9hw3tc5qLb9WaHUbivmUas7sE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=SaNN9iaM; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="SaNN9iaM" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C9DB1C4CEC2; Wed, 2 Oct 2024 13:47:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1727876872; bh=s99xaMF4zt+meiKA3L7yxlEn/NNoCPyIniu8jP1cBr4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SaNN9iaMCwMWnVnm7Q4yhBxCBY+6mYthuLxAvLPbrFcI3MdN+UEP/OS3V4tGF+69t 1PvI20YA1sPxpV0Zn5DnpkV/wTnviDd/huUFv8czHQpspFJMynnWAafrJPY6nMZQRw dAqYa486bX5Zl8+3Sd+H+Ls1uMr9xirrvm3qTlfg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Chen Baozi , Wang Zhimin , Chen Zhenhua , Wang Yinfeng , Jiakun Shuai , WangYuli , stable Subject: [PATCH 6.11 587/695] usb: xHCI: add XHCI_RESET_ON_RESUME quirk for Phytium xHCI host Date: Wed, 2 Oct 2024 14:59:45 +0200 Message-ID: <20241002125845.942370562@linuxfoundation.org> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241002125822.467776898@linuxfoundation.org> References: <20241002125822.467776898@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: WangYuli commit 118ecef16cc221a23f96617016f7a205b070109f upstream. 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. Co-developed-by: Chen Baozi Signed-off-by: Chen Baozi Co-developed-by: Wang Zhimin Signed-off-by: Wang Zhimin Co-developed-by: Chen Zhenhua Signed-off-by: Chen Zhenhua Co-developed-by: Wang Yinfeng Signed-off-by: Wang Yinfeng Co-developed-by: Jiakun Shuai Signed-off-by: Jiakun Shuai Signed-off-by: WangYuli Link: https://lore.kernel.org/r/2C1FDC3BB34715BE+20240905040916.63199-1-wangyuli@uniontech.com Cc: stable Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/xhci-pci.c | 7 +++++++ 1 file changed, 7 insertions(+) --- 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 @@ -419,6 +422,10 @@ static void xhci_pci_quirks(struct devic 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)