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

[Jurij Smakov]

Author: jurij-guest
Date: Fri Dec 29 02:29:54 2006
New Revision: 8050

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/sparc/isa-dev-no-reg.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/9
Log:
Add bugfix/sparc/isa-dev-no-reg.patch to make sure that
isa_dev_get_resource() can deal with devices which do not have a 'reg'
PROM property. Failure to handle such devices properly resulted in an
oops during boot on Netra X1. Thanks to Richard Mortimer for debugging
and patch. (closes: #404216)


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Fri Dec 29 02:29:54 2006
@@ -83,6 +83,13 @@
     - softirq: remove BUG_ONs which can incorrectly trigger
     - Fix SUNRPC wakeup/execute race condition
 
+  [ Jurij Smakov ]
+  * Add bugfix/sparc/isa-dev-no-reg.patch to make sure that
+    isa_dev_get_resource() can deal with devices which do not have a 'reg'
+    PROM property. Failure to handle such devices properly resulted in an
+    oops during boot on Netra X1. Thanks to Richard Mortimer for debugging
+    and patch. (closes: #404216)
+
  -- maximilian attems <maks at sternwelten.at>  Fri, 29 Dec 2006 00:33:09 +0100
 
 linux-2.6 (2.6.18-8) unstable; urgency=low

Added: dists/sid/linux-2.6/debian/patches/bugfix/sparc/isa-dev-no-reg.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/sparc/isa-dev-no-reg.patch	Fri Dec 29 02:29:54 2006
@@ -0,0 +1,27 @@
+From: Richard Mortimer <richm at oldelvet.org.uk>
+
+The todm5819 Openboot device node on Netra X1 does not have a "reg"
+property. In this case of_get_property returns NULL resulting in an
+Oops. Avoid this by returning from isa_dev_get_resource() without
+attempting to request_resource().
+
+Signed-off-by: Richard Mortimer <richm at oldelvet.org.uk>
+---
+ arch/sparc64/kernel/isa.c |    4 ++++
+ 1 files changed, 4 insertions(+), 0 deletions(-)
+
+diff --git a/arch/sparc64/kernel/isa.c b/arch/sparc64/kernel/isa.c
+index ad1c4f5..cb556f0 100644
+--- a/arch/sparc64/kernel/isa.c
++++ b/arch/sparc64/kernel/isa.c
+@@ -31,6 +31,10 @@ isa_dev_get_resource(struct sparc_isa_device *isa_dev)
+ 
+ 	pregs = of_get_property(isa_dev->prom_node, "reg", &prop_len);
+ 
++	if (!pregs) {
++		return NULL;
++	}
++
+ 	/* Only the first one is interesting. */
+ 	len = pregs[0].reg_size;
+ 	base = (((unsigned long)pregs[0].which_io << 32) |

Modified: dists/sid/linux-2.6/debian/patches/series/9
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/9	(original)
+++ dists/sid/linux-2.6/debian/patches/series/9	Fri Dec 29 02:29:54 2006
@@ -24,3 +24,4 @@
 + bugfix/2.6.16.35
 + bugfix/2.6.16.36
 + bugfix/2.6.16.37
++ bugfix/sparc/isa-dev-no-reg.patch