From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 23 Jul 2013 16:43:21 +0000 (-0700)
Subject: 3.10-stable patches
X-Git-Tag: v3.10.3~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f3220bc72fc002ea515b063e15cb382e4d5db78;p=thirdparty%2Fkernel%2Fstable-queue.git

3.10-stable patches

added patches:
	of-fix-address-decoding-on-bimini-and-js2x-machines.patch
---

diff --git a/queue-3.10/of-fix-address-decoding-on-bimini-and-js2x-machines.patch b/queue-3.10/of-fix-address-decoding-on-bimini-and-js2x-machines.patch
new file mode 100644
index 00000000000..ec546df25bf
--- /dev/null
+++ b/queue-3.10/of-fix-address-decoding-on-bimini-and-js2x-machines.patch
@@ -0,0 +1,48 @@
+From 6dd18e4684f3d188277bbbc27545248487472108 Mon Sep 17 00:00:00 2001
+From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Date: Wed, 3 Jul 2013 16:01:10 +1000
+Subject: of: Fix address decoding on Bimini and js2x machines
+
+From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+
+commit 6dd18e4684f3d188277bbbc27545248487472108 upstream.
+
+ Commit:
+
+  e38c0a1fbc5803cbacdaac0557c70ac8ca5152e7
+  of/address: Handle #address-cells > 2 specially
+
+broke real time clock access on Bimini, js2x, and similar powerpc
+machines using the "maple" platform. That code was indirectly relying
+on the old (broken) behaviour of the translation for the hypertransport
+to ISA bridge.
+
+This fixes it by treating hypertransport as a PCI bus
+
+Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
+Acked-by: Rob Herring <rob.herring@calxeda.com>
+Signed-off-by: Grant Likely <grant.likely@linaro.org>
+Cc: Jonghwan Choi <jhbird.choi@gmail.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/of/address.c |    8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+--- a/drivers/of/address.c
++++ b/drivers/of/address.c
+@@ -106,8 +106,12 @@ static unsigned int of_bus_default_get_f
+ 
+ static int of_bus_pci_match(struct device_node *np)
+ {
+-	/* "vci" is for the /chaos bridge on 1st-gen PCI powermacs */
+-	return !strcmp(np->type, "pci") || !strcmp(np->type, "vci");
++	/*
++	 * "vci" is for the /chaos bridge on 1st-gen PCI powermacs
++	 * "ht" is hypertransport
++	 */
++	return !strcmp(np->type, "pci") || !strcmp(np->type, "vci") ||
++		!strcmp(np->type, "ht");
+ }
+ 
+ static void of_bus_pci_count_cells(struct device_node *np,
diff --git a/queue-3.10/series b/queue-3.10/series
index 7889fff4fdc..8123df56f2c 100644
--- a/queue-3.10/series
+++ b/queue-3.10/series
@@ -75,3 +75,4 @@ uprobes-fix-return-value-in-error-handling-path.patch
 svcrpc-fix-failures-to-handle-1-uid-s.patch
 svcrpc-fix-handling-of-too-short-rpc-s.patch
 svcrpc-don-t-error-out-on-small-tcp-fragment.patch
+of-fix-address-decoding-on-bimini-and-js2x-machines.patch