rpms/kernel/F-13 git-bluetooth.patch, 1.6, 1.7 kernel.spec, 1.2096, 1.2097

Wed Jul 14 21:31:30 UTC 2010

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv12440

Modified Files:
	git-bluetooth.patch kernel.spec 
Log Message:
Truncate the obsolete git-bluetooth.patch, use ApplyOptionalPatch
  for git-bluetooth and git-cpufreq patches.

git-bluetooth.patch:
 0 files changed

Index: git-bluetooth.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/git-bluetooth.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7

--- git-bluetooth.patch	9 Jul 2010 09:09:19 -0000	1.6
+++ git-bluetooth.patch	14 Jul 2010 21:31:29 -0000	1.7
@@ -1,262 +0,0 @@
-commit ea42416024fb33c970dbc10a6c69c0831126d75e
-Author: Jiri Kosina <jkosina at suse.cz>
-Date:   Wed Feb 3 15:52:31 2010 +0100
-
-    HID: make Wacom modesetting failures non-fatal
-    
-    With Wacom tablet mode-setting moved from userspace into kernel,
-    we don't have to consider failures of device queries through the
-    _raw callback as hard failure, as the driver can safely continue
-    anyway.
-    
-    This is consistent with the current USB driver in wacom_sys.c
-    
-    Reported-by: Ping Cheng <pinglinux at gmail.com>
-    Signed-off-by: Jiri Kosina <jkosina at suse.cz>
-
-commit a37234f5fcd6ad44ada8c477c2ab531f3ed9fbe5
-Author: Bastien Nocera <hadess at hadess.net>
-Date:   Wed Jan 20 12:01:53 2010 +0000
-
-    HID: Enable Sixaxis controller over Bluetooth
-    
-    Now that hid_output_raw_report works, port the PS3 Sixaxis
-    Bluetooth quirk from user-space, into kernel-space.
-    
-    Signed-off-by: Bastien Nocera <hadess at hadess.net>
-    Acked-by: Marcel Holtmann <marcel at holtmann.org>
-    Signed-off-by: Jiri Kosina <jkosina at suse.cz>
-
-commit 6bc702ac6551532774171d593a805c3565befb4e
-Author: Bastien Nocera <hadess at hadess.net>
-Date:   Wed Jan 20 12:00:53 2010 +0000
-
-    HID: Implement Wacom quirk in the kernel
-    
-    The hid-wacom driver required user-space to poke at the tablet
-    to make it send data about the cursor location.
-    
-    This patch makes it do the same thing but in the kernel.
-    
-    Signed-off-by: Bastien Nocera <hadess at hadess.net>
-    Acked-by: Marcel Holtmann <marcel at holtmann.org>
-    Signed-off-by: Jiri Kosina <jkosina at suse.cz>
-
-commit 6fd920bdba1752fdd6411a55b3c17e0fda67b8d2
-Author: Jiri Kosina <jkosina at suse.cz>
-Date:   Fri Jan 29 15:03:36 2010 +0100
-
-    HID: make raw reports possible for both feature and output reports
-    
-    In commit 2da31939a42 ("Bluetooth: Implement raw output support for HIDP
-    layer"), support for Bluetooth hid_output_raw_report was added, but it
-    pushes the data to the intr socket instead of the ctrl one. This has been
-    fixed by 6bf8268f9a91f1 ("Bluetooth: Use the control channel for raw HID reports")
-    
-    Still, it is necessary to distinguish whether the report in question should be
-    either FEATURE or OUTPUT. For this, we have to extend the generic HID API,
-    so that hid_output_raw_report() callback provides means to specify this
-    value so that it can be passed down to lower level hardware drivers (currently
-    Bluetooth and USB).
-    
-    Based on original patch by Bastien Nocera <hadess at hadess.net>
-    Acked-by: Marcel Holtmann <marcel at holtmann.org>
-    Signed-off-by: Jiri Kosina <jkosina at suse.cz>
-
-diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
-index eabe5f8..f7f80e1 100644
---- a/drivers/hid/hid-core.c
-+++ b/drivers/hid/hid-core.c
-@@ -1340,6 +1340,7 @@ static const struct hid_device_id hid_blacklist[] = {
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_PETALYNX, USB_DEVICE_ID_PETALYNX_MAXTER_REMOTE) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
-+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_SUNPLUS, USB_DEVICE_ID_SUNPLUS_WDESKTOP) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb300) },
-diff --git a/drivers/hid/hid-sony.c b/drivers/hid/hid-sony.c
-index 4e84502..6ced140 100644
---- a/drivers/hid/hid-sony.c
-+++ b/drivers/hid/hid-sony.c
-@@ -48,7 +48,7 @@ static void sony_report_fixup(struct hid_device *hdev, __u8 *rdesc,
-  * to "operational".  Without this, the ps3 controller will not report any
-  * events.
-  */
--static int sony_set_operational(struct hid_device *hdev)
-+static int sony_set_operational_usb(struct hid_device *hdev)
- {
- 	struct usb_interface *intf = to_usb_interface(hdev->dev.parent);
- 	struct usb_device *dev = interface_to_usbdev(intf);
-@@ -73,6 +73,12 @@ static int sony_set_operational(struct hid_device *hdev)
- 	return ret;
- }
- 
-+static int sony_set_operational_bt(struct hid_device *hdev)
-+{
-+	unsigned char buf[] = { 0x53, 0xf4,  0x42, 0x03, 0x00, 0x00 };
-+	return hdev->hid_output_raw_report(hdev, buf, sizeof(buf), HID_FEATURE_REPORT);
-+}
-+
- static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
- {
- 	int ret;
-@@ -101,7 +107,17 @@ static int sony_probe(struct hid_device *hdev, const struct hid_device_id *id)
- 		goto err_free;
- 	}
- 
--	ret = sony_set_operational(hdev);
-+	switch (hdev->bus) {
-+	case BUS_USB:
-+		ret = sony_set_operational_usb(hdev);
-+		break;
-+	case BUS_BLUETOOTH:
-+		ret = sony_set_operational_bt(hdev);
-+		break;
-+	default:
-+		ret = 0;
-+	}
-+
- 	if (ret < 0)
- 		goto err_stop;
- 
-@@ -121,6 +137,7 @@ static void sony_remove(struct hid_device *hdev)
- 
- static const struct hid_device_id sony_devices[] = {
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
-+	{ HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS3_CONTROLLER) },
- 	{ HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_VAIO_VGX_MOUSE),
- 		.driver_data = VAIO_RDESC_CONSTANT },
- 	{ }
-diff --git a/drivers/hid/hid-wacom.c b/drivers/hid/hid-wacom.c
-index 12dcda5..8d3b46f 100644
---- a/drivers/hid/hid-wacom.c
-+++ b/drivers/hid/hid-wacom.c
-@@ -156,7 +156,9 @@ static int wacom_probe(struct hid_device *hdev,
- 	struct hid_input *hidinput;
- 	struct input_dev *input;
- 	struct wacom_data *wdata;
-+	char rep_data[2];
- 	int ret;
-+	int limit;
- 
- 	wdata = kzalloc(sizeof(*wdata), GFP_KERNEL);
- 	if (wdata == NULL) {
-@@ -166,6 +168,7 @@ static int wacom_probe(struct hid_device *hdev,
- 
- 	hid_set_drvdata(hdev, wdata);
- 
-+	/* Parse the HID report now */
- 	ret = hid_parse(hdev);
- 	if (ret) {
- 		dev_err(&hdev->dev, "parse failed\n");
-@@ -178,6 +181,31 @@ static int wacom_probe(struct hid_device *hdev,
- 		goto err_free;
- 	}
- 
-+	/*
-+	 * Note that if the raw queries fail, it's not a hard failure and it
-+	 * is safe to continue
-+	 */
-+
-+	/* Set Wacom mode2 */
-+	rep_data[0] = 0x03; rep_data[1] = 0x00;
-+	limit = 3;
-+	do {
-+		ret = hdev->hid_output_raw_report(hdev, rep_data, 2,
-+				HID_FEATURE_REPORT);
-+	} while (ret < 0 && limit-- > 0);
-+	if (ret < 0)
-+		dev_warn(&hdev->dev, "failed to poke device #1, %d\n", ret);
-+
-+	/* 0x06 - high reporting speed, 0x05 - low speed */
-+	rep_data[0] = 0x06; rep_data[1] = 0x00;
-+	limit = 3;
-+	do {
-+		ret = hdev->hid_output_raw_report(hdev, rep_data, 2,
-+				HID_FEATURE_REPORT);
-+	} while (ret < 0 && limit-- > 0);
-+	if (ret < 0)
-+		dev_warn(&hdev->dev, "failed to poke device #2, %d\n", ret);
-+
- 	hidinput = list_entry(hdev->inputs.next, struct hid_input, list);
- 	input = hidinput->input;
- 
-diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c
-index cdd1369..d044767 100644
---- a/drivers/hid/hidraw.c
-+++ b/drivers/hid/hidraw.c
-@@ -134,7 +134,7 @@ static ssize_t hidraw_write(struct file *file, const char __user *buffer, size_t
- 		goto out;
- 	}
- 
--	ret = dev->hid_output_raw_report(dev, buf, count);
-+	ret = dev->hid_output_raw_report(dev, buf, count, HID_OUTPUT_REPORT);
- out:
- 	kfree(buf);
- 	return ret;
-diff --git a/drivers/hid/usbhid/hid-core.c b/drivers/hid/usbhid/hid-core.c
-index e2997a8..caa16c0 100644
---- a/drivers/hid/usbhid/hid-core.c
-+++ b/drivers/hid/usbhid/hid-core.c
-@@ -774,7 +774,8 @@ static int hid_alloc_buffers(struct usb_device *dev, struct hid_device *hid)
- 	return 0;
- }
- 
--static int usbhid_output_raw_report(struct hid_device *hid, __u8 *buf, size_t count)
-+static int usbhid_output_raw_report(struct hid_device *hid, __u8 *buf, size_t count,
-+		unsigned char report_type)
- {
- 	struct usbhid_device *usbhid = hid->driver_data;
- 	struct usb_device *dev = hid_to_usb_dev(hid);
-@@ -785,7 +786,7 @@ static int usbhid_output_raw_report(struct hid_device *hid, __u8 *buf, size_t co
- 	ret = usb_control_msg(dev, usb_sndctrlpipe(dev, 0),
- 		HID_REQ_SET_REPORT,
- 		USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE,
--		((HID_OUTPUT_REPORT + 1) << 8) | *buf,
-+		((report_type + 1) << 8) | *buf,
- 		interface->desc.bInterfaceNumber, buf + 1, count - 1,
- 		USB_CTRL_SET_TIMEOUT);
- 
-diff --git a/include/linux/hid.h b/include/linux/hid.h
-index 8709365..3661a62 100644
---- a/include/linux/hid.h
-+++ b/include/linux/hid.h
-@@ -501,7 +501,7 @@ struct hid_device {							/* device report descriptor */
- 	void (*hiddev_report_event) (struct hid_device *, struct hid_report *);
- 
- 	/* handler for raw output data, used by hidraw */
--	int (*hid_output_raw_report) (struct hid_device *, __u8 *, size_t);
-+	int (*hid_output_raw_report) (struct hid_device *, __u8 *, size_t, unsigned char);
- 
- 	/* debugging support via debugfs */
- 	unsigned short debug;
-diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
-index 6cf526d..280529a 100644
---- a/net/bluetooth/hidp/core.c
-+++ b/net/bluetooth/hidp/core.c
-@@ -313,10 +313,21 @@ static int hidp_send_report(struct hidp_session *session, struct hid_report *rep
- 	return hidp_queue_report(session, buf, rsize);
- }
- 
--static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, size_t count)
-+static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, size_t count,
-+		unsigned char report_type)
- {
--	if (hidp_send_ctrl_message(hid->driver_data,
--			HIDP_TRANS_SET_REPORT | HIDP_DATA_RTYPE_FEATURE,
-+	switch (report_type) {
-+	case HID_FEATURE_REPORT:
-+		report_type = HIDP_TRANS_SET_REPORT | HIDP_DATA_RTYPE_FEATURE;
-+		break;
-+	case HID_OUTPUT_REPORT:
-+		report_type = HIDP_TRANS_DATA | HIDP_DATA_RTYPE_OUPUT;
-+		break;
-+	default:
-+		return -EINVAL;
-+	}
-+
-+	if (hidp_send_ctrl_message(hid->driver_data, report_type,
- 			data, count))
- 		return -ENOMEM;
- 	return count;


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/kernel.spec,v
retrieving revision 1.2096
retrieving revision 1.2097
diff -u -p -r1.2096 -r1.2097
--- kernel.spec	14 Jul 2010 20:42:41 -0000	1.2096
+++ kernel.spec	14 Jul 2010 21:31:30 -0000	1.2097
@@ -601,6 +601,7 @@ Patch05: linux-2.6-makefile-after_link.p
 Patch09: linux-2.6-upstream-reverts.patch
 # Git trees.
 Patch11: git-bluetooth.patch
+Patch12: git-cpufreq.patch
 
 # Standalone patches
 Patch20: linux-2.6-hotfixes.patch
@@ -1168,7 +1169,8 @@ ApplyOptionalPatch linux-2.6-compile-fix
 # revert patches from upstream that conflict or that we get via other means
 ApplyOptionalPatch linux-2.6-upstream-reverts.patch -R
 
-#ApplyPatch git-bluetooth.patch
+ApplyOptionalPatch git-bluetooth.patch
+ApplyOptionalPatch git-cpufreq.patch
 
 ApplyPatch linux-2.6-hotfixes.patch
 
@@ -2026,6 +2028,10 @@ fi
 
 
 %changelog
+* Wed Jul 14 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.34.1-13
+- Truncate the obsolete git-bluetooth.patch, use ApplyOptionalPatch
+  for git-bluetooth and git-cpufreq patches.
+
 * Wed Jul 14 2010 Chuck Ebbert <cebbert at redhat.com>  2.6.34.1-12
 - pci-pm-do-not-use-native-pcie-pme-by-default.patch:
   fix PCIe hotplug interrupts firing continuously. (#613412)

