From: Michael Tremer Date: Sun, 30 Dec 2018 14:23:52 +0000 (+0000) Subject: kernel: Change ASPM policy to default X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fc32b25fbe5b1c77f5804d43b9e01ee7a42d3e6e;p=ipfire-3.x.git kernel: Change ASPM policy to default Fixes: #11372 Signed-off-by: Michael Tremer --- diff --git a/kernel/config-arm-generic b/kernel/config-arm-generic index 8ca1a8835..9acd3fd6d 100644 --- 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 246f07495..195a8d0e1 100644 --- 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 6b3ae388d..b247f2841 100644 --- 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 9f2ab359f..1f9c0fc58 100644 --- 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