rpms/kernel/F-9 linux-2.6-hid-adjust-fixup-for-ms-1028-receiver.patch, NONE, 1.1.2.1 linux-2.6-kvmclock-unsync-tsc-workaround.patch, NONE, 1.1.2.1 kernel.spec, 1.891.2.18, 1.891.2.19

Chuck Ebbert cebbert at fedoraproject.org
Fri Feb 6 22:27:15 UTC 2009


Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7109

Modified Files:
      Tag: private-fedora-9-2_6_27-branch
	kernel.spec 
Added Files:
      Tag: private-fedora-9-2_6_27-branch
	linux-2.6-hid-adjust-fixup-for-ms-1028-receiver.patch 
	linux-2.6-kvmclock-unsync-tsc-workaround.patch 
Log Message:
Two fixes from F-10:
  linux-2.6-kvmclock-unsync-tsc-workaround.patch
  linux-2.6-hid-adjust-fixup-for-ms-1028-receiver.patch

linux-2.6-hid-adjust-fixup-for-ms-1028-receiver.patch:

--- NEW FILE linux-2.6-hid-adjust-fixup-for-ms-1028-receiver.patch ---
From: Jiri Kosina <jkosina at suse.cz>
Date: Wed, 14 Jan 2009 02:03:21 +0000 (+0100)
Subject: HID: adjust report descriptor fixup for MS 1028 receiver
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=0fb21de0799a985d2da3da14ae5625d724256638

HID: adjust report descriptor fixup for MS 1028 receiver

Report descriptor fixup for MS 1028 receiver changes also values for
Keyboard and Consumer, which incorrectly trims the range, causing correct
events being thrown away before passing to userspace.

We need to keep the GenDesk usage fixup though, as it reports totally bogus
values about axis.

Reported-by: Lucas Gadani <lgadani at gmail.com>
Signed-off-by: Jiri Kosina <jkosina at suse.cz>
[Backport to 2.6.27: cebbert at redhat.com]
---

--- a/drivers/hid/usbhid/hid-quirks.c
+++ b/drivers/hid/usbhid/hid-quirks.c
@@ -30,7 +30,7 @@
 #define MS_NOGET	0x10
 
 /*
- * Microsoft Wireless Desktop Receiver (Model 1028) has several
+ * Microsoft Wireless Desktop Receiver (Model 1028) has
  * 'Usage Min/Max' where it ought to have 'Physical Min/Max'
  */
 static void ms_report_fixup(struct hid_device *hdev, __u8 *rdesc,
@@ -38,19 +38,11 @@ static void ms_report_fixup(struct hid_device *hdev, __u8 *rdesc,
  */
 static void usbhid_fixup_microsoft_descriptor(unsigned char *rdesc, int rsize)
 {
-	if (rsize == 571 && rdesc[284] == 0x19
-	                 && rdesc[286] == 0x2a
-	                 && rdesc[304] == 0x19
-	                 && rdesc[306] == 0x29
-	                 && rdesc[352] == 0x1a
-	                 && rdesc[355] == 0x2a
-			 && rdesc[557] == 0x19
+	if (rsize == 571 && rdesc[557] == 0x19
 			 && rdesc[559] == 0x29) {
 		printk(KERN_INFO "Fixing up Microsoft Wireless Receiver Model 1028 report descriptor\n");
-		rdesc[284] = rdesc[304] = rdesc[557] = 0x35;
-		rdesc[352] = 0x36;
-		rdesc[286] = rdesc[355] = 0x46;
-		rdesc[306] = rdesc[559] = 0x45;
+		rdesc[557] = 0x35;
+		rdesc[559] = 0x45;
 	}
 }
 

linux-2.6-kvmclock-unsync-tsc-workaround.patch:

--- NEW FILE linux-2.6-kvmclock-unsync-tsc-workaround.patch ---
>From 05d073827d82d7fa29aff7a35279650b8feb6f75 Mon Sep 17 00:00:00 2001
From: Glauber Costa <glommer at redhat.com>
Date: Thu, 29 Jan 2009 12:39:22 -0500
Subject: [PATCH] Disable kvmclock for non constant tsc cpus.

Currently, this code path is posing us big troubles,
and we won't have a decent patch in time. So, temporarily
disable it.

See:

  https://bugzilla.redhat.com/475598

There's a module parameter for the adventurous who want to force
it.

Signed-off-by: Glauber Costa <glommer at redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti at redhat.com>
[backport to 2.6.27 by cebbert at redhat.com]
---
 arch/x86/kvm/x86.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index cc17546..2e22ac9 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -868,6 +868,9 @@ out:
 	return r;
 }
 
+static int force_kvmclock = 0;
+module_param(force_kvmclock, bool, 0644);
+
 int kvm_dev_ioctl_check_extension(long ext)
 {
 	int r;
@@ -879,7 +882,6 @@ int kvm_dev_ioctl_check_extension(long ext)
 	case KVM_CAP_USER_MEMORY:
 	case KVM_CAP_SET_TSS_ADDR:
 	case KVM_CAP_EXT_CPUID:
-	case KVM_CAP_CLOCKSOURCE:
 	case KVM_CAP_PIT:
 	case KVM_CAP_NOP_IO_DELAY:
 	case KVM_CAP_MP_STATE:
@@ -901,6 +903,9 @@ int kvm_dev_ioctl_check_extension(long ext)
 	case KVM_CAP_PV_MMU:
 		r = !tdp_enabled;
 		break;
+	case KVM_CAP_CLOCKSOURCE:
+		r = force_kvmclock || boot_cpu_has(X86_FEATURE_CONSTANT_TSC);
+		break;
 	default:
 		r = 0;
 		break;
-- 
1.6.1



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.891.2.18
retrieving revision 1.891.2.19
diff -u -r1.891.2.18 -r1.891.2.19
--- kernel.spec	6 Feb 2009 22:14:17 -0000	1.891.2.18
+++ kernel.spec	6 Feb 2009 22:26:44 -0000	1.891.2.19
@@ -656,6 +656,7 @@
 Patch454: linux-2.6-input.git-i8042-add-xps-m1530-to-nomux.patch
 Patch455: linux-2.6-input-atkbd-broaden-dell-signatures.patch
 Patch456: linux-2.6-input-atkbd-samsung-nc10-key-repeat-fix.patch
+Patch457: linux-2.6-hid-adjust-fixup-for-ms-1028-receiver.patch
 
 Patch460: linux-2.6-serial-460800.patch
 Patch510: linux-2.6-silence-noise.patch
@@ -719,6 +720,9 @@
 
 Patch2030: linux-2.6-net-tulip-interrupt.patch
 
+# kvmclock is broken with unsync TSC (#475598)
+Patch2040: linux-2.6-kvmclock-unsync-tsc-workaround.patch
+
 # linux1394 git patches
 Patch2200: linux-2.6-firewire-git-update.patch
 Patch2201: linux-2.6-firewire-git-pending.patch
@@ -1232,6 +1236,9 @@
 ApplyPatch linux-2.6-input-atkbd-broaden-dell-signatures.patch
 # fix key repeats on Samsung NC10
 ApplyPatch linux-2.6-input-atkbd-samsung-nc10-key-repeat-fix.patch
+# fix ms wireless kbd (F10 #475398)
+ApplyPatch linux-2.6-hid-adjust-fixup-for-ms-1028-receiver.patch
+
 
 # Allow to use 480600 baud on 16C950 UARTs
 ApplyPatch linux-2.6-serial-460800.patch
@@ -1301,6 +1308,9 @@
 
 ApplyPatch linux-2.6-net-tulip-interrupt.patch
 
+# kvmclock is broken with unsync TSC (#475598)
+ApplyPatch linux-2.6-kvmclock-unsync-tsc-workaround.patch
+
 # Nouveau DRM + drm fixes
 ApplyPatch drm-fedora9-rollup.patch
 ApplyPatch drm-mm-readd-nopfn.patch
@@ -1924,6 +1934,11 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
 
 %changelog
+* Fri Feb 07 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.14-78.2.19
+- Two fixes from F-10:
+  linux-2.6-kvmclock-unsync-tsc-workaround.patch
+  linux-2.6-hid-adjust-fixup-for-ms-1028-receiver.patch
+
 * Fri Feb 07 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.27.14-78.2.18
 - Add ext4 stable patch queue
 




More information about the scm-commits mailing list