From 6b849ecf545cba3c1d3615034903907432d2235c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fabian=20Gr=C3=BCnbichler?= Date: Fri, 24 Feb 2017 15:28:04 +0100 Subject: [PATCH] disable intel_idle for Atom N2000 series MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reported-By: Felix Krohn Signed-off-by: Fabian Grünbichler --- Makefile | 1 + ...e-Add-CPU-model-54-Atom-N2000-series.patch | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 Revert-intel_idle-Add-CPU-model-54-Atom-N2000-series.patch diff --git a/Makefile b/Makefile index 866db24..f4d6874 100644 --- a/Makefile +++ b/Makefile @@ -268,6 +268,7 @@ ${KERNEL_SRC}/README ${KERNEL_CFG_ORG}: ${KERNELSRCTAR} cd ${KERNEL_SRC}; patch -p1 < ../0001-kvm-x86-correctly-reset-dest_map-vector-when-restori.patch cd ${KERNEL_SRC}; patch -p1 < ../CVE-2017-2596-kvm-page-reference-leakage-in-handle_vmon.patch cd ${KERNEL_SRC}; patch -p1 < ../CVE-2017-6074-dccp-fix-freeing-skb-too-early-for-IPV6_RECVPKTINFO.patch + cd ${KERNEL_SRC}; patch -p1 < ../Revert-intel_idle-Add-CPU-model-54-Atom-N2000-series.patch sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/' touch $@ diff --git a/Revert-intel_idle-Add-CPU-model-54-Atom-N2000-series.patch b/Revert-intel_idle-Add-CPU-model-54-Atom-N2000-series.patch new file mode 100644 index 0000000..8e7a14a --- /dev/null +++ b/Revert-intel_idle-Add-CPU-model-54-Atom-N2000-series.patch @@ -0,0 +1,34 @@ +From 91846c55815e659a7f0b26b86f0252a9d9803423 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= +Date: Fri, 24 Feb 2017 13:37:45 +0100 +Subject: [PATCH] Revert "intel_idle: Add CPU model 54 (Atom N2000 series)" +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +As requested by OVH, to fix unbootable systems with Atom +N2800 CPUs. This should not affect other CPU classes at all. + +This reverts commit acead1b0fac5b10d0ae3f1cc5f7820b9f9f924f5. + +Reported-By: Felix Krohn +Signed-off-by: Fabian Grünbichler +--- + drivers/idle/intel_idle.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c +index 012980a..fbb8646 100644 +--- a/drivers/idle/intel_idle.c ++++ b/drivers/idle/intel_idle.c +@@ -995,7 +995,6 @@ static const struct x86_cpu_id intel_idle_ids[] __initconst = { + ICPU(0x2f, idle_cpu_nehalem), + ICPU(0x2a, idle_cpu_snb), + ICPU(0x2d, idle_cpu_snb), +- ICPU(0x36, idle_cpu_atom), + ICPU(0x37, idle_cpu_byt), + ICPU(0x4c, idle_cpu_cht), + ICPU(0x3a, idle_cpu_ivb), +-- +2.1.4 + -- 2.39.2