Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp2057199iob; Thu, 5 May 2022 14:35:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz+eiv2UQJiq429dATnU6etOLnoQMgc0v2mLzv1EkifUVkB/BRFHnaRtBdxBYYnyFqccZIt X-Received: by 2002:a17:90a:f30d:b0:1dc:792f:ddac with SMTP id ca13-20020a17090af30d00b001dc792fddacmr8392848pjb.20.1651786534155; Thu, 05 May 2022 14:35:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651786534; cv=none; d=google.com; s=arc-20160816; b=WyA3jsqBXjCjOLpWQpfMxNRrwPg6tvNyk3B0iY9pfSxO4r0cEgIVH9Wyx4tULi8Pe4 zZXdCSoU+wCFHbmHnNLHHPBn4Gxb3kSiNYqSVp1ELz7Ml9TrXl9RpOVj+FKmE1H3+6oz /2EhbVWDZ3SUesQrhM1CyP/vPamvRYqrxyeQiFLx+KuhTnzKZ+wptTAJOQc+TIrWFDFQ AdZF5uzSGYs7zumndaTLcOfPDVOZvB03qOPZAEF2RsOX1Y8V2irc2Bv7jbZbNUhxj0JQ ofHM/fh07lV40hlqdjwsCB79m8dOVrIUN2axC4s9rxLpSqemOnIw3qL/vmoHQNAiLA90 nZ9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=BMsEB5g24R2UhC4tBOYjyYD9+D+ZfKJAutNlWUOqWag=; b=p+G+Wx2M7zKBEyrN0jns0vZL2dMxL4MvjXi7KQJXRiTpCb1TZJS0QL7znh4XNpyOD6 INFomDsrEKuPiJDVx7FFIIQ9Bk6HUyLVAURpphnEie2EG1drV0I1DIg7/d9BsunM6Zvm hnCmp4QlSB+aUw3o6xROoVpZ3ARlZx/qDg+BwxpZc5Bg1QQkIEW5KgaicCl7Z0Ldqdfi 7Khxs+CWrdM5RrBYgvFYocvFILxigFZkcXcgSHYbNY4LkjG6BrrnwRfW4ajhoo7Q+ZoN kBkUFVXLYYX0/wxzr1u/Axj/X/lOoGD1j0jglnYWOvlGO1m7xrBPXBlbgDdCdF62dVuA NjYw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yotB2Wj2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 3-20020a630003000000b003ab7c9c5fb3si2606544pga.544.2022.05.05.14.35.17; Thu, 05 May 2022 14:35:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yotB2Wj2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1359708AbiEDRkP (ORCPT + 99 others); Wed, 4 May 2022 13:40:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1356792AbiEDRJo (ORCPT ); Wed, 4 May 2022 13:09:44 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CA9581D319; Wed, 4 May 2022 09:55:36 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 7328DB8278E; Wed, 4 May 2022 16:55:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2DD48C385A4; Wed, 4 May 2022 16:55:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683335; bh=8VMbv6k1Ez79dhZYetnG2VPw/IkmhQKJA3RVyKVyfcU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yotB2Wj2gVVIpz4NqmAnKLPZLCs+bm4idMcdP+vI8VkDyg6eXcbKyE0ML3fxyNJWZ Y19JjNyRWnv04yp+ND4Cqg0pRuAgPsXxLfQya6ZVnYtC2l6V4cAvUY/WA8yNGMro72 3pvf3Yusa2MRmA3g+whD71JJeln0sGGevbmmTMB8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Evan Green , stable Subject: [PATCH 5.17 010/225] xhci: Enable runtime PM on second Alderlake controller Date: Wed, 4 May 2022 18:44:08 +0200 Message-Id: <20220504153111.197596636@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Evan Green commit d8bfe5091d6cc4b8b8395e4666979ae72a6069ca upstream. Alderlake has two XHCI controllers with PCI IDs 0x461e and 0x51ed. We had previously added the quirk to default enable runtime PM for 0x461e, now add it for 0x51ed as well. Signed-off-by: Evan Green Cc: stable Link: https://lore.kernel.org/r/20220408114225.1.Ibcff6b86ed4eacfe4c4bc89c90e18416f3900a3e@changeid Signed-off-by: Greg Kroah-Hartman --- drivers/usb/host/xhci-pci.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- 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_XHCI 0x461e +#define PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI 0x51ed #define PCI_DEVICE_ID_AMD_RENOIR_XHCI 0x1639 #define PCI_DEVICE_ID_AMD_PROMONTORYA_4 0x43b9 @@ -266,7 +267,8 @@ static void xhci_pci_quirks(struct devic pdev->device == PCI_DEVICE_ID_INTEL_ICE_LAKE_XHCI || pdev->device == PCI_DEVICE_ID_INTEL_TIGER_LAKE_XHCI || pdev->device == PCI_DEVICE_ID_INTEL_MAPLE_RIDGE_XHCI || - pdev->device == PCI_DEVICE_ID_INTEL_ALDER_LAKE_XHCI)) + pdev->device == PCI_DEVICE_ID_INTEL_ALDER_LAKE_XHCI || + pdev->device == PCI_DEVICE_ID_INTEL_ALDER_LAKE_PCH_XHCI)) xhci->quirks |= XHCI_DEFAULT_PM_RUNTIME_ALLOW; if (pdev->vendor == PCI_VENDOR_ID_ETRON &&