From patchwork Mon Oct 31 03:51:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Reka Norman X-Patchwork-Id: 13025369 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9996BC38A02 for ; Mon, 31 Oct 2022 03:52:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229729AbiJaDvm (ORCPT ); Sun, 30 Oct 2022 23:51:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229674AbiJaDvk (ORCPT ); Sun, 30 Oct 2022 23:51:40 -0400 Received: from mail-pf1-x430.google.com (mail-pf1-x430.google.com [IPv6:2607:f8b0:4864:20::430]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8DF6E614C for ; Sun, 30 Oct 2022 20:51:39 -0700 (PDT) Received: by mail-pf1-x430.google.com with SMTP id k22so9646333pfd.3 for ; Sun, 30 Oct 2022 20:51:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=eojpOnKYxEuE+Hb1fLiytrJguJoVmdPOwG26b/IYxxI=; b=DXqKD7yuSfoOAIJ/f5MO0aq+9Y4rj8xPW6TD78CipU8qvAEJrcZKcjxXurb5AEVNnu 0b/kMljABZaADPsjeJrnGU6f+nxKGvAfTC2du/fHNFK8cFnm1gs0zPkOPnFa0ZUKshvP TczVGnYqFxQS7UxbIwYIA5t0PpOzteMIhavTE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=eojpOnKYxEuE+Hb1fLiytrJguJoVmdPOwG26b/IYxxI=; b=6cUTbi+F7z5PP23uhAUNShbc1H/Dh0ANgnQ6lMUZL+wGZ+dySUy9uGZNdyqggkHvhp GZd5OQ9+noycSZB901ZV7e2/jJcWwRvwlkL7Y+F7zCYdXFYgT46j5BlJcWq1Ov5l3mQs QZuYgRF/yg96oS2OQY6Ib5szCsFg1JcU+NSbrQ4gvLlGzYfJKTLnndCRjCY97rsBojZm 4zPnFYfOGU5ZFVHE5p7+7w6Lx4GIeHv+zIoVIoJqxe/C/dbVCkvdaIPBj0taignGvBTR qKCBU0MtWAOu24a78HFfegL6pO1xVflZA20V/qxXKYgtS4ONC7PLlXJaY7BT35Z2ONHQ mKFA== X-Gm-Message-State: ACrzQf09ZKkUnKkTbQbciRtcbiQqHDng4zb543eG7IKzfFZm/t3j2V0N +sZMDSLCRJxcbLoPWX20TPeBLw== X-Google-Smtp-Source: AMsMyM7RVPbc/CgjuIGWI4hMPwc8Dfa+/QeEvZHsgwc7S+5ARn1luyKwoAJt77tc3mxDIkQK/AjBmg== X-Received: by 2002:a63:6909:0:b0:41c:9f4f:a63c with SMTP id e9-20020a636909000000b0041c9f4fa63cmr11293418pgc.76.1667188299072; Sun, 30 Oct 2022 20:51:39 -0700 (PDT) Received: from rekanorman3.syd.corp.google.com ([2401:fa00:9:14:4fdc:505:9b5a:4c97]) by smtp.gmail.com with ESMTPSA id d85-20020a621d58000000b0056bc30e618dsm3371384pfd.38.2022.10.30.20.51.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 30 Oct 2022 20:51:38 -0700 (PDT) From: Reka Norman To: Mathias Nyman Cc: Reka Norman , Greg Kroah-Hartman , linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Subject: [PATCH v2] xhci: Apply XHCI_RESET_TO_DEFAULT quirk to ADL-N Date: Mon, 31 Oct 2022 14:51:14 +1100 Message-Id: <20221031035114.1803570-1-rekanorman@chromium.org> X-Mailer: git-send-email 2.38.1.273.g43a17bfeac-goog MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org ADL-N systems have the same issue as ADL-P, where a large boot firmware delay is seen if USB ports are left in U3 at shutdown. So apply the XHCI_RESET_TO_DEFAULT quirk to ADL-N as well. This patch depends on commit 34cd2db408d5 ("xhci: Add quirk to reset host back to default state at shutdown"). The issue it fixes is a ~20s boot time delay when booting from S5. It affects ADL-N devices, and ADL-N support was added starting from v5.16. Signed-off-by: Reka Norman --- Changes in v2: - Add more details to the commit message. drivers/usb/host/xhci-pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index 7bccbe50bab15..f98cf30a3c1a5 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c @@ -59,6 +59,7 @@ #define PCI_DEVICE_ID_INTEL_TIGER_LAKE_XHCI 0x9a13 #define PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_XHCI 0x1138 #define PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI 0x51ed +#define PCI_DEVICE_ID_INTEL_ALDER_LAKE_N_PCH_XHCI 0x54ed #define PCI_DEVICE_ID_AMD_RENOIR_XHCI 0x1639 #define PCI_DEVICE_ID_AMD_PROMONTORYA_4 0x43b9 @@ -246,7 +247,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) xhci->quirks |= XHCI_MISSING_CAS; if (pdev->vendor == PCI_VENDOR_ID_INTEL && - pdev->device == PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI) + (pdev->device == PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI || + pdev->device == PCI_DEVICE_ID_INTEL_ALDER_LAKE_N_PCH_XHCI)) xhci->quirks |= XHCI_RESET_TO_DEFAULT; if (pdev->vendor == PCI_VENDOR_ID_INTEL &&