From patchwork Wed Sep 6 07:54:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kai-Heng Feng X-Patchwork-Id: 1830238 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=TLAcjiPs; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RgZRZ60kWz1ygc for ; Wed, 6 Sep 2023 17:55:22 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1qdnNa-000595-TY; Wed, 06 Sep 2023 07:55:14 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1qdnNX-00057S-VQ for kernel-team@lists.ubuntu.com; Wed, 06 Sep 2023 07:55:12 +0000 Received: from localhost.localdomain (unknown [10.101.196.174]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id A10763F704 for ; Wed, 6 Sep 2023 07:55:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1693986911; bh=5/OQn/Bi2JpYOGCQ8V9LlageQbKTOAnbl6P68s1MJ8o=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TLAcjiPscRZfuGXsKQk2jEFgPzmi+aQ5kLzft1OVhjC7nATgfFAiaQrMANNheHUdC NHh6gTzLvoIsZzJDbt/e2GnZbxGzoom8MdrAoLD+mnNJuyJmbozm8rIKpXvs4Wub9+ CnpQRZemAjshUP403DoJH7cBwoVUROW3JZO70OT/afLz6m8xqwqyhX2IGfFHwZVVfr pDKudIOeeSqgkL1kjMnK3GtHVCOusJREHj91WtXJB1zMV/i5M7mr0SE+nmk0YDaqnV D/BXPeIRgYcGAm5a8IwHe244Bq4Hg0fBcuH4xEKoqIO1qHWlkad0xsJY3+ANDynL75 EpUpD+9be12FQ== From: Kai-Heng Feng To: kernel-team@lists.ubuntu.com Subject: [L/M/Unstable] [PATCH 3/9] Revert "UBUNTU: SAUCE: PCI/ASPM: Enable ASPM for links under VMD domain" Date: Wed, 6 Sep 2023 15:54:15 +0800 Message-Id: <20230906075421.357683-4-kai.heng.feng@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230906075421.357683-1-kai.heng.feng@canonical.com> References: <20230906075421.357683-1-kai.heng.feng@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" BugLink: https://bugs.launchpad.net/bugs/2034504 This reverts commit 1a0102a08f206149d9abd56c2b28877c878b5526. Signed-off-by: Kai-Heng Feng --- drivers/pci/pcie/aspm.c | 3 +-- drivers/pci/quirks.c | 12 ------------ include/linux/pci.h | 2 -- 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index fd9e03fa315e..1d3d1cb0594e 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -701,8 +701,7 @@ static void pcie_aspm_cap_init(struct pcie_link_state *link, int blacklist) aspm_l1ss_init(link); /* Save default state */ - link->aspm_default = parent->dev_flags & PCI_DEV_FLAGS_ENABLE_ASPM ? - ASPM_STATE_ALL : link->aspm_enabled; + link->aspm_default = link->aspm_enabled; /* Setup initial capable state. Will be updated later */ link->aspm_capable = link->aspm_support; diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 4ff1bb93a2bd..592e1c4ae697 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -6050,15 +6050,3 @@ DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a2d, dpc_log_size); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a2f, dpc_log_size); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a31, dpc_log_size); #endif - -/* - * Device [8086:9a09] - * BIOS may not be able to access config space of devices under VMD domain, so - * it relies on software to enable ASPM for links under VMD. - */ -static void pci_fixup_enable_aspm(struct pci_dev *pdev) -{ - pdev->dev_flags |= PCI_DEV_FLAGS_ENABLE_ASPM; -} -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x9a09, pci_fixup_enable_aspm); -DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0xa0b0, pci_fixup_enable_aspm); diff --git a/include/linux/pci.h b/include/linux/pci.h index f011101794f8..bd9026da772b 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -244,8 +244,6 @@ enum pci_dev_flags { PCI_DEV_FLAGS_NO_RELAXED_ORDERING = (__force pci_dev_flags_t) (1 << 11), /* Device does honor MSI masking despite saying otherwise */ PCI_DEV_FLAGS_HAS_MSI_MASKING = (__force pci_dev_flags_t) (1 << 12), - /* Enable ASPM regardless of how LnkCtl is programmed */ - PCI_DEV_FLAGS_ENABLE_ASPM = (__force pci_dev_flags_t) (1 << 13), }; enum pci_irq_reroute_variant {