riscv: dts: starfive: move timebase-frequency to .dtsi
Subsystems (3)
Conor Dooley
maintainerPATCH 1/1 riscv: dts: starfive: move timebase-frequency to .dtsi
From: Conor Dooley <[email protected]>
Properties fixed by the SoC should be defined in the $soc.dtsi, and the timebase-frequency is not sourced directly from an off-chip oscillator.
---
I actually have no idea whether this is true or not, I asked on the jh8100 series but only got an answer for that SoC and not the existing ones. I'm hoping that a patch envokes more of a reaction!
--- arch/riscv/boot/dts/starfive/jh7100-common.dtsi | 4 ---- arch/riscv/boot/dts/starfive/jh7100.dtsi | 1 + .../riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi | 4 ---- arch/riscv/boot/dts/starfive/jh7110.dtsi | 1 + 4 files changed, 2 insertions(+), 8 deletions(-)
arch/riscv/boot/dts/starfive/jh7100-common.dtsi +0 -4
@@ -19,10 +19,6 @@ chosen { stdout-path = "serial0:115200n8"; }; - cpus { - timebase-frequency = <6250000>; - }; - memory@80000000 { device_type = "memory"; reg = <0x0 0x80000000 0x2 0x0>;
arch/riscv/boot/dts/starfive/jh7100.dtsi +1 -0
@@ -16,6 +16,7 @@ / { cpus { #address-cells = <1>; #size-cells = <0>; + timebase-frequency = <6250000>; U74_0: cpu@0 { compatible = "sifive,u74-mc", "riscv";
arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +0 -4
@@ -26,10 +26,6 @@ chosen { stdout-path = "serial0:115200n8"; }; - cpus { - timebase-frequency = <4000000>; - }; - memory@40000000 { device_type = "memory"; reg = <0x0 0x40000000 0x1 0x0>;
arch/riscv/boot/dts/starfive/jh7110.dtsi +1 -0
@@ -18,6 +18,7 @@ / { cpus { #address-cells = <1>; #size-cells = <0>; + timebase-frequency = <4000000>; S7_0: cpu@0 { compatible = "sifive,s7", "riscv";
Signature · 1 line
2.39.2
Quoted 14 lines
-----Original Message-----
From: Conor Dooley <[email protected]>
Sent: Friday, December 1, 2023 12:11 AM
To: [email protected]
Cc: [email protected]; Conor Dooley <[email protected]>; Emil Renner Berthing <[email protected]>; Rob Herring <[email protected]>; Krzysztof Kozlowski <[email protected]>; Paul Walmsley <[email protected]>; Palmer Dabbelt <[email protected]>; [email protected]; [email protected]; Walker Chen <[email protected]>; JeeHeng Sia <[email protected]>; Leyfoon Tan <[email protected]>
Subject: [PATCH v1] riscv: dts: starfive: move timebase-frequency to .dtsiFrom: Conor Dooley <[email protected]>
Quoted 8 lines
Properties fixed by the SoC should be defined in the $soc.dtsi, and the timebase-frequency is not sourced directly from an off-chip oscillator.
Signed-off-by Conor Dooley <[email protected]>---
I actually have no idea whether this is true or not, I asked on the jh8100 series but only got an answer for that SoC and not the existing ones. I'm hoping that a patch envokes more of a reaction!
I believe it is controlled by the internal clock, but I will let Walker have the final say.
Quoted 77 lines
CC Emil Renner Berthing <[email protected]>CC Conor Dooley <[email protected]>CC Rob Herring <[email protected]>CC Krzysztof Kozlowski <[email protected]>CC Paul Walmsley <[email protected]>CC Palmer Dabbelt <[email protected]>CC Walker Chen <[email protected]>CC JeeHeng Sia <[email protected]>CC Leyfoon Tan <[email protected]>--- arch/riscv/boot/dts/starfive/jh7100-common.dtsi | 4 ---- arch/riscv/boot/dts/starfive/jh7100.dtsi | 1 + .../riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi | 4 ---- arch/riscv/boot/dts/starfive/jh7110.dtsi | 1 + 4 files changed, 2 insertions(+), 8 deletions(-)arch/riscv/boot/dts/starfive/jh7100-common.dtsi +0
-4@@ -19,10 +19,6 @@ chosen { stdout-path = "serial0:115200n8"; }; - cpus { - timebase-frequency = <6250000>; - }; - memory@80000000 { device_type = "memory"; reg = <0x0 0x80000000 0x2 0x0>;arch/riscv/boot/dts/starfive/jh7100.dtsi +1
-0@@ -16,6 +16,7 @@ / { cpus { #address-cells = <1>; #size-cells = <0>; + timebase-frequency = <6250000>; U74_0: cpu@0 { compatible = "sifive,u74-mc", "riscv";arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive- renamed from arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +0
-02.dtsi
indexb89e9791efa7..7873c7ffde4d100644arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +0
-4@@ -26,10 +26,6 @@ chosen { stdout-path = "serial0:115200n8"; }; - cpus { - timebase-frequency = <4000000>; - }; - memory@40000000 { device_type = "memory"; reg = <0x0 0x40000000 0x1 0x0>;arch/riscv/boot/dts/starfive/jh7110.dtsi +1
-1@@ -18,6 +18,7 @@ / { cpus { #address-cells = <1>; #size-cells = <0>; + timebase-frequency = <4000000>; S7_0: cpu@0 { compatible = "sifive,s7", "riscv"; --2.39.2
Quoted 4 lines · Conor Dooley
From: Conor Dooley <[email protected]>
Properties fixed by the SoC should be defined in the $soc.dtsi, and the timebase-frequency is not sourced directly from an off-chip oscillator.
Yes, according to the JH7100 docs[1] the mtime register is sourced from the osc_sys external oscillator through u74rtc_toggle. However I haven't yet found a place in the docs that describe where that clock is divided by 4 to get 6.25MHz from the 25MHz.
I expect the JH7110 mtime is set up in a similar way, but haven't yet dug into the available documentation.
[1]: https://github.com/starfive-tech/JH7100_Docs/blob/main/vic_u7_manual_with_creativecommons.pdf
/Emil
Quoted 83 lines
Signed-off-by Conor Dooley <[email protected]>---
I actually have no idea whether this is true or not, I asked on the jh8100 series but only got an answer for that SoC and not the existing ones. I'm hoping that a patch envokes more of a reaction!CC Emil Renner Berthing <[email protected]>CC Conor Dooley <[email protected]>CC Rob Herring <[email protected]>CC Krzysztof Kozlowski <[email protected]>CC Paul Walmsley <[email protected]>CC Palmer Dabbelt <[email protected]>CC Walker Chen <[email protected]>CC JeeHeng Sia <[email protected]>CC Leyfoon Tan <[email protected]>--- arch/riscv/boot/dts/starfive/jh7100-common.dtsi | 4 ---- arch/riscv/boot/dts/starfive/jh7100.dtsi | 1 + .../riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi | 4 ---- arch/riscv/boot/dts/starfive/jh7110.dtsi | 1 + 4 files changed, 2 insertions(+), 8 deletions(-)arch/riscv/boot/dts/starfive/jh7100-common.dtsi +0
-4@@ -19,10 +19,6 @@ chosen { stdout-path = "serial0:115200n8"; }; - cpus { - timebase-frequency = <6250000>; - }; - memory@80000000 { device_type = "memory"; reg = <0x0 0x80000000 0x2 0x0>;arch/riscv/boot/dts/starfive/jh7100.dtsi +1
-0@@ -16,6 +16,7 @@ / { cpus { #address-cells = <1>; #size-cells = <0>; + timebase-frequency = <6250000>; U74_0: cpu@0 { compatible = "sifive,u74-mc", "riscv";arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +0
-4@@ -26,10 +26,6 @@ chosen { stdout-path = "serial0:115200n8"; }; - cpus { - timebase-frequency = <4000000>; - }; - memory@40000000 { device_type = "memory"; reg = <0x0 0x40000000 0x1 0x0>;arch/riscv/boot/dts/starfive/jh7110.dtsi +1
-1@@ -18,6 +18,7 @@ / { cpus { #address-cells = <1>; #size-cells = <0>; + timebase-frequency = <4000000>; S7_0: cpu@0 { compatible = "sifive,s7", "riscv"; --2.39.2
Conor Dooley
maintainerQuoted 6 lines · Emil Renner Berthing
Quoted 4 lines · Conor Dooley
From: Conor Dooley <[email protected]>
Properties fixed by the SoC should be defined in the $soc.dtsi, and the timebase-frequency is not sourced directly from an off-chip oscillator.
Quoted 7 lines
Yes, according to the JH7100 docs[1] the mtime register is sourced from the
osc_sysexternal oscillator throughu74rtc_toggle. However I haven't yet found a place in the docs that describe where that clock is divided by 4 to get 6.25MHz from the 25MHz.I expect the JH7110 mtime is set up in a similar way, but haven't yet dug into the available documentation.
Your other reply suggests that this is a fixed division for the jh7110, in which case it makes sense to leave it as-is. mpfs is different in that it is fixed to 1 MHz regardless of which of the permitted external oscillator frequencies you use.
Quoted 12 lines · Conor Dooley
Quoted 11 lines · Emil Renner Berthing
Quoted 4 lines · Conor Dooley
From: Conor Dooley <[email protected]>
Properties fixed by the SoC should be defined in the $soc.dtsi, and the timebase-frequency is not sourced directly from an off-chip oscillator.
Yes, according to the JH7100 docs[1] the mtime register is sourced from the
osc_sysexternal oscillator throughu74rtc_toggle. However I haven't yet found a place in the docs that describe where that clock is divided by 4 to get 6.25MHz from the 25MHz.
Quoted 7 lines
Quoted 2 lines
I expect the JH7110 mtime is set up in a similar way, but haven't yet dug into the available documentation.
Your other reply suggests that this is a fixed division for the jh7110, in which case it makes sense to leave it as-is. mpfs is different in that it is fixed to 1 MHz regardless of which of the permitted external oscillator frequencies you use.
This is what I've found for the JH7100:
osc_sys (25MHz) -> u74rtc_toggle (gate) -> ? (div 4) -> mtime
The divide by 4 is not in the regular clock tree, so if it is configurable it must be some bits hidden in the syscon area or something. The only restriction I've found in the docs is that it must be strictly less than half the rate of the core clock.
For the JH7110 it goes:
osc (24MHz) -> rtc_toggle (div N) -> mtime
..where N defaults to 6 and this is also the maximum N.
/Emil
Quoted 77 lines · Conor Dooley
From: Conor Dooley <[email protected]>
Properties fixed by the SoC should be defined in the $soc.dtsi, and the timebase-frequency is not sourced directly from an off-chip oscillator.
Signed-off-by Conor Dooley <[email protected]>---
I actually have no idea whether this is true or not, I asked on the jh8100 series but only got an answer for that SoC and not the existing ones. I'm hoping that a patch envokes more of a reaction!CC Emil Renner Berthing <[email protected]>CC Conor Dooley <[email protected]>CC Rob Herring <[email protected]>CC Krzysztof Kozlowski <[email protected]>CC Paul Walmsley <[email protected]>CC Palmer Dabbelt <[email protected]>CC Walker Chen <[email protected]>CC JeeHeng Sia <[email protected]>CC Leyfoon Tan <[email protected]>--- arch/riscv/boot/dts/starfive/jh7100-common.dtsi | 4 ---- arch/riscv/boot/dts/starfive/jh7100.dtsi | 1 + .../riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi | 4 ---- arch/riscv/boot/dts/starfive/jh7110.dtsi | 1 + 4 files changed, 2 insertions(+), 8 deletions(-)arch/riscv/boot/dts/starfive/jh7100-common.dtsi +0
-4@@ -19,10 +19,6 @@ chosen { stdout-path = "serial0:115200n8"; }; - cpus { - timebase-frequency = <6250000>; - }; - memory@80000000 { device_type = "memory"; reg = <0x0 0x80000000 0x2 0x0>;arch/riscv/boot/dts/starfive/jh7100.dtsi +1
-0@@ -16,6 +16,7 @@ / { cpus { #address-cells = <1>; #size-cells = <0>; + timebase-frequency = <6250000>; U74_0: cpu@0 { compatible = "sifive,u74-mc", "riscv";arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +0
-4@@ -26,10 +26,6 @@ chosen { stdout-path = "serial0:115200n8"; }; - cpus { - timebase-frequency = <4000000>; - }; - memory@40000000 { device_type = "memory"; reg = <0x0 0x40000000 0x1 0x0>;arch/riscv/boot/dts/starfive/jh7110.dtsi +0
-0
arch/riscv/boot/dts/starfive/jh7110.dtsi / { · line 24
Quoted 7 lines
arch/riscv/boot/dts/starfive/jh7110.dtsi +1
-0@@ -18,6 +18,7 @@ / { cpus { #address-cells = <1>; #size-cells = <0>; + timebase-frequency = <4000000>; S7_0: cpu@0 { compatible = "sifive,s7", "riscv";
Hi Conor and Emil,
I found some information that I hope will be useful to you. What Emil said is right:
osc (24MHz) -> rtc_toggle (div N) -> mtime
I found the N is depend on this clock register in drivers/clk/starfive/clk-starfive-jh7110-sys.c:
83 JH71X0__DIV(JH7110_SYSCLK_RTC_TOGGLE, "rtc_toggle", 6, JH7110_SYSCLK_OSC),
and the description of the register is that the divider defaults to and is fixed to 6. So the timebase-frequency is 4MHz on the JH7110.
Best regards,
Xingyu Wu