MIPS: ralink: add CPU clock detection for MT7621
Subsystems (6)
v2 cover MIPS: ralink: add CPU clock detection for MT7621
This patchset ports CPU clock detection for MT7621 from OpenWrt.
Last time I sent this, I forgot to add an binding include which caused a compile error and the patch doesn't stay in linux-next.
This patchset resent the first two commits and also added binding documentation for mt7621-pll and used it in mt7621-dts at drivers/staging.
Changes since v1:
1. changed commit title prefix for dt include
2. split the patch adding clock node (details in that patch body)
3. drop useless syscon in dt documentation
4. drop cpuclock node for gbpc1
Chuanhong Guo (6):
dt-bindings: clock: add dt binding header for mt7621-pll
MIPS: ralink: drop ralink_clk_init for mt7621
MIPS: ralink: add clock device providing cpu/bus clock for mt7621
dt: bindings: add mt7621-pll dt binding documentation
staging: mt7621-dts: fix register range of memc node in mt7621.dtsi
staging: mt7621-dts: add dt nodes for mt7621-pll
.../bindings/clock/mediatek,mt7621-pll.txt | 18 ++++ arch/mips/include/asm/mach-ralink/mt7621.h | 20 ++++ arch/mips/ralink/mt7621.c | 98 +++++++++++++------ drivers/staging/mt7621-dts/gbpc1.dts | 5 - drivers/staging/mt7621-dts/mt7621.dtsi | 17 ++-- include/dt-bindings/clock/mt7621-clk.h | 14 +++ 6 files changed, 126 insertions(+), 46 deletions(-) create mode 100644 Documentation/devicetree/bindings/clock/mediatek,mt7621-pll.txt create mode 100644 include/dt-bindings/clock/mt7621-clk.h
Signature · 1 line
2.21.0
PATCH v2 1/6 dt-bindings: clock: add dt binding header for mt7621-pll
This patch adds dt binding header for mediatek,mt7621-pll
---
Change since v1:
Change commit title prefix.
include/dt-bindings/clock/mt7621-clk.h | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 include/dt-bindings/clock/mt7621-clk.h
include/dt-bindings/clock/mt7621-clk.h new file +14 -0
@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright (C) 2018 Weijie Gao <[email protected]> +*/ + +#ifndef __DT_BINDINGS_MT7621_CLK_H +#define __DT_BINDINGS_MT7621_CLK_H + +#define MT7621_CLK_CPU 0 +#define MT7621_CLK_BUS 1 + +#define MT7621_CLK_MAX 2 + +#endif /* __DT_BINDINGS_MT7621_CLK_H */
Signature · 1 line
2.21.0
PATCH v2 2/6 MIPS: ralink: drop ralink_clk_init for mt7621
In reply to Chuanhong GuoThis function isn't called anywhere. just drop it.
---
Change since v1:
New patch. Split from:
"MIPS: ralink: fix cpu clock of mt7621 and add dt clk devices"
arch/mips/ralink/mt7621.c | 43 --------------------------------------- 1 file changed, 43 deletions(-)
arch/mips/ralink/mt7621.c +0 -43
@@ -18,11 +18,6 @@#include "common.h" -#define SYSC_REG_SYSCFG 0x10 -#define SYSC_REG_CPLL_CLKCFG0 0x2c -#define SYSC_REG_CUR_CLK_STS 0x44 -#define CPU_CLK_SEL (BIT(30) | BIT(31)) -#define MT7621_GPIO_MODE_UART1 1#define MT7621_GPIO_MODE_I2C 2#define MT7621_GPIO_MODE_UART3_MASK 0x3
@@ -113,44 +108,6 @@ phys_addr_t mips_cpc_default_phys_base(void)panic ("Cannot detect cpc address" ); } -void __init ralink_clk_init (void ) -{ -int cpu_fdiv =0 ; -int cpu_ffrac =0 ; -int fbdiv =0 ; -u32 clk_sts, syscfg; -u8 clk_sel =0 , xtal_mode; -u32 cpu_clk; - -if ((rt_sysc_r32 (SYSC_REG_CPLL_CLKCFG0 ) &CPU_CLK_SEL ) !=0 ) - clk_sel =1 ; - -switch (clk_sel) { -case 0 : - clk_sts =rt_sysc_r32 (SYSC_REG_CUR_CLK_STS ); - cpu_fdiv = ((clk_sts >>8 ) &0x1F ); - cpu_ffrac = (clk_sts &0x1F ); - cpu_clk = (500 * cpu_ffrac / cpu_fdiv) *1000 *1000 ; -break ; - -case 1 : - fbdiv = ((rt_sysc_r32 (0x648 ) >>4 ) &0x7F ) +1 ; - syscfg =rt_sysc_r32 (SYSC_REG_SYSCFG ); - xtal_mode = (syscfg >>6 ) &0x7 ; -if (xtal_mode >=6 ) { -/* 25Mhz Xtal */ - cpu_clk =25 * fbdiv *1000 *1000 ; - }else if (xtal_mode >=3 ) { -/* 40Mhz Xtal */ - cpu_clk =40 * fbdiv *1000 *1000 ; - }else { -/* 20Mhz Xtal */ - cpu_clk =20 * fbdiv *1000 *1000 ; - } -break ; - } -} -void __init ralink_of_remap (void ) { rt_sysc_membase =plat_of_remap_node ("mtk,mt7621-sysc" );
Signature · 1 line
2.21.0
PATCH v2 3/6 MIPS: ralink: add clock device providing cpu/bus clock for mt7621
In reply to Chuanhong GuoFor a long time the mt7621 uses a fixed cpu clock which causes a problem if the cpu frequency is not 880MHz.
This patch adds cpu/bus clock calculation code and binds clocks to mt7621-pll node.
Ported from OpenWrt:c7ca224299 ramips: fix cpu clock of mt7621 and add dt clk devices
---
Changes since v1:
1. split patch.
2. calculate clocks using the function called by CLK_OF_DECLARE drop direct function call in timer-gic.c of ralink_clk_init
3. drop assignment of mips-hpt-frequency
arch/mips/include/asm/mach-ralink/mt7621.h | 20 ++++++ arch/mips/ralink/mt7621.c | 77 ++++++++++++++++++++++ 2 files changed, 97 insertions(+)
arch/mips/include/asm/mach-ralink/mt7621.h +20 -0
@@ -17,6 +17,10 @@#define SYSC_REG_CHIP_REV 0x0c#define SYSC_REG_SYSTEM_CONFIG0 0x10#define SYSC_REG_SYSTEM_CONFIG1 0x14 +#define SYSC_REG_CLKCFG0 0x2c +#define SYSC_REG_CUR_CLK_STS 0x44 + +#define MEMC_REG_CPU_PLL 0x648#define CHIP_REV_PKG_MASK 0x1#define CHIP_REV_PKG_SHIFT 16
@@ -24,6 +28,22 @@#define CHIP_REV_VER_SHIFT 8#define CHIP_REV_ECO_MASK 0xf +#define XTAL_MODE_SEL_MASK 0x7 +#define XTAL_MODE_SEL_SHIFT 6 + +#define CPU_CLK_SEL_MASK 0x3 +#define CPU_CLK_SEL_SHIFT 30 + +#define CUR_CPU_FDIV_MASK 0x1f +#define CUR_CPU_FDIV_SHIFT 8 +#define CUR_CPU_FFRAC_MASK 0x1f +#define CUR_CPU_FFRAC_SHIFT 0 + +#define CPU_PLL_PREDIV_MASK 0x3 +#define CPU_PLL_PREDIV_SHIFT 12 +#define CPU_PLL_FBDIV_MASK 0x7f +#define CPU_PLL_FBDIV_SHIFT 4 +#define MT7621_DRAM_BASE 0x0#define MT7621_DDR2_SIZE_MIN 32#define MT7621_DDR2_SIZE_MAX 256
arch/mips/ralink/mt7621.c +77 -0
100 lines not on this page · raw message
Signature · 1 line
2.21.0
PATCH v2 4/6 dt: bindings: add mt7621-pll dt binding documentation
In reply to Chuanhong GuoThis commit adds device tree binding documentation for MT7621 PLL controller.
---
Change since v1:
drop useless syscon in compatible string
.../bindings/clock/mediatek,mt7621-pll.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/mediatek,mt7621-pll.txt
Documentation/devicetree/bindings/clock/mediatek,mt7621-pll.txt new file +18 -0
@@ -0,0 +1,18 @@ +Binding for Mediatek MT7621 PLL controller + +The PLL controller provides the 2 main clocks of the SoC: CPU and BUS. + +Required Properties: +- compatible: has to be "mediatek,mt7621-pll" +- #clock-cells: has to be one + +Optional properties: +- clock-output-names: should be "cpu", "bus" + +Example: + pll { + compatible = "mediatek,mt7621-pll"; + + #clock-cells = <1>; + clock-output-names = "cpu", "bus"; + };
Signature · 1 line
2.21.0
Re: [PATCH v2 4/6] dt: bindings: add mt7621-pll dt binding documentation
Hi Chuanhong,
Quoted 4 lines · Chuanhong Guo
This commit adds device tree binding documentation for MT7621 PLL controller.
Signed-off-by Chuanhong Guo <[email protected]>
Quoted 8 lines
---
Change since v1:
drop useless syscon in compatible string.../bindings/clock/mediatek,mt7621-pll.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/mediatek,mt7621-pll.txt
This binding needs review from DT maintainers before I apply it, but as a general note it's typical to add the binding *before* its use in the series. That is, this patch should come before patch 3.
Personally I'd squash it with patch 1 so the binding & the header file needed to use the binding are added in one patch, then a later patch actually makes use of them.
Thanks,
Paul
Quoted 27 lines
Documentation/devicetree/bindings/clock/mediatek,mt7621-pll.txt new file +18
-0@@ -0,0 +1,18 @@ +Binding for Mediatek MT7621 PLL controller + +The PLL controller provides the 2 main clocks of the SoC: CPU and BUS. + +Required Properties: +- compatible: has to be "mediatek,mt7621-pll" +- #clock-cells: has to be one + +Optional properties: +- clock-output-names: should be "cpu", "bus" + +Example: + pll { + compatible = "mediatek,mt7621-pll"; + + #clock-cells = <1>; + clock-output-names = "cpu", "bus"; + };Signature · 1 line
2.21.0
Rob Herring
maintainerRe: [PATCH v2 4/6] dt: bindings: add mt7621-pll dt binding documentation
In reply to Chuanhong GuoQuoted 23 lines · Chuanhong Guo
This commit adds device tree binding documentation for MT7621 PLL controller.
Signed-off-by Chuanhong Guo <[email protected]>---
Change since v1:
drop useless syscon in compatible string.../bindings/clock/mediatek,mt7621-pll.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 Documentation/devicetree/bindings/clock/mediatek,mt7621-pll.txtDocumentation/devicetree/bindings/clock/mediatek,mt7621-pll.txt new file +4
-0@@ -0,0 +1,18 @@ +Binding for Mediatek MT7621 PLL controller + +The PLL controller provides the 2 main clocks of the SoC: CPU and BUS. +
Documentation/devicetree/bindings/clock/mediatek,mt7621-pll.txt line 14
Quoted 10 lines
Documentation/devicetree/bindings/clock/mediatek,mt7621-pll.txt new file +10
-0+Required Properties: +- compatible: has to be "mediatek,mt7621-pll" +- #clock-cells: has to be one + +Optional properties: +- clock-output-names: should be "cpu", "bus" + +Example: + pll { + compatible = "mediatek,mt7621-pll";
You didn't answer Stephen's question on v1.
Based on this binding, there is no way to control/program the PLL. Is this part of some IP block?
Quoted 7 lines
Documentation/devicetree/bindings/clock/mediatek,mt7621-pll.txt new file +4
-0+ + #clock-cells = <1>; + clock-output-names = "cpu", "bus"; + };Signature · 1 line
2.21.0
Re: [PATCH v2 4/6] dt: bindings: add mt7621-pll dt binding documentation
Hi!
Quoted 6 lines · Rob Herring
[...]
Documentation/devicetree/bindings/clock/mediatek,mt7621-pll.txt line 14
Quoted 3 lines
Documentation/devicetree/bindings/clock/mediatek,mt7621-pll.txt new file +3
-0+Example: + pll { + compatible = "mediatek,mt7621-pll";You didn't answer Stephen's question on v1.
I thought he was asking why there's a syscon in compatible string. I noticed that the syscon in my previous patch is a copy-paste error from elsewhere and dropped it.
Quoted 3 lines
Based on this binding, there is no way to control/program the PLL. Is this part of some IP block?
The entire section is called "system control" in datasheet and is occupied in arch/mips/ralink/mt7621.c [0]
Two clocks provided here is determined by reading some read-only registers in this part.
There's another register in this section providing clock gates for every peripherals, but MTK doesn't provide a clock plan in their datasheet. I can't determine corresponding clock frequencies for every peripherals, thus unable to write a working clock driver.
Quoted 8 lines
Quoted 8 lines
Documentation/devicetree/bindings/clock/mediatek,mt7621-pll.txt new file +4
-1+ + #clock-cells = <1>; + clock-output-names = "cpu", "bus"; + }; --2.21.0
Regards,
Chuanhong Guo
[0] https://elixir.bootlin.com/linux/latest/source/arch/mips/ralink/mt7621.c#L156
Re: [PATCH v2 4/6] dt: bindings: add mt7621-pll dt binding documentation
Hi,
Am 17.08.19 um 16:42 schrieb Chuanhong Guo:
Quoted 18 lines
Hi!
Quoted 6 lines · Rob Herring
[...]
Documentation/devicetree/bindings/clock/mediatek,mt7621-pll.txt line 14
Quoted 3 lines
Documentation/devicetree/bindings/clock/mediatek,mt7621-pll.txt new file +3
-0+Example: + pll { + compatible = "mediatek,mt7621-pll";You didn't answer Stephen's question on v1.
I thought he was asking why there's a syscon in compatible string. I noticed that the syscon in my previous patch is a copy-paste error from elsewhere and dropped it.
Quoted 3 lines
Based on this binding, there is no way to control/program the PLL. Is this part of some IP block?
Quoted 8 lines
The entire section is called "system control" in datasheet and is occupied in
arch/mips/ralink/mt7621.c[0]
Two clocks provided here is determined by reading some read-only registers in this part.
There's another register in this section providing clock gates for every peripherals, but MTK doesn't provide a clock plan in their datasheet. I can't determine corresponding clock frequencies for every peripherals, thus unable to write a working clock driver.
In provided link [0] the ralink_clk_init function is reading SYSC_REG_CPLL_CLKCFG0 R/W register. This register is used to determine clock source, clock freq and CPU or bus clocks. SYSC_REG_CPLL_CLKCFG1 register is a clock gate controller. It is used to enable or disable clocks. Jist wild assumption. All peripheral devices are suing bus clock.
IMO - this information is enough to create full blown drivers/clk/mediatek/clk-mt7621.c
Quoted 13 lines
Quoted 7 lines
Quoted 7 lines
Documentation/devicetree/bindings/clock/mediatek,mt7621-pll.txt new file +4
-1+ + #clock-cells = <1>; + clock-output-names = "cpu", "bus"; + }; --2.21.0
Regards,
Chuanhong Guo[0] https://elixir.bootlin.com/linux/latest/source/arch/mips/ralink/mt7621.c#L156
Re: [PATCH v2 4/6] dt: bindings: add mt7621-pll dt binding documentation
Hi!
Quoted 2 lines · Oleksij Rempel
In provided link [0] the
ralink_clk_initfunction is readingSYSC_REG_CPLL_CLKCFG0R/W register. This register is used to determine clock source, clock freq and CPU or bus clocks.
This register should only be changed by bootloader, not kernel. So it's read-only in kernel's perspective.
Quoted 2 lines
SYSC_REG_CPLL_CLKCFG1register is a clock gate controller. It is used to enable or disable clocks. Jist wild assumption. All peripheral devices are suing bus clock.
This assumption is incorrect. When this patchset is applied in OpenWrt, I asked the author why there's still a fixed clock in mt7621.dtsi, He told me that there's another clock for those unchanged peripherals and he doesn't have time to write a clock provider for it. I don't know how many undocumented clocks are there since this piece of info is missing in datasheet.
Quoted 2 lines
IMO - this information is enough to create full blown
drivers/clk/mediatek/clk-mt7621.c
And this information isn't enough because the assumption above is incorrect :P
Regards,
Chuanhong Guo
Re: [PATCH v2 4/6] dt: bindings: add mt7621-pll dt binding documentation
Am 17.08.19 um 18:22 schrieb Chuanhong Guo:
Quoted 9 lines
Hi!
Quoted 2 lines · Oleksij Rempel
In provided link [0] the
ralink_clk_initfunction is readingSYSC_REG_CPLL_CLKCFG0R/W register. This register is used to determine clock source, clock freq and CPU or bus clocks.This register should only be changed by bootloader, not kernel. So it's read-only in kernel's perspective.
there is no kernel perspective, until you have some kind of privilege separation. There is only: "i decided not to write on to writeable register".
Quoted 7 lines
Quoted 2 lines
SYSC_REG_CPLL_CLKCFG1register is a clock gate controller. It is used to enable or disable clocks. Jist wild assumption. All peripheral devices are suing bus clock.This assumption is incorrect. When this patchset is applied in OpenWrt, I asked the author why there's still a fixed clock in
mt7621.dtsi, He told me that there's another clock for those unchanged peripherals and he doesn't have time to write a clock provider for it.
Can you please provide a link to this patch or email.
Quoted 7 lines
I don't know how many undocumented clocks are there since this piece of info is missing in datasheet.
Quoted 2 lines
IMO - this information is enough to create full blown
drivers/clk/mediatek/clk-mt7621.cAnd this information isn't enough because the assumption above is incorrect :P
Ok, let's assume I accept this not technical argumentation.
We have at least 2 know registers:SYSC_REG_CPLL_CLKCFG0 - it provides some information about boostrapped refclock. PLL and dividers used for CPU and some sort of BUS (AHB?). SYSC_REG_CPLL_CLKCFG1 - a banch of gates to enable/disable clocks for all or some ip cores. What is probably missing is a set of dividers for each ip core. From your words it is not document.
With this information the clk driver will provide gate functionality and a set of hardcoded clocks. With this driver will work part of power management and nice devicetree without fixed clocks.
--
Regards,
Oleksij
Re: [PATCH v2 4/6] dt: bindings: add mt7621-pll dt binding documentation
Hi!
Quoted 9 lines · Oleksij Rempel
Quoted 7 lines
Quoted 2 lines
SYSC_REG_CPLL_CLKCFG1register is a clock gate controller. It is used to enable or disable clocks. Jist wild assumption. All peripheral devices are suing bus clock.This assumption is incorrect. When this patchset is applied in OpenWrt, I asked the author why there's still a fixed clock in
mt7621.dtsi, He told me that there's another clock for those unchanged peripherals and he doesn't have time to write a clock provider for it.Can you please provide a link to this patch or email.
This discussion is in Chinese and using an IM software so there's no link available.
Quoted 7 lines
We have at least 2 know registers:
SYSC_REG_CPLL_CLKCFG0- it provides some information about boostrapped refclock. PLL and dividers used for CPU and some sort of BUS (AHB?).SYSC_REG_CPLL_CLKCFG1- a banch of gates to enable/disable clocks for all or some ip cores.
What is probably missing is a set of dividers for
each ip core. From your words it is not document.
The specific missing part I was referring to, is parent clocks for every gates. I'm not going to assume this with current openwrt device tree because some peripherals doesn't have a clock binding at all or have a dummy one there.
Quoted 4 lines
With this information the clk driver will provide gate functionality and a set of hardcoded clocks. With this driver will work part of power management and nice devicetree without fixed clocks.
Regards,
Chuanhong Guo
Re: [PATCH v2 4/6] dt: bindings: add mt7621-pll dt binding documentation
Am 18.08.19 um 04:29 schrieb Chuanhong Guo:
Quoted 24 lines
Hi!
Quoted 9 lines · Oleksij Rempel
Quoted 7 lines
Quoted 2 lines
SYSC_REG_CPLL_CLKCFG1register is a clock gate controller. It is used to enable or disable clocks. Jist wild assumption. All peripheral devices are suing bus clock.This assumption is incorrect. When this patchset is applied in OpenWrt, I asked the author why there's still a fixed clock in
mt7621.dtsi, He told me that there's another clock for those unchanged peripherals and he doesn't have time to write a clock provider for it.Can you please provide a link to this patch or email.
This discussion is in Chinese and using an IM software so there's no link available.
Quoted 7 lines
We have at least 2 know registers:
SYSC_REG_CPLL_CLKCFG0- it provides some information about boostrapped refclock. PLL and dividers used for CPU and some sort of BUS (AHB?).SYSC_REG_CPLL_CLKCFG1- a banch of gates to enable/disable clocks for all or some ip cores.
What is probably missing is a set of dividers for
each ip core. From your words it is not document.
Quoted 4 lines
The specific missing part I was referring to, is parent clocks for every gates. I'm not going to assume this with current openwrt device tree because some peripherals doesn't have a clock binding at all or have a dummy one there.
Ok, then I do not understand what is the motivation to upstream something what is not nearly ready for use. This code is currently on prototyping phase and you have no information how to make it ready.
It means, we cannot expect that this driver will be fixed any time soon.
--
Regards,
Oleksij
Re: [PATCH v2 4/6] dt: bindings: add mt7621-pll dt binding documentation
Hi!
Quoted 9 lines · Oleksij Rempel
Quoted 9 lines
Quoted 8 lines
We have at least 2 know registers:
SYSC_REG_CPLL_CLKCFG0- it provides some information about boostrapped refclock. PLL and dividers used for CPU and some sort of BUS (AHB?).SYSC_REG_CPLL_CLKCFG1- a banch of gates to enable/disable clocks for all or some ip cores.
What is probably missing is a set of dividers for
each ip core. From your words it is not document.
Quoted 7 lines
Quoted 4 lines
The specific missing part I was referring to, is parent clocks for every gates. I'm not going to assume this with current openwrt device tree because some peripherals doesn't have a clock binding at all or have a dummy one there.
Ok, then I do not understand what is the motivation to upstream something what is not nearly ready for use.
Why isn't it "ready for use" then?
A complete mt7621-pll driver will contain two parts:
1. A clock provider which outputs several clocks
2. A clock gate with parent clocks properly configured
Two clocks provided here are just two clocks that can't be controlled in kernel no matter where it goes (arch/mips/ralink or drivers/clk). Having a working CPU clock provider is better than defining a fixed clock in dts because CPU clock can be controlled by bootloader. (BTW description for CPU PLL register is also missing in datasheet.) Clock gate is an unrelated part and there is no information to properly implement it unless MTK decided to release a clock plan somehow.
Quoted 1 line
This code is currently on prototyping phase
Code for clock calculation is done, not "prototyping".
Quoted 1 line
It means, we cannot expect that this driver will be fixed any time soon.
I think clock gating is a separated feature instead of a broken part that has to be fixed.
Regards,
Chuanhong Guo
Re: [PATCH v2 4/6] dt: bindings: add mt7621-pll dt binding documentation
Am 18.08.19 um 09:19 schrieb Chuanhong Guo:
Quoted 25 lines
Hi!
Quoted 9 lines · Oleksij Rempel
Quoted 9 lines
Quoted 8 lines
We have at least 2 know registers:
SYSC_REG_CPLL_CLKCFG0- it provides some information about boostrapped refclock. PLL and dividers used for CPU and some sort of BUS (AHB?).SYSC_REG_CPLL_CLKCFG1- a banch of gates to enable/disable clocks for all or some ip cores.
What is probably missing is a set of dividers for
each ip core. From your words it is not document.Quoted 7 lines
Quoted 4 lines
The specific missing part I was referring to, is parent clocks for every gates. I'm not going to assume this with current openwrt device tree because some peripherals doesn't have a clock binding at all or have a dummy one there.
Ok, then I do not understand what is the motivation to upstream something what is not nearly ready for use.
Why isn't it "ready for use" then?
A complete mt7621-pll driver will contain two parts:
1. A clock provider which outputs several clocks
2. A clock gate with parent clocks properly configured
Quoted 8 lines
Two clocks provided here are just two clocks that can't be controlled in kernel no matter where it goes (
arch/mips/ralinkordrivers/clk). Having a working CPU clock provider is better than defining a fixed clock in dts because CPU clock can be controlled by bootloader. (BTW description for CPU PLL register is also missing in datasheet.) Clock gate is an unrelated part and there is no information to properly implement it unless MTK decided to release a clock plan somehow.
With other words, your complete system is running with unknown clock rates. The source clock in the clock three can be configured differently by bootloader but you don't know how it is done how and it is not documented.
Quoted 8 lines
Quoted 1 line
This code is currently on prototyping phase
Code for clock calculation is done, not "prototyping".
Quoted 1 line
It means, we cannot expect that this driver will be fixed any time soon.
I think clock gating is a separated feature instead of a broken part that has to be fixed.
Ok, i would agree with it. But from what you said, this feature will be never implemented.
So, I repeat my question. What is the point to upstream code for a system, which has not enough information to get proper clock rate even for uart? or is uart running with cpu or bus clock rate?
--
Regards,
Oleksij
Re: [PATCH v2 4/6] dt: bindings: add mt7621-pll dt binding documentation
Hi!
Quoted 36 lines · Oleksij Rempel
Am 18.08.19 um 09:19 schrieb Chuanhong Guo:
Quoted 25 lines
Hi!
Quoted 9 lines · Oleksij Rempel
Quoted 9 lines
Quoted 8 lines
We have at least 2 know registers:
SYSC_REG_CPLL_CLKCFG0- it provides some information about boostrapped refclock. PLL and dividers used for CPU and some sort of BUS (AHB?).SYSC_REG_CPLL_CLKCFG1- a banch of gates to enable/disable clocks for all or some ip cores.
What is probably missing is a set of dividers for
each ip core. From your words it is not document.Quoted 7 lines
Quoted 4 lines
The specific missing part I was referring to, is parent clocks for every gates. I'm not going to assume this with current openwrt device tree because some peripherals doesn't have a clock binding at all or have a dummy one there.
Ok, then I do not understand what is the motivation to upstream something what is not nearly ready for use.
Why isn't it "ready for use" then?
A complete mt7621-pll driver will contain two parts:
1. A clock provider which outputs several clocks
2. A clock gate with parent clocks properly configuredQuoted 8 lines
Two clocks provided here are just two clocks that can't be controlled in kernel no matter where it goes (
arch/mips/ralinkordrivers/clk). Having a working CPU clock provider is better than defining a fixed clock in dts because CPU clock can be controlled by bootloader. (BTW description for CPU PLL register is also missing in datasheet.) Clock gate is an unrelated part and there is no information to properly implement it unless MTK decided to release a clock plan somehow.
Quoted 2 lines
With other words, your complete system is running with unknown clock rates.
And without this patchset the complete system is running with unknown clock and, even worse, we make assumptions about what clock bootloader uses, hardcoded it in dts and hope it is the correct value.
Quoted 3 lines
The source clock in the clock three can be configured differently by bootloader but you don't know how it is done how and it is not documented.
Actually, I don't know about this and I didn't wrote the original clock calculation code. I just ported it from downstream OpenWrt kernel. Here's a piece of code from Mediatek's SDK kernel:
case 0:
reg = (*(volatile u32 *)(RALINK_SYSCTL_BASE + 0x44));
cpu_fdiv = ((reg >> 8) & 0x1F);
cpu_ffrac = (reg & 0x1F);
mips_cpu_feq = (500 * cpu_ffrac / cpu_fdiv) * 1000 * 1000;
break;
case 1: //CPU PLL
reg = (*(volatile u32 *)(RALINK_MEMCTRL_BASE + 0x648));
fbdiv = ((reg >> 4) & 0x7F) + 1;
reg = (*(volatile u32 *)(RALINK_SYSCTL_BASE + 0x10));
reg = (reg >> 6) & 0x7;
if(reg >= 6) { //25Mhz Xtal
mips_cpu_feq = 25 * fbdiv * 1000 * 1000;
} else if(reg >=3) { //40Mhz Xtal
mips_cpu_feq = 20 * fbdiv * 1000 * 1000;
} else { // 20Mhz Xtal
/* TODO */
}
break;Quoted 10 lines
Quoted 9 lines
Quoted 2 lines
This code is currently on prototyping phase
Code for clock calculation is done, not "prototyping".
Quoted 1 line
It means, we cannot expect that this driver will be fixed any time soon.
I think clock gating is a separated feature instead of a broken part that has to be fixed.
Quoted 6 lines
Ok, i would agree with it. But from what you said, this feature will be never implemented.
So, I repeat my question. What is the point to upstream code for a system, which has not enough information to get proper clock rate even for uart? or is uart running with cpu or bus clock rate?
uart runs of a fixed 50MHz clock according to another piece of code from MTK SDK:
(a pastebin version here for better readability. This specific question has nothing to do with patch reviewing and doesn't need to be preserved in mail forever.)
https://paste.ubuntu.com/p/fYmtDFW9nh/
I could ask the same question:
What is the point of upstreaming an incomplete MT7621 support in the first place? Current MT7621 support in upstream kernel works only for mt7621a not mt7621s and it runs of unknown clocks. These kind of code should stay in downstream projects like OpenWrt forever isn't it?
Regards,
Chuanhong Guo
Re: [PATCH v2 4/6] dt: bindings: add mt7621-pll dt binding documentation
Quoted 101 lines · Chuanhong Guo
Hi!
Quoted 36 lines · Oleksij Rempel
Am 18.08.19 um 09:19 schrieb Chuanhong Guo:
Quoted 25 lines
Hi!
Quoted 9 lines · Oleksij Rempel
Quoted 9 lines
Quoted 8 lines
We have at least 2 know registers:
SYSC_REG_CPLL_CLKCFG0- it provides some information about boostrapped refclock. PLL and dividers used for CPU and some sort of BUS (AHB?).SYSC_REG_CPLL_CLKCFG1- a banch of gates to enable/disable clocks for all or some ip cores.
What is probably missing is a set of dividers for
each ip core. From your words it is not document.Quoted 7 lines
Quoted 4 lines
The specific missing part I was referring to, is parent clocks for every gates. I'm not going to assume this with current openwrt device tree because some peripherals doesn't have a clock binding at all or have a dummy one there.
Ok, then I do not understand what is the motivation to upstream something what is not nearly ready for use.
Why isn't it "ready for use" then?
A complete mt7621-pll driver will contain two parts:
1. A clock provider which outputs several clocks
2. A clock gate with parent clocks properly configuredQuoted 8 lines
Two clocks provided here are just two clocks that can't be controlled in kernel no matter where it goes (
arch/mips/ralinkordrivers/clk). Having a working CPU clock provider is better than defining a fixed clock in dts because CPU clock can be controlled by bootloader. (BTW description for CPU PLL register is also missing in datasheet.) Clock gate is an unrelated part and there is no information to properly implement it unless MTK decided to release a clock plan somehow.Quoted 2 lines
With other words, your complete system is running with unknown clock rates.
And without this patchset the complete system is running with unknown clock and, even worse, we make assumptions about what clock bootloader uses, hardcoded it in dts and hope it is the correct value.
Quoted 3 lines
The source clock in the clock three can be configured differently by bootloader but you don't know how it is done how and it is not documented.
Actually, I don't know about this and I didn't wrote the original clock calculation code. I just ported it from downstream OpenWrt kernel. Here's a piece of code from Mediatek's SDK kernel:
case 0:
reg = (*(volatile u32 *)(RALINK_SYSCTL_BASE + 0x44)); cpu_fdiv = ((reg >> 8) & 0x1F); cpu_ffrac = (reg & 0x1F); mips_cpu_feq = (500 * cpu_ffrac / cpu_fdiv) * 1000 * 1000; break; case 1: //CPU PLL reg = (*(volatile u32 *)(RALINK_MEMCTRL_BASE + 0x648)); fbdiv = ((reg >> 4) & 0x7F) + 1; reg = (*(volatile u32 *)(RALINK_SYSCTL_BASE + 0x10)); reg = (reg >> 6) & 0x7; if(reg >= 6) { //25Mhz Xtal mips_cpu_feq = 25 * fbdiv * 1000 * 1000; } else if(reg >=3) { //40Mhz Xtal mips_cpu_feq = 20 * fbdiv * 1000 * 1000; } else { // 20Mhz Xtal /* TODO */ } break;Quoted 10 lines
Quoted 9 lines
Quoted 2 lines
This code is currently on prototyping phase
Code for clock calculation is done, not "prototyping".
Quoted 1 line
It means, we cannot expect that this driver will be fixed any time soon.
I think clock gating is a separated feature instead of a broken part that has to be fixed.
Quoted 6 lines
Ok, i would agree with it. But from what you said, this feature will be never implemented.
So, I repeat my question. What is the point to upstream code for a system, which has not enough information to get proper clock rate even for uart? or is uart running with cpu or bus clock rate?
uart runs of a fixed 50MHz clock according to another piece of code from MTK SDK:
(a pastebin version here for better readability. This specific question has nothing to do with patch reviewing and doesn't need to be preserved in mail forever.)
https://paste.ubuntu.com/p/fYmtDFW9nh/
Quoted 5 lines
I could ask the same question:
What is the point of upstreaming an incomplete MT7621 support in the first place? Current MT7621 support in upstream kernel works only for mt7621a not mt7621s and it runs of unknown clocks. These kind of code should stay in downstream projects like OpenWrt forever isn't it?
And in fact you've upstreamed a broken ag71xx driver anyway.
This debate goes nowhere. I've clarified the situation and made my point. Of course I can't read through the ancient and heavily hacked vendor kernel to figure out a clock plan myself.
Regards,
Chuanhong Guo
Re: [PATCH v2 4/6] dt: bindings: add mt7621-pll dt binding documentation
Am 18.08.19 um 10:44 schrieb Chuanhong Guo:
Quoted 95 lines · Chuanhong Guo
Quoted 94 lines
Hi!
Quoted 36 lines · Oleksij Rempel
Am 18.08.19 um 09:19 schrieb Chuanhong Guo:
Quoted 25 lines
Hi!
Quoted 9 lines · Oleksij Rempel
Quoted 9 lines
Quoted 8 lines
We have at least 2 know registers:
SYSC_REG_CPLL_CLKCFG0- it provides some information about boostrapped refclock. PLL and dividers used for CPU and some sort of BUS (AHB?).SYSC_REG_CPLL_CLKCFG1- a banch of gates to enable/disable clocks for all or some ip cores.
What is probably missing is a set of dividers for
each ip core. From your words it is not document.Quoted 7 lines
Quoted 4 lines
The specific missing part I was referring to, is parent clocks for every gates. I'm not going to assume this with current openwrt device tree because some peripherals doesn't have a clock binding at all or have a dummy one there.
Ok, then I do not understand what is the motivation to upstream something what is not nearly ready for use.
Why isn't it "ready for use" then?
A complete mt7621-pll driver will contain two parts:
1. A clock provider which outputs several clocks
2. A clock gate with parent clocks properly configuredQuoted 8 lines
Two clocks provided here are just two clocks that can't be controlled in kernel no matter where it goes (
arch/mips/ralinkordrivers/clk). Having a working CPU clock provider is better than defining a fixed clock in dts because CPU clock can be controlled by bootloader. (BTW description for CPU PLL register is also missing in datasheet.) Clock gate is an unrelated part and there is no information to properly implement it unless MTK decided to release a clock plan somehow.Quoted 2 lines
With other words, your complete system is running with unknown clock rates.
And without this patchset the complete system is running with unknown clock and, even worse, we make assumptions about what clock bootloader uses, hardcoded it in dts and hope it is the correct value.
Quoted 3 lines
The source clock in the clock three can be configured differently by bootloader but you don't know how it is done how and it is not documented.
Actually, I don't know about this and I didn't wrote the original clock calculation code. I just ported it from downstream OpenWrt kernel. Here's a piece of code from Mediatek's SDK kernel:
case 0:
reg = (*(volatile u32 *)(RALINK_SYSCTL_BASE + 0x44)); cpu_fdiv = ((reg >> 8) & 0x1F); cpu_ffrac = (reg & 0x1F); mips_cpu_feq = (500 * cpu_ffrac / cpu_fdiv) * 1000 * 1000; break; case 1: //CPU PLL reg = (*(volatile u32 *)(RALINK_MEMCTRL_BASE + 0x648)); fbdiv = ((reg >> 4) & 0x7F) + 1; reg = (*(volatile u32 *)(RALINK_SYSCTL_BASE + 0x10)); reg = (reg >> 6) & 0x7; if(reg >= 6) { //25Mhz Xtal mips_cpu_feq = 25 * fbdiv * 1000 * 1000; } else if(reg >=3) { //40Mhz Xtal mips_cpu_feq = 20 * fbdiv * 1000 * 1000; } else { // 20Mhz Xtal /* TODO */ } break;Quoted 16 lines
Quoted 9 lines
Quoted 2 lines
This code is currently on prototyping phase
Code for clock calculation is done, not "prototyping".
Quoted 1 line
It means, we cannot expect that this driver will be fixed any time soon.
I think clock gating is a separated feature instead of a broken part that has to be fixed.
Ok, i would agree with it. But from what you said, this feature will be never implemented.
So, I repeat my question. What is the point to upstream code for a system, which has not enough information to get proper clock rate even for uart? or is uart running with cpu or bus clock rate?
Quoted 6 lines
Quoted 6 lines
uart runs of a fixed 50MHz clock according to another piece of code from MTK SDK:
(a pastebin version here for better readability. This specific question has nothing to do with patch reviewing and doesn't need to be preserved in mail forever.)
https://paste.ubuntu.com/p/fYmtDFW9nh/
ok.
lets see more code:drivers/staging/mt7621-mmc/sd.c
/* clock source for host: global */
#if defined(CONFIG_SOC_MT7620)
static u32 hclks[] = {48000000}; /* +/- by chhung */ #elif defined(CONFIG_SOC_MT7621)
static u32 hclks[] = {50000000}; /* +/- by chhung */ #endif
hm.. 50Mhz again. Feels like APB clock.
./drivers/staging/mt7621-dts/mt7621.dtsi
cpuclock: cpuclock@0 {
#clock-cells = <0>;
compatible = "fixed-clock";
/* FIXME: there should be way to detect this */
clock-frequency = <880000000>;
};Your driver is trying to cover cpuclock
sysclock: sysclock@0 {
#clock-cells = <0>;
compatible = "fixed-clock";
/* This is normally 1/4 of cpuclock */
clock-frequency = <220000000>;
};and most probably system clock alias "bus clock", most probably AHB.
i2c: i2c@900 {
compatible = "mediatek,mt7621-i2c";
clocks = <&sysclock>;looks like i2c is using AHB clock.
uartlite: uartlite@c00 {
compatible = "ns16550a";
clocks = <&sysclock>;
clock-frequency = <50000000>;and uart is suing APB clock
spi0: spi@b00 {
compatible = "ralink,mt7621-spi";
clocks = <&sysclock>;SPI -> APB
xhci: xhci@1E1C0000 {
compatible = "mediatek,mt8173-xhci";
clocks = <&sysclock>;
clock-names = "sys_ck";XHCI -> AHB
ethernet: ethernet@1e100000 {
compatible = "mediatek,mt7621-eth";
clocks = <&sysclock>;
clock-names = "ethif";Ethernet -> AHB
So, all device are using two groups of clocks. System clock with seems to depend on CPU clock.
Or 50MHz clock. Which is for some unknow reason always 50MHz.
Here we have already upstream code:arch/mips/ralink/mt7620.c
xtal_rate = mt7620_get_xtal_rate();
#define RFMT(label) label ":%lu.%03luMHz " #define RINT(x) ((x) / 1000000) #define RFRAC(x) (((x) / 1000) % 1000)
if (is_mt76x8()) {
if (xtal_rate == MHZ(40))
cpu_rate = MHZ(580);
else
cpu_rate = MHZ(575);
dram_rate = sys_rate = cpu_rate / 3;
periph_rate = MHZ(40);
pcmi2s_rate = MHZ(480);
ralink_clk_add("10000d00.uartlite", periph_rate);
ralink_clk_add("10000e00.uartlite", periph_rate);which is doing same as I requested before. Well, preferred in drivers/clk/ manner.
Quoted 5 lines
Quoted 5 lines
I could ask the same question:
What is the point of upstreaming an incomplete MT7621 support in the first place? Current MT7621 support in upstream kernel works only for mt7621a not mt7621s and it runs of unknown clocks. These kind of code should stay in downstream projects like OpenWrt forever isn't it?
I need to admit. I really like the idea of pushing all downstream OpenWrt code mainline. And respect every one who is doing it.
Other question, do this platfrom SoC really worth it? Vendor seems do not care about it. This product belong to
Quoted 1 line
And in fact you've upstreamed a broken ag71xx driver anyway.
I don't think this example is nearly comparable. We have enough documentation to provide working driver. For mainlining was removed everything what do not belong there:
- direct reading and writing to system wide clock registers. This should be done over clk framework.
- switch support. It should be done in dsa framework, not inside of ethernet driver.
- ethertool support was removed to reduce review overhead and can be add later if need.
- debugfs support was removed removed to reduce review overhead and can be add later if need.
- phy or board specific quirks was removed as well. This has nothing todo with ethernet driver and belong to other frameworks or drivers.
Quoted 3 lines
This debate goes nowhere. I've clarified the situation and made my point. Of course I can't read through the ancient and heavily hacked vendor kernel to figure out a clock plan myself.
Ok, I provided you some productive technical hints how it should be done. I don't think mt7620 has better documentation then mt7621 and even in this case it was possible to make more or less good driver.
--
Regards,
Oleksij
Re: [PATCH v2 4/6] dt: bindings: add mt7621-pll dt binding documentation
Hi!
Quoted 31 lines · Oleksij Rempel
lets see more code:
drivers/staging/mt7621-mmc/sd.c
/* clock source for host: global */
#ifdefined(CONFIG_SOC_MT7620)
static u32 hclks[] = {48000000}; /* +/- by chhung */ #elifdefined(CONFIG_SOC_MT7621)
static u32 hclks[] = {50000000}; /* +/- by chhung */ #endifhm.. 50Mhz again. Feels like APB clock.
./drivers/staging/mt7621-dts/mt7621.dtsicpuclock: cpuclock@0 { #clock-cells = <0>; compatible = "fixed-clock"; /* FIXME: there should be way to detect this */ clock-frequency = <880000000>; };Your driver is trying to cover cpuclock
sysclock: sysclock@0 { #clock-cells = <0>; compatible = "fixed-clock"; /* This is normally 1/4 of cpuclock */ clock-frequency = <220000000>; };
Quoted 1 line
and most probably system clock alias "bus clock", most probably AHB.
This sysclock was the 50MHz clock in OpenWrt. It's set as "bus clock" upstream by an incorrect commit.
As already stated in previous reply: I'm not going to make assumption about clock plan using OpenWrt's device tree because it already contains several mistakes on clocks. Since the upstream device tree comes from there, I don't trust it either. You might want to check out patch 6/6 in this series where the original author of this commit in openwrt fixed some clocks and I ported it here.
Quoted 8 lines
[...]
Quoted 3 lines
This debate goes nowhere. I've clarified the situation and made my point. Of course I can't read through the ancient and heavily hacked vendor kernel to figure out a clock plan myself.
Ok, I provided you some productive technical hints how it should be done. I don't think mt7620 has better documentation then mt7621 and even in this case it was possible to make more or less good driver.
It does. A clock plan for mt7620 is available in MT7620 Programming Guide, Page 14.
Regards,
Chuanhong Guo
Re: [PATCH v2 4/6] dt: bindings: add mt7621-pll dt binding documentation
In reply to Chuanhong GuoHi,
Am 17.08.19 um 16:42 schrieb Chuanhong Guo:
Quoted 18 lines
Hi!
Quoted 6 lines · Rob Herring
[...]
Documentation/devicetree/bindings/clock/mediatek,mt7621-pll.txt line 14
Quoted 3 lines
Documentation/devicetree/bindings/clock/mediatek,mt7621-pll.txt new file +3
-0+Example: + pll { + compatible = "mediatek,mt7621-pll";You didn't answer Stephen's question on v1.
I thought he was asking why there's a syscon in compatible string. I noticed that the syscon in my previous patch is a copy-paste error from elsewhere and dropped it.
Quoted 3 lines
Based on this binding, there is no way to control/program the PLL. Is this part of some IP block?
Quoted 8 lines
The entire section is called "system control" in datasheet and is occupied in
arch/mips/ralink/mt7621.c[0]
Two clocks provided here is determined by reading some read-only registers in this part.
There's another register in this section providing clock gates for every peripherals, but MTK doesn't provide a clock plan in their datasheet. I can't determine corresponding clock frequencies for every peripherals, thus unable to write a working clock driver.
In provided link [0] the ralink_clk_init function is reading SYSC_REG_CPLL_CLKCFG0 R/W register. This register is used to determine clock source, clock freq and CPU or bus clocks. SYSC_REG_CPLL_CLKCFG1 register is a clock gate controller. It is used to enable or disable clocks. Jist wild assumption. All peripheral devices are suing bus clock.
IMO - this information is enough to create full blown drivers/clk/mediatek/clk-mt7621.c
Quoted 8 lines
Quoted 7 lines
Quoted 7 lines
Documentation/devicetree/bindings/clock/mediatek,mt7621-pll.txt new file +4
-1+ + #clock-cells = <1>; + clock-output-names = "cpu", "bus"; + }; --2.21.0
Quoted 5 lines
Regards,
Chuanhong Guo[0] https://elixir.bootlin.com/linux/latest/source/arch/mips/ralink/mt7621.c#L156
--
Regards,
Oleksij
PATCH v2 5/6 staging: mt7621-dts: fix register range of memc node in mt7621.dtsi
In reply to Chuanhong GuoThe memc node from mt7621.dtsi has incorrect register resource. Fix it according to the programming guide.
---
Change since v1: None.
drivers/staging/mt7621-dts/mt7621.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/staging/mt7621-dts/mt7621.dtsi +1 -1
@@ -138,7 +138,7 @@ memc: memc@5000 { compatible = "mtk,mt7621-memc"; - reg = <0x300 0x100>; + reg = <0x5000 0x1000>; }; cpc: cpc@1fbf0000 {
Signature · 1 line
2.21.0
PATCH v2 6/6 staging: mt7621-dts: add dt nodes for mt7621-pll
In reply to Chuanhong GuoThis commit adds device-tree node for mt7621-pll and use its clocks accordingly.
---
Changes since v1:
1. drop cpuclock node in gbpc1.dts
2. drop syscon in mt7621-pll node
drivers/staging/mt7621-dts/gbpc1.dts | 5 ----- drivers/staging/mt7621-dts/mt7621.dtsi | 15 +++++++-------- 2 files changed, 7 insertions(+), 13 deletions(-)
drivers/staging/mt7621-dts/gbpc1.dts +0 -5
@@ -106,11 +106,6 @@ clock-frequency = <225000000>; }; -&cpuclock { - compatible = "fixed-clock"; - clock-frequency = <900000000>; -}; - &pcie { pinctrl-names = "default"; pinctrl-0 = <&pcie_pins>;
drivers/staging/mt7621-dts/mt7621.dtsi +7 -8
@@ -1,4 +1,5 @@ #include <dt-bindings/interrupt-controller/mips-gic.h> +#include <dt-bindings/clock/mt7621-clk.h> #include <dt-bindings/gpio/gpio.h> / {
@@ -27,12 +28,11 @@ serial0 = &uartlite; }; - cpuclock: cpuclock@0 { - #clock-cells = <0>; - compatible = "fixed-clock"; + pll: pll { + compatible = "mediatek,mt7621-pll"; - /* FIXME: there should be way to detect this */ - clock-frequency = <880000000>; + #clock-cells = <1>; + clock-output-names = "cpu", "bus"; }; sysclock: sysclock@0 {
@@ -155,7 +155,6 @@ compatible = "ns16550a"; reg = <0xc00 0x100>; - clocks = <&sysclock>; clock-frequency = <50000000>; interrupt-parent = <&gic>;
@@ -172,7 +171,7 @@ compatible = "ralink,mt7621-spi"; reg = <0xb00 0x100>; - clocks = <&sysclock>; + clocks = <&pll MT7621_CLK_BUS>; resets = <&rstctrl 18>; reset-names = "spi";
@@ -372,7 +371,7 @@ timer { compatible = "mti,gic-timer"; interrupts = <GIC_LOCAL 1 IRQ_TYPE_NONE>; - clocks = <&cpuclock>; + clocks = <&pll MT7621_CLK_CPU>; }; };
Signature · 1 line
2.21.0