[kernel] r8338 - in dists/sid/linux-2.6/debian: . patches/bugfix/sparc patches/series

[Jurij Smakov]

Author: jurij-guest
Date: Fri Mar  9 13:54:03 2007
New Revision: 8338

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/sparc/eth1394-unaligned-access.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/12
Log:
Add bugfix/sparc/eth1394-unaligned-access.patch by Emanuele Roca (plus 
backports from 2.6.20) to fix unaligned memory accesses in Firewire
eth1394 driver.


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Fri Mar  9 13:54:03 2007
@@ -11,6 +11,9 @@
   * Add bugfix/sparc/e450-boot-failure.patch to fix boot failure on
     E450 machines. Thanks to David Miller for the patch and to Daniel
     Smolik for testing.
+  * Add bugfix/sparc/eth1394-unaligned-access.patch to fix unaligned
+    memory accesses in the Firewire eth1394 driver. Thanks to Emanuele
+    Roca for the patch.
 
  -- Steve Langasek <vorlon at debian.org>  Mon,  5 Mar 2007 00:25:35 -0800
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/sparc/eth1394-unaligned-access.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/sparc/eth1394-unaligned-access.patch	Fri Mar  9 13:54:03 2007
@@ -0,0 +1,56 @@
+Author          : Emanuele Rocca <ema at debian.org> plus backports from 2.6.20
+Date            : Tue, 27 Feb 2007 00:23:28 +0100
+Message-ID      : <20070226232328.GA6779 at darkmoon.home>
+Status          : included upstream, confirmed working
+Description     : fixes unaligned access in ether1394_reset_priv()
+
+diff -aur a/drivers/ieee1394/eth1394.c b/drivers/ieee1394/eth1394.c
+--- a/drivers/ieee1394/eth1394.c	2006-09-20 06:42:06.000000000 +0300
++++ b/drivers/ieee1394/eth1394.c	2007-03-09 15:07:18.000000000 +0200
+@@ -65,6 +65,7 @@
+ #include <asm/uaccess.h>
+ #include <asm/delay.h>
+ #include <asm/semaphore.h>
++#include <asm/unaligned.h>
+ #include <net/arp.h>
+ 
+ #include "csr1212.h"
+@@ -491,7 +492,7 @@
+ 	int i;
+ 	struct eth1394_priv *priv = netdev_priv(dev);
+ 	struct hpsb_host *host = priv->host;
+-	u64 guid = *((u64*)&(host->csr.rom->bus_info_data[3]));
++	u64 guid = get_unaligned((u64*)&(host->csr.rom->bus_info_data[3]));
+ 	u16 maxpayload = 1 << (host->csr.max_rec + 1);
+ 	int max_speed = IEEE1394_SPEED_MAX;
+ 
+@@ -894,6 +895,7 @@
+ 		u16 maxpayload;
+ 		struct eth1394_node_ref *node;
+ 		struct eth1394_node_info *node_info;
++		__be64 guid;
+ 
+ 		/* Sanity check. MacOSX seems to be sending us 131 in this
+ 		 * field (atleast on my Panther G5). Not sure why. */
+@@ -902,8 +904,9 @@
+ 
+ 		maxpayload = min(eth1394_speedto_maxpayload[sspd], (u16)(1 << (max_rec + 1)));
+ 
++		guid = get_unaligned(&arp1394->s_uniq_id);
+ 		node = eth1394_find_node_guid(&priv->ip_node_list,
+-					      be64_to_cpu(arp1394->s_uniq_id));
++					      be64_to_cpu(guid));
+ 		if (!node) {
+ 			return 0;
+ 		}
+@@ -1675,8 +1678,9 @@
+ 		if (max_payload < dg_size + hdr_type_len[ETH1394_HDR_LF_UF])
+ 			priv->bc_dgl++;
+ 	} else {
++		__be64 guid = get_unaligned((u64 *)eth->h_dest);
+ 		node = eth1394_find_node_guid(&priv->ip_node_list,
+-					      be64_to_cpu(*(u64*)eth->h_dest));
++					      be64_to_cpu(guid));
+ 		if (!node) {
+ 			ret = -EAGAIN;
+ 			goto fail;

Modified: dists/sid/linux-2.6/debian/patches/series/12
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/12	(original)
+++ dists/sid/linux-2.6/debian/patches/series/12	Fri Mar  9 13:54:03 2007
@@ -1 +1,2 @@
 + bugfix/sparc/e450-boot-failure.patch
++ bugfix/sparc/eth1394-unaligned-access.patch