Skip to contentSkip to conversation

arm64: Add DT support for Juno r2 board

PATCH New Sudeep Holla 3 participants 7 messages Dec 23, 2015 – Jan 11, 2016

Subsystems (2)
Device tree bindings Arm/versatile express platform
lore
Share & tools
lore

Sudeep Holla

author
#0 lore raw

PATCH 1/1 arm64: Add DT support for Juno r2 board

Juno r2 is identical to Juno r1 with Cortex A57 cores replaced by Cortex A72 cores.

Acked-by Liviu Dudau <[email protected]>
Signed-off-by Sudeep Holla <[email protected]>
---
 Documentation/devicetree/bindings/arm/arm-boards |   1 +
 Documentation/devicetree/bindings/arm/cpus.txt   |   1 +
 arch/arm64/boot/dts/arm/Makefile                 |   2 +-
 arch/arm64/boot/dts/arm/juno-r2.dts              | 200 +++++++++++++++++++++++
 4 files changed, 203 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm64/boot/dts/arm/juno-r2.dts
Documentation/devicetree/bindings/arm/arm-boards +1 -0
index 1a709970e7f7..70601a58c433 100644
@@ -180,6 +180,7 @@ described under the RS1 memory mapping.
 Required properties (in root node):
 	compatible = "arm,juno";	/* For Juno r0 board */
 	compatible = "arm,juno-r1";	/* For Juno r1 board */
+	compatible = "arm,juno-r2";	/* For Juno r2 board */
 
 Required nodes:
 The description for the board must include:
Documentation/devicetree/bindings/arm/cpus.txt +1 -0
index 3a07a87fef20..58e240d75169 100644
@@ -157,6 +157,7 @@ nodes to be present and contain the properties described below.
 			    "arm,cortex-a17"
 			    "arm,cortex-a53"
 			    "arm,cortex-a57"
+			    "arm,cortex-a72"
 			    "arm,cortex-m0"
 			    "arm,cortex-m0+"
 			    "arm,cortex-m1"
arch/arm64/boot/dts/arm/Makefile +1 -1
index bb3c07209676..c0bf56b9ce3d 100644
@@ -1,5 +1,5 @@
 dtb-$(CONFIG_ARCH_VEXPRESS) += foundation-v8.dtb
-dtb-$(CONFIG_ARCH_VEXPRESS) += juno.dtb juno-r1.dtb
+dtb-$(CONFIG_ARCH_VEXPRESS) += juno.dtb juno-r1.dtb juno-r2.dtb
 dtb-$(CONFIG_ARCH_VEXPRESS) += rtsm_ve-aemv8a.dtb
 dtb-$(CONFIG_ARCH_VEXPRESS) += vexpress-v2f-1xv7-ca53x2.dtb
arch/arm64/boot/dts/arm/juno-r2.dts new file +200 -0

200 lines not on this page · raw message

Signature · 1 line
1.9.1
maintainer
#1 lore raw

PATCH 1/1 arm64: Add DT support for Juno r2 board

Quoted 2 lines · Sudeep Holla

Juno r2 is identical to Juno r1 with Cortex A57 cores replaced by Cortex A72 cores.

That's a bigger change than I'd expect...

Quoted 5 lines
Acked-by Liviu Dudau <[email protected]>
Signed-off-by Sudeep Holla <[email protected]>
---
 Documentation/devicetree/bindings/arm/arm-boards |   1 +
 Documentation/devicetree/bindings/arm/cpus.txt   |   1 +

This should probably be a separate patch, but I already have a patch in my tree for 4.5 adding arm,cortex-a72. So just drop this hunk.

Quoted 4 lines
 arch/arm64/boot/dts/arm/Makefile                 |   2 +-
 arch/arm64/boot/dts/arm/juno-r2.dts              | 200 +++++++++++++++++++++++
 4 files changed, 203 insertions(+), 1 deletion(-)
 create mode 100644 arch/arm64/boot/dts/arm/juno-r2.dts

[...]

arch/arm64/boot/dts/arm/juno-r2.dts line 155

Quoted 2 lines
arch/arm64/boot/dts/arm/juno-r2.dts new file +2 -0
+	pmu_a72 {
+		compatible = "arm,cortex-a72-pmu";

This needs to be documented.

arch/arm64/boot/dts/arm/juno-r2.dts line 177

Quoted 2 lines
arch/arm64/boot/dts/arm/juno-r2.dts new file +2 -0
+	pcie-controller at 40000000 {
+		compatible = "arm,juno-r1-pcie", "plda,xpressrich3-axi", "pci-host-ecam-generic";

Is this common with r1?

Rob

author
#2 lore raw

PATCH 1/1 arm64: Add DT support for Juno r2 board

Hi Rob,

Thanks for the review.

Quoted 6 lines · Rob Herring
Quoted 2 lines · Sudeep Holla

Juno r2 is identical to Juno r1 with Cortex A57 cores replaced by Cortex A72 cores.

That's a bigger change than I'd expect...

I am not sure if I understood what you meant by that. Do you want me to elaborate with more details ?

Quoted 9 lines
Quoted 5 lines
Acked-by Liviu Dudau <[email protected]>
Signed-off-by Sudeep Holla <[email protected]>
---
  Documentation/devicetree/bindings/arm/arm-boards |   1 +
  Documentation/devicetree/bindings/arm/cpus.txt   |   1 +

This should probably be a separate patch, but I already have a patch in my tree for 4.5 adding arm,cortex-a72. So just drop this hunk.

OK, will post DT binding separately.

Quoted 5 lines
Quoted 4 lines
  arch/arm64/boot/dts/arm/Makefile                 |   2 +-
  arch/arm64/boot/dts/arm/juno-r2.dts              | 200 +++++++++++++++++++++++
  4 files changed, 203 insertions(+), 1 deletion(-)

create mode 100644 arch/arm64/boot/dts/arm/juno-r2.dts

Quoted 7 lines

[...]

arch/arm64/boot/dts/arm/juno-r2.dts line 155

Quoted 2 lines
arch/arm64/boot/dts/arm/juno-r2.dts new file +2 -0
+	pmu_a72 {
+		compatible = "arm,cortex-a72-pmu";

This needs to be documented.

Yes, Will is already carrying a patch in his tree to add this [1]

Quoted 5 lines

arch/arm64/boot/dts/arm/juno-r2.dts line 177

Quoted 2 lines
arch/arm64/boot/dts/arm/juno-r2.dts new file +2 -0
+	pcie-controller at 40000000 {
+		compatible = "arm,juno-r1-pcie", "plda,xpressrich3-axi", "pci-host-ecam-generic";

Is this common with r1?

AFAIK it is. Liviu can you confirm ?

Regards,
Sudeep

[1]
https://git.kernel.org/cgit/linux/kernel/git/arm64/linux.git/commit/?h=for-next/perf&id=5d7ee87708d4d86fcc32afc9552d05f7625d303d

maintainer
#3 lore raw

PATCH 1/1 arm64: Add DT support for Juno r2 board

Quoted 12 lines · Sudeep Holla

Hi Rob,

Thanks for the review.

Quoted 7 lines · Rob Herring
Quoted 3 lines · Sudeep Holla

Juno r2 is identical to Juno r1 with Cortex A57 cores replaced by Cortex A72 cores.

Quoted 5 lines
Quoted 2 lines

That's a bigger change than I'd expect...

I am not sure if I understood what you meant by that. Do you want me to elaborate with more details ?

No, just my commentary that I'd expect r1 -> r2 to be a board or Si spin rather than a whole new core.

Quoted 7 lines
Quoted 7 lines
Quoted 5 lines
Acked-by Liviu Dudau <[email protected]>
Signed-off-by Sudeep Holla <[email protected]>
---
  Documentation/devicetree/bindings/arm/arm-boards |   1 +
  Documentation/devicetree/bindings/arm/cpus.txt   |   1 +
Quoted 5 lines
Quoted 3 lines

This should probably be a separate patch, but I already have a patch in my tree for 4.5 adding arm,cortex-a72. So just drop this hunk.

OK, will post DT binding separately.

No need, it is already in my tree.

Quoted 9 lines
Quoted 7 lines
Quoted 3 lines
(quoted diff) +2 -0
+       pcie-controller at 40000000 {
+               compatible = "arm,juno-r1-pcie", "plda,xpressrich3-axi",

"pci-host-ecam-generic";

Is this common with r1?

AFAIK it is. Liviu can you confirm ?

Then perhaps you should move this to a common spot.

Rob

author
#4 lore raw

PATCH 1/1 arm64: Add DT support for Juno r2 board

Quoted 13 lines · Rob Herring
Quoted 12 lines · Sudeep Holla

Hi Rob,

Thanks for the review.

Quoted 7 lines · Rob Herring
Quoted 3 lines · Sudeep Holla

Juno r2 is identical to Juno r1 with Cortex A57 cores replaced by Cortex A72 cores.

Quoted 9 lines
Quoted 5 lines
Quoted 2 lines

That's a bigger change than I'd expect...

I am not sure if I understood what you meant by that. Do you want me to elaborate with more details ?

No, just my commentary that I'd expect r1 -> r2 to be a board or Si spin rather than a whole new core.

Ah OK, yes it's new Si and has other minor updates like latest revisions of Cortex-A53 and other IPs. I just mentioned only the DT visible changes in the commit log.

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 5 lines
Acked-by Liviu Dudau <[email protected]>
Signed-off-by Sudeep Holla <[email protected]>
---
   Documentation/devicetree/bindings/arm/arm-boards |   1 +
   Documentation/devicetree/bindings/arm/cpus.txt   |   1 +
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

This should probably be a separate patch, but I already have a patch in my tree for 4.5 adding arm,cortex-a72. So just drop this hunk.

OK, will post DT binding separately.

No need, it is already in my tree.

Sorry for not being clear earlier. I was referring the "arm,juno-r2" compatible addition. I assume you have no objection if it's part of the same patch.

Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 3 lines
(quoted diff) +2 -0
+       pcie-controller at 40000000 {
+               compatible = "arm,juno-r1-pcie", "plda,xpressrich3-axi",

"pci-host-ecam-generic";

Quoted 7 lines
Quoted 4 lines
Quoted 2 lines

Is this common with r1?

AFAIK it is. Liviu can you confirm ?

Then perhaps you should move this to a common spot.

True, will wait for Liviu's response.

Signature · 2 lines
Regards,
Sudeep
maintainer
#5 lore raw

PATCH 1/1 arm64: Add DT support for Juno r2 board

Quoted 58 lines · Sudeep Holla
Quoted 13 lines · Rob Herring
Quoted 12 lines · Sudeep Holla

Hi Rob,

Thanks for the review.

Quoted 7 lines · Rob Herring
Quoted 3 lines · Sudeep Holla

Juno r2 is identical to Juno r1 with Cortex A57 cores replaced by Cortex A72 cores.

Quoted 9 lines
Quoted 5 lines
Quoted 2 lines

That's a bigger change than I'd expect...

I am not sure if I understood what you meant by that. Do you want me to elaborate with more details ?

No, just my commentary that I'd expect r1 -> r2 to be a board or Si spin rather than a whole new core.

Ah OK, yes it's new Si and has other minor updates like latest revisions of Cortex-A53 and other IPs. I just mentioned only the DT visible changes in the commit log.

Quoted 7 lines
Quoted 7 lines
Quoted 7 lines
Quoted 5 lines
Acked-by Liviu Dudau <[email protected]>
Signed-off-by Sudeep Holla <[email protected]>
---
  Documentation/devicetree/bindings/arm/arm-boards |   1 +
  Documentation/devicetree/bindings/arm/cpus.txt   |   1 +
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

This should probably be a separate patch, but I already have a patch in my tree for 4.5 adding arm,cortex-a72. So just drop this hunk.

OK, will post DT binding separately.

No need, it is already in my tree.

Sorry for not being clear earlier. I was referring the "arm,juno-r2" compatible addition. I assume you have no objection if it's part of the same patch.

Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
Quoted 3 lines
(quoted diff) +2 -0
+       pcie-controller at 40000000 {
+               compatible = "arm,juno-r1-pcie", "plda,xpressrich3-axi",

"pci-host-ecam-generic";

Is this common with r1?

Quoted 6 lines
Quoted 4 lines
Quoted 1 line

AFAIK it is. Liviu can you confirm ?

Then perhaps you should move this to a common spot.

True, will wait for Liviu's response.

AFAIK Juno r2 should have identical PCIe controller to r1. I have not been able to test it myself but at the same time I have no information on any changes applied to the IP.

Sudeep, probably worth moving the pcie-controller at 40000000 node in juno-base.dtsi and disable it by default, then re-enable in juno-r1.dts and juno-r2.dts.

Best regards,
Liviu

Quoted 5 lines
Signature · 3 lines
-- 
Regards,
Sudeep
Signature · 8 lines
====================
| I would like to |
| fix the world,  |
| but they're not |
| giving me the   |
 \ source code!  /
  ---------------
    ?\_(?)_/?
author
#6 lore raw

PATCH 1/1 arm64: Add DT support for Juno r2 board

Quoted 1 line · Liviu Dudau

On Wed, Dec 30, 2015 at 03:34:09PM +0000, Sudeep Holla wrote:

[...]

Quoted 6 lines
Quoted 6 lines
Quoted 5 lines
Quoted 2 lines

AFAIK it is. Liviu can you confirm ?

Then perhaps you should move this to a common spot.

Quoted 9 lines
Quoted 1 line

True, will wait for Liviu's response.

AFAIK Juno r2 should have identical PCIe controller to r1. I have not been able to test it myself but at the same time I have no information on any changes applied to the IP.

Sudeep, probably worth moving the pcie-controller at 40000000 node in juno-base.dtsi and disable it by default, then re-enable in juno-r1.dts and juno-r2.dts.

Yes, that's exactly what I though as it's present even on R0 but disabled due to H/W bug. I will do that and repost after merge window.

Signature · 2 lines
Regards,
Sudeep