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 E19C8AD58; Wed, 19 Jun 2024 13:15:31 +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=1718802932; cv=none; b=bnW30zARQHpuXQ+VGVF4RVYYwGnl7zVBaHWtxnXRsU3jXjqT6GpJydx9YoNOhbc19PhRp8AtzqvZdZ1/6foUmRNeXvRd9d2ydR5covOTgeWFryQI1GCUcM3qdBzoqheeijOSTMmH4xagtjTrSyVqoAv5n9WxerTWY1gf9V3hAUk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718802932; c=relaxed/simple; bh=eg+5LXLsc4a1PSc0qjzbyLtoSX6IsHzfuKxbtdubtkc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RmRkTOOg6suZOSpp4r2HYUOvODDLOXDimZCWh21DedX3uoroO44nFJ6sUBIyEYoPY2pAFJQU5j81m7QzH6x35rxjsx+9k3xZ46fD+vw5dfyn2v63762NnbJI3LwlLzpet1CDJ3VAjavBZRbd/UGchH5SR9Vgxc5kIfNQSJ2rZCk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=C7HpAtEe; 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="C7HpAtEe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 894CCC2BBFC; Wed, 19 Jun 2024 13:15:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1718802930; bh=eg+5LXLsc4a1PSc0qjzbyLtoSX6IsHzfuKxbtdubtkc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=C7HpAtEek9xTUihIoOq+noK7KUVgIXaiUJ+PKVcZHaC9cim2785yAYW9q9yYOtgb7 o6FHIlcbu37JMXx2qJpshXuxj9ylpYyGkWWPXWH6soZidefaGKVj/2eD1OxRuR2KhO x0WPJGOlpoe8A4QUFcQXMdgnJqC499z11fFUkdSQ= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Kuangyi Chiang , Mathias Nyman Subject: [PATCH 6.9 095/281] xhci: Apply reset resume quirk to Etron EJ188 xHCI host Date: Wed, 19 Jun 2024 14:54:14 +0200 Message-ID: <20240619125613.506655766@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240619125609.836313103@linuxfoundation.org> References: <20240619125609.836313103@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 6.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Kuangyi Chiang commit 17bd54555c2aaecfdb38e2734149f684a73fa584 upstream. As described in commit c877b3b2ad5c ("xhci: Add reset on resume quirk for asrock p67 host"), EJ188 have the same issue as EJ168, where completely dies on resume. So apply XHCI_RESET_ON_RESUME quirk to EJ188 as well. Cc: stable@vger.kernel.org Signed-off-by: Kuangyi Chiang Signed-off-by: Mathias Nyman Link: https://lore.kernel.org/r/20240611120610.3264502-3-mathias.nyman@linux.intel.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 @@ -36,6 +36,7 @@ #define PCI_VENDOR_ID_ETRON 0x1b6f #define PCI_DEVICE_ID_EJ168 0x7023 +#define PCI_DEVICE_ID_EJ188 0x7052 #define PCI_DEVICE_ID_INTEL_LYNXPOINT_XHCI 0x8c31 #define PCI_DEVICE_ID_INTEL_LYNXPOINT_LP_XHCI 0x9c31 @@ -402,6 +403,10 @@ static void xhci_pci_quirks(struct devic xhci->quirks |= XHCI_TRUST_TX_LENGTH; xhci->quirks |= XHCI_BROKEN_STREAMS; } + if (pdev->vendor == PCI_VENDOR_ID_ETRON && + pdev->device == PCI_DEVICE_ID_EJ188) + xhci->quirks |= XHCI_RESET_ON_RESUME; + if (pdev->vendor == PCI_VENDOR_ID_RENESAS && pdev->device == 0x0014) { xhci->quirks |= XHCI_TRUST_TX_LENGTH;