arm64: ARMv8 RTSM model SoC support

Currently the clk-vexpress.c implementation relies on the vexpress code to call the vexpress_clk_of_init() function which performs the SP810 initialisation. This patch adds "arm,sp810" to the clock DT match array allowing of_clk_init() to call the vexpress_sp810_of_setup() function. In case of CONFIG_ARM64, make vexpress_clk_of_init() an arch_initcall().

Note that SP810 requires the fixed clocks to be already registered. Since the clock subsystem does not handle DT dependencies, the corresponding DT entries must be in the correct order.

Signed-off-by Catalin Marinas <[email protected]>

Cc Pawel Moll <[email protected]>

---
 drivers/clk/versatile/clk-vexpress.c | 28 +++++++++++++++++-----------
 include/linux/vexpress.h             |  2 +-
 2 files changed, 18 insertions(+), 12 deletions(-)

drivers/clk/versatile/clk-vexpress.c +0 -0

index 4f83ff9..a3754e7 100644

drivers/clk/versatile/clk-vexpress.c +5 -0

@@ -138,4 +128,20 @@ void __init vexpress_clk_of_init(void)
 				"v2m-timer1", "sp804"));
 }
 
+static const __initconst struct of_device_id vexpress_clk_match[] = {
+	{ .compatible = "fixed-clock", .data = of_fixed_clk_setup, },
+	{ .compatible = "arm,vexpress-osc", .data = vexpress_osc_of_setup, },
+	{ .compatible = "arm,sp810", .data = vexpress_sp810_of_setup, },
+	{}

Quoted 21 lines · Catalin Marinas

Currently the clk-vexpress.c implementation relies on the vexpress code to call the vexpress_clk_of_init() function which performs the SP810 initialisation. This patch adds "arm,sp810" to the clock DT match array allowing of_clk_init() to call the vexpress_sp810_of_setup() function. In case of CONFIG_ARM64, make vexpress_clk_of_init() an arch_initcall().

Note that SP810 requires the fixed clocks to be already registered. Since the clock subsystem does not handle DT dependencies, the corresponding DT entries must be in the correct order.

Signed-off-by Catalin Marinas <[email protected]>

Cc Pawel Moll <[email protected]>

---
 drivers/clk/versatile/clk-vexpress.c | 28 +++++++++++++++++-----------
 include/linux/vexpress.h             |  2 +-
 2 files changed, 18 insertions(+), 12 deletions(-)

drivers/clk/versatile/clk-vexpress.c +0 -0

index 4f83ff9..a3754e7 100644

[...]

Quoted 13 lines

drivers/clk/versatile/clk-vexpress.c +9 -0

@@ -138,4 +128,20 @@ void __init vexpress_clk_of_init(void)
 				"v2m-timer1", "sp804"));
 }
 
+static const __initconst struct of_device_id vexpress_clk_match[] = {
+	{ .compatible = "fixed-clock", .data = of_fixed_clk_setup, },
+	{ .compatible = "arm,vexpress-osc", .data = vexpress_osc_of_setup, },
+	{ .compatible = "arm,sp810", .data = vexpress_sp810_of_setup, },
+	{}
+};
+
+int __init vexpress_clk_of_init(void)
+{

drivers/clk/versatile/clk-vexpress.c void __init vexpress_clk_of_init(void) · line 145

Quoted 6 lines

drivers/clk/versatile/clk-vexpress.c +6 -0

+	of_clk_init(vexpress_clk_match);
+	return 0;
+}
+#ifdef CONFIG_ARM64
+arch_initcall(vexpress_clk_of_init);
+#endif

Any way to avoid the ifdef? Is it intended to be a temporarily solution?

Currently the clk-vexpress.c implementation relies on the vexpress code to call the vexpress_clk_of_init() function which performs the SP810 initialisation. This patch adds "arm,sp810" to the clock DT match array allowing of_clk_init() to call the vexpress_sp810_of_setup() function. In case of CONFIG_ARM64, make vexpress_clk_of_init() an arch_initcall().

Note that SP810 requires the fixed clocks to be already registered. Since the clock subsystem does not handle DT dependencies, the corresponding DT entries must be in the correct order.

Signed-off-by Catalin Marinas <[email protected]>

Cc Pawel Moll <[email protected]>

---
 drivers/clk/versatile/clk-vexpress.c | 28 +++++++++++++++++-----------
 include/linux/vexpress.h             |  2 +-
 2 files changed, 18 insertions(+), 12 deletions(-)

drivers/clk/versatile/clk-vexpress.c +17 -11

index 4f83ff9..a3754e7 100644
@@ -98,21 +98,11 @@ struct clk *vexpress_sp810_of_get(struct of_phandle_args *clkspec, void *data)
 	return vexpress_sp810_timerclken[clkspec->args[0]];
 }
 
-static const __initconst struct of_device_id vexpress_fixed_clk_match[] = {
-	{ .compatible = "fixed-clock", .data = of_fixed_clk_setup, },
-	{ .compatible = "arm,vexpress-osc", .data = vexpress_osc_of_setup, },
-	{}
-};
-
-void __init vexpress_clk_of_init(void)
+static void __init vexpress_sp810_of_setup(struct device_node *node)
 {
-	struct device_node *node;
 	struct clk *clk;
 	struct clk *refclk, *timclk;
 
-	of_clk_init(vexpress_fixed_clk_match);
-
-	node = of_find_compatible_node(NULL, NULL, "arm,sp810");
 	vexpress_sp810_init(of_iomap(node, 0));
 	of_clk_add_provider(node, vexpress_sp810_of_get, NULL);
 

@@ -138,4 +128,20 @@ void __init vexpress_clk_of_init(void)
 				"v2m-timer1", "sp804"));
 }
 
+static const __initconst struct of_device_id vexpress_clk_match[] = {
+	{ .compatible = "fixed-clock", .data = of_fixed_clk_setup, },
+	{ .compatible = "arm,vexpress-osc", .data = vexpress_osc_of_setup, },
+	{ .compatible = "arm,sp810", .data = vexpress_sp810_of_setup, },
+	{}
+};
+
+int __init vexpress_clk_of_init(void)
+{
+	of_clk_init(vexpress_clk_match);
+	return 0;
+}
+#ifdef CONFIG_ARM64
+arch_initcall(vexpress_clk_of_init);
+#endif
+
 #endif

include/linux/vexpress.h +1 -1

index c52215f..b55ae6a 100644
@@ -116,6 +116,6 @@ struct clk *vexpress_osc_setup(struct device *dev);
 void vexpress_osc_of_setup(struct device_node *node);
 
 void vexpress_clk_init(void __iomem *sp810_base);
-void vexpress_clk_of_init(void);
+int vexpress_clk_of_init(void);
 
 #endif

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Quoted 9 lines · Catalin Marinas

Currently the clk-vexpress.c implementation relies on the vexpress code to call the vexpress_clk_of_init() function which performs the SP810 initialisation. This patch adds "arm,sp810" to the clock DT match array allowing of_clk_init() to call the vexpress_sp810_of_setup() function. In case of CONFIG_ARM64, make vexpress_clk_of_init() an arch_initcall().

Note that SP810 requires the fixed clocks to be already registered. Since the clock subsystem does not handle DT dependencies, the corresponding DT entries must be in the correct order.

Which they aren't on 32-bit vexpress ;-) leading to:

ERROR: could not get clock /smb/motherboard/iofpga at 3,00000000/sysctl at 020000:refclk(0)
ERROR: could not get clock /smb/motherboard/iofpga at 3,00000000/sysctl at 020000:timclk(1)

  ------------[ cut here ]------------
  WARNING: at drivers/clk/versatile/clk-vexpress.c:112 vexpress_sp810_of_setup+0x43/0xc8()
  Modules linked in:
  [<c0011cbd>] (unwind_backtrace+0x1/0x9c) from [<c001c1a9>] (warn_slowpath_common+0x39/0x50)
  [<c001c1a9>] (warn_slowpath_common+0x39/0x50) from [<c001c1d7>] (warn_slowpath_null+0x17/0x1c)
  [<c001c1d7>] (warn_slowpath_null+0x17/0x1c) from [<c05b4fab>] (vexpress_sp810_of_setup+0x43/0xc8)
  [<c05b4fab>] (vexpress_sp810_of_setup+0x43/0xc8) from [<c05b4e67>] (of_clk_init+0x1f/0x34)
  [<c05b4e67>] (of_clk_init+0x1f/0x34) from [<c05b515d>] (vexpress_clk_of_init+0x9/0x10)
  [<c05b515d>] (vexpress_clk_of_init+0x9/0x10) from [<c05a7d2b>] (v2m_dt_timer_init+0x7/0x78)
  [<c05a7d2b>] (v2m_dt_timer_init+0x7/0x78) from [<c05a4d09>] (time_init+0x11/0x20)
  [<c05a4d09>] (time_init+0x11/0x20) from [<c05a24fb>] (start_kernel+0x113/0x214)
  [<c05a24fb>] (start_kernel+0x113/0x214) from [<8000807f>] (0x8000807f)
  ---[ end trace 1b75b31a2719ed1c ]---

After moving all "fixed-clock" nodes to be the first devices in arch/arm/boot/dts/vexpress-v2m{-rs1,}.dtsi then all appears well. (I am only trying out patches 1-3 of this set at the moment).

Quoted 29 lines · Jon Medhurst (Tixy)

Quoted 9 lines · Catalin Marinas

Currently the clk-vexpress.c implementation relies on the vexpress code to call the vexpress_clk_of_init() function which performs the SP810 initialisation. This patch adds "arm,sp810" to the clock DT match array allowing of_clk_init() to call the vexpress_sp810_of_setup() function. In case of CONFIG_ARM64, make vexpress_clk_of_init() an arch_initcall().

Note that SP810 requires the fixed clocks to be already registered. Since the clock subsystem does not handle DT dependencies, the corresponding DT entries must be in the correct order.

Which they aren't on 32-bit vexpress ;-) leading to:

ERROR: could not get clock /smb/motherboard/iofpga at 3,00000000/sysctl at 020000:refclk(0)
ERROR: could not get clock /smb/motherboard/iofpga at 3,00000000/sysctl at 020000:timclk(1)

  ------------[ cut here ]------------
  WARNING: at drivers/clk/versatile/clk-vexpress.c:112 vexpress_sp810_of_setup+0x43/0xc8()
  Modules linked in:
  [<c0011cbd>] (unwind_backtrace+0x1/0x9c) from [<c001c1a9>] (warn_slowpath_common+0x39/0x50)
  [<c001c1a9>] (warn_slowpath_common+0x39/0x50) from [<c001c1d7>] (warn_slowpath_null+0x17/0x1c)
  [<c001c1d7>] (warn_slowpath_null+0x17/0x1c) from [<c05b4fab>] (vexpress_sp810_of_setup+0x43/0xc8)
  [<c05b4fab>] (vexpress_sp810_of_setup+0x43/0xc8) from [<c05b4e67>] (of_clk_init+0x1f/0x34)
  [<c05b4e67>] (of_clk_init+0x1f/0x34) from [<c05b515d>] (vexpress_clk_of_init+0x9/0x10)
  [<c05b515d>] (vexpress_clk_of_init+0x9/0x10) from [<c05a7d2b>] (v2m_dt_timer_init+0x7/0x78)
  [<c05a7d2b>] (v2m_dt_timer_init+0x7/0x78) from [<c05a4d09>] (time_init+0x11/0x20)
  [<c05a4d09>] (time_init+0x11/0x20) from [<c05a24fb>] (start_kernel+0x113/0x214)
  [<c05a24fb>] (start_kernel+0x113/0x214) from [<8000807f>] (0x8000807f)
  ---[ end trace 1b75b31a2719ed1c ]---

Quoted 3 lines

After moving all "fixed-clock" nodes to be the first devices in arch/arm/boot/dts/vexpress-v2m{-rs1,}.dtsi then all appears well. (I am only trying out patches 1-3 of this set at the moment).

I'm waiting for Pawel's feedback (he's still on holiday). He may have a better solution for the vexpress code than relying on the dts order but for now the simples fix is to change the dts.

Quoted 34 lines · Catalin Marinas

Quoted 32 lines · Jon Medhurst (Tixy)

Quoted 9 lines · Catalin Marinas

Currently the clk-vexpress.c implementation relies on the vexpress code to call the vexpress_clk_of_init() function which performs the SP810 initialisation. This patch adds "arm,sp810" to the clock DT match array allowing of_clk_init() to call the vexpress_sp810_of_setup() function. In case of CONFIG_ARM64, make vexpress_clk_of_init() an arch_initcall().

Note that SP810 requires the fixed clocks to be already registered. Since the clock subsystem does not handle DT dependencies, the corresponding DT entries must be in the correct order.

Which they aren't on 32-bit vexpress ;-) leading to:

ERROR: could not get clock /smb/motherboard/iofpga at 3,00000000/sysctl at 020000:refclk(0)
ERROR: could not get clock /smb/motherboard/iofpga at 3,00000000/sysctl at 020000:timclk(1)

  ------------[ cut here ]------------
  WARNING: at drivers/clk/versatile/clk-vexpress.c:112 vexpress_sp810_of_setup+0x43/0xc8()
  Modules linked in:
  [<c0011cbd>] (unwind_backtrace+0x1/0x9c) from [<c001c1a9>] (warn_slowpath_common+0x39/0x50)
  [<c001c1a9>] (warn_slowpath_common+0x39/0x50) from [<c001c1d7>] (warn_slowpath_null+0x17/0x1c)
  [<c001c1d7>] (warn_slowpath_null+0x17/0x1c) from [<c05b4fab>] (vexpress_sp810_of_setup+0x43/0xc8)
  [<c05b4fab>] (vexpress_sp810_of_setup+0x43/0xc8) from [<c05b4e67>] (of_clk_init+0x1f/0x34)
  [<c05b4e67>] (of_clk_init+0x1f/0x34) from [<c05b515d>] (vexpress_clk_of_init+0x9/0x10)
  [<c05b515d>] (vexpress_clk_of_init+0x9/0x10) from [<c05a7d2b>] (v2m_dt_timer_init+0x7/0x78)
  [<c05a7d2b>] (v2m_dt_timer_init+0x7/0x78) from [<c05a4d09>] (time_init+0x11/0x20)
  [<c05a4d09>] (time_init+0x11/0x20) from [<c05a24fb>] (start_kernel+0x113/0x214)
  [<c05a24fb>] (start_kernel+0x113/0x214) from [<8000807f>] (0x8000807f)
  ---[ end trace 1b75b31a2719ed1c ]---

After moving all "fixed-clock" nodes to be the first devices in arch/arm/boot/dts/vexpress-v2m{-rs1,}.dtsi then all appears well. (I am only trying out patches 1-3 of this set at the moment).

Quoted 3 lines

I'm waiting for Pawel's feedback (he's still on holiday). He may have a better solution for the vexpress code than relying on the dts order but for now the simples fix is to change the dts.

Fair enough. But if the patch series gets used as is then another patch will need to be added to it to fix the device-trees.

That's the third version of the patch series adding support for the ARMv8 RTSM model (vexpress-like) to the AArch64 kernel. There is no SoC-specific code under arch/arm64/ as the kernel makes use of the vexpress support already under drivers/ (apart from dts, defconfig and some Kconfig changes).

Hi,

That's the third version of the patch series adding support for the ARMv8 RTSM model (vexpress-like) to the AArch64 kernel. There is no SoC-specific code under arch/arm64/ as the kernel makes use of the vexpress support already under drivers/ (apart from dts, defconfig and some Kconfig changes).

The patches here can be found on this branch:

git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64.git soc-armv8-experimental

Quoted 9 lines · Catalin Marinas

That's the third version of the patch series adding support for the ARMv8 RTSM model (vexpress-like) to the AArch64 kernel. There is no SoC-specific code under arch/arm64/ as the kernel makes use of the vexpress support already under drivers/ (apart from dts, defconfig and some Kconfig changes).

The patches here can be found on this branch:

git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64.git soc-armv8-experimental

In case you weren't aware:

git checkout catalin/soc-armv8-experimental
ARCH=arm CROSS_COMPILE=arm-none-linux-gnueabi- make vexpress_defconfig ARCH=arm CROSS_COMPILE=arm-none-linux-gnueabi- make Image

CC drivers/irqchip/gic.o
drivers/irqchip/gic.c: In function 'gic_init':
drivers/irqchip/gic.c:399:2: error: 'handle_arch_irq' undeclared (first use in this function) drivers/irqchip/gic.c:399:2: note: each undeclared identifier is reported only once for each function it appears in

arm64 builds fine for me. I haven't tried merging Rob Herring's GIC stuff. I may just postpone further poking around until those changes land.