Linux v3.9-rc5
This commit is contained in:
Justin M. Forbes
parent
6ba7175650
commit
4c578540af
|
|
@ -1,45 +0,0 @@
|
|||
From 565bd59e8f55b82eb49b58b0972ac41f4448ef06 Mon Sep 17 00:00:00 2001
|
||||
From: Josh Boyer <jwboyer@redhat.com>
|
||||
Date: Fri, 15 Mar 2013 10:31:31 -0400
|
||||
Subject: [PATCH] HID: usbhid: quirk for MSI GX680R led panel
|
||||
|
||||
This keyboard backlight device causes a 10 second delay to boot. Add it
|
||||
to the quirk list with HID_QUIRK_NO_INIT_REPORTS.
|
||||
|
||||
This fixes Red Hat bugzilla https://bugzilla.redhat.com/show_bug.cgi?id=907221
|
||||
|
||||
Signed-off-by: Josh Boyer <jwboyer@redhat.com>
|
||||
---
|
||||
drivers/hid/hid-ids.h | 3 +++
|
||||
drivers/hid/usbhid/hid-quirks.c | 1 +
|
||||
2 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
|
||||
index d1063e9..c438877 100644
|
||||
--- a/drivers/hid/hid-ids.h
|
||||
+++ b/drivers/hid/hid-ids.h
|
||||
@@ -590,6 +590,9 @@
|
||||
#define USB_VENDOR_ID_MONTEREY 0x0566
|
||||
#define USB_DEVICE_ID_GENIUS_KB29E 0x3004
|
||||
|
||||
+#define USB_VENDOR_ID_MSI 0x1770
|
||||
+#define USB_DEVICE_ID_MSI_GX680R_LED_PANEL 0xff00
|
||||
+
|
||||
#define USB_VENDOR_ID_NATIONAL_SEMICONDUCTOR 0x0400
|
||||
#define USB_DEVICE_ID_N_S_HARMONY 0xc359
|
||||
|
||||
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
|
||||
index e991d81..476c984 100644
|
||||
--- a/drivers/hid/usbhid/hid-quirks.c
|
||||
+++ b/drivers/hid/usbhid/hid-quirks.c
|
||||
@@ -73,6 +73,7 @@ static const struct hid_blacklist {
|
||||
{ USB_VENDOR_ID_FORMOSA, USB_DEVICE_ID_FORMOSA_IR_RECEIVER, HID_QUIRK_NO_INIT_REPORTS },
|
||||
{ USB_VENDOR_ID_FREESCALE, USB_DEVICE_ID_FREESCALE_MX28, HID_QUIRK_NOGET },
|
||||
{ USB_VENDOR_ID_MGE, USB_DEVICE_ID_MGE_UPS, HID_QUIRK_NOGET },
|
||||
+ { USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GX680R_LED_PANEL, HID_QUIRK_NO_INIT_REPORTS },
|
||||
{ USB_VENDOR_ID_NOVATEK, USB_DEVICE_ID_NOVATEK_MOUSE, HID_QUIRK_NO_INIT_REPORTS },
|
||||
{ USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN, HID_QUIRK_NO_INIT_REPORTS },
|
||||
{ USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN1, HID_QUIRK_NO_INIT_REPORTS },
|
||||
--
|
||||
1.8.1.2
|
||||
|
||||
|
|
@ -1,45 +0,0 @@
|
|||
From 926bb9deb21046248d01e2f6fc86fdbb149b514c Mon Sep 17 00:00:00 2001
|
||||
From: Josh Boyer <jwboyer@redhat.com>
|
||||
Date: Fri, 15 Mar 2013 10:27:36 -0400
|
||||
Subject: [PATCH 1/2] HID: usbhid: quirk for Realtek Multi-card reader
|
||||
|
||||
This device has an odd HID entry and causes a 10 second delay in boot.
|
||||
Add this device to the quirks list with HID_QUIRK_NO_INIT_REPORTS.
|
||||
|
||||
This fixes Red Hat bugzilla https://bugzilla.redhat.com/show_bug.cgi?id=806587
|
||||
|
||||
Signed-off-by: Josh Boyer <jwboyer@redhat.com>
|
||||
---
|
||||
drivers/hid/hid-ids.h | 3 +++
|
||||
drivers/hid/usbhid/hid-quirks.c | 1 +
|
||||
2 files changed, 4 insertions(+)
|
||||
|
||||
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
|
||||
index 92e47e5..d1063e9 100644
|
||||
--- a/drivers/hid/hid-ids.h
|
||||
+++ b/drivers/hid/hid-ids.h
|
||||
@@ -684,6 +684,9 @@
|
||||
#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001 0x3001
|
||||
#define USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008 0x3008
|
||||
|
||||
+#define USB_VENDOR_ID_REALTEK 0x0bda
|
||||
+#define USB_DEVICE_ID_REALTEK_READER 0x0152
|
||||
+
|
||||
#define USB_VENDOR_ID_ROCCAT 0x1e7d
|
||||
#define USB_DEVICE_ID_ROCCAT_ARVO 0x30d4
|
||||
#define USB_DEVICE_ID_ROCCAT_ISKU 0x319c
|
||||
diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
|
||||
index e0e6abf..e991d81 100644
|
||||
--- a/drivers/hid/usbhid/hid-quirks.c
|
||||
+++ b/drivers/hid/usbhid/hid-quirks.c
|
||||
@@ -80,6 +80,7 @@ static const struct hid_blacklist {
|
||||
{ USB_VENDOR_ID_PRODIGE, USB_DEVICE_ID_PRODIGE_CORDLESS, HID_QUIRK_NOGET },
|
||||
{ USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3001, HID_QUIRK_NOGET },
|
||||
{ USB_VENDOR_ID_QUANTA, USB_DEVICE_ID_QUANTA_OPTICAL_TOUCH_3008, HID_QUIRK_NOGET },
|
||||
+ { USB_VENDOR_ID_REALTEK, USB_DEVICE_ID_REALTEK_READER, HID_QUIRK_NO_INIT_REPORTS },
|
||||
{ USB_VENDOR_ID_SENNHEISER, USB_DEVICE_ID_SENNHEISER_BTD500USB, HID_QUIRK_NOGET },
|
||||
{ USB_VENDOR_ID_SIGMATEL, USB_DEVICE_ID_SIGMATEL_STMP3780, HID_QUIRK_NOGET },
|
||||
{ USB_VENDOR_ID_SUN, USB_DEVICE_ID_RARITAN_KVM_DONGLE, HID_QUIRK_NOGET },
|
||||
--
|
||||
1.8.1.2
|
||||
|
||||
|
|
@ -2152,6 +2152,7 @@ CONFIG_TELCLOCK=m
|
|||
# Serial drivers
|
||||
#
|
||||
CONFIG_SERIAL_8250=y
|
||||
# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
|
||||
CONFIG_SERIAL_8250_CONSOLE=y
|
||||
CONFIG_SERIAL_8250_CS=m
|
||||
CONFIG_SERIAL_8250_NR_UARTS=32
|
||||
|
|
|
|||
|
|
@ -37,6 +37,8 @@ CONFIG_X86_PM_TIMER=y
|
|||
CONFIG_EFI=y
|
||||
CONFIG_EFI_STUB=y
|
||||
CONFIG_EFI_VARS=y
|
||||
CONFIG_EFI_VARS_PSTORE=y
|
||||
CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
|
||||
CONFIG_EFI_PCDP=y
|
||||
CONFIG_FB_EFI=y
|
||||
|
||||
|
|
|
|||
|
|
@ -1,42 +0,0 @@
|
|||
From: dirk.brandewie@gmail.com
|
||||
To: linux-kernel@vger.kernel.org, cpufreq@vger.kernel.org
|
||||
Cc: Dirk Brandewie <dirk.brandewie@gmail.com>,
|
||||
Dirk Brandewie <dirk.j.brandewie@intel.com>
|
||||
Subject: [PATCH] cpufreq/intel_pstate: Fix calculation of current frequency
|
||||
Date: Fri, 22 Mar 2013 10:51:05 -0700
|
||||
Message-Id: <1363974665-22049-1-git-send-email-dirk.brandewie@gmail.com>
|
||||
|
||||
From: Dirk Brandewie <dirk.brandewie@gmail.com>
|
||||
|
||||
Use the correct pstate value to calculate the effective frequency.
|
||||
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=923942
|
||||
Reported-by: Satish Balay <balay@fastmail.fm>
|
||||
|
||||
Signed-off-by: Dirk Brandewie <dirk.j.brandewie@intel.com>
|
||||
---
|
||||
drivers/cpufreq/intel_pstate.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
|
||||
index e84af66..ad72922 100644
|
||||
--- a/drivers/cpufreq/intel_pstate.c
|
||||
+++ b/drivers/cpufreq/intel_pstate.c
|
||||
@@ -454,7 +454,7 @@ static inline void intel_pstate_calc_busy(struct cpudata *cpu,
|
||||
sample->idletime_us * 100,
|
||||
sample->duration_us);
|
||||
core_pct = div64_u64(sample->aperf * 100, sample->mperf);
|
||||
- sample->freq = cpu->pstate.turbo_pstate * core_pct * 1000;
|
||||
+ sample->freq = cpu->pstate.max_pstate * core_pct * 1000;
|
||||
|
||||
sample->core_pct_busy = div_s64((sample->pstate_pct_busy * core_pct),
|
||||
100);
|
||||
--
|
||||
1.7.7.6
|
||||
|
||||
--
|
||||
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
|
||||
the body of a message to majordomo@vger.kernel.org
|
||||
More majordomo info at http://vger.kernel.org/majordomo-info.html
|
||||
Please read the FAQ at http://www.tux.org/lkml/
|
||||
|
||||
|
|
@ -1,56 +0,0 @@
|
|||
commit 866111646f2c5d4c6c25e2bb97f5c61c3992defb
|
||||
Author: Dirk Brandewie <dirk.brandewie@gmail.com>
|
||||
Date: Mon Mar 18 16:55:02 2013 -0700
|
||||
|
||||
cpufreq/intel_pstate: Add function to check that all MSR's are valid
|
||||
|
||||
Some VMs seem to try to implement some MSRs but not all the registers
|
||||
the driver needs. Check to make sure all the MSR that we need are
|
||||
available. If any of the required MSRs are not available refuse to
|
||||
load.
|
||||
|
||||
Signed-off-by: Dirk Brandewie <dirk.brandewie@gmail.com>
|
||||
|
||||
--- linux-3.9.0-0.rc3.git0.2.fc19.x86_64/drivers/cpufreq/intel_pstate.c~ 2013-03-19 14:54:33.489581718 -0400
|
||||
+++ linux-3.9.0-0.rc3.git0.2.fc19.x86_64/drivers/cpufreq/intel_pstate.c 2013-03-19 14:55:09.667523730 -0400
|
||||
@@ -752,6 +752,30 @@ static struct cpufreq_driver intel_pstat
|
||||
|
||||
static int __initdata no_load;
|
||||
|
||||
+static int intel_pstate_msrs_not_valid(void)
|
||||
+{
|
||||
+ /* Check that all the msr's we are using are valid. */
|
||||
+ u64 aperf, mperf, tmp;
|
||||
+
|
||||
+ rdmsrl(MSR_IA32_APERF, aperf);
|
||||
+ rdmsrl(MSR_IA32_MPERF, mperf);
|
||||
+
|
||||
+ if (!intel_pstate_min_pstate() ||
|
||||
+ !intel_pstate_max_pstate() ||
|
||||
+ !intel_pstate_turbo_pstate())
|
||||
+ return -ENODEV;
|
||||
+
|
||||
+ rdmsrl(MSR_IA32_APERF, tmp);
|
||||
+ if (!(tmp - aperf))
|
||||
+ return -ENODEV;
|
||||
+
|
||||
+ rdmsrl(MSR_IA32_MPERF, tmp);
|
||||
+ if (!(tmp - mperf))
|
||||
+ return -ENODEV;
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
static int __init intel_pstate_init(void)
|
||||
{
|
||||
int cpu, rc = 0;
|
||||
@@ -764,6 +788,9 @@ static int __init intel_pstate_init(void
|
||||
if (!id)
|
||||
return -ENODEV;
|
||||
|
||||
+ if (intel_pstate_msrs_not_valid())
|
||||
+ return -ENODEV;
|
||||
+
|
||||
pr_info("Intel P-state driver initializing.\n");
|
||||
|
||||
all_cpu_data = vmalloc(sizeof(void *) * num_possible_cpus());
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
htmldocs will fail, because device-drivers.tmpl references the
|
||||
non-existant file 8250.c (which got renamed to 8250_core.c)
|
||||
|
||||
Signed-off-by: Kyle McMartin <kyle@redhat.com>
|
||||
|
||||
--- a/Documentation/DocBook/device-drivers.tmpl
|
||||
+++ b/Documentation/DocBook/device-drivers.tmpl
|
||||
@@ -227,7 +227,7 @@ X!Isound/sound_firmware.c
|
||||
<chapter id="uart16x50">
|
||||
<title>16x50 UART Driver</title>
|
||||
!Edrivers/tty/serial/serial_core.c
|
||||
-!Edrivers/tty/serial/8250/8250.c
|
||||
+!Edrivers/tty/serial/8250/8250_core.c
|
||||
</chapter>
|
||||
|
||||
<chapter id="fbdev">
|
||||
30
kernel.spec
30
kernel.spec
|
|
@ -62,7 +62,7 @@ Summary: The Linux kernel
|
|||
# For non-released -rc kernels, this will be appended after the rcX and
|
||||
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
|
||||
#
|
||||
%global baserelease 2
|
||||
%global baserelease 1
|
||||
%global fedora_build %{baserelease}
|
||||
|
||||
# base_sublevel is the kernel version we're starting with and patching
|
||||
|
|
@ -93,7 +93,7 @@ Summary: The Linux kernel
|
|||
# The next upstream release sublevel (base_sublevel+1)
|
||||
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
|
||||
# The rc snapshot level
|
||||
%define rcrev 4
|
||||
%define rcrev 5
|
||||
# The git snapshot level
|
||||
%define gitrev 0
|
||||
# Set rpm version accordingly
|
||||
|
|
@ -737,24 +737,17 @@ Patch21276: mac80211-Dont-restart-sta-timer-if-not-running.patch
|
|||
#rhbz 859282
|
||||
Patch21275: VMX-x86-handle-host-TSC-calibration-failure.patch
|
||||
|
||||
#rhbz 907221
|
||||
Patch21277: HID-usbhid-quirk-for-MSI-GX680R-led-panel.patch
|
||||
|
||||
#rhbz 806587
|
||||
Patch21278: HID-usbhid-quirk-for-Realtek-Multi-card-reader.patch
|
||||
|
||||
Patch22000: weird-root-dentry-name-debug.patch
|
||||
Patch22010: debug-idle-sched-warn-once.patch
|
||||
|
||||
#selinux ptrace child permissions
|
||||
Patch22001: selinux-apply-different-permission-to-ptrace-child.patch
|
||||
|
||||
Patch23000: cpufreq-intel-pstate-validate-msrs.patch
|
||||
Patch23001: cpufreq-intel-pstate-max-is-in-the-max-variable-who-knew.patch
|
||||
|
||||
#rhbz 927469
|
||||
Patch23006: fix-child-thread-introspection.patch
|
||||
|
||||
Patch23007: htmldoc-build-fix.patch
|
||||
|
||||
# END OF PATCH DEFINITIONS
|
||||
|
||||
%endif
|
||||
|
|
@ -1423,10 +1416,6 @@ ApplyPatch debug-idle-sched-warn-once.patch
|
|||
#selinux ptrace child permissions
|
||||
ApplyPatch selinux-apply-different-permission-to-ptrace-child.patch
|
||||
|
||||
# rhbz 922923
|
||||
ApplyPatch cpufreq-intel-pstate-validate-msrs.patch
|
||||
ApplyPatch cpufreq-intel-pstate-max-is-in-the-max-variable-who-knew.patch
|
||||
|
||||
#rhbz 859485
|
||||
ApplyPatch vt-Drop-K_OFF-for-VC_MUTE.patch
|
||||
|
||||
|
|
@ -1452,15 +1441,11 @@ ApplyPatch VMX-x86-handle-host-TSC-calibration-failure.patch
|
|||
#rhbz 920218
|
||||
ApplyPatch mac80211-Dont-restart-sta-timer-if-not-running.patch
|
||||
|
||||
#rhbz 907221
|
||||
ApplyPatch HID-usbhid-quirk-for-MSI-GX680R-led-panel.patch
|
||||
|
||||
#rhbz 806587
|
||||
ApplyPatch HID-usbhid-quirk-for-Realtek-Multi-card-reader.patch
|
||||
|
||||
#rhbz 927469
|
||||
ApplyPatch fix-child-thread-introspection.patch
|
||||
|
||||
ApplyPatch htmldoc-build-fix.patch
|
||||
|
||||
# END OF PATCH APPLICATIONS
|
||||
|
||||
%endif
|
||||
|
|
@ -2293,6 +2278,9 @@ fi
|
|||
# and build.
|
||||
|
||||
%changelog
|
||||
* Tue Apr 02 2013 Justin M. Forbes <jforbes@redhat.com> - 3.9.0-0.rc5.git0.1
|
||||
- Linux v3.9-rc5
|
||||
|
||||
* Mon Apr 01 2013 Josh Boyer <jwboyer@redhat.com>
|
||||
- Enable CONFIG_MCE_INJECT (rhbz 927353)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
|
||||
index 2209620..659c1bb 100644
|
||||
--- a/drivers/tty/serial/8250/8250.c
|
||||
+++ b/drivers/tty/serial/8250/8250.c
|
||||
--- a/drivers/tty/serial/8250/8250_core.c
|
||||
+++ b/drivers/tty/serial/8250/8250_core.c
|
||||
@@ -7,6 +7,9 @@
|
||||
*
|
||||
* Copyright (C) 2001 Russell King.
|
||||
|
|
|
|||
Loading…
Reference in New Issue