diff --git a/i915-fix-backlight-regression-misconfigured-VBT.patch b/i915-fix-backlight-regression-misconfigured-VBT.patch deleted file mode 100644 index 0fa5b46..0000000 --- a/i915-fix-backlight-regression-misconfigured-VBT.patch +++ /dev/null @@ -1,80 +0,0 @@ -Hi All, - -This patch series (which I'm forwarding from the intel-gfx mailing list) fixes -a bunch of backlight regressions in 3.15+ and as such should probably -be added to the stabilization branch. - -I expect these to land in 3.16 soon enough, but just to be sure we should -keep an eye on that too. - -Regards, - -Hans - - -diff -ruNp a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h ---- a/drivers/gpu/drm/i915/i915_drv.h 2014-06-08 13:19:54.000000000 -0500 -+++ b/drivers/gpu/drm/i915/i915_drv.h 2014-07-01 10:18:57.167645053 -0500 -@@ -803,6 +803,7 @@ enum intel_sbi_destination { - #define QUIRK_PIPEA_FORCE (1<<0) - #define QUIRK_LVDS_SSC_DISABLE (1<<1) - #define QUIRK_INVERT_BRIGHTNESS (1<<2) -+#define QUIRK_BACKLIGHT_PRESENT (1<<3) - - struct intel_fbdev; - struct intel_fbc_work; -diff -ruNp a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c ---- a/drivers/gpu/drm/i915/intel_display.c 2014-07-01 10:17:06.084680359 -0500 -+++ b/drivers/gpu/drm/i915/intel_display.c 2014-07-01 10:24:56.961768058 -0500 -@@ -11165,6 +11165,13 @@ static void quirk_invert_brightness(stru - dev_priv->quirks |= QUIRK_INVERT_BRIGHTNESS; - DRM_INFO("applying inverted panel brightness quirk\n"); - } -+/* Some VBT's incorrectly indicate no backlight is present */ -+static void quirk_backlight_present(struct drm_device *dev) -+{ -+ struct drm_i915_private *dev_priv = dev->dev_private; -+ dev_priv->quirks |= QUIRK_BACKLIGHT_PRESENT; -+ DRM_INFO("applying backlight present quirk\n"); -+} - - struct intel_quirk { - int device; -@@ -11237,6 +11244,18 @@ static struct intel_quirk intel_quirks[] - - /* Acer Aspire 5336 */ - { 0x2a42, 0x1025, 0x048a, quirk_invert_brightness }, -+ -+ /* Acer C720 Chromebook has a controllable backlight */ -+ { 0x0a06, 0x1025, 0x0a11, quirk_backlight_present }, -+ -+ /* Dell 11 Chromebook */ -+ { 0x0a06, 0x1028, 0x0a35, quirk_backlight_present }, -+ -+ /* HP 14 (Celeron 2955U) Chromebook */ -+ { 0x0a06, 0x103c, 0x21ed, quirk_backlight_present }, -+ -+ /* Toshiba CB35 Chromebook */ -+ { 0x0a06, 0x1179, 0x0a88, quirk_backlight_present }, - }; - - static void intel_init_quirks(struct drm_device *dev) -diff -ruNp a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c ---- a/drivers/gpu/drm/i915/intel_panel.c 2014-07-01 10:17:06.153680958 -0500 -+++ b/drivers/gpu/drm/i915/intel_panel.c 2014-07-01 10:28:03.578386955 -0500 -@@ -1065,8 +1065,13 @@ int intel_panel_setup_backlight(struct d - int ret; - - if (!dev_priv->vbt.backlight.present) { -- DRM_DEBUG_KMS("native backlight control not available per VBT\n"); -- return 0; -+ if (dev_priv->quirks & QUIRK_BACKLIGHT_PRESENT) { -+ DRM_DEBUG_KMS("no backlight present per VBT, but " -+ "present per quirk\n"); -+ } else { -+ DRM_DEBUG_KMS("no backlight present per VBT\n"); -+ return 0; -+ } - } - - /* set level and max in panel struct */ diff --git a/intel_pstate-Fix-setting-VID.patch b/intel_pstate-Fix-setting-VID.patch deleted file mode 100644 index a71432c..0000000 --- a/intel_pstate-Fix-setting-VID.patch +++ /dev/null @@ -1,133 +0,0 @@ - -Delivered-To: jwboyer@gmail.com -Received: by 10.76.6.212 with SMTP id d20csp423274oaa; - Fri, 20 Jun 2014 07:30:34 -0700 (PDT) -X-Received: by 10.66.141.165 with SMTP id rp5mr5252763pab.90.1403274633343; - Fri, 20 Jun 2014 07:30:33 -0700 (PDT) -Return-Path: -Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) - by mx.google.com with ESMTP id xz4si10079103pac.71.2014.06.20.07.29.38 - for ; - Fri, 20 Jun 2014 07:30:33 -0700 (PDT) -Received-SPF: none (google.com: stable-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; -Authentication-Results: mx.google.com; - spf=neutral (google.com: stable-owner@vger.kernel.org does not designate permitted sender hosts) smtp.mail=stable-owner@vger.kernel.org; - dkim=neutral (body hash did not verify) header.i=@; - dmarc=fail (p=NONE dis=NONE) header.from=gmail.com -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1752826AbaFTO2N (ORCPT + 73 others); - Fri, 20 Jun 2014 10:28:13 -0400 -Received: from mail-pb0-f42.google.com ([209.85.160.42]:38213 "EHLO - mail-pb0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1752069AbaFTO2M (ORCPT - ); Fri, 20 Jun 2014 10:28:12 -0400 -Received: by mail-pb0-f42.google.com with SMTP id ma3so3196581pbc.29 - for ; Fri, 20 Jun 2014 07:28:11 -0700 (PDT) -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=gmail.com; s=20120113; - h=from:to:cc:subject:date:message-id:in-reply-to:references; - bh=9oo+zXKxjbr7v1snerKTk1H7F9TqWZtlTUz/dYa9Mtc=; - b=dYHB8IsNt7nWot8Da4/spNLtKjWeMlpQv+LpR+c7Y8DUuJe1lcMqt6NeLHZcOBUv2Y - Y6Bw8IIE3DYaVUFzakB2oBRCHaQJwqERAb0+y8zVt4lkxRh6AOjeR6coDk9oE8sDQmkN - zZzv3mR6rd2sE6CkRFwkJUJgHRd5DgluDU96k7OKLEzJpuq+6BrvwPto8TU6ZMkmQiqj - pRP0ics6FdaE7GtFE6XmEjGYSnsAFzUn8ycgFPjZU39PhkhTDottomejlUEEs8NORxn3 - eYxzh48Ae/P9JTgydBpMpUkpsb+86akHDWoTWG3z6D6mwCzFl9dNmUL43j/ONVjf6pPh - wopw== -X-Received: by 10.66.122.70 with SMTP id lq6mr5211252pab.51.1403274491745; - Fri, 20 Jun 2014 07:28:11 -0700 (PDT) -Received: from echolake.localdomain (static-50-43-41-81.bvtn.or.frontiernet.net. [50.43.41.81]) - by mx.google.com with ESMTPSA id vx10sm44287848pac.17.2014.06.20.07.28.09 - for - (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); - Fri, 20 Jun 2014 07:28:10 -0700 (PDT) -From: dirk.brandewie@gmail.com -X-Google-Original-From: dirk.j.brandewie@intel.com -To: linux-pm@vger.kernel.org -Cc: rjw@rjwysocki.net, dirk.brandewie@gmail.com, - stable@vger.kernel.org, Dirk Brandewie -Subject: [PATCH 1/3] intel_pstate: Fix setting VID -Date: Fri, 20 Jun 2014 07:27:58 -0700 -Message-Id: <1403274480-10593-2-git-send-email-dirk.j.brandewie@intel.com> -X-Mailer: git-send-email 1.9.0 -In-Reply-To: <1403274480-10593-1-git-send-email-dirk.j.brandewie@intel.com> -References: <1403274480-10593-1-git-send-email-dirk.j.brandewie@intel.com> -Sender: stable-owner@vger.kernel.org -Precedence: bulk -List-ID: -X-Mailing-List: stable@vger.kernel.org - -From: Dirk Brandewie - -Commit 21855ff5 intel_pstate: Set turbo VID for BayTrail introduced -setting the turbo VID which is required to prevent a machine check on -some Baytrail SKUs under heavy graphics based workloads. The -docmumentation update that brought the requirement to light also -changed the bit mask used for enumerating P state and VID values from -0x7f to 0x3f. - -This change returns the mask value to 0x7f. - -Tested with the Intel NUC DN2820FYK, -BIOS version FYBYT10H.86A.0034.2014.0513.1413 with v3.16-rc1 and -v3.14.8 kernel versions. - -Reported-by: Rune Reterson -Reported-by: Eric Eickmeyer -Tested-by: Rune Reterson -Tested-by: Eric Eickmeyer - -References: https://bugzilla.kernel.org/show_bug.cgi?id=77951 - -Cc: Cc: Stable [3.13+] -Signed-off-by: Dirk Brandewie ---- - drivers/cpufreq/intel_pstate.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c -index 924bb2d..74376d6 100644 ---- a/drivers/cpufreq/intel_pstate.c -+++ b/drivers/cpufreq/intel_pstate.c -@@ -357,21 +357,21 @@ static int byt_get_min_pstate(void) - { - u64 value; - rdmsrl(BYT_RATIOS, value); -- return (value >> 8) & 0x3F; -+ return (value >> 8) & 0x7F; - } - - static int byt_get_max_pstate(void) - { - u64 value; - rdmsrl(BYT_RATIOS, value); -- return (value >> 16) & 0x3F; -+ return (value >> 16) & 0x7F; - } - - static int byt_get_turbo_pstate(void) - { - u64 value; - rdmsrl(BYT_TURBO_RATIOS, value); -- return value & 0x3F; -+ return value & 0x7F; - } - - static void byt_set_pstate(struct cpudata *cpudata, int pstate) -@@ -405,8 +405,8 @@ static void byt_get_vid(struct cpudata *cpudata) - - - rdmsrl(BYT_VIDS, value); -- cpudata->vid.min = int_tofp((value >> 8) & 0x3f); -- cpudata->vid.max = int_tofp((value >> 16) & 0x3f); -+ cpudata->vid.min = int_tofp((value >> 8) & 0x7f); -+ cpudata->vid.max = int_tofp((value >> 16) & 0x7f); - cpudata->vid.ratio = div_fp( - cpudata->vid.max - cpudata->vid.min, - int_tofp(cpudata->pstate.max_pstate - --- -1.9.0 - --- -To unsubscribe from this list: send the line "unsubscribe stable" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/intel_pstate-Update-documentation-of-max-min_perf_pct-sysfs-files.patch b/intel_pstate-Update-documentation-of-max-min_perf_pct-sysfs-files.patch deleted file mode 100644 index 304b600..0000000 --- a/intel_pstate-Update-documentation-of-max-min_perf_pct-sysfs-files.patch +++ /dev/null @@ -1,97 +0,0 @@ - -Delivered-To: jwboyer@gmail.com -Received: by 10.76.6.212 with SMTP id d20csp423275oaa; - Fri, 20 Jun 2014 07:30:34 -0700 (PDT) -X-Received: by 10.68.190.98 with SMTP id gp2mr5272210pbc.88.1403274634321; - Fri, 20 Jun 2014 07:30:34 -0700 (PDT) -Return-Path: -Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) - by mx.google.com with ESMTP id hp1si10074557pad.83.2014.06.20.07.29.43 - for ; - Fri, 20 Jun 2014 07:30:34 -0700 (PDT) -Received-SPF: none (google.com: stable-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; -Authentication-Results: mx.google.com; - spf=neutral (google.com: stable-owner@vger.kernel.org does not designate permitted sender hosts) smtp.mail=stable-owner@vger.kernel.org; - dkim=neutral (body hash did not verify) header.i=@; - dmarc=fail (p=NONE dis=NONE) header.from=gmail.com -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1752837AbaFTO2Q (ORCPT + 73 others); - Fri, 20 Jun 2014 10:28:16 -0400 -Received: from mail-pa0-f44.google.com ([209.85.220.44]:49238 "EHLO - mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1752834AbaFTO2P (ORCPT - ); Fri, 20 Jun 2014 10:28:15 -0400 -Received: by mail-pa0-f44.google.com with SMTP id rd3so3177765pab.17 - for ; Fri, 20 Jun 2014 07:28:15 -0700 (PDT) -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=gmail.com; s=20120113; - h=from:to:cc:subject:date:message-id:in-reply-to:references; - bh=rsR1AnYOOFONegcKUuZzrIkP/Fwwpd8RySrcXDcatYE=; - b=H8hEI3Sg3lQRMr4ADxJtNpRGhyOTkP+gFC3du64xhLqVHicLrvtD06Wz7Vv0AowO52 - JpoocTnE8lUQvSMqev+LIh83DoFZxvYqrWqv0815LcZATxquRCPfNw8py9uTm3o0ABIy - PhXPM7UO278Ov67fqu63akRwHfrgtd22iXkHcn68ZqbTvdfo/jJlMcgRVoysP8XNPoIV - FZ4uVsHsjcx77zgA6A8t22vG5eozHRabvcvyxAp8eC/GwSjlWRFN7ETD28w4muvZcbFm - PFDieDk7detiTEqFyXncStI0i81Ezun+IyWnPnI1EOqPXKLoFaUiyxmw6Z7iOWLs0166 - NLoA== -X-Received: by 10.68.193.100 with SMTP id hn4mr5166204pbc.50.1403274495186; - Fri, 20 Jun 2014 07:28:15 -0700 (PDT) -Received: from echolake.localdomain (static-50-43-41-81.bvtn.or.frontiernet.net. [50.43.41.81]) - by mx.google.com with ESMTPSA id vx10sm44287848pac.17.2014.06.20.07.28.13 - for - (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); - Fri, 20 Jun 2014 07:28:13 -0700 (PDT) -From: dirk.brandewie@gmail.com -X-Google-Original-From: dirk.j.brandewie@intel.com -To: linux-pm@vger.kernel.org -Cc: rjw@rjwysocki.net, dirk.brandewie@gmail.com, - stable@vger.kernel.org, Dirk Brandewie -Subject: [PATCH 3/3] intel_pstate: Update documentation of {max,min}_perf_pct sysfs files -Date: Fri, 20 Jun 2014 07:28:00 -0700 -Message-Id: <1403274480-10593-4-git-send-email-dirk.j.brandewie@intel.com> -X-Mailer: git-send-email 1.9.0 -In-Reply-To: <1403274480-10593-1-git-send-email-dirk.j.brandewie@intel.com> -References: <1403274480-10593-1-git-send-email-dirk.j.brandewie@intel.com> -Sender: stable-owner@vger.kernel.org -Precedence: bulk -List-ID: -X-Mailing-List: stable@vger.kernel.org - -From: Dirk Brandewie - -Update documentation to make the interpretation of the values clearer - -References: https://bugzilla.kernel.org/show_bug.cgi?id=64251 - -Cc: Stable [3.13+] -Signed-off-by: Dirk Brandewie ---- - Documentation/cpu-freq/intel-pstate.txt | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/Documentation/cpu-freq/intel-pstate.txt b/Documentation/cpu-freq/intel-pstate.txt -index e742d21..a69ffe1 100644 ---- a/Documentation/cpu-freq/intel-pstate.txt -+++ b/Documentation/cpu-freq/intel-pstate.txt -@@ -15,10 +15,13 @@ New sysfs files for controlling P state selection have been added to - /sys/devices/system/cpu/intel_pstate/ - - max_perf_pct: limits the maximum P state that will be requested by -- the driver stated as a percentage of the available performance. -+ the driver stated as a percentage of the available performance. The -+ available (P states) performance may be reduced by the no_turbo -+ setting described below. - - min_perf_pct: limits the minimum P state that will be requested by -- the driver stated as a percentage of the available performance. -+ the driver stated as a percentage of the max (non-turbo) -+ performance level. - - no_turbo: limits the driver to selecting P states below the turbo - frequency range. --- -1.9.0 - --- -To unsubscribe from this list: send the line "unsubscribe stable" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/intel_pstate-dont-touch-turbo-bit-if-turbo-disabled-or-unavailable.patch b/intel_pstate-dont-touch-turbo-bit-if-turbo-disabled-or-unavailable.patch deleted file mode 100644 index 5d66cbb..0000000 --- a/intel_pstate-dont-touch-turbo-bit-if-turbo-disabled-or-unavailable.patch +++ /dev/null @@ -1,163 +0,0 @@ - -Delivered-To: jwboyer@gmail.com -Received: by 10.76.6.212 with SMTP id d20csp423277oaa; - Fri, 20 Jun 2014 07:30:35 -0700 (PDT) -X-Received: by 10.68.139.36 with SMTP id qv4mr5223355pbb.82.1403274634649; - Fri, 20 Jun 2014 07:30:34 -0700 (PDT) -Return-Path: -Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) - by mx.google.com with ESMTP id qv2si9954447pbb.188.2014.06.20.07.29.40 - for ; - Fri, 20 Jun 2014 07:30:34 -0700 (PDT) -Received-SPF: none (google.com: stable-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; -Authentication-Results: mx.google.com; - spf=neutral (google.com: stable-owner@vger.kernel.org does not designate permitted sender hosts) smtp.mail=stable-owner@vger.kernel.org; - dkim=neutral (body hash did not verify) header.i=@; - dmarc=fail (p=NONE dis=NONE) header.from=gmail.com -Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand - id S1752836AbaFTO2P (ORCPT + 73 others); - Fri, 20 Jun 2014 10:28:15 -0400 -Received: from mail-pb0-f51.google.com ([209.85.160.51]:46198 "EHLO - mail-pb0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org - with ESMTP id S1752834AbaFTO2N (ORCPT - ); Fri, 20 Jun 2014 10:28:13 -0400 -Received: by mail-pb0-f51.google.com with SMTP id rp16so3192728pbb.10 - for ; Fri, 20 Jun 2014 07:28:13 -0700 (PDT) -DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; - d=gmail.com; s=20120113; - h=from:to:cc:subject:date:message-id:in-reply-to:references; - bh=d4snuLkO7yJL099uI4N/+0VV5Rt4O8Cw+AAMmj8igq8=; - b=Hmy0dMfQu3uRTZzAq3zGf2sfVMhRUxySItx4tChAq3aaQAehBA+1vqEHeiQ6ZNpXrD - BJfbmvByR/d4G55woGKZbyOPL/t5XzkVVUuefHgKvEDjWbHns/RYax+lgRFI4Cb1aLEe - 4u1/8cZ29BpFQ/yVW2D6/K6uwcJ6MQRK8lZISKjf/9oxZLg6vEeR4JGC70qo6yDHeUlu - VUQ3RrvKJ7NQw2nXTxAPuAvNEd+JCbKp6zO6gi6jET5vAQnevlrx+LxMjKssXI+QjXsH - N11ImMdOmbmBUgEIkFctpViP+fOFMTfkwIMh05FSQZtcy3NVF5kEUHR8N3B2klbGBYln - TJ8w== -X-Received: by 10.68.133.163 with SMTP id pd3mr5111437pbb.166.1403274493273; - Fri, 20 Jun 2014 07:28:13 -0700 (PDT) -Received: from echolake.localdomain (static-50-43-41-81.bvtn.or.frontiernet.net. [50.43.41.81]) - by mx.google.com with ESMTPSA id vx10sm44287848pac.17.2014.06.20.07.28.11 - for - (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); - Fri, 20 Jun 2014 07:28:12 -0700 (PDT) -From: dirk.brandewie@gmail.com -X-Google-Original-From: dirk.j.brandewie@intel.com -To: linux-pm@vger.kernel.org -Cc: rjw@rjwysocki.net, dirk.brandewie@gmail.com, - stable@vger.kernel.org, Dirk Brandewie -Subject: [PATCH 2/3] intel_pstate: don't touch turbo bit if turbo disabled or unavailable. -Date: Fri, 20 Jun 2014 07:27:59 -0700 -Message-Id: <1403274480-10593-3-git-send-email-dirk.j.brandewie@intel.com> -X-Mailer: git-send-email 1.9.0 -In-Reply-To: <1403274480-10593-1-git-send-email-dirk.j.brandewie@intel.com> -References: <1403274480-10593-1-git-send-email-dirk.j.brandewie@intel.com> -Sender: stable-owner@vger.kernel.org -Precedence: bulk -List-ID: -X-Mailing-List: stable@vger.kernel.org - -From: Dirk Brandewie - -If turbo is disabled in the BIOS bit 38 should be set in -MSR_IA32_MISC_ENABLE register per section 14.3.2.1 of the SDM Vol 3 -document 325384-050US Feb 2014. If this bit is set do *not* attempt -to disable trubo via the MSR_IA32_PERF_CTL register. On some systems -trying to disable turbo via MSR_IA32_PERF_CTL will cause subsequent -writes to MSR_IA32_PERF_CTL not take affect, in fact reading -MSR_IA32_PERF_CTL will not show the IDA/Turbo DISENGAGE bit(32) as -set. A write of bit 32 to zero returns to normal operation. - -Also deal with the case where the processor does not support -turbo and the BIOS does not report the fact in MSR_IA32_MISC_ENABLE -but does report the max and turbo P states as the same value. - -References: https://bugzilla.kernel.org/show_bug.cgi?id=64251 - -Cc: Stable [3.13+] -Signed-off-by: Dirk Brandewie ---- - drivers/cpufreq/intel_pstate.c | 22 ++++++++++++++++------ - 1 file changed, 16 insertions(+), 6 deletions(-) - -diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c -index 74376d6..127ead8 100644 ---- a/drivers/cpufreq/intel_pstate.c -+++ b/drivers/cpufreq/intel_pstate.c -@@ -128,6 +128,7 @@ static struct pstate_funcs pstate_funcs; - - struct perf_limits { - int no_turbo; -+ int turbo_disabled; - int max_perf_pct; - int min_perf_pct; - int32_t max_perf; -@@ -287,7 +288,10 @@ static ssize_t store_no_turbo(struct kobject *a, struct attribute *b, - if (ret != 1) - return -EINVAL; - limits.no_turbo = clamp_t(int, input, 0 , 1); -- -+ if (limits.turbo_disabled) { -+ pr_warn("Turbo disabled by BIOS or unavailable on processor\n"); -+ limits.no_turbo = limits.turbo_disabled; -+ } - return count; - } - -@@ -381,7 +385,7 @@ static void byt_set_pstate(struct cpudata *cpudata, int pstate) - u32 vid; - - val = pstate << 8; -- if (limits.no_turbo) -+ if (limits.no_turbo && !limits.turbo_disabled) - val |= (u64)1 << 32; - - vid_fp = cpudata->vid.min + mul_fp( -@@ -448,7 +452,7 @@ static void core_set_pstate(struct cpudata *cpudata, int pstate) - u64 val; - - val = pstate << 8; -- if (limits.no_turbo) -+ if (limits.no_turbo && !limits.turbo_disabled) - val |= (u64)1 << 32; - - wrmsrl_on_cpu(cpudata->cpu, MSR_IA32_PERF_CTL, val); -@@ -741,7 +745,7 @@ static int intel_pstate_set_policy(struct cpufreq_policy *policy) - limits.min_perf = int_tofp(1); - limits.max_perf_pct = 100; - limits.max_perf = int_tofp(1); -- limits.no_turbo = 0; -+ limits.no_turbo = limits.turbo_disabled; - return 0; - } - limits.min_perf_pct = (policy->min * 100) / policy->cpuinfo.max_freq; -@@ -784,6 +788,7 @@ static int intel_pstate_cpu_init(struct cpufreq_policy *policy) - { - struct cpudata *cpu; - int rc; -+ u64 misc_en; - - rc = intel_pstate_init_cpu(policy->cpu); - if (rc) -@@ -791,8 +796,13 @@ static int intel_pstate_cpu_init(struct cpufreq_policy *policy) - - cpu = all_cpu_data[policy->cpu]; - -- if (!limits.no_turbo && -- limits.min_perf_pct == 100 && limits.max_perf_pct == 100) -+ rdmsrl(MSR_IA32_MISC_ENABLE, misc_en); -+ if (misc_en & MSR_IA32_MISC_ENABLE_TURBO_DISABLE || -+ cpu->pstate.max_pstate == cpu->pstate.turbo_pstate) { -+ limits.turbo_disabled = 1; -+ limits.no_turbo = 1; -+ } -+ if (limits.min_perf_pct == 100 && limits.max_perf_pct == 100) - policy->policy = CPUFREQ_POLICY_PERFORMANCE; - else - policy->policy = CPUFREQ_POLICY_POWERSAVE; --- -1.9.0 - --- -To unsubscribe from this list: send the line "unsubscribe stable" in -the body of a message to majordomo@vger.kernel.org -More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/kernel.spec b/kernel.spec index 26837ba..47dd680 100644 --- a/kernel.spec +++ b/kernel.spec @@ -74,7 +74,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 5 +%define stable_update 6 # Is it a -stable RC? %define stable_rc 0 # Set rpm version accordingly @@ -733,10 +733,6 @@ Patch26014: acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch #rhbz 1064516 Patch25098: e1000e-Failure-to-write-SHRA-turns-on-PROMISC-mode.patch -Patch25102: intel_pstate-Fix-setting-VID.patch -Patch25103: intel_pstate-dont-touch-turbo-bit-if-turbo-disabled-or-unavailable.patch -Patch25104: intel_pstate-Update-documentation-of-max-min_perf_pct-sysfs-files.patch - Patch25109: revert-input-wacom-testing-result-shows-get_report-is-unnecessary.patch #rhbz 1021036, submitted upstream @@ -745,9 +741,6 @@ Patch25110: 0001-ideapad-laptop-Change-Lenovo-Yoga-2-series-rfkill-ha.patch #rhbz 1114768 Patch25112: 0001-synaptics-Add-min-max-quirk-for-pnp-id-LEN2002-Edge-.patch -# https://bugs.freedesktop.org/show_bug.cgi?id=79813 submitted upstream -Patch25113: i915-fix-backlight-regression-misconfigured-VBT.patch - #rhbz 1117008 Patch25114: Revert-drm-i915-reverse-dp-link-param-selection-pref.patch @@ -1446,10 +1439,6 @@ ApplyPatch acpi-video-Add-use_native_backlight-quirk-for-HP-Pro.patch #rhbz 1064516 ApplyPatch e1000e-Failure-to-write-SHRA-turns-on-PROMISC-mode.patch -ApplyPatch intel_pstate-Fix-setting-VID.patch -ApplyPatch intel_pstate-dont-touch-turbo-bit-if-turbo-disabled-or-unavailable.patch -ApplyPatch intel_pstate-Update-documentation-of-max-min_perf_pct-sysfs-files.patch - ApplyPatch revert-input-wacom-testing-result-shows-get_report-is-unnecessary.patch #rhbz 1021036, submitted upstream @@ -1458,9 +1447,6 @@ ApplyPatch 0001-ideapad-laptop-Change-Lenovo-Yoga-2-series-rfkill-ha.patch #rhbz 1114768 ApplyPatch 0001-synaptics-Add-min-max-quirk-for-pnp-id-LEN2002-Edge-.patch -# https://bugs.freedesktop.org/show_bug.cgi?id=79813 submitted upstream -ApplyPatch i915-fix-backlight-regression-misconfigured-VBT.patch - #rhbz 1117008 ApplyPatch Revert-drm-i915-reverse-dp-link-param-selection-pref.patch @@ -2278,7 +2264,8 @@ fi # ||----w | # || || %changelog -* Thu Jul 17 2014 Josh Boyer +* Thu Jul 17 2014 Josh Boyer - 3.15.6-200 +- Linux v3.15.6 - CVE-2014-4943 pppol2tp level handling (rhbz 1119458 1120542) * Wed Jul 16 2014 Josh Boyer diff --git a/sources b/sources index 993ef5c..e3b7282 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 97ca1625bb40368dc41b9a7971549071 linux-3.15.tar.xz -c604bc7db1d2a365a114c43e7ac504bd patch-3.15.5.xz +25e4c27b4aff5e14dc4b3dc0029fd05d patch-3.15.6.xz