kernel: Change ASPM policy to default

Fixes: #11372
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic
index 8ca1a88355c2bf3b63cc09f1e30b40ac38774a9c..9acd3fd6d7bf715fdfe3c29dd17ba4d03d020032 100644 (file)
--- a/kernel/config-arm-generic
+++ b/kernel/config-arm-generic
@@ -39,8 +39,6 @@ CONFIG_PCI_DOMAINS_GENERIC=y
 CONFIG_PCI_SYSCALL=y
 # CONFIG_PCIEAER_INJECT is not set
 # CONFIG_PCIE_ECRC is not set
-CONFIG_PCIEASPM_DEFAULT=y
-# CONFIG_PCIEASPM_POWERSAVE is not set
 # CONFIG_PCI_STUB is not set
 # CONFIG_PCI_IOV is not set
 # CONFIG_PCI_PRI is not set

diff --git a/kernel/config-generic b/kernel/config-generic
index 246f074950bd2f1e89e9c8bc859c58f26fc07114..195a8d0e142915f19714a353b65a1c0b6165b693 100644 (file)
--- a/kernel/config-generic
+++ b/kernel/config-generic
@@ -286,6 +286,8 @@ CONFIG_HOTPLUG_PCI_PCIE=y
 CONFIG_PCIEAER=y
 CONFIG_PCIEASPM=y
 # CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
 # CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
 # CONFIG_PCIEASPM_PERFORMANCE is not set
 CONFIG_PCIE_PME=y

diff --git a/kernel/config-x86-generic b/kernel/config-x86-generic
index 6b3ae388d9f5ae5e522fe56c9d99eb6ee980b761..b247f2841c2d54d60dbf92fa1a67e6fce578e372 100644 (file)
--- a/kernel/config-x86-generic
+++ b/kernel/config-x86-generic
@@ -308,8 +308,6 @@ CONFIG_MMCONF_FAM10H=y
 # CONFIG_PCI_CNB20LE_QUIRK is not set
 CONFIG_PCIEAER_INJECT=m
 CONFIG_PCIE_ECRC=y
-# CONFIG_PCIEASPM_DEFAULT is not set
-CONFIG_PCIEASPM_POWERSAVE=y
 # CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
 CONFIG_PCI_STUB=y
 CONFIG_PCI_PF_STUB=m

diff --git a/kernel/kernel.nm b/kernel/kernel.nm
index 9f2ab359fe80a02411e58fdd0c02c53e89819112..1f9c0fc585d4478a44062c0c5818510fc24a37c4 100644 (file)
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@ -5,7 +5,7 @@
 
 name       = kernel
 version    = 4.20
-release    = 6
+release    = 7
 thisapp    = linux-%{version}
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter@ipfire.org>