Fri Jul 10 19:05:03 UTC 2009

Author: myoung

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7796

Modified Files:
      Tag: private-myoung-dom0-branch
	.cvsignore config-generic config-powerpc-generic 
	config-x86-generic config-x86_64-generic kernel.spec 
	linux-2.6-compile-fixes.patch linux-2.6-v4l-dvb-fixes.patch 
	sources upstream 
Added Files:
      Tag: private-myoung-dom0-branch
	hdpvr-ir-enable.patch linux-2.6-dmadebug-spinlock.patch 
	patch-2.6.31-rc2-git4.bz2.sign 
Removed Files:
      Tag: private-myoung-dom0-branch
	patch-2.6.31-rc2-git2.bz2.sign 
Log Message:
xen doesn't like CONFIG_KERNEL_LZMA


hdpvr-ir-enable.patch:

--- NEW FILE hdpvr-ir-enable.patch ---
>From http://hg.jannau.net/hdpvr/, pending v4l-dvb pull request

---
 drivers/media/video/hdpvr/hdpvr-core.c |    3 +-
 drivers/media/video/hdpvr/hdpvr-i2c.c  |   36 +++++++++++++++++++++++++------
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/drivers/media/video/hdpvr/hdpvr-core.c b/drivers/media/video/hdpvr/hdpvr-core.c
index 188bd5a..878d1e5 100644
--- a/drivers/media/video/hdpvr/hdpvr-core.c
+++ b/drivers/media/video/hdpvr/hdpvr-core.c
@@ -363,8 +363,7 @@ static int hdpvr_probe(struct usb_interface *interface,
 	}
 
 #ifdef CONFIG_I2C
-	/* until i2c is working properly */
-	retval = 0; /* hdpvr_register_i2c_adapter(dev); */
+	retval = hdpvr_register_i2c_adapter(dev);
 	if (retval < 0) {
 		v4l2_err(&dev->v4l2_dev, "registering i2c adapter failed\n");
 		goto error;
diff --git a/drivers/media/video/hdpvr/hdpvr-i2c.c b/drivers/media/video/hdpvr/hdpvr-i2c.c
index c4b5d15..1c01b6c 100644
--- a/drivers/media/video/hdpvr/hdpvr-i2c.c
+++ b/drivers/media/video/hdpvr/hdpvr-i2c.c
@@ -22,7 +22,7 @@
 #define REQTYPE_I2C_WRITE_STATT	0xd0
 
 static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
-			  char *data, int len)
+			  char *data, int len, int bus)
 {
 	int ret;
 	char *buf = kmalloc(len, GFP_KERNEL);
@@ -32,7 +32,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
 	ret = usb_control_msg(dev->udev,
 			      usb_rcvctrlpipe(dev->udev, 0),
 			      REQTYPE_I2C_READ, CTRL_READ_REQUEST,
-			      0x100|addr, 0, buf, len, 1000);
+			      bus<<8 | addr, 0, buf, len, 1000);
 
 	if (ret == len) {
 		memcpy(data, buf, len);
@@ -46,7 +46,7 @@ static int hdpvr_i2c_read(struct hdpvr_device *dev, unsigned char addr,
 }
 
 static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
-			   char *data, int len)
+			   char *data, int len, int bus)
 {
 	int ret;
 	char *buf = kmalloc(len, GFP_KERNEL);
@@ -57,14 +57,14 @@ static int hdpvr_i2c_write(struct hdpvr_device *dev, unsigned char addr,
 	ret = usb_control_msg(dev->udev,
 			      usb_sndctrlpipe(dev->udev, 0),
 			      REQTYPE_I2C_WRITE, CTRL_WRITE_REQUEST,
-			      0x100|addr, 0, buf, len, 1000);
+			      bus<<8 | addr, 0, buf, len, 1000);
 
 	if (ret < 0)
 		goto error;
 
 	ret = usb_control_msg(dev->udev,
 			      usb_rcvctrlpipe(dev->udev, 0),
-			      REQTYPE_I2C_WRITE_STATT, CTRL_READ_REQUEST,
+			      REQTYPE_I2C_WRITE_STATT, CTRL_READ_REQUEST,
 			      0, 0, buf, 2, 1000);
 
 	if (ret == 2)
@@ -93,10 +93,10 @@ static int hdpvr_transfer(struct i2c_adapter *i2c_adapter, struct i2c_msg *msgs,
 
 		if (msgs[i].flags & I2C_M_RD)
 			retval = hdpvr_i2c_read(dev, addr, msgs[i].buf,
-						msgs[i].len);
+						msgs[i].len, 1);
 		else
 			retval = hdpvr_i2c_write(dev, addr, msgs[i].buf,
-						 msgs[i].len);
+						 msgs[i].len, 1);
 	}
 
 	mutex_unlock(&dev->i2c_mutex);
@@ -114,6 +114,26 @@ static struct i2c_algorithm hdpvr_algo = {
 	.functionality = hdpvr_functionality,
 };
 
+static int hdpvr_activate_ir(struct hdpvr_device *dev)
+{
+	char buffer[8];
+
+	mutex_lock(&dev->i2c_mutex);
+
+	hdpvr_i2c_read(dev, 0x54, buffer, 1, 0);
+
+	buffer[0] = 0;
+	buffer[1] = 0x8;
+	hdpvr_i2c_write(dev, 0x54, buffer, 2, 1);
+
+	buffer[1] = 0x18;
+	hdpvr_i2c_write(dev, 0x54, buffer, 2, 1);
+
+	mutex_unlock(&dev->i2c_mutex);
+	return 0;
+}
+
+
 int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
 {
 	struct i2c_adapter *i2c_adap;
@@ -123,6 +143,8 @@ int hdpvr_register_i2c_adapter(struct hdpvr_device *dev)
 	if (i2c_adap == NULL)
 		goto error;
 
+	hdpvr_activate_ir(dev);
+
 	strlcpy(i2c_adap->name, "Hauppauge HD PVR I2C",
 		sizeof(i2c_adap->name));
 	i2c_adap->algo  = &hdpvr_algo;

linux-2.6-dmadebug-spinlock.patch:

--- NEW FILE linux-2.6-dmadebug-spinlock.patch ---
--- linux-2.6.30.noarch/lib/dma-debug.c~	2009-07-09 20:02:56.000000000 -0400
+++ linux-2.6.30.noarch/lib/dma-debug.c	2009-07-09 20:03:06.000000000 -0400
@@ -716,7 +716,7 @@ void dma_debug_init(u32 num_entries)
 
 	for (i = 0; i < HASH_SIZE; ++i) {
 		INIT_LIST_HEAD(&dma_entry_hash[i].list);
-		dma_entry_hash[i].lock = SPIN_LOCK_UNLOCKED;
+		spin_lock_init(&dma_entry_hash[i].lock);
 	}
 
 	if (dma_debug_fs_init() != 0) {


--- NEW FILE patch-2.6.31-rc2-git4.bz2.sign ---
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: See http://www.kernel.org/signature.html for info

iD8DBQBKVd5wyGugalF9Dw4RAjiPAJsF1fMvheHCcS5lK098yDT5eFEOVQCdGNmt
+ZWQaPxwh/0FmXXNP3cXmFY=
=x/pO
-----END PGP SIGNATURE-----


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/.cvsignore,v
retrieving revision 1.1014.2.19
retrieving revision 1.1014.2.20
diff -u -p -r1.1014.2.19 -r1.1014.2.20
--- .cvsignore	9 Jul 2009 22:52:59 -0000	1.1014.2.19
+++ .cvsignore	10 Jul 2009 19:04:29 -0000	1.1014.2.20
@@ -6,4 +6,4 @@ temp-*
 kernel-2.6.30
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc2.bz2
-patch-2.6.31-rc2-git2.bz2
+patch-2.6.31-rc2-git4.bz2


Index: config-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-generic,v
retrieving revision 1.238.6.28
retrieving revision 1.238.6.29
diff -u -p -r1.238.6.28 -r1.238.6.29
--- config-generic	9 Jul 2009 22:53:00 -0000	1.238.6.28
+++ config-generic	10 Jul 2009 19:04:29 -0000	1.238.6.29
@@ -1809,6 +1809,7 @@ CONFIG_INPUT_KEYBOARD=y
 CONFIG_KEYBOARD_ATKBD=y
 # CONFIG_KEYBOARD_SUNKBD is not set
 # CONFIG_KEYBOARD_XTKBD is not set
+# CONFIG_KEYBOARD_MATRIX is not set
 # CONFIG_KEYBOARD_NEWTON is not set
 # CONFIG_KEYBOARD_STOWAWAY is not set
 # CONFIG_KEYBOARD_LKKBD is not set


Index: config-powerpc-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-powerpc-generic,v
retrieving revision 1.33.6.7
retrieving revision 1.33.6.8
diff -u -p -r1.33.6.7 -r1.33.6.8
--- config-powerpc-generic	27 Jun 2009 11:05:10 -0000	1.33.6.7
+++ config-powerpc-generic	10 Jul 2009 19:04:29 -0000	1.33.6.8
@@ -239,6 +239,7 @@ CONFIG_EXTRA_TARGETS=""
 # CONFIG_FS_ENET is not set
 # CONFIG_UCC_GETH is not set
 # CONFIG_KEYBOARD_GPIO is not set
+# CONFIG_KEYBOARD_MATRIX is not set
 # CONFIG_MOUSE_GPIO is not set
 # CONFIG_SERIAL_CPM is not set
 # CONFIG_SERIAL_QE is not set


Index: config-x86-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86-generic,v
retrieving revision 1.68.6.13
retrieving revision 1.68.6.14
diff -u -p -r1.68.6.13 -r1.68.6.14
--- config-x86-generic	9 Jul 2009 22:53:00 -0000	1.68.6.13
+++ config-x86-generic	10 Jul 2009 19:04:29 -0000	1.68.6.14
@@ -1,6 +1,6 @@
 CONFIG_UID16=y
 # CONFIG_64BIT is not set
-CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_LZMA is not set
 
 #
 # Processor type and features


Index: config-x86_64-generic
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/config-x86_64-generic,v
retrieving revision 1.68.2.12
retrieving revision 1.68.2.13
diff -u -p -r1.68.2.12 -r1.68.2.13
--- config-x86_64-generic	9 Jul 2009 22:53:00 -0000	1.68.2.12
+++ config-x86_64-generic	10 Jul 2009 19:04:29 -0000	1.68.2.13
@@ -1,6 +1,6 @@
 CONFIG_64BIT=y
 CONFIG_UID16=y
-CONFIG_KERNEL_LZMA=y
+# CONFIG_KERNEL_LZMA is not set
 
 # CONFIG_MK8 is not set
 # CONFIG_MPSC is not set


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1294.2.39
retrieving revision 1.1294.2.40
diff -u -p -r1.1294.2.39 -r1.1294.2.40
--- kernel.spec	9 Jul 2009 22:53:00 -0000	1.1294.2.39
+++ kernel.spec	10 Jul 2009 19:04:29 -0000	1.1294.2.40
@@ -59,7 +59,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 2
 # The git snapshot level
-%define gitrev 2
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 2.6.%{upstream_sublevel}
 %endif
@@ -648,6 +648,7 @@ Patch900: linux-2.6-pci-cacheline-sizing
 
 Patch1515: linux-2.6.31-lirc.patch
 Patch1516: lirc_streamzap-buffer-rework.patch
+Patch1517: hdpvr-ir-enable.patch
 
 # nouveau + drm fixes
 Patch1811: drm-next.patch
@@ -673,6 +674,8 @@ Patch2900: linux-2.6-v4l-dvb-update.patc
 Patch2901: linux-2.6-v4l-dvb-experimental.patch
 Patch2903: linux-2.6-revert-dvb-net-kabi-change.patch
 
+Patch3000: linux-2.6-dmadebug-spinlock.patch
+
 # fs fixes
 
 # NFSv4
@@ -1131,6 +1134,8 @@ ApplyPatch linux-2.6.29-sparc-IOC_TYPECH
 #
 ApplyPatch linux-2.6-execshield.patch
 
+ApplyPatch linux-2.6-dmadebug-spinlock.patch
+
 #
 # bugfixes to drivers and filesystems
 #
@@ -1222,6 +1227,8 @@ ApplyPatch linux-2.6-pci-cacheline-sizin
 ApplyPatch linux-2.6.31-lirc.patch
 # should be a short-lived patch, hopefully fixing bz#508952 w/o breaking anything else...
 ApplyPatch lirc_streamzap-buffer-rework.patch
+# enable IR receiver on Hauppauge HD PVR (v4l-dvb merge pending)
+ApplyPatch hdpvr-ir-enable.patch
 
 ApplyPatch linux-2.6-e1000-ich9.patch
 
@@ -1869,6 +1876,20 @@ fi
 
 %changelog
 * Thu Jul 09 2009 Michael Young <m.a.young at durham.ac.uk>
+- disable CONFIG_KERNEL_LZMA as xen doesn't like it
+
+* Thu Jul 09 2009 Dave Jones <davej at redhat.com> 2.6.31-0.62.rc2.git4
+- Use correct spinlock initialization in dma-debug
+
+* Thu Jul 09 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31-0.61.rc2.git4
+- 2.6.31-rc2-git4
+
+* Thu Jul 09 2009 Jarod Wilson <jarod at redhat.com>
+- Enable IR receiver on the Hauppauge HD PVR
+- Trim the changelog, axing everything before 2.6.29 (see cvs
+  if you still really want to see that far back)
+
+* Thu Jul 09 2009 Michael Young <m.a.young at durham.ac.uk>
 - update pvops and see if CONFIG_KERNEL_LZMA=y is compatible with xen
 
 * Wed Jul 08 2009 Dave Jones <davej at redhat.com>

linux-2.6-compile-fixes.patch:

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.193
retrieving revision 1.193.6.1
diff -u -p -r1.193 -r1.193.6.1
--- linux-2.6-compile-fixes.patch	11 Feb 2009 14:55:24 -0000	1.193
+++ linux-2.6-compile-fixes.patch	10 Jul 2009 19:04:30 -0000	1.193.6.1
@@ -4,3 +4,14 @@
 # Please add the errors from gcc before the diffs to save others having
 # to do a compile to figure out what your diff is fixing. Thanks.
 #
+--- linux-2.6.30.noarch/drivers/net/bmac.c~	2009-07-09 21:51:36.000000000 -0400
++++ linux-2.6.30.noarch/drivers/net/bmac.c	2009-07-09 21:51:47.000000000 -0400
+@@ -431,7 +431,7 @@ bmac_init_phy(struct net_device *dev)
+ 			printk(KERN_DEBUG);
+ 		printk(KERN_CONT " %.4x", bmac_mif_read(dev, addr));
+ 	}
+-	print(KERN_CONT "\n");
++	printk(KERN_CONT "\n");
+ 
+ 	if (bp->is_bmac_plus) {
+ 		unsigned int capable, ctrl;

linux-2.6-v4l-dvb-fixes.patch:

Index: linux-2.6-v4l-dvb-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-v4l-dvb-fixes.patch,v
retrieving revision 1.2.8.9
retrieving revision 1.2.8.10
diff -u -p -r1.2.8.9 -r1.2.8.10
--- linux-2.6-v4l-dvb-fixes.patch	24 Apr 2009 22:27:13 -0000	1.2.8.9
+++ linux-2.6-v4l-dvb-fixes.patch	10 Jul 2009 19:04:30 -0000	1.2.8.10
@@ -113202,3 +113202,14 @@ index 82b9bdd..6cc18bf 100644
  	help
  	  Say Y here to include support for soundcards based on the ForteMedia
  	  FM801 chip with a TEA5757 tuner connected to GPIO1-3 pins (Media
+--- linux-2.6.30.noarch/drivers/media/video/hdpvr/hdpvr-i2c.c~	2009-07-09 21:56:58.000000000 -0400
++++ linux-2.6.30.noarch/drivers/media/video/hdpvr/hdpvr-i2c.c	2009-07-09 21:57:34.000000000 -0400
+@@ -64,7 +64,7 @@ static int hdpvr_i2c_write(struct hdpvr_
+ 
+ 	ret = usb_control_msg(dev->udev,
+ 			      usb_rcvctrlpipe(dev->udev, 0),
+-			      REQTYPE_I2C_WRITE_STAT, CTRL_READ_REQUEST,
++			      REQTYPE_I2C_WRITE_STATT, CTRL_READ_REQUEST,
+ 			      0, 0, buf, 2, 1000);
+ 
+ 	if (ret == 2)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/sources,v
retrieving revision 1.976.2.20
retrieving revision 1.976.2.21
diff -u -p -r1.976.2.20 -r1.976.2.21
--- sources	9 Jul 2009 22:53:02 -0000	1.976.2.20
+++ sources	10 Jul 2009 19:04:31 -0000	1.976.2.21
@@ -1,3 +1,3 @@
 7a80058a6382e5108cdb5554d1609615  linux-2.6.30.tar.bz2
 a785e5e8d16d646c7a7c876359b3dab3  patch-2.6.31-rc2.bz2
-3ce980fca192d93cdc0d09237aad318d  patch-2.6.31-rc2-git2.bz2
+76b4082138a3d4ba88c37da6e3b91d13  patch-2.6.31-rc2-git4.bz2


Index: upstream
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/upstream,v
retrieving revision 1.888.2.19
retrieving revision 1.888.2.20
diff -u -p -r1.888.2.19 -r1.888.2.20
--- upstream	9 Jul 2009 22:53:03 -0000	1.888.2.19
+++ upstream	10 Jul 2009 19:04:31 -0000	1.888.2.20
@@ -1,4 +1,4 @@
 linux-2.6.30.tar.bz2
 patch-2.6.31-rc2.bz2
-patch-2.6.31-rc2-git2.bz2
+patch-2.6.31-rc2-git4.bz2
 


--- patch-2.6.31-rc2-git2.bz2.sign DELETED ---


