Skip to contentSkip to conversation

ARM RealView DeviceTree support v6

PATCH New Linus Walleij 5 participants 23 messages Sep 8, 2014 – Jan 13, 2015

Subsystems (9)
lore
Share & tools
lore
#0 lore raw

cover ARM RealView DeviceTree support v6

I've updated the RealView DeviceTree patch again.

Main changes:
- Calculate cache associativity from ePAPR definitions
- Rely on the l2c_aux_[mask|val] from the DT_MACHINE
- Add cache line size to device tree

Florian Fainelli (1):
ARM: l2c: parse 'cache-size' and 'cache-sets' properties

Linus Walleij (6):
leds: add a driver for syscon-based LEDs
leds: add device tree bindings for register bit LEDs
power: reset: driver for the Versatile syscon reboot
soc: add driver for the ARM RealView
ARM: l2x0: calculate associativity from ePAPR cache props
ARM: realview: basic device tree implementation

 Documentation/devicetree/bindings/arm/arm-boards   |  65 ++++++
 Documentation/devicetree/bindings/arm/gic.txt      |   1 +
 Documentation/devicetree/bindings/arm/l2cc.txt     |   2 +
 .../devicetree/bindings/leds/register-bit-led.txt  |  99 +++++++++
 arch/arm/boot/dts/Makefile                         |   1 +
 arch/arm/boot/dts/arm-realview-pb1176.dts          | 246 +++++++++++++++++++++
 arch/arm/mach-realview/Kconfig                     |  13 ++
 arch/arm/mach-realview/Makefile                    |   1 +
 arch/arm/mach-realview/realview-dt.c               |  32 +++
 arch/arm/mm/cache-l2x0.c                           | 111 ++++++++++
 drivers/irqchip/irq-gic.c                          |   2 +
 drivers/leds/Kconfig                               |  10 +
 drivers/leds/Makefile                              |   1 +
 drivers/leds/leds-syscon.c                         | 165 ++++++++++++++
 drivers/power/reset/Kconfig                        |   9 +
 drivers/power/reset/Makefile                       |   1 +
 drivers/power/reset/arm-versatile-reboot.c         | 111 ++++++++++
 drivers/soc/Kconfig                                |   1 +
 drivers/soc/Makefile                               |   1 +
 drivers/soc/versatile/Kconfig                      |  10 +
 drivers/soc/versatile/Makefile                     |   1 +
 drivers/soc/versatile/soc-realview.c               | 144 ++++++++++++
 22 files changed, 1027 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/leds/register-bit-led.txt
 create mode 100644 arch/arm/boot/dts/arm-realview-pb1176.dts
 create mode 100644 arch/arm/mach-realview/realview-dt.c
 create mode 100644 drivers/leds/leds-syscon.c
 create mode 100644 drivers/power/reset/arm-versatile-reboot.c
 create mode 100644 drivers/soc/versatile/Kconfig
 create mode 100644 drivers/soc/versatile/Makefile
 create mode 100644 drivers/soc/versatile/soc-realview.c
Signature · 1 line
1.9.3
#1 lore raw

PATCH v6 1/7 leds: add a driver for syscon-based LEDs

This makes it possible to create a set of LEDs from a syscon MFD instance, which is lean mean and clean on the ARM reference designs and can replace the Versatile LEDs driver in the long run, as well as other custom syscon LEDs drivers.

Cc Bryan Wu <[email protected]>
Cc Richard Purdie <[email protected]>

---
ChangeLog v1->v2:
- Augment driver to probe all nodes of a syscon to see if they are "register-bit-led"s, and then allocate them under the syscon if that is the case.
- Switch compatible string from "syscon-leds" to "register-bit-led"

---
 drivers/leds/Kconfig       |  10 +++
 drivers/leds/Makefile      |   1 +
 drivers/leds/leds-syscon.c | 165 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 176 insertions(+)
 create mode 100644 drivers/leds/leds-syscon.c
drivers/leds/Kconfig +10 -0
index 8c96e2ddf43b..ea05b6e2ea58 100644
@@ -478,6 +478,16 @@ config LEDS_BLINKM
 	  This option enables support for the BlinkM RGB LED connected
 	  through I2C. Say Y to enable support for the BlinkM LED.
 
+config LEDS_SYSCON
+	bool "LED support for LEDs on system controllers"
+	depends on LEDS_CLASS
+	depends on MFD_SYSCON
+	depends on OF
+	help
+	  This option enabled support for the LEDs on syscon type
+	  devices. This will only work with device tree enabled
+	  devices.
+
 config LEDS_VERSATILE
 	tristate "LED support for the ARM Versatile and RealView"
 	depends on ARCH_REALVIEW || ARCH_VERSATILE
drivers/leds/Makefile +1 -0
index d8cc5f2777de..822dd83ef97a 100644
@@ -53,6 +53,7 @@ obj-$(CONFIG_LEDS_ASIC3)		+= leds-asic3.o
 obj-$(CONFIG_LEDS_MAX8997)		+= leds-max8997.o
 obj-$(CONFIG_LEDS_LM355x)		+= leds-lm355x.o
 obj-$(CONFIG_LEDS_BLINKM)		+= leds-blinkm.o
+obj-$(CONFIG_LEDS_SYSCON)		+= leds-syscon.o
 obj-$(CONFIG_LEDS_VERSATILE)		+= leds-versatile.o
 
 # LED SPI Drivers
drivers/leds/leds-syscon.c new file +165 -0

165 lines not on this page · raw message

Signature · 1 line
1.9.3
#2 lore raw

PATCH v6 1/7 leds: add a driver for syscon-based LEDs

Quoted 8 lines · Linus Walleij

This makes it possible to create a set of LEDs from a syscon MFD instance, which is lean mean and clean on the ARM reference designs and can replace the Versatile LEDs driver in the long run, as well as other custom syscon LEDs drivers.

Cc Bryan Wu <[email protected]>
Cc Richard Purdie <[email protected]>
Quoted 6 lines

---
ChangeLog v1->v2:
- Augment driver to probe all nodes of a syscon to see if they are "register-bit-led"s, and then allocate them under the syscon if that is the case.
- Switch compatible string from "syscon-leds" to "register-bit-led"

Bryan can you please ACK this patch if you're OK with it so it can be pulled in through ARM SoC?

Yours,
Linus Walleij

#3 lore raw

PATCH v6 1/7 leds: add a driver for syscon-based LEDs

Quoted 17 lines · Linus Walleij
Quoted 8 lines · Linus Walleij

This makes it possible to create a set of LEDs from a syscon MFD instance, which is lean mean and clean on the ARM reference designs and can replace the Versatile LEDs driver in the long run, as well as other custom syscon LEDs drivers.

Cc Bryan Wu <[email protected]>
Cc Richard Purdie <[email protected]>
Quoted 6 lines

---
ChangeLog v1->v2:
- Augment driver to probe all nodes of a syscon to see if they are "register-bit-led"s, and then allocate them under the syscon if that is the case.
- Switch compatible string from "syscon-leds" to "register-bit-led"

Quoted 2 lines

Bryan can you please ACK this patch if you're OK with it so it can be pulled in through ARM SoC?

Ping!

I will send a pull request for this soon anyway.

Yours,
Linus Walleij

#4 lore raw

PATCH v6 1/7 leds: add a driver for syscon-based LEDs

Quoted 21 lines · Linus Walleij
Quoted 17 lines · Linus Walleij
Quoted 8 lines · Linus Walleij

This makes it possible to create a set of LEDs from a syscon MFD instance, which is lean mean and clean on the ARM reference designs and can replace the Versatile LEDs driver in the long run, as well as other custom syscon LEDs drivers.

Cc Bryan Wu <[email protected]>
Cc Richard Purdie <[email protected]>
Quoted 6 lines

---
ChangeLog v1->v2:
- Augment driver to probe all nodes of a syscon to see if they are "register-bit-led"s, and then allocate them under the syscon if that is the case.
- Switch compatible string from "syscon-leds" to "register-bit-led"

Quoted 2 lines

Bryan can you please ACK this patch if you're OK with it so it can be pulled in through ARM SoC?

Quoted 6 lines

Ping!

I will send a pull request for this soon anyway.

Yours,
Linus Walleij

So sorry about this, my Gmail filter out this email. I have no problem with this.
-Bryan

#5 lore raw

PATCH v6 2/7 leds: add device tree bindings for register bit LEDs

In reply to Linus Walleij

This adds the device tree bindings used by register bit LEDs.

Cc devicetree at vger.kernel.org
Cc Bryan Wu <[email protected]>
Cc Richard Purdie <[email protected]>

---
ChangeLog v1->v2:
- Rename binding "register-bit-led"
- Define that such nodes appear only as children of syscon
- Group required and optional parameters
- Number nodes as foo@<offset>.<bit>
- Update example

---
 .../devicetree/bindings/leds/register-bit-led.txt  | 99 ++++++++++++++++++++++
 1 file changed, 99 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/leds/register-bit-led.txt
Documentation/devicetree/bindings/leds/register-bit-led.txt new file +99 -0
new file mode 100644
index 000000000000..379cefdc0bda
@@ -0,0 +1,99 @@
+Device Tree Bindings for Register Bit LEDs
+
+Register bit leds are used with syscon multifunctional devices
+where single bits in a certain register can turn on/off a
+single LED. The register bit LEDs appear as children to the
+syscon device, with the proper compatible string. For the
+syscon bindings see:
+Documentation/devicetree/bindings/mfd/syscon.txt
+
+Each LED is represented as a sub-node of the syscon device. Each
+node's name represents the name of the corresponding LED.
+
+LED sub-node properties:
+
+Required properties:
+- compatible : must be "register-bit-led"
+- offset : register offset to the register controlling this LED
+- mask : bit mask for the bit controlling this LED in the register
+  typically 0x01, 0x02, 0x04 ...
+
+Optional properties:
+- label : (optional)
+  see Documentation/devicetree/bindings/leds/common.txt
+- linux,default-trigger : (optional)
+  see Documentation/devicetree/bindings/leds/common.txt
+- default-state: (optional) The initial state of the LED. Valid
+  values are "on", "off", and "keep". If the LED is already on or off
+  and the default-state property is set the to same value, then no
+  glitch should be produced where the LED momentarily turns off (or
+  on). The "keep" setting will keep the LED at whatever its current
+  state is, without producing a glitch.  The default is off if this
+  property is not present.
+
+Example:
+
+syscon: syscon at 10000000 {
+	compatible = "arm,realview-pb1176-syscon", "syscon";
+	reg = <0x10000000 0x1000>;
+
+	led at 08.0 {
+		compatible = "register-bit-led";
+		offset = <0x08>;
+		mask = <0x01>;
+		label = "versatile:0";
+		linux,default-trigger = "heartbeat";
+		default-state = "on";
+	};
+	led at 08.1 {
+		compatible = "register-bit-led";
+		offset = <0x08>;
+		mask = <0x02>;
+		label = "versatile:1";
+		linux,default-trigger = "mmc0";
+		default-state = "off";
+	};
+	led at 08.2 {
+		compatible = "register-bit-led";
+		offset = <0x08>;
+		mask = <0x04>;
+		label = "versatile:2";
+		linux,default-trigger = "cpu0";
+		default-state = "off";
+	};
+	led at 08.3 {
+		compatible = "register-bit-led";
+		offset = <0x08>;
+		mask = <0x08>;
+		label = "versatile:3";
+		default-state = "off";
+	};
+	led at 08.4 {
+		compatible = "register-bit-led";
+		offset = <0x08>;
+		mask = <0x10>;
+		label = "versatile:4";
+		default-state = "off";
+	};
+	led at 08.5 {
+		compatible = "register-bit-led";
+		offset = <0x08>;
+		mask = <0x20>;
+		label = "versatile:5";
+		default-state = "off";
+	};
+	led at 08.6 {
+		compatible = "register-bit-led";
+		offset = <0x08>;
+		mask = <0x40>;
+		label = "versatile:6";
+		default-state = "off";
+	};
+	led at 08.7 {
+		compatible = "register-bit-led";
+		offset = <0x08>;
+		mask = <0x80>;
+		label = "versatile:7";
+		default-state = "off";
+	};
+};
Signature · 1 line
1.9.3
#6 lore raw

PATCH v6 3/7 power: reset: driver for the Versatile syscon reboot

In reply to Linus Walleij

This driver enabled us to drive the reboot of the Versatile family of ARM reference boards. Even though only the RealView boards are supported initially, these boards all have the same procedure for reboot:

- Write a magic value into an unlocking register
- Write another magic value into a reset control register

The driver will be reusable for Versatile and possibly also the Integrator family of reference boards.

Cc Sebastian Reichel <[email protected]>
Cc Dmitry Eremin-Solenikov <[email protected]>
Cc David Woodhouse <[email protected]>

---
ChangeLog v1->v2:
- Do not probe from a platform device, instead use a device_initcall() and look up the syscon device from its node. If that device is not yet registered, the call will be deferred. This is done so that the Linux driver model is not reflected into the device tree, as the reboot property of the syscon is not a separate device.

---
 drivers/power/reset/Kconfig                |   9 +++
 drivers/power/reset/Makefile               |   1 +
 drivers/power/reset/arm-versatile-reboot.c | 111 +++++++++++++++++++++++++++++
 3 files changed, 121 insertions(+)
 create mode 100644 drivers/power/reset/arm-versatile-reboot.c
drivers/power/reset/Kconfig +9 -0
index ca41523bbebf..2447c76e2f1a 100644
@@ -75,6 +75,15 @@ config POWER_RESET_SUN6I
 	help
 	  Reboot support for the Allwinner A31 SoCs.
 
+config POWER_RESET_VERSATILE
+	bool "ARM Versatile family reboot driver"
+	depends on ARM
+	depends on MFD_SYSCON
+	depends on OF
+	help
+	  Power off and restart support for ARM Versatile family of
+	  reference boards.
+
 config POWER_RESET_VEXPRESS
 	bool "ARM Versatile Express power-off and reset driver"
 	depends on ARM || ARM64
drivers/power/reset/Makefile +1 -0
index a42e70edd037..41ab0e7b92b8 100644
@@ -7,6 +7,7 @@ obj-$(CONFIG_POWER_RESET_MSM) += msm-poweroff.o
 obj-$(CONFIG_POWER_RESET_QNAP) += qnap-poweroff.o
 obj-$(CONFIG_POWER_RESET_RESTART) += restart-poweroff.o
 obj-$(CONFIG_POWER_RESET_SUN6I) += sun6i-reboot.o
+obj-$(CONFIG_POWER_RESET_VERSATILE) += arm-versatile-reboot.o
 obj-$(CONFIG_POWER_RESET_VEXPRESS) += vexpress-poweroff.o
 obj-$(CONFIG_POWER_RESET_XGENE) += xgene-reboot.o
 obj-$(CONFIG_POWER_RESET_KEYSTONE) += keystone-reset.o
drivers/power/reset/arm-versatile-reboot.c new file +111 -0

111 lines not on this page · raw message

Signature · 1 line
1.9.3
#7 lore raw

PATCH v6 3/7 power: reset: driver for the Versatile syscon reboot

Quoted 16 lines · Linus Walleij

This driver enabled us to drive the reboot of the Versatile family of ARM reference boards. Even though only the RealView boards are supported initially, these boards all have the same procedure for reboot:

- Write a magic value into an unlocking register
- Write another magic value into a reset control register

The driver will be reusable for Versatile and possibly also the Integrator family of reference boards.

Cc Sebastian Reichel <[email protected]>
Cc Dmitry Eremin-Solenikov <[email protected]>
Cc David Woodhouse <[email protected]>
Quoted 7 lines

---
ChangeLog v1->v2:
- Do not probe from a platform device, instead use a device_initcall() and look up the syscon device from its node. If that device is not yet registered, the call will be deferred. This is done so that the Linux driver model is not reflected into the device tree, as the reboot property of the syscon is not a separate device.

Can any of the power maintainers please ACK this patch if it looks OK, so it can be pulled in through ARM SoC?

Yours,
Linus Walleij

#8 lore raw

PATCH v6 3/7 power: reset: driver for the Versatile syscon reboot

Quoted 25 lines · Linus Walleij
Quoted 16 lines · Linus Walleij

This driver enabled us to drive the reboot of the Versatile family of ARM reference boards. Even though only the RealView boards are supported initially, these boards all have the same procedure for reboot:

- Write a magic value into an unlocking register
- Write another magic value into a reset control register

The driver will be reusable for Versatile and possibly also the Integrator family of reference boards.

Cc Sebastian Reichel <[email protected]>
Cc Dmitry Eremin-Solenikov <[email protected]>
Cc David Woodhouse <[email protected]>
Quoted 7 lines

---
ChangeLog v1->v2:
- Do not probe from a platform device, instead use a device_initcall() and look up the syscon device from its node. If that device is not yet registered, the call will be deferred. This is done so that the Linux driver model is not reflected into the device tree, as the reboot property of the syscon is not a separate device.

Quoted 2 lines

Can any of the power maintainers please ACK this patch if it looks OK, so it can be pulled in through ARM SoC?

Sorry for the delay:

-- Sebastian
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140915/decd54cf/attachment.sig>

#9 lore raw

PATCH v6 4/7 soc: add driver for the ARM RealView

In reply to Linus Walleij

This adds a SoC driver to be used by the ARM RealView reference boards. We create the "versatile" directory to hold the different ARM reference designs as per the pattern of the clk directory layout. The driver utilze the syscon to get to the register needed. After this we can use sysfs to get at some SoC properties on RealView DT variants like this:

Quoted 2 lines

cd /sysbus/soc/devices/soc0
ls

board         family        machine       power         subsystem
build         fpga          manufacturer  soc_id        uevent
Quoted 1 line

cat family

Versatile

Quoted 1 line

cat fpga

Multi-layer AXI

Quoted 1 line

cat board

HBI-0147

Quoted 1 line

cat build

03

---
 drivers/soc/Kconfig                  |   1 +
 drivers/soc/Makefile                 |   1 +
 drivers/soc/versatile/Kconfig        |  10 +++
 drivers/soc/versatile/Makefile       |   1 +
 drivers/soc/versatile/soc-realview.c | 144 +++++++++++++++++++++++++++++++++++
 5 files changed, 157 insertions(+)
 create mode 100644 drivers/soc/versatile/Kconfig
 create mode 100644 drivers/soc/versatile/Makefile
 create mode 100644 drivers/soc/versatile/soc-realview.c
drivers/soc/Kconfig +1 -0
index c8543855aa82..6ed3590253cf 100644
@@ -1,5 +1,6 @@
 menu "SOC (System On Chip) specific Drivers"
 
 source "drivers/soc/qcom/Kconfig"
+source "drivers/soc/versatile/Kconfig"
 
 endmenu
drivers/soc/Makefile +1 -0
index 3b1b95d932d1..d20d8f625732 100644
@@ -4,3 +4,4 @@
 
 obj-$(CONFIG_ARCH_QCOM)		+= qcom/
 obj-$(CONFIG_ARCH_TEGRA)	+= tegra/
+obj-$(CONFIG_PLAT_VERSATILE)	+= versatile/
drivers/soc/versatile/Kconfig new file +10 -0
new file mode 100644
index 000000000000..bf5ee9c85330
@@ -0,0 +1,10 @@
+#
+# ARM Versatile SoC drivers
+#
+config SOC_REALVIEW
+	bool "SoC bus device for the ARM RealView platforms"
+	depends on ARCH_REALVIEW
+	select SOC_BUS
+	help
+	  Include support for the SoC bus on the ARM RealView platforms
+	  providing some sysfs information about the ASIC variant.
drivers/soc/versatile/Makefile new file +1 -0
new file mode 100644
index 000000000000..ad547435648e
@@ -0,0 +1 @@
+obj-$(CONFIG_SOC_REALVIEW)	+= soc-realview.o
drivers/soc/versatile/soc-realview.c new file +144 -0

144 lines not on this page · raw message

Signature · 1 line
1.9.3
#10 lore raw

PATCH v6 5/7 ARM: l2c: parse 'cache-size' and 'cache-sets' properties

In reply to Linus Walleij

From: Florian Fainelli <[email protected]>

When both 'cache-size' and 'cache-sets' are specified for a L2 cache controller node, parse those properties and set up the way_size based on which type of L2 cache controller we are using.

Update the L2 cache controller Device Tree binding with the optional 'cache-size' and 'cache-sets' properties. These both come from the ePAPR specification.

---
 Documentation/devicetree/bindings/arm/l2cc.txt |  2 +
 arch/arm/mm/cache-l2x0.c                       | 61 ++++++++++++++++++++++++++
 2 files changed, 63 insertions(+)
Documentation/devicetree/bindings/arm/l2cc.txt +2 -0
index af527ee111c2..d33ed2344c7e 100644
@@ -44,6 +44,8 @@ Optional properties:
   I/O coherent mode. Valid only when the arm,pl310-cache compatible
   string is used.
 - interrupts : 1 combined interrupt.
+- cache-size : specifies the size in bytes of the cache
+- cache-sets : specifies the number of associativity sets of the cache
 - cache-id-part: cache id part number to be used if it is not present
   on hardware
 - wt-override: If present then L2 is forced to Write through mode
arch/arm/mm/cache-l2x0.c +61 -0

85 lines not on this page · raw message

Signature · 1 line
1.9.3
maintainer
#11 lore raw

PATCH v6 5/7 ARM: l2c: parse 'cache-size' and 'cache-sets' properties

arch/arm/mm/cache-l2x0.c static int l2_wt_override; · line 962

Quoted 7 lines · On Monday 08 September 2014 13:38:04 Linus Walleij wrote:
arch/arm/mm/cache-l2x0.c +7 -0
+       of_property_read_u32(np, "cache-size", &size);
+       of_property_read_u32(np, "cache-sets", &sets);
+
+       if (!size || !sets)
+               return;
+
+       way_size = size / sets;

Going back to this one: Isn't (size / sets) the set-size rather than the way-size?

After we discussed this on IRC, I had expected a calculation like

	set_size = size / sets;
	ways = set_size / line_size;
	way_size = size / ways;

	Arnd
#12 lore raw

PATCH v6 5/7 ARM: l2c: parse 'cache-size' and 'cache-sets' properties

Quoted 12 lines · Arnd Bergmann

arch/arm/mm/cache-l2x0.c static int l2_wt_override; · line 962

Quoted 7 lines · On Monday 08 September 2014 13:38:04 Linus Walleij wrote:
arch/arm/mm/cache-l2x0.c +7 -0
+       of_property_read_u32(np, "cache-size", &size);
+       of_property_read_u32(np, "cache-sets", &sets);
+
+       if (!size || !sets)
+               return;
+
+       way_size = size / sets;

Going back to this one: Isn't (size / sets) the set-size rather than the way-size?

Quoted 5 lines

After we discussed this on IRC, I had expected a calculation like

        set_size = size / sets;
        ways = set_size / line_size;
        way_size = size / ways;

First: in this PB1176 case:

set_size = 128K/8 = 16K
ways = 16K/32 = 512 bytes
way_size = 128K/512 = 128 bytes

Well maybe it's the ARM reference manual internal lingo that is actually causing the confusion here. It will say something like:

[19:17] Way-size 3?b000 = Reserved, internally mapped to 16KB 3?b001 = 16KB, this is the default value
3?b010 = 32KB
3?b011 = 64KB
3?b100 = 128KB
3?b101 = 256KB
3?b110 to 3?b111 = Reserved, internally mapped to 256 KB

OK way-size ... is in the 16 thru 256KB range, which fits nicely with set size incidentally. And also corresponds to current comments in the code such as this from arch/arm/mach-realview/realview_pb1176.c:

#ifdef CONFIG_CACHE_L2X0
/*
* The PL220 needs to be manually configured as the hardware
* doesn't report the correct sizes.
* 128kB (16kB/way), 8-way associativity, event monitor and
* parity enabled, ignore share bit, no force write allocate
* Bits: .... ...0 0111 0011 0000 .... .... .... */
l2x0_init(__io_address(REALVIEW_PB1176_L220_BASE), 0x00730000,
0xfe000fff);
#endif

I can add a comment explaining that ARMs terminology does not match the academic terminology or something, and say that the thing we poke into "way-size" is actually "set size", if we agree that is what we're seeing here.

Florian: what was your interpretation?

Yours,
Linus Walleij

maintainer
#13 lore raw

PATCH v6 5/7 ARM: l2c: parse 'cache-size' and 'cache-sets' properties

Quoted 19 lines · On Monday 08 September 2014 14:36:48 Linus Walleij wrote:
Quoted 12 lines · Arnd Bergmann

arch/arm/mm/cache-l2x0.c static int l2_wt_override; · line 962

Quoted 7 lines · On Monday 08 September 2014 13:38:04 Linus Walleij wrote:
arch/arm/mm/cache-l2x0.c +7 -0
+       of_property_read_u32(np, "cache-size", &size);
+       of_property_read_u32(np, "cache-sets", &sets);
+
+       if (!size || !sets)
+               return;
+
+       way_size = size / sets;

Going back to this one: Isn't (size / sets) the set-size rather than the way-size?

Quoted 5 lines

After we discussed this on IRC, I had expected a calculation like

        set_size = size / sets;
        ways = set_size / line_size;
        way_size = size / ways;
Quoted 5 lines

First: in this PB1176 case:

set_size = 128K/8 = 16K
ways = 16K/32 = 512 bytes
way_size = 128K/512 = 128 bytes

I guess we should first try to find the right units so we know what we are talking about. I was under the impression that the set size is the number of bytes in a set, while 'ways' is counting the associativity and has no unit.

The last line also seems to incorrectly computed. Dividing 128KB by 512 bytes should be 256 (no unit).

Quoted 17 lines

Well maybe it's the ARM reference manual internal lingo that is actually causing the confusion here. It will say something like:

[19:17] Way-size 3?b000 = Reserved, internally mapped to 16KB 3?b001 = 16KB, this is the default value
3?b010 = 32KB
3?b011 = 64KB
3?b100 = 128KB
3?b101 = 256KB
3?b110 to 3?b111 = Reserved, internally mapped to 256 KB

OK way-size ... is in the 16 thru 256KB range, which fits nicely with set size incidentally. And also corresponds to current comments in the code such as this from arch/arm/mach-realview/realview_pb1176.c:

Quoted 11 lines

#ifdef CONFIG_CACHE_L2X0
/*
* The PL220 needs to be manually configured as the hardware
* doesn't report the correct sizes.
* 128kB (16kB/way), 8-way associativity, event monitor and
* parity enabled, ignore share bit, no force write allocate
* Bits: .... ...0 0111 0011 0000 .... .... .... */
l2x0_init(__io_address(REALVIEW_PB1176_L220_BASE), 0x00730000,
0xfe000fff);
#endif

16KB way-size seems realistic, yes.

Quoted 4 lines

I can add a comment explaining that ARMs terminology does not match the academic terminology or something, and say that the thing we poke into "way-size" is actually "set size", if we agree that is what we're seeing here.

Let's see again: 16KB way-size * 8 ways = 128KB, that seems correct. 16KB way-size / 32B line-size = 512 sets, that also seems realistic. 128KB cache-size / 512 sets = 256B set-size. 256B / 32B = 8 ways, so everything fits together.

Now in the code:

+ of_property_read_u32(np, "cache-size", &size);

131072

+ of_property_read_u32(np, "cache-sets", &sets);

512

+
+ if (!size || !sets)
+ return;
+
+ way_size = size / sets;

256 -> impossible.

         set_size = size / sets;

256

         ways = set_size / line_size;

8

         way_size = size / ways;

16KB -> ok

Arnd

#14 lore raw

PATCH v6 5/7 ARM: l2c: parse 'cache-size' and 'cache-sets' properties

Quoted 22 lines · Arnd Bergmann
Quoted 21 lines · On Monday 08 September 2014 14:36:48 Linus Walleij wrote:
Quoted 12 lines · Arnd Bergmann

arch/arm/mm/cache-l2x0.c static int l2_wt_override; · line 962

Quoted 7 lines · On Monday 08 September 2014 13:38:04 Linus Walleij wrote:
arch/arm/mm/cache-l2x0.c +7 -0
+       of_property_read_u32(np, "cache-size", &size);
+       of_property_read_u32(np, "cache-sets", &sets);
+
+       if (!size || !sets)
+               return;
+
+       way_size = size / sets;

Going back to this one: Isn't (size / sets) the set-size rather than the way-size?

Quoted 5 lines

After we discussed this on IRC, I had expected a calculation like

        set_size = size / sets;
        ways = set_size / line_size;
        way_size = size / ways;

First: in this PB1176 case:

Quoted 8 lines
Quoted 3 lines

set_size = 128K/8 = 16K
ways = 16K/32 = 512 bytes
way_size = 128K/512 = 128 bytes

I guess we should first try to find the right units so we know what we are talking about. I was under the impression that the set size is the number of bytes in a set, while 'ways' is counting the associativity and has no unit.

I agree with that.

Quoted 68 lines

The last line also seems to incorrectly computed. Dividing 128KB by 512 bytes should be 256 (no unit).

Quoted 17 lines

Well maybe it's the ARM reference manual internal lingo that is actually causing the confusion here. It will say something like:

[19:17] Way-size 3?b000 = Reserved, internally mapped to 16KB 3?b001 = 16KB, this is the default value
3?b010 = 32KB
3?b011 = 64KB
3?b100 = 128KB
3?b101 = 256KB
3?b110 to 3?b111 = Reserved, internally mapped to 256 KB

OK way-size ... is in the 16 thru 256KB range, which fits nicely with set size incidentally. And also corresponds to current comments in the code such as this from arch/arm/mach-realview/realview_pb1176.c:

Quoted 11 lines

#ifdef CONFIG_CACHE_L2X0
/*
* The PL220 needs to be manually configured as the hardware
* doesn't report the correct sizes.
* 128kB (16kB/way), 8-way associativity, event monitor and
* parity enabled, ignore share bit, no force write allocate
* Bits: .... ...0 0111 0011 0000 .... .... .... */
l2x0_init(__io_address(REALVIEW_PB1176_L220_BASE), 0x00730000,
0xfe000fff);
#endif

16KB way-size seems realistic, yes.

Quoted 4 lines

I can add a comment explaining that ARMs terminology does not match the academic terminology or something, and say that the thing we poke into "way-size" is actually "set size", if we agree that is what we're seeing here.

Let's see again: 16KB way-size * 8 ways = 128KB, that seems correct. 16KB way-size / 32B line-size = 512 sets, that also seems realistic. 128KB cache-size / 512 sets = 256B set-size. 256B / 32B = 8 ways, so everything fits together.

Now in the code:

+ of_property_read_u32(np, "cache-size", &size);

131072

+ of_property_read_u32(np, "cache-sets", &sets);

512

arch/arm/mm/cache-l2x0.c +5 -0
+
+       if (!size || !sets)
+               return;
+
+       way_size = size / sets;

256 -> impossible.

         set_size = size / sets;

256

Quoted 7 lines
         ways = set_size / line_size;

8

         way_size = size / ways;

16KB -> ok

So what we are missing right now is just a 'cache-line-size' property to get the maths right.
--
Florian

maintainer
#15 lore raw

PATCH v6 5/7 ARM: l2c: parse 'cache-size' and 'cache-sets' properties

Quoted 2 lines · On Monday 08 September 2014 13:33:39 Florian Fainelli wrote:

So what we are missing right now is just a 'cache-line-size' property to get the maths right.

Patch 6/7 actually adds that already, and it's even required by ePAPR.

Arnd

#16 lore raw

PATCH v6 5/7 ARM: l2c: parse 'cache-size' and 'cache-sets' properties

In reply to Arnd Bergmann
Quoted 10 lines · Arnd Bergmann

[Me]

Quoted 4 lines

I can add a comment explaining that ARMs terminology does not match the academic terminology or something, and say that the thing we poke into "way-size" is actually "set size", if we agree that is what we're seeing here.

Let's see again: 16KB way-size * 8 ways = 128KB, that seems correct. 16KB way-size / 32B line-size = 512 sets, that also seems realistic. 128KB cache-size / 512 sets = 256B set-size. 256B / 32B = 8 ways, so everything fits together.

I've sent a v2 version of the patch using the terminology and calculations from this thread, and it yields the right numbers, for PB1176, I will check with the values from other RealView platforms to see if they also give the same result back.

I had to squash Florians & my patch, it didn't make sense to have them artificially separate.

Yours,
Linus Walleij

#17 lore raw

PATCH v6 5/7 ARM: l2c: parse 'cache-size' and 'cache-sets' properties

In reply to Linus Walleij
Quoted 54 lines · Linus Walleij
Quoted 12 lines · Arnd Bergmann

arch/arm/mm/cache-l2x0.c static int l2_wt_override; · line 962

Quoted 7 lines · On Monday 08 September 2014 13:38:04 Linus Walleij wrote:
arch/arm/mm/cache-l2x0.c +7 -0
+       of_property_read_u32(np, "cache-size", &size);
+       of_property_read_u32(np, "cache-sets", &sets);
+
+       if (!size || !sets)
+               return;
+
+       way_size = size / sets;

Going back to this one: Isn't (size / sets) the set-size rather than the way-size?

Quoted 5 lines

After we discussed this on IRC, I had expected a calculation like

        set_size = size / sets;
        ways = set_size / line_size;
        way_size = size / ways;

First: in this PB1176 case:

set_size = 128K/8 = 16K
ways = 16K/32 = 512 bytes
way_size = 128K/512 = 128 bytes

Well maybe it's the ARM reference manual internal lingo that is actually causing the confusion here. It will say something like:

[19:17] Way-size 3?b000 = Reserved, internally mapped to 16KB 3?b001 = 16KB, this is the default value
3?b010 = 32KB
3?b011 = 64KB
3?b100 = 128KB
3?b101 = 256KB
3?b110 to 3?b111 = Reserved, internally mapped to 256 KB

OK way-size ... is in the 16 thru 256KB range, which fits nicely with set size incidentally. And also corresponds to current comments in the code such as this from arch/arm/mach-realview/realview_pb1176.c:

#ifdef CONFIG_CACHE_L2X0
/*
* The PL220 needs to be manually configured as the hardware
* doesn't report the correct sizes.
* 128kB (16kB/way), 8-way associativity, event monitor and
* parity enabled, ignore share bit, no force write allocate
* Bits: .... ...0 0111 0011 0000 .... .... .... */
l2x0_init(__io_address(REALVIEW_PB1176_L220_BASE), 0x00730000,
0xfe000fff);
#endif

Quoted 6 lines

I can add a comment explaining that ARMs terminology does not match the academic terminology or something, and say that the thing we poke into "way-size" is actually "set size", if we agree that is what we're seeing here.

Florian: what was your interpretation?

Yes that was my interpretation as well, that we could have 'way-size' and 'set-size' be the same things here, now that I re-think about it, I am not sure anymore. More to follow on Arnd's reply to this email. --
Florian

#18 lore raw

PATCH v6 6/7 ARM: l2x0: calculate associativity from ePAPR cache props

In reply to Linus Walleij

Using the cache size, number of sets and cache line size we can calculate desired associativity of the L2 cache. This is done by the calculation:

associativity = (cache size / cache sets) / cache line size

For most normal cache sizes this will quickly roof out to the maximum associativity of 8 (L2x0 variants) or 16 (PL3x0 variants). While all variants have a hard-coded line size of 32 bytes we also support reading the "cache-line-size" ePAPR binding and complain if it does not match the hardware.

---
 arch/arm/mm/cache-l2x0.c | 62 +++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 56 insertions(+), 6 deletions(-)
arch/arm/mm/cache-l2x0.c +56 -6
index 61a684c743c6..f275cd4e5151 100644
@@ -947,14 +947,18 @@ static u32 cache_id_part_number_from_dt;
 
 static void __init l2x0_cache_size_of_parse(const struct device_node *np,
 					    u32 *aux_val, u32 *aux_mask,
-					    u32 max_way_size)
+					    u32 max_way_size,
+					    u32 max_associativity)
 {
 	u32 mask = 0, val = 0;
 	u32 size = 0, sets = 0;
 	u32 way_size = 0, way_size_bits = 1;
+	u32 linesize = 0;
+	u32 assoc = 0;
 
 	of_property_read_u32(np, "cache-size", &size);
 	of_property_read_u32(np, "cache-sets", &sets);
+	of_property_read_u32(np, "cache-line-size", &linesize);
 
 	if (!size || !sets)
 		return;
@@ -962,10 +966,56 @@ static void __init l2x0_cache_size_of_parse(const struct device_node *np,
 	way_size = size / sets;
 
 	if (way_size > max_way_size) {
-		pr_warn("L2C: way size %dKB is too large\n", way_size >> 10);
+		pr_warn("L2C OF: way size %dKB is too large\n", way_size >> 10);
 		return;
 	}
 
+	/* All these l2 caches have the same line size actually */
+	if (!linesize)
+		linesize = CACHE_LINE_SIZE;
+	if (linesize != CACHE_LINE_SIZE)
+		pr_warn("L2C OF: DT supplied line size %d bytes does "
+			"not match hardware line size of %d bytes\n",
+			linesize,
+			CACHE_LINE_SIZE);
+
+	/*
+	 * This cache is set associative. By increasing associativity
+	 * we increase the number of blocks per set. Usually this
+	 * quickly hits the roof at 8 or 16 ways of associativity.
+	 */
+	assoc = way_size / linesize;
+	if (assoc > max_associativity)
+		assoc = max_associativity;
+
+	mask |= L2X0_AUX_CTRL_ASSOC_MASK;
+
+	/*
+	 * Special checks for the PL310 that only has two settings and
+	 * cannot be set to fully associative.
+	 */
+	if (max_associativity == 16) {
+		if (assoc <= 8) {
+			assoc = 8;
+			/* Leave bit 16 in associativity set to 0 */
+		}
+		if (assoc > 8 && assoc <= 16) {
+			assoc = 16;
+			val |= L310_AUX_CTRL_ASSOCIATIVITY_16;
+		}
+	} else {
+		if (sets == 1)
+			/* Direct-mapped cache */
+			assoc = 1;
+		val |= (assoc << L2X0_AUX_CTRL_ASSOC_SHIFT);
+	}
+
+	pr_info("L2C OF: size: %d bytes (%dKB)\n", size, size >> 10);
+	pr_info("L2C OF: way_size: %d bytes (%d KB)\n",
+		way_size, way_size >> 10);
+	pr_info("L2C OF: associativity: %d ways\n", assoc);
+
+	/* Convert to KB */
 	way_size >>= 10;
 	switch (way_size) {
 	case 512:
@@ -987,7 +1037,7 @@ static void __init l2x0_cache_size_of_parse(const struct device_node *np,
 		way_size_bits = 1;
 		break;
 	default:
-		pr_err("cache way size: %d KB is not mapped\n",
+		pr_err("L2C OF: cache way size: %d KB is not mapped\n",
 		       way_size);
 		break;
 	}
@@ -1029,7 +1079,7 @@ static void __init l2x0_of_parse(const struct device_node *np,
 		val |= (dirty - 1) << L2X0_AUX_CTRL_DIRTY_LATENCY_SHIFT;
 	}
 
-	l2x0_cache_size_of_parse(np, aux_val, aux_mask, SZ_256K);
+	l2x0_cache_size_of_parse(np, aux_val, aux_mask, SZ_256K, 8);
 
 	*aux_val &= ~mask;
 	*aux_val |= val;
@@ -1105,7 +1155,7 @@ static void __init l2c310_of_parse(const struct device_node *np,
 			       l2x0_base + L310_ADDR_FILTER_START);
 	}
 
-	l2x0_cache_size_of_parse(np, aux_val, aux_mask, SZ_512K);
+	l2x0_cache_size_of_parse(np, aux_val, aux_mask, SZ_512K, 16);
 }
 
 static const struct l2c_init_data of_l2c310_data __initconst = {
@@ -1313,7 +1363,7 @@ static void __init aurora_of_parse(const struct device_node *np,
 	*aux_val |= val;
 	*aux_mask &= ~mask;
 
-	l2x0_cache_size_of_parse(np, aux_val, aux_mask, SZ_256K);
+	l2x0_cache_size_of_parse(np, aux_val, aux_mask, SZ_256K, 8);
 }
 
 static const struct l2c_init_data of_aurora_with_outer_data __initconst = {
Signature · 1 line
1.9.3
maintainer
#19 lore raw

PATCH v6 6/7 ARM: l2x0: calculate associativity from ePAPR cache props

Quoted 6 lines · On Monday 08 September 2014 13:38:05 Linus Walleij wrote:

static void __init l2x0_cache_size_of_parse(const struct device_node *np,

                                            u32 *aux_val, u32 *aux_mask,
arch/arm/mm/cache-l2x0.c +2 -1
-                                           u32 max_way_size)
+                                           u32 max_way_size,
+                                           u32 max_associativity)

arch/arm/mm/cache-l2x0.c static u32 cache_id_part_number_from_dt; · line 961

Quoted 10 lines
arch/arm/mm/cache-l2x0.c +3 -0
 {
        u32 mask = 0, val = 0;
        u32 size = 0, sets = 0;
        u32 way_size = 0, way_size_bits = 1;
+       u32 linesize = 0;
+       u32 assoc = 0;
 
        of_property_read_u32(np, "cache-size", &size);
        of_property_read_u32(np, "cache-sets", &sets);
+       of_property_read_u32(np, "cache-line-size", &linesize);

If I read ePAPR correctly, you have to read "cache-block-size" as well, and use that as a fallback if "cache-line-size" is not provided. The line size is only required to be in the DT if it's different from the block size.

Quoted 9 lines
        if (!size || !sets)
                return;
arch/arm/mm/cache-l2x0.c +1 -1
@@ -962,10 +966,56 @@ static void __init l2x0_cache_size_of_parse(const struct device_node *np,
        way_size = size / sets;
 
        if (way_size > max_way_size) {
-               pr_warn("L2C: way size %dKB is too large\n", way_size >> 10);
+               pr_warn("L2C OF: way size %dKB is too large\n", way_size >> 10);
                return;

arch/arm/mm/cache-l2x0.c static void __init l2x0_cache_size_of_parse(const struct device_node *np, · line 980

Quoted 10 lines
arch/arm/mm/cache-l2x0.c +8 -0
        }
 
+       /* All these l2 caches have the same line size actually */
+       if (!linesize)
+               linesize = CACHE_LINE_SIZE;
+       if (linesize != CACHE_LINE_SIZE)
+               pr_warn("L2C OF: DT supplied line size %d bytes does "
+                       "not match hardware line size of %d bytes\n",
+                       linesize,
+                       CACHE_LINE_SIZE);

and CACHE_LINE_SIZE seems to be what ePAPR calls cache-block-size, i.e. the fundamental unit of cache management as seen from the CPU, independent of how it is physically organized.

arch/arm/mm/cache-l2x0.c static void __init l2x0_cache_size_of_parse(const struct device_node *np, · line 990

Quoted 9 lines
arch/arm/mm/cache-l2x0.c +9 -0
+       /*
+        * This cache is set associative. By increasing associativity
+        * we increase the number of blocks per set. Usually this
+        * quickly hits the roof at 8 or 16 ways of associativity.
+        */
+       assoc = way_size / linesize;
+       if (assoc > max_associativity)
+               assoc = max_associativity;
+

I don't see what this helps us. Doesn't this silently try to fix up incorrect device trees?
If so, I'd rather see the cache get disabled and a warning printed here.

arch/arm/mm/cache-l2x0.c static void __init l2x0_cache_size_of_parse(const struct device_node *np, · line 1005

Quoted 13 lines
arch/arm/mm/cache-l2x0.c +13 -0
+       /*
+        * Special checks for the PL310 that only has two settings and
+        * cannot be set to fully associative.
+        */
+       if (max_associativity == 16) {
+               if (assoc <= 8) {
+                       assoc = 8;
+                       /* Leave bit 16 in associativity set to 0 */
+               }
+               if (assoc > 8 && assoc <= 16) {
+                       assoc = 16;
+                       val |= L310_AUX_CTRL_ASSOCIATIVITY_16;
+               }

Same thing here.

arch/arm/mm/cache-l2x0.c static void __init l2x0_cache_size_of_parse(const struct device_node *np, · line 1011

Quoted 6 lines
arch/arm/mm/cache-l2x0.c +6 -0
+       } else {
+               if (sets == 1)
+                       /* Direct-mapped cache */
+                       assoc = 1;
+               val |= (assoc << L2X0_AUX_CTRL_ASSOC_SHIFT);
+       }

This looks wrong: isn't "sets==1" fully associative rather than direct-mapped?

Arnd

#20 lore raw

PATCH v6 6/7 ARM: l2x0: calculate associativity from ePAPR cache props

Quoted 13 lines · Arnd Bergmann
Quoted 12 lines · On Monday 08 September 2014 13:38:05 Linus Walleij wrote:

static void __init l2x0_cache_size_of_parse(const struct device_node *np,

                                            u32 *aux_val, u32 *aux_mask,
arch/arm/mm/cache-l2x0.c +4 -1
-                                           u32 max_way_size)
+                                           u32 max_way_size,
+                                           u32 max_associativity)
 {
        u32 mask = 0, val = 0;
        u32 size = 0, sets = 0;
        u32 way_size = 0, way_size_bits = 1;
+       u32 linesize = 0;
+       u32 assoc = 0;
Quoted 8 lines
Quoted 4 lines
        of_property_read_u32(np, "cache-size", &size);
        of_property_read_u32(np, "cache-sets", &sets);

+ of_property_read_u32(np, "cache-line-size", &linesize);

If I read ePAPR correctly, you have to read "cache-block-size" as well, and use that as a fallback if "cache-line-size" is not provided. The line size is only required to be in the DT if it's different from the block size.

OK fixed this...

Quoted 15 lines
Quoted 4 lines
        if (way_size > max_way_size) {
arch/arm/mm/cache-l2x0.c +1 -1
-               pr_warn("L2C: way size %dKB is too large\n", way_size >> 10);
+               pr_warn("L2C OF: way size %dKB is too large\n", way_size >> 10);
                return;

arch/arm/mm/cache-l2x0.c static void __init l2x0_cache_size_of_parse(const struct device_node *np, · line 980

Quoted 10 lines
arch/arm/mm/cache-l2x0.c +8 -0
        }
 
+       /* All these l2 caches have the same line size actually */
+       if (!linesize)
+               linesize = CACHE_LINE_SIZE;
+       if (linesize != CACHE_LINE_SIZE)
+               pr_warn("L2C OF: DT supplied line size %d bytes does "
+                       "not match hardware line size of %d bytes\n",
+                       linesize,
+                       CACHE_LINE_SIZE);
Quoted 3 lines

and CACHE_LINE_SIZE seems to be what ePAPR calls cache-block-size, i.e. the fundamental unit of cache management as seen from the CPU, independent of how it is physically organized.

Yeah. Well, actually that means the variable in cache-l2x0.c should be renamed from CACHE_LINE_SIZE to CACHE_BLOCK_SIZE
if we go with that terminology, right? That is the real change that is needed to make terminology consistent then.

Quoted 10 lines

arch/arm/mm/cache-l2x0.c static void __init l2x0_cache_size_of_parse(const struct device_node *np, · line 990

Quoted 9 lines
arch/arm/mm/cache-l2x0.c +9 -0
+       /*
+        * This cache is set associative. By increasing associativity
+        * we increase the number of blocks per set. Usually this
+        * quickly hits the roof at 8 or 16 ways of associativity.
+        */
+       assoc = way_size / linesize;
+       if (assoc > max_associativity)
+               assoc = max_associativity;
+
Quoted 2 lines

I don't see what this helps us. Doesn't this silently try to fix up incorrect device trees?

I will look closer... But whatever comes out of the calculation is always way about 8 or even 16. Probably my arithmetics get it wrong because of terminology confusion. With the definitions from your previous mail, maybe it all ends up correctly. I'll hack around a bit and see.

Quoted 9 lines

arch/arm/mm/cache-l2x0.c static void __init l2x0_cache_size_of_parse(const struct device_node *np, · line 1011

Quoted 6 lines
arch/arm/mm/cache-l2x0.c +6 -0
+       } else {
+               if (sets == 1)
+                       /* Direct-mapped cache */
+                       assoc = 1;
+               val |= (assoc << L2X0_AUX_CTRL_ASSOC_SHIFT);
+       }

This looks wrong: isn't "sets==1" fully associative rather than direct-mapped?

Yep. I'll fix.

Yours,
Linus Walleij

maintainer
#21 lore raw

PATCH v6 6/7 ARM: l2x0: calculate associativity from ePAPR cache props

Quoted 10 lines · On Monday 08 September 2014 14:43:55 Linus Walleij wrote:
Quoted 5 lines

and CACHE_LINE_SIZE seems to be what ePAPR calls cache-block-size, i.e. the fundamental unit of cache management as seen from the CPU, independent of how it is physically organized.

Yeah. Well, actually that means the variable in cache-l2x0.c should be renamed from CACHE_LINE_SIZE to CACHE_BLOCK_SIZE
if we go with that terminology, right? That is the real change that is needed to make terminology consistent then.

Not sure if it's worth it. It may be a case of IBM terminology being at odds with ARM terminology. ;-)

Arnd

#22 lore raw

PATCH v6 7/7 ARM: realview: basic device tree implementation

In reply to Linus Walleij

This implements basic device tree boot support for the RealView platforms, with a basic device tree for ARM PB1176 as an example.

The implementation is done with a new DT-specific board file using only pre-existing bindings for the basic IRQ, timer and serial port drivers. A new compatible type is added to the GIC for the ARM1176.

This implementation uses the MFD syscon handle from day one to access the system controller registers, and register the devices using the SoC bus.

---
ChangeLog v5->v6:
- Rely on the default DT machine as it will pass the l2x0 untouched, we can let the default population call build up the device tree and skipe .init_machine() entirely.
- Get rid of cache associativity from the device tree, we added code to calculate this from size and sets.
- Put .l2c_aux_mask and .l2c_aux_val into the DT MACHINE entry so we can skip the separate call to l2x0_init().
- Specify cache line size in L2 DT entry.
ChangeLog v4->v5:
- Move the l2x0_init() aux set-ups over to the device tree, using one patch from Florian Fainelli and one patch from myself to support the needed bits.
- Put "simple-bus" last in binding documentation, examples and device tree so we go from most to least specific.
- Use the compatible arm11mp-gic binding for the GIC, and add a more specific binding "arm,arm1176jzf-devchip-gic" for the variant specifically found on the ARM1176JZF development chip. Add IRQCHIP_DECLARE() for both variants.
- Drop the "reboot device" node as we rewrote the driver to hog onto the syscon node directly.
- Augment device tree for the new register-bit-leds used with the syscon.
ChangeLog v3->v4:
- Switch the LEDs to usa a new syscon-LEDs driver so we can use the syscon as a hub for all these registers
- Split out the SoC driver to its own file in drivers/soc ChangeLog v2->v3:
- Rename uart at 0x12345678 to serial at 0x12345678 in DTS file
- Drop static remapping for the LEDs, using my new invention syscon-leds instead
- Drop the hunk selecting ARM_DMA_MEM_BUFFERABLE for the DT version of the RealView platform. We think this is a local optimization we can live without.
- Split off the reset driver to a separate syscon-based reset driver in drivers/power/reset, add separate device tree bindings for this driver.
- To make sure the reset driver is always available for this system a few extra select statements are needed in Kconfig
- Split off the SoC bus driver to an easily identifiable chunk inside the mach-realview/realview-dt.c file. This *can* be spun off as a separate driver under drivers/soc for example but we need some separate discussion on this subject.
- Augment the SoC driver to display some system info so it's clear why this driver is there.
- Drop surplus string "with device tree" from machine description in the DTS file.
- Move the new GIC compatible string in alphabetic order. ChangeLog v1->v2:
- Adjust timer clock names to be the same as the example in the device tree binding.
- Remove all memory fixup code - this should be handled by the device tree specification of memory areas or by special MM hacks for the RealView PBX.
- Fix the documentation around syscon to specify that it can be in any node, need not be the root node.
- Switch device tree license to the BSD license, taken from arch/powerpc/boot/dts/p1024rdb_32b.dts
- Add a hunk for the new compatible string to Documentation/devicetree/bindings/arm/gic.txt
- Move the clocks out of the SoC node, certainly the xtal is not sitting on the SoC...
- Sort the selects in Kconfig alphabetically
- Use IS_ENABLED() for the l2x0 code snippet
- Instead of checking the board variant in the reset routine to figure out how to tweak the reset controller, have a compatible string for each syscon variant, map it to an enum that provides a unique type ID and that way figure out how to handle it in a maybe more elegant way.
- Open issue: what do to with the l2x0 stuff?

---
 Documentation/devicetree/bindings/arm/arm-boards |  65 ++++++
 Documentation/devicetree/bindings/arm/gic.txt    |   1 +
 arch/arm/boot/dts/Makefile                       |   1 +
 arch/arm/boot/dts/arm-realview-pb1176.dts        | 246 +++++++++++++++++++++++
 arch/arm/mach-realview/Kconfig                   |  13 ++
 arch/arm/mach-realview/Makefile                  |   1 +
 arch/arm/mach-realview/realview-dt.c             |  32 +++
 drivers/irqchip/irq-gic.c                        |   2 +
 8 files changed, 361 insertions(+)
 create mode 100644 arch/arm/boot/dts/arm-realview-pb1176.dts
 create mode 100644 arch/arm/mach-realview/realview-dt.c
Documentation/devicetree/bindings/arm/arm-boards +65 -0
index c554ed3d44fb..556c8665fdbf 100644
@@ -92,3 +92,68 @@ Required nodes:
 - core-module: the root node to the Versatile platforms must have
   a core-module with regs and the compatible strings
   "arm,core-module-versatile", "syscon"
+
+ARM RealView Boards
+-------------------
+The RealView boards cover tailored evaluation boards that are used to explore
+the ARM11 and Cortex A-8 and Cortex A-9 processors.
+
+Required properties (in root node):
+	/* RealView Emulation Baseboard */
+	compatible = "arm,realview-eb";
+	 /* RealView Platform Baseboard for ARM1176JZF-S */
+	compatible = "arm,realview-pb1176";
+	/* RealView Platform Baseboard for ARM11 MPCore */
+	compatible = "arm,realview-pb11mp";
+	/* RealView Platform Baseboard for Cortex A-8 */
+	compatible = "arm,realview-pba8";
+	/* RealView Platform Baseboard Explore for Cortex A-9 */
+	compatible = "arm,realview-pbx";
+
+Required nodes:
+
+- soc: some node of the RealView platforms must be the SoC
+  node that contain the SoC-specific devices, withe the compatible
+  string set to one of these tuples:
+   "arm,realview-eb-soc", "simple-bus"
+   "arm,realview-pb1176-soc", "simple-bus"
+   "arm,realview-pb11mp-soc", "simple-bus"
+   "arm,realview-pba8-soc", "simple-bus"
+   "arm,realview-pbx-soc", "simple-bus"
+
+- syscon: some subnode of the RealView SoC node must be a
+  system controller node pointing to the control registers,
+  with the compatible string set to one of these tuples:
+   "arm,realview-eb-syscon", "syscon"
+   "arm,realview-pb1176-syscon", "syscon"
+   "arm,realview-pb11mp-syscon", "syscon"
+   "arm,realview-pba8-syscon", "syscon"
+   "arm,realview-pbx-syscon", "syscon"
+
+  Required properties for the system controller:
+  - regs: the location and size of the system controller registers,
+    one range of 0x1000 bytes.
+
+Example:
+
+/dts-v1/;
+#include <dt-bindings/interrupt-controller/irq.h>
+#include "skeleton.dtsi"
+
+/ {
+	model = "ARM RealView PB1176 with device tree";
+	compatible = "arm,realview-pb1176";
+
+	soc {
+		#address-cells = <1>;
+		#size-cells = <1>;
+		compatible = "arm,realview-pb1176-soc", "simple-bus";
+		ranges;
+
+		syscon: syscon at 10000000 {
+			compatible = "arm,realview-syscon", "syscon";
+			reg = <0x10000000 0x1000>;
+		};
+
+	};
+};
Documentation/devicetree/bindings/arm/gic.txt +1 -0
index c7d2fa156678..b38608af66db 100644
@@ -17,6 +17,7 @@ Main node required properties:
 	"arm,cortex-a7-gic"
 	"arm,arm11mp-gic"
 	"brcm,brahma-b15-gic"
+	"arm,arm1176jzf-devchip-gic"
 - interrupt-controller : Identifies the node as an interrupt controller
 - #interrupt-cells : Specifies the number of cells needed to encode an
   interrupt source.  The type shall be a <u32> and the value shall be 3.
arch/arm/boot/dts/Makefile +1 -0
index b8c5cd3ddeb9..e55d28eed151 100644
@@ -344,6 +344,7 @@ dtb-$(CONFIG_ARCH_QCOM) += \
 	qcom-apq8084-mtp.dtb \
 	qcom-msm8660-surf.dtb \
 	qcom-msm8960-cdp.dtb
+dtb-$(CONFIG_ARCH_REALVIEW) += arm-realview-pb1176.dtb
 dtb-$(CONFIG_ARCH_ROCKCHIP) += \
 	rk3066a-bqcurie2.dtb \
 	rk3188-radxarock.dtb \
arch/arm/boot/dts/arm-realview-pb1176.dts new file +246 -0

246 lines not on this page · raw message

arch/arm/mach-realview/Kconfig +13 -0
index 9db2029aa632..565925f37dc5 100644
@@ -1,6 +1,19 @@
 menu "RealView platform type"
 	depends on ARCH_REALVIEW
 
+config REALVIEW_DT
+	bool "Support RealView(R) Device Tree based boot"
+	select ARM_GIC
+	select MFD_SYSCON
+	select POWER_RESET
+	select POWER_RESET_VERSATILE
+	select POWER_SUPPLY
+	select SOC_REALVIEW
+	select USE_OF
+	help
+	  Include support for booting the ARM(R) RealView(R) evaluation
+	  boards using a device tree machine description.
+
 config MACH_REALVIEW_EB
 	bool "Support RealView(R) Emulation Baseboard"
 	select ARM_GIC
arch/arm/mach-realview/Makefile +1 -0
index 541fa4c109ef..e07fdf7ae8a7 100644
@@ -3,6 +3,7 @@
 #
 
 obj-y					:= core.o
+obj-$(CONFIG_REALVIEW_DT)		+= realview-dt.o
 obj-$(CONFIG_MACH_REALVIEW_EB)		+= realview_eb.o
 obj-$(CONFIG_MACH_REALVIEW_PB11MP)	+= realview_pb11mp.o
 obj-$(CONFIG_MACH_REALVIEW_PB1176)	+= realview_pb1176.o
arch/arm/mach-realview/realview-dt.c new file +32 -0
new file mode 100644
index 000000000000..cc28b89dd48f
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2014 Linaro Ltd.
+ *
+ * Author: Linus Walleij <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2, as
+ * published by the Free Software Foundation.
+ *
+ */
+#include <linux/of_platform.h>
+#include <asm/mach/arch.h>
+#include <asm/hardware/cache-l2x0.h>
+#include "core.h"
+
+static const char *realview_dt_platform_compat[] __initconst = {
+	"arm,realview-eb",
+	"arm,realview-pb1176",
+	"arm,realview-pb11mp",
+	"arm,realview-pba8",
+	"arm,realview-pbx",
+	NULL,
+};
+
+DT_MACHINE_START(REALVIEW_DT, "ARM RealView Machine (Device Tree Support)")
+#ifdef CONFIG_ZONE_DMA
+	.dma_zone_size	= SZ_256M,
+#endif
+	.dt_compat	= realview_dt_platform_compat,
+	.l2c_aux_val = 0x0,
+	.l2c_aux_mask = ~0x0,
+MACHINE_END
drivers/irqchip/irq-gic.c +2 -0
index 4b959e606fe8..4e75e3f24a97 100644
@@ -1022,6 +1022,8 @@ gic_of_init(struct device_node *node, struct device_node *parent)
 	return 0;
 }
 IRQCHIP_DECLARE(gic_400, "arm,gic-400", gic_of_init);
+IRQCHIP_DECLARE(arm11mp_gic, "arm,arm11mp-gic", gic_of_init);
+IRQCHIP_DECLARE(arm1176jzf_dc_gic, "arm,arm1176jzf-devchip-gic", gic_of_init);
 IRQCHIP_DECLARE(cortex_a15_gic, "arm,cortex-a15-gic", gic_of_init);
 IRQCHIP_DECLARE(cortex_a9_gic, "arm,cortex-a9-gic", gic_of_init);
 IRQCHIP_DECLARE(cortex_a7_gic, "arm,cortex-a7-gic", gic_of_init);
Signature · 1 line
1.9.3