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 7A63B1DF74E; Wed, 6 Nov 2024 12:19:36 +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=1730895576; cv=none; b=dExskdgGoyTgjNofPAtyAwcmQmjOBf3jG17hqdNHW+gc57VfXrF6P3Fw150u+kNN4J9iTRpAv66QbBO+WIKwc/9xALiGBRfzK/XGWXhsDOwv84In5ot1Dbe2X04uWzisIaPjIrVJUmZQYg4qAKSgYhY6+1gNs7hshbASq7KG1IU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730895576; c=relaxed/simple; bh=A6suKevHJJlRbumE3Bx514/fUmEIxCerCp40N2gpqcg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MhanAWP5zBjmVeUo2+L4UxcDg5NB+ljXzaABTYrQt9dRwIvC/2GiUm1rG2Xytmb+p+hPIbqzsXWn0yVVS45K58+Ccid+bELAqQcPGecIWfjUV5EU4196LIweJsdGtgJ8KJNkDRB2i+qHrsNAP98Os6Qciw78N9x2clkH4+YvNSU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=DRa37vD4; 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="DRa37vD4" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F0462C4CECD; Wed, 6 Nov 2024 12:19:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1730895576; bh=A6suKevHJJlRbumE3Bx514/fUmEIxCerCp40N2gpqcg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DRa37vD4wX4QS6BWaRq4Hb5wr6QeLQ56Kvw/wOgH/tn0UDNjTutfrASngJifYRQgh /z9XSwv32J5SFt3lLP5qJiZ4xEcV9+B4drtx63JI7cqUs1jtPSUIBVQIoc9HPj/eHZ 1VD4ptcFE++XWtPz/TKdcOFFR5MhEYPIjLO6mH54= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jose Alberto Reguero , stable Subject: [PATCH 4.19 265/350] usb: xhci: Fix problem with xhci resume from suspend Date: Wed, 6 Nov 2024 13:03:13 +0100 Message-ID: <20241106120327.444117390@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241106120320.865793091@linuxfoundation.org> References: <20241106120320.865793091@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jose Alberto Reguero commit d44238d8254a36249d576c96473269dbe500f5e4 upstream. I have a ASUS PN51 S mini pc that has two xhci devices. One from AMD, and other from ASMEDIA. The one from ASMEDIA have problems when resume from suspend, and keep broken until unplug the power cord. I use this kernel parameter: xhci-hcd.quirks=128 and then it works ok. I make a path to reset only the ASMEDIA xhci. Signed-off-by: Jose Alberto Reguero Cc: stable Link: https://lore.kernel.org/r/20240919184202.22249-1-jose.alberto.reguero@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/xhci-pci.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -55,6 +55,7 @@ #define PCI_DEVICE_ID_ASMEDIA_1042A_XHCI 0x1142 #define PCI_DEVICE_ID_ASMEDIA_1142_XHCI 0x1242 #define PCI_DEVICE_ID_ASMEDIA_2142_XHCI 0x2142 +#define PCI_DEVICE_ID_ASMEDIA_3042_XHCI 0x3042 #define PCI_DEVICE_ID_ASMEDIA_3242_XHCI 0x3242 static const char hcd_name[] = "xhci_hcd"; @@ -272,6 +273,10 @@ static void xhci_pci_quirks(struct devic pdev->device == PCI_DEVICE_ID_ASMEDIA_1042A_XHCI) xhci->quirks |= XHCI_ASMEDIA_MODIFY_FLOWCONTROL; + if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && + pdev->device == PCI_DEVICE_ID_ASMEDIA_3042_XHCI) + xhci->quirks |= XHCI_RESET_ON_RESUME; + if (pdev->vendor == PCI_VENDOR_ID_TI && pdev->device == 0x8241) xhci->quirks |= XHCI_LIMIT_ENDPOINT_INTERVAL_7;