{"id":2230419,"url":"http://patchwork.ozlabs.org/api/1.1/patches/2230419/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-pci/patch/20260429180647.197072-5-thomas.falcon@intel.com/","project":{"id":28,"url":"http://patchwork.ozlabs.org/api/1.1/projects/28/?format=json","name":"Linux PCI development","link_name":"linux-pci","list_id":"linux-pci.vger.kernel.org","list_email":"linux-pci@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null},"msgid":"<20260429180647.197072-5-thomas.falcon@intel.com>","date":"2026-04-29T18:06:46","name":"[RFC,4/4] pcie/aspm: Remove CONFIG_PCIEASPM_* policy definitions","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"46d54e88c1aa7b3891d56d9ceccaac70549f4eeb","submitter":{"id":93044,"url":"http://patchwork.ozlabs.org/api/1.1/people/93044/?format=json","name":"Falcon, Thomas","email":"thomas.falcon@intel.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linux-pci/patch/20260429180647.197072-5-thomas.falcon@intel.com/mbox/","series":[{"id":502124,"url":"http://patchwork.ozlabs.org/api/1.1/series/502124/?format=json","web_url":"http://patchwork.ozlabs.org/project/linux-pci/list/?series=502124","date":"2026-04-29T18:06:44","name":"pcie/aspm: Enable all advertised ASPM states by default","version":1,"mbox":"http://patchwork.ozlabs.org/series/502124/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2230419/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2230419/checks/","tags":{},"headers":{"Return-Path":"\n ","X-Original-To":["incoming@patchwork.ozlabs.org","linux-pci@vger.kernel.org"],"Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256\n header.s=Intel header.b=AYRLeY3w;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=2600:3c15:e001:75::12fc:5321; helo=sin.lore.kernel.org;\n envelope-from=linux-pci+bounces-53419-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)","smtp.subspace.kernel.org;\n\tdkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com\n header.b=\"AYRLeY3w\"","smtp.subspace.kernel.org;\n arc=none smtp.client-ip=192.198.163.15","smtp.subspace.kernel.org;\n dmarc=pass (p=none dis=none) header.from=intel.com","smtp.subspace.kernel.org;\n spf=pass smtp.mailfrom=intel.com"],"Received":["from sin.lore.kernel.org (sin.lore.kernel.org\n [IPv6:2600:3c15:e001:75::12fc:5321])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4g5QKs2Rp9z1xqf\n\tfor ; Thu, 30 Apr 2026 04:09:05 +1000 (AEST)","from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby sin.lore.kernel.org (Postfix) with ESMTP id D40CD30236EB\n\tfor ; Wed, 29 Apr 2026 18:07:16 +0000 (UTC)","from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id 556ED41C2E3;\n\tWed, 29 Apr 2026 18:07:08 +0000 (UTC)","from mgamail.intel.com (mgamail.intel.com [192.198.163.15])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id 7671941B36A;\n\tWed, 29 Apr 2026 18:07:04 +0000 (UTC)","from fmviesa003.fm.intel.com ([10.60.135.143])\n by fmvoesa109.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 29 Apr 2026 11:06:57 -0700","from iherna2-mobl4.amr.corp.intel.com (HELO tfalcon-desk.intel.com)\n ([10.124.221.251])\n by fmviesa003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 29 Apr 2026 11:06:55 -0700"],"ARC-Seal":"i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1777486027; cv=none;\n b=SznxlTywf/6R/FU5qXtoJ+m9mUJEkfTs9r3Y29FrZqa+h+DQuNb9Hdxs9huBbFSfKhAL3YR3QzLK/7Ft+kG0FXHDbqTIJ2dZfmm31emPB43HDDwat+AK73UZsegD3K0LrVsu/pdgFr68pXweoWAg2bOahwZPgV4xXQHXmAlgeYY=","ARC-Message-Signature":"i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1777486027; c=relaxed/simple;\n\tbh=8uRRJsQyi1OO48XlDkSkvbTHBNR4NC4KE68xK6PgRao=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version;\n b=DqEVdqUrK0h7Qu7r3bGO88uNHAMgn5JeUbAe0N3RWyH4HFXiLub9lVmgUAzCOKKwXu5WdE/WN8fX/sH6k06yj5DXJrc94I7alFRqXCT4mz/gvakDqOI1n/2fhoFabEXambJXKMdfGmCiGdNJLzadMAIRfgxdgowoBmFI378FOi8=","ARC-Authentication-Results":"i=1; smtp.subspace.kernel.org;\n dmarc=pass (p=none dis=none) header.from=intel.com;\n spf=pass smtp.mailfrom=intel.com;\n dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com\n header.b=AYRLeY3w; arc=none smtp.client-ip=192.198.163.15","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1777486025; x=1809022025;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=8uRRJsQyi1OO48XlDkSkvbTHBNR4NC4KE68xK6PgRao=;\n b=AYRLeY3whfx7R55LuOnLjHfXoct5iRHjTY0VX1QFsuZBdp5L67Ux5jJ0\n 1ufxnaYqrQ1BXqXrjMR2E7loRIfQ4g+8pbAuwZckpDFufTBcI+QF8t1G1\n v+MXuqrkyl248KL9/F9wmvhOv2ejxAM1ORpM0kxocfa7vet6SGwA+8e+K\n 5G37M+4EwSmLcsCFq/Yu/NP+eMXiSnX+s6O2t2rHlsvPlQtUgiejlBeGh\n MZfv0FCetzaRpb6LfzfL5kWl4esHGQakffLk2A0gEEl2EPkPPcr88AZr2\n MKLYYepYC7j3uoynkpvL3DB7A6kxtG6/H5g7BDmyMoJ1A3hNO3F4OG3ZM\n A==;","X-CSE-ConnectionGUID":["VpHu2iC6S/6IbQObwOkcCQ==","p1i6a/13QHCI0NYooubA0g=="],"X-CSE-MsgGUID":["GSvkjBIrSt6EwaWGlfG+6g==","SjOFropJT16lb8FhHn2hzg=="],"X-IronPort-AV":["E=McAfee;i=\"6800,10657,11771\"; a=\"78532289\"","E=Sophos;i=\"6.23,206,1770624000\";\n d=\"scan'208\";a=\"78532289\""],"X-ExtLoop1":"1","From":"Thomas Falcon ","To":"Bjorn Helgaas ,\n\t\"Rafael J . Wysocki\" ","Cc":"\"David E . Box\" ,\n\tLukas Wunner ,\n\tManivannan Sadhasivam ,\n\tLen Brown ,\n\tlinux-pci@vger.kernel.org,\n\tlinux-kernel@vger.kernel.org,\n\tThomas Falcon ","Subject":"[RFC PATCH 4/4] pcie/aspm: Remove CONFIG_PCIEASPM_* policy\n definitions","Date":"Wed, 29 Apr 2026 13:06:46 -0500","Message-ID":"<20260429180647.197072-5-thomas.falcon@intel.com>","X-Mailer":"git-send-email 2.43.0","In-Reply-To":"<20260429180647.197072-1-thomas.falcon@intel.com>","References":"<20260429180647.197072-1-thomas.falcon@intel.com>","Precedence":"bulk","X-Mailing-List":"linux-pci@vger.kernel.org","List-Id":"","List-Subscribe":"","List-Unsubscribe":"","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit"},"content":"ASPM policy now defaults to POLICY_POWER_SUPERSAVE for new systems\nand POLICY_DEFAULT for others while allowing the user to change\npolicy using the existing pcie_aspm module parameter. Safely remove\nCONFIG_PCIEASPM_* policy settings.\n\nSuggested-by: David E. Box \nSigned-off-by: Thomas Falcon \n---\n Documentation/arch/x86/amd-debugging.rst | 5 ++--\n arch/mips/configs/bmips_stb_defconfig | 1 -\n arch/mips/configs/loongson2k_defconfig | 1 -\n drivers/pci/pcie/Kconfig | 33 ------------------------\n drivers/pci/pcie/aspm.c | 8 ------\n 5 files changed, 2 insertions(+), 46 deletions(-)","diff":"diff --git a/Documentation/arch/x86/amd-debugging.rst b/Documentation/arch/x86/amd-debugging.rst\nindex d92bf59d62c7..3f346a46357a 100644\n--- a/Documentation/arch/x86/amd-debugging.rst\n+++ b/Documentation/arch/x86/amd-debugging.rst\n@@ -260,9 +260,8 @@ of the devices.\n ASPM\n ----\n For the best runtime power consumption, ASPM should be programmed as intended\n-by the BIOS from the hardware vendor. To accomplish this the Linux kernel\n-should be compiled with ``CONFIG_PCIEASPM_DEFAULT`` set to ``y`` and the\n-sysfs file ``/sys/module/pcie_aspm/parameters/policy`` should not be modified.\n+by the BIOS from the hardware vendor. To accomplish this the sysfs file\n+``/sys/module/pcie_aspm/parameters/policy`` should not be modified.\n \n Most notably, if L1.2 is not configured properly for any devices, the SoC\n will not be able to enter the deepest idle state.\ndiff --git a/arch/mips/configs/bmips_stb_defconfig b/arch/mips/configs/bmips_stb_defconfig\nindex ecfa7f777efa..bb19073986a8 100644\n--- a/arch/mips/configs/bmips_stb_defconfig\n+++ b/arch/mips/configs/bmips_stb_defconfig\n@@ -22,7 +22,6 @@ CONFIG_RD_XZ=y\n # CONFIG_RD_LZ4 is not set\n CONFIG_PCI=y\n CONFIG_PCI_MSI=y\n-CONFIG_PCIEASPM_POWERSAVE=y\n CONFIG_PCIEPORTBUS=y\n CONFIG_PCIE_BRCMSTB=y\n CONFIG_CPU_FREQ=y\ndiff --git a/arch/mips/configs/loongson2k_defconfig b/arch/mips/configs/loongson2k_defconfig\nindex ca534a6b66de..0a2c123eee69 100644\n--- a/arch/mips/configs/loongson2k_defconfig\n+++ b/arch/mips/configs/loongson2k_defconfig\n@@ -88,7 +88,6 @@ CONFIG_RFKILL=m\n CONFIG_RFKILL_INPUT=y\n CONFIG_PCIEPORTBUS=y\n CONFIG_HOTPLUG_PCI_PCIE=y\n-CONFIG_PCIEASPM_PERFORMANCE=y\n CONFIG_HOTPLUG_PCI=y\n CONFIG_DEVTMPFS=y\n CONFIG_DEVTMPFS_MOUNT=y\ndiff --git a/drivers/pci/pcie/Kconfig b/drivers/pci/pcie/Kconfig\nindex 207c2deae35f..069058870506 100644\n--- a/drivers/pci/pcie/Kconfig\n+++ b/drivers/pci/pcie/Kconfig\n@@ -81,39 +81,6 @@ config PCIEASPM\n \n \t When in doubt, say Y.\n \n-choice\n-\tprompt \"Default ASPM policy\"\n-\tdefault PCIEASPM_DEFAULT\n-\tdepends on PCIEASPM\n-\n-config PCIEASPM_DEFAULT\n-\tbool \"BIOS default\"\n-\tdepends on PCIEASPM\n-\thelp\n-\t Use the BIOS defaults for PCI Express ASPM.\n-\n-config PCIEASPM_POWERSAVE\n-\tbool \"Powersave\"\n-\tdepends on PCIEASPM\n-\thelp\n-\t Enable PCI Express ASPM L0s and L1 where possible, even if the\n-\t BIOS did not.\n-\n-config PCIEASPM_POWER_SUPERSAVE\n-\tbool \"Power Supersave\"\n-\tdepends on PCIEASPM\n-\thelp\n-\t Same as PCIEASPM_POWERSAVE, except it also enables L1 substates where\n-\t possible. This would result in higher power savings while staying in L1\n-\t where the components support it.\n-\n-config PCIEASPM_PERFORMANCE\n-\tbool \"Performance\"\n-\tdepends on PCIEASPM\n-\thelp\n-\t Disable PCI Express ASPM L0s and L1, even if the BIOS enabled them.\n-endchoice\n-\n config PCIE_PME\n \tdef_bool y\n \tdepends on PCIEPORTBUS && PM\ndiff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c\nindex 1c81e2f2e589..112904a75a4c 100644\n--- a/drivers/pci/pcie/aspm.c\n+++ b/drivers/pci/pcie/aspm.c\n@@ -258,15 +258,7 @@ static LIST_HEAD(link_list);\n #define POLICY_POWERSAVE 2\t/* high power saving */\n #define POLICY_POWER_SUPERSAVE 3 /* possibly even more power saving */\n \n-#ifdef CONFIG_PCIEASPM_PERFORMANCE\n-static int aspm_policy = POLICY_PERFORMANCE;\n-#elif defined CONFIG_PCIEASPM_POWERSAVE\n-static int aspm_policy = POLICY_POWERSAVE;\n-#elif defined CONFIG_PCIEASPM_POWER_SUPERSAVE\n-static int aspm_policy = POLICY_POWER_SUPERSAVE;\n-#else\n static int aspm_policy;\n-#endif\n static int aspm_default_policy = POLICY_POWER_SUPERSAVE;\n static bool aspm_user_policy;\n \n","prefixes":["RFC","4/4"]}