Re: [PATCH] of: Fix address decoding on Bimini and js2x machines

2013-07-04 Thread Grant Likely
On Wed, 3 Jul 2013 15:37:56 +0100, Grant Likely grant.lik...@linaro.org wrote:
 On Wed, Jul 3, 2013 at 3:10 PM, Rob Herring robherri...@gmail.com wrote:
  On 07/03/2013 01:01 AM, Benjamin Herrenschmidt wrote:
   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 b...@kernel.crashing.org
  CC: sta...@vger.kernel.org [v3.6+]
  ---
 
  Rob, if you have no objection I will put that in powerpc -next
 
  NP.
 
  Acked-by: Rob Herring rob.herr...@calxeda.com
 
 I'll include this in my 3.11 pull request for Linus

Oops. Ben, I misread what you wrote. It would have been just fine to
include it in your powerpc -next branch. Sorry for the confusion.

Anyway, I saw your powerpc pull req and that this patch wasn't in it, so
I've picked it up and will send it to Linus as soon as the test build
completes.

g.
___
devicetree-discuss mailing list
devicetree-discuss@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/devicetree-discuss


Re: [PATCH] of: Fix address decoding on Bimini and js2x machines

2013-07-04 Thread Benjamin Herrenschmidt
On Thu, 2013-07-04 at 17:18 +0100, Grant Likely wrote:
  I'll include this in my 3.11 pull request for Linus
 
 Oops. Ben, I misread what you wrote. It would have been just fine to
 include it in your powerpc -next branch. Sorry for the confusion.
 
 Anyway, I saw your powerpc pull req and that this patch wasn't in it, so
 I've picked it up and will send it to Linus as soon as the test build
 completes.

Yeah, I was about to add it to a subsequent fixes branch but since you
picked it up I'll just leave it.

Thanks !

Cheers,
Ben.
 

___
devicetree-discuss mailing list
devicetree-discuss@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/devicetree-discuss


[PATCH] of: Fix address decoding on Bimini and js2x machines

2013-07-03 Thread Benjamin Herrenschmidt
 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 b...@kernel.crashing.org
CC: sta...@vger.kernel.org [v3.6+]
---

Rob, if you have no objection I will put that in powerpc -next

diff --git a/drivers/of/address.c b/drivers/of/address.c
index 04da786..7c8221d 100644
--- a/drivers/of/address.c
+++ b/drivers/of/address.c
@@ -106,8 +106,12 @@ static unsigned int of_bus_default_get_flags(const __be32 *
 
 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,


___
devicetree-discuss mailing list
devicetree-discuss@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/devicetree-discuss


Re: [PATCH] of: Fix address decoding on Bimini and js2x machines

2013-07-03 Thread Rob Herring
On 07/03/2013 01:01 AM, Benjamin Herrenschmidt wrote:
  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 b...@kernel.crashing.org
 CC: sta...@vger.kernel.org [v3.6+]
 ---
 
 Rob, if you have no objection I will put that in powerpc -next

NP.

Acked-by: Rob Herring rob.herr...@calxeda.com

Rob

 
 diff --git a/drivers/of/address.c b/drivers/of/address.c
 index 04da786..7c8221d 100644
 --- a/drivers/of/address.c
 +++ b/drivers/of/address.c
 @@ -106,8 +106,12 @@ static unsigned int of_bus_default_get_flags(const 
 __be32 *
  
  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,
 
 

___
devicetree-discuss mailing list
devicetree-discuss@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/devicetree-discuss


Re: [PATCH] of: Fix address decoding on Bimini and js2x machines

2013-07-03 Thread Grant Likely
On Wed, Jul 3, 2013 at 3:10 PM, Rob Herring robherri...@gmail.com wrote:
 On 07/03/2013 01:01 AM, Benjamin Herrenschmidt wrote:
  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 b...@kernel.crashing.org
 CC: sta...@vger.kernel.org [v3.6+]
 ---

 Rob, if you have no objection I will put that in powerpc -next

 NP.

 Acked-by: Rob Herring rob.herr...@calxeda.com

I'll include this in my 3.11 pull request for Linus

g.
___
devicetree-discuss mailing list
devicetree-discuss@lists.ozlabs.org
https://lists.ozlabs.org/listinfo/devicetree-discuss