[kernel] r21901 - in dists/wheezy/linux/debian: . patches patches/debian

[Ben Hutchings]

Author: benh
Date: Wed Sep 24 04:08:35 2014
New Revision: 21901

Log:
sp5100_tco: Reject SB8x0 chips (Closes: #726150)

Added:
   dists/wheezy/linux/debian/patches/debian/sp5100_tco-reject-sb8x0-chips.patch
Modified:
   dists/wheezy/linux/debian/changelog
   dists/wheezy/linux/debian/patches/series

Modified: dists/wheezy/linux/debian/changelog
==============================================================================
--- dists/wheezy/linux/debian/changelog	Wed Sep 24 03:40:06 2014	(r21900)
+++ dists/wheezy/linux/debian/changelog	Wed Sep 24 04:08:35 2014	(r21901)
@@ -195,6 +195,7 @@
   * udf: Avoid infinite loop when processing indirect ICBs (CVE-2014-6410)
   * libceph: do not hard code max auth ticket len (CVE-2014-6416,
     CVE-2014-6417, CVE-2014-6418)
+  * sp5100_tco: Reject SB8x0 chips (Closes: #726150)
 
   [ Cyril Brulebois ]
   * udeb: Add virtio_scsi to virtio-modules (Closes: #756249).

Added: dists/wheezy/linux/debian/patches/debian/sp5100_tco-reject-sb8x0-chips.patch
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/wheezy/linux/debian/patches/debian/sp5100_tco-reject-sb8x0-chips.patch	Wed Sep 24 04:08:35 2014	(r21901)
@@ -0,0 +1,27 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Wed, 24 Sep 2014 03:02:28 +0100
+Subject: sp5100_tco: Reject SB8x0 chips
+Bug-Debian: https://bugs.debian.org/726150
+Forwarded: not-needed
+
+The SMBus functions of SB8x0 chips have the same PCI ID as on the
+SP5100, but the TCO timer has a different register set!  They can be
+distinguished by PCI revision.
+
+Upstream commit 740fbddf5c3f ('watchdog: sp5100_tco: Add SB8x0 chipset
+support') adds support for the newer chips, but we're playing safe
+here by rejecting them completely.
+
+--- a/drivers/watchdog/sp5100_tco.c
++++ b/drivers/watchdog/sp5100_tco.c
+@@ -287,6 +287,10 @@ static unsigned char __devinit sp5100_tc
+ 	if (!sp5100_tco_pci)
+ 		return 0;
+ 
++	/* Higher revisions are SB8x0 which have a different register set */
++	if (sp5100_tco_pci->revision >= 0x40)
++		return 0;
++
+ 	/* Request the IO ports used by this driver */
+ 	pm_iobase = SP5100_IO_PM_INDEX_REG;
+ 	if (!request_region(pm_iobase, SP5100_PM_IOPORTS_SIZE, "SP5100 TCO")) {

Modified: dists/wheezy/linux/debian/patches/series
==============================================================================
--- dists/wheezy/linux/debian/patches/series	Wed Sep 24 03:40:06 2014	(r21900)
+++ dists/wheezy/linux/debian/patches/series	Wed Sep 24 04:08:35 2014	(r21901)
@@ -1136,3 +1136,4 @@
 bugfix/all/udf-Avoid-infinite-loop-when-processing-indirect-ICB.patch
 bugfix/all/libceph-add-process_one_ticket-helper.patch
 bugfix/all/libceph-do-not-hard-code-max-auth-ticket-len.patch
+debian/sp5100_tco-reject-sb8x0-chips.patch