ARM: stm32: Make bsec available in SPL
Subsystems (4)
RFC PATCH 1/2 ARM: stm32: Make bsec available in SPL
Make the bsec driver available both in SPL and in U-Boot proper to make it possible to read out the SoC type (A/C/D/F) and thus to determine the MPU PLL configuration (650/800 MHz).
--- arch/arm/mach-stm32mp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-stm32mp/Makefile +1 -1
@@ -3,6 +3,7 @@ # Copyright (C) 2018, STMicroelectronics - All Rights Reserved # +obj-y += bsec.o obj-y += cpu.o obj-y += dram_init.o obj-y += syscon.o
@@ -10,7 +11,6 @@ obj-y += syscon.o ifdef CONFIG_SPL_BUILD obj-y += spl.o else -obj-y += bsec.o obj-$(CONFIG_CMD_STM32KEY) += cmd_stm32key.o obj-$(CONFIG_ARMV7_PSCI) += psci.o endif
Signature · 1 line
2.25.1
RFC PATCH 2/2 clk: stm32mp1: Handle SoC speed grade configs
There are two speed grades of the STM32MP1, the A/C and D/F, the former can run up to 650 MHz, the later at up to 800 MHz. Allow specifying PLL config for both in the DT, so that it is possible to cater for boards which can be populated with either SoC.
--- drivers/clk/clk_stm32mp1.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-)
drivers/clk/clk_stm32mp1.c +26 -4
@@ -4,6 +4,7 @@*/ #include <common.h> +#include <asm/arch/sys_proto.h> #include <clk-uclass.h> #include <div64.h> #include <dm.h>
@@ -1464,6 +1465,12 @@ static void pll_csg(struct stm32mp1_clk_priv *priv, int pll_id, u32 *csg)setbits_le32 (priv->base + pll[pll_id].pllxcr,RCC_PLLNCR_SSCG_CTRL ); } +static __maybe_unused int stm32mp1_is_df (void ) +{ +/* ID bit 7 is set on 15x{D,F}xx and not on 15x{A,C}xx */ +return get_cpu_type () &BIT (7 ); +} + static __maybe_unused int pll_set_rate(struct udevice *dev, int pll_id, int div_id,
@@ -1491,8 +1498,13 @@ static __maybe_unused int pll_set_rate(struct udevice *dev, ret =ofnode_read_u32_array (plloff,"cfg" , pllcfg,PLLCFG_NB ); -if (ret <0 ) -return -FDT_ERR_NOTFOUND ; +if (ret <0 ) { + ret =ofnode_read_u32_array (plloff, +stm32mp1_is_df () ?"cfg-df" :"cfg-ac" , + pllcfg,PLLCFG_NB ); +if (ret <0 ) +return -FDT_ERR_NOTFOUND ; + } fck_ref =pll_get_fref_ck (priv, pll_id);
@@ -1687,8 +1699,13 @@ static int stm32mp1_clktree(struct udevice *dev) ret =ofnode_read_u32_array (plloff[i],"cfg" , pllcfg[i],PLLCFG_NB );if (ret <0 ) { -debug ("field cfg invalid: error %d\n" , ret); -return -FDT_ERR_NOTFOUND ; + ret =ofnode_read_u32_array (plloff[i], +stm32mp1_is_df () ?"cfg-df" :"cfg-ac" , + pllcfg[i],PLLCFG_NB ); +if (ret <0 ) { +debug ("field cfg invalid: error %d\n" , ret); +return -FDT_ERR_NOTFOUND ; + } } }
@@ -1783,6 +1800,11 @@ static int stm32mp1_clktree(struct udevice *dev)continue ; fracv =ofnode_read_u32_default (plloff[i],"frac" ,0 ); +if (!fracv) { + fracv =ofnode_read_u32_default (plloff[i], +stm32mp1_is_df () ?"frac-df" :"frac-ac" , +0 ); + }pll_config (priv, i, pllcfg[i], fracv); ret =ofnode_read_u32_array (plloff[i],"csg" , csg,PLLCSG_NB );if (!ret) {
Signature · 1 line
2.25.1
RFC PATCH 2/2 clk: stm32mp1: Handle SoC speed grade configs
Dear Marek,
Quoted 86 lines
From: Marek Vasut <[email protected]>
Sent: mardi 12 mai 2020 19:07There are two speed grades of the STM32MP1, the A/C and D/F, the former can run up to 650 MHz, the later at up to 800 MHz. Allow specifying PLL config for both in the DT, so that it is possible to cater for boards which can be populated with either SoC.
Signed-off-by Marek Vasut <[email protected]>Cc Patrick Delaunay <[email protected]>Cc Patrice Chotard <[email protected]>--- drivers/clk/clk_stm32mp1.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-)drivers/clk/clk_stm32mp1.c index renamed from drivers/clk/clk_stm32mp1.c +0
-0
50df8425bf..cecc06638e100644drivers/clk/clk_stm32mp1.c +25
-5@@ -4,6 +4,7 @@*/ #include <common.h> +#include <asm/arch/sys_proto.h> #include <clk-uclass.h> #include <div64.h> #include <dm.h> @@ -1464,6 +1465,12 @@ static void pll_csg(struct stm32mp1_clk_priv *priv, int pll_id, u32 *csg)setbits_le32 (priv->base + pll[pll_id].pllxcr,RCC_PLLNCR_SSCG_CTRL ); } +static __maybe_unused int stm32mp1_is_df (void ) { +/* ID bit 7 is set on 15x{D,F}xx and not on 15x{A,C}xx */ +return get_cpu_type () &BIT (7 ); +} + static __maybe_unused int pll_set_rate(struct udevice *dev, int pll_id, int div_id,@@ -1491,8 +1498,13 @@ static __maybe_unused int pll_set_rate(structudevice *dev, ret =ofnode_read_u32_array (plloff,"cfg" , pllcfg,PLLCFG_NB ); -if (ret <0 ) -return -FDT_ERR_NOTFOUND ; +if (ret <0 ) { + ret =ofnode_read_u32_array (plloff, +stm32mp1_is_df () ?"cfg-df" :"cfg-ac" , + pllcfg,PLLCFG_NB ); +if (ret <0 ) +return -FDT_ERR_NOTFOUND ; + } fck_ref =pll_get_fref_ck (priv, pll_id);@@ -1687,8 +1699,13 @@ static int stm32mp1_clktree(struct udevice *dev) ret =ofnode_read_u32_array (plloff[i],"cfg" , pllcfg[i],PLLCFG_NB );if (ret <0 ) { -debug ("field cfg invalid: error %d\n" , ret); -return -FDT_ERR_NOTFOUND ; + ret =ofnode_read_u32_array (plloff[i], +stm32mp1_is_df () ?"cfg-df" :"cfg-ac" , + pllcfg[i],PLLCFG_NB ); +if (ret <0 ) { +debug ("field cfg invalid: error %d\n" , ret); +return -FDT_ERR_NOTFOUND ; + } } }@@ -1783,6 +1800,11 @@ static int stm32mp1_clktree(struct udevice *dev)continue ; fracv =ofnode_read_u32_default (plloff[i],"frac" ,0 ); +if (!fracv) { + fracv =ofnode_read_u32_default (plloff[i], +stm32mp1_is_df () ?"frac-df" :"frac-ac" , +0 ); + }pll_config (priv, i, pllcfg[i], fracv); ret =ofnode_read_u32_array (plloff[i],"csg" , csg,PLLCSG_NB );if (!ret) { --
Quoted 1 line
2.25.1
The 2 speed grade will be supported with OPP information and HW support,present in kernel device tree (upstream in progress)
I port this patch in U-Boot with:
http://patchwork.ozlabs.org/project/uboot/patch/20200421171123.2.Id3620aec4deb419f1c1a5876b865556e86d3aba1 at changeid/
Please check the full serie
stm32mp1: use OPP information for PLL1 settings in SPL
http://patchwork.ozlabs.org/project/uboot/list/?series=171767
PLL1 settings are now computed in SPL and no more read from DT.
Regards
Patrick
RFC PATCH 2/2 clk: stm32mp1: Handle SoC speed grade configs
Quoted 96 lines · Patrick DELAUNAY
Dear Marek,
Quoted 86 lines
From: Marek Vasut <[email protected]>
Sent: mardi 12 mai 2020 19:07There are two speed grades of the STM32MP1, the A/C and D/F, the former can run up to 650 MHz, the later at up to 800 MHz. Allow specifying PLL config for both in the DT, so that it is possible to cater for boards which can be populated with either SoC.
Signed-off-by Marek Vasut <[email protected]>Cc Patrick Delaunay <[email protected]>Cc Patrice Chotard <[email protected]>--- drivers/clk/clk_stm32mp1.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-)drivers/clk/clk_stm32mp1.c index renamed from drivers/clk/clk_stm32mp1.c +0
-0
50df8425bf..cecc06638e100644drivers/clk/clk_stm32mp1.c +25
-5@@ -4,6 +4,7 @@*/ #include <common.h> +#include <asm/arch/sys_proto.h> #include <clk-uclass.h> #include <div64.h> #include <dm.h> @@ -1464,6 +1465,12 @@ static void pll_csg(struct stm32mp1_clk_priv *priv, int pll_id, u32 *csg)setbits_le32 (priv->base + pll[pll_id].pllxcr,RCC_PLLNCR_SSCG_CTRL ); } +static __maybe_unused int stm32mp1_is_df (void ) { +/* ID bit 7 is set on 15x{D,F}xx and not on 15x{A,C}xx */ +return get_cpu_type () &BIT (7 ); +} + static __maybe_unused int pll_set_rate(struct udevice *dev, int pll_id, int div_id,@@ -1491,8 +1498,13 @@ static __maybe_unused int pll_set_rate(structudevice *dev, ret =ofnode_read_u32_array (plloff,"cfg" , pllcfg,PLLCFG_NB ); -if (ret <0 ) -return -FDT_ERR_NOTFOUND ; +if (ret <0 ) { + ret =ofnode_read_u32_array (plloff, +stm32mp1_is_df () ?"cfg-df" :"cfg-ac" , + pllcfg,PLLCFG_NB ); +if (ret <0 ) +return -FDT_ERR_NOTFOUND ; + } fck_ref =pll_get_fref_ck (priv, pll_id);@@ -1687,8 +1699,13 @@ static int stm32mp1_clktree(struct udevice *dev) ret =ofnode_read_u32_array (plloff[i],"cfg" , pllcfg[i],PLLCFG_NB );if (ret <0 ) { -debug ("field cfg invalid: error %d\n" , ret); -return -FDT_ERR_NOTFOUND ; + ret =ofnode_read_u32_array (plloff[i], +stm32mp1_is_df () ?"cfg-df" :"cfg-ac" , + pllcfg[i],PLLCFG_NB ); +if (ret <0 ) { +debug ("field cfg invalid: error %d\n" , ret); +return -FDT_ERR_NOTFOUND ; + } } }@@ -1783,6 +1800,11 @@ static int stm32mp1_clktree(struct udevice *dev)continue ; fracv =ofnode_read_u32_default (plloff[i],"frac" ,0 ); +if (!fracv) { + fracv =ofnode_read_u32_default (plloff[i], +stm32mp1_is_df () ?"frac-df" :"frac-ac" , +0 ); + }pll_config (priv, i, pllcfg[i], fracv); ret =ofnode_read_u32_array (plloff[i],"csg" , csg,PLLCSG_NB );if (!ret) { --Quoted 1 line
2.25.1
The 2 speed grade will be supported with OPP information and HW support,present in kernel device tree (upstream in progress)
I port this patch in U-Boot with:
http://patchwork.ozlabs.org/project/uboot/patch/20200421171123.2.Id3620aec4deb419f1c1a5876b865556e86d3aba1 at changeid/
Quoted 5 lines
Please check the full serie
stm32mp1: use OPP information for PLL1 settings in SPL
http://patchwork.ozlabs.org/project/uboot/list/?series=171767PLL1 settings are now computed in SPL and no more read from DT.
That's even better, nice, thanks !
btw. does the D/F 800 MHz always set BIT(7) in the CPU ID , while the A/C 650 MHz part never does ? Maybe you can use that to discern the speed grades instead of listing all the parts ...
Signature · 2 lines
Best regards, Marek Vasut
RFC PATCH 2/2 clk: stm32mp1: Handle SoC speed grade configs
Hi Marek,
Quoted 21 lines
From: Marek Vasut <[email protected]>
Sent: mercredi 13 mai 2020 12:53Quoted 17 lines · Patrick DELAUNAY
Dear Marek,
Quoted 15 lines
From: Marek Vasut <[email protected]>
Sent: mardi 12 mai 2020 19:07There are two speed grades of the STM32MP1, the A/C and D/F, the former can run up to 650 MHz, the later at up to 800 MHz. Allow specifying PLL config for both in the DT, so that it is possible to cater for boards which can be populated with either SoC.
Signed-off-by Marek Vasut <[email protected]>Cc Patrick Delaunay <[email protected]>Cc Patrice Chotard <[email protected]>--- drivers/clk/clk_stm32mp1.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-)
[...]
Quoted 13 lines
Quoted 13 lines
The 2 speed grade will be supported with OPP information and HW support,present in kernel device tree (upstream in progress)
I port this patch in U-Boot with:
http://patchwork.ozlabs.org/project/uboot/patch/20200421171123.2.Id3620aec4deb419f1c1a5876b865556e86d3aba1at changeid/Please check the full serie
stm32mp1: use OPP information for PLL1 settings in SPL
http://patchwork.ozlabs.org/project/uboot/list/?series=171767
Quoted 7 lines
Quoted 1 line
PLL1 settings are now computed in SPL and no more read from DT.
That's even better, nice, thanks !
btw. does the D/F 800 MHz always set BIT(7) in the CPU ID , while the A/C 650 MHz part never does ? Maybe you can use that to discern the speed grades instead of listing all the parts ...
Yes but the meaning of RPN (the part of CPU IP) is undocumented... And BIT(7) could be no more be valid for next products.
So I prefer use the documented value of Device Part Number (RPN) as a fixed value.
For example:
Bits 7:0 RPN_coding[7:0]:0x00: STM32MP157Cx0x01: STM32MP157Ax0x80: STM32MP157Fx0x81: STM32MP157Dx
Others: Reserved
And it is also requested by ST marketing team
(don't code on RPN bit decoding).
Even if I agree: it is more elegant than my switch case.
Quoted 3 lines
--
Best regards,
Marek Vasut
Regards
Patrick
RFC PATCH 2/2 clk: stm32mp1: Handle SoC speed grade configs
Quoted 61 lines · Patrick DELAUNAY
Hi Marek,
Quoted 21 lines
From: Marek Vasut <[email protected]>
Sent: mercredi 13 mai 2020 12:53Quoted 17 lines · Patrick DELAUNAY
Dear Marek,
Quoted 15 lines
From: Marek Vasut <[email protected]>
Sent: mardi 12 mai 2020 19:07There are two speed grades of the STM32MP1, the A/C and D/F, the former can run up to 650 MHz, the later at up to 800 MHz. Allow specifying PLL config for both in the DT, so that it is possible to cater for boards which can be populated with either SoC.
Signed-off-by Marek Vasut <[email protected]>Cc Patrick Delaunay <[email protected]>Cc Patrice Chotard <[email protected]>--- drivers/clk/clk_stm32mp1.c | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-)[...]
Quoted 13 lines
Quoted 13 lines
The 2 speed grade will be supported with OPP information and HW support,present in kernel device tree (upstream in progress)
I port this patch in U-Boot with:
http://patchwork.ozlabs.org/project/uboot/patch/20200421171123.2.Id3620aec4deb419f1c1a5876b865556e86d3aba1at changeid/Please check the full serie
stm32mp1: use OPP information for PLL1 settings in SPL
http://patchwork.ozlabs.org/project/uboot/list/?series=171767Quoted 7 lines
Quoted 1 line
PLL1 settings are now computed in SPL and no more read from DT.
That's even better, nice, thanks !
btw. does the D/F 800 MHz always set BIT(7) in the CPU ID , while the A/C 650 MHz part never does ? Maybe you can use that to discern the speed grades instead of listing all the parts ...
Yes but the meaning of RPN (the part of CPU IP) is undocumented... And BIT(7) could be no more be valid for next products.
So I prefer use the documented value of Device Part Number (RPN) as a fixed value.
For example:
Bits 7:0 RPN_coding[7:0]:
0x00: STM32MP157Cx0x01: STM32MP157Ax0x80: STM32MP157Fx0x81: STM32MP157Dx
Others: Reserved
Quoted 4 lines
And it is also requested by ST marketing team
(don't code on RPN bit decoding).Even if I agree: it is more elegant than my switch case.
And it saves a few bytes in SPL size ;-)
RFC PATCH 2/2 clk: stm32mp1: Handle SoC speed grade configs
In reply to Patrick DELAUNAYQuoted 1 line · Patrick DELAUNAY
Dear Marek,
Hi,
[...]
Quoted 16 lines
Quoted 13 lines
drivers/clk/clk_stm32mp1.c +5
-1@@ -1783,6 +1800,11 @@ static int stm32mp1_clktree(struct udevice *dev)continue ; fracv =ofnode_read_u32_default (plloff[i],"frac" ,0 ); +if (!fracv) { + fracv =ofnode_read_u32_default (plloff[i], +stm32mp1_is_df () ?"frac-df" :"frac-ac" , +0 ); + }pll_config (priv, i, pllcfg[i], fracv); ret =ofnode_read_u32_array (plloff[i],"csg" , csg,PLLCSG_NB );if (!ret) { --Quoted 1 line
2.25.1
The 2 speed grade will be supported with OPP information and HW support,present in kernel device tree (upstream in progress)
Great, thanks!
RFC PATCH 1/2 ARM: stm32: Make bsec available in SPL
In reply to Marek VasutDear Marek,
Quoted 34 lines
From: Marek Vasut <[email protected]>
Sent: mardi 12 mai 2020 19:07Make the bsec driver available both in SPL and in U-Boot proper to make it possible to read out the SoC type (A/C/D/F) and thus to determine the MPU PLL configuration (650/800 MHz).
Signed-off-by Marek Vasut <[email protected]>Cc Patrick Delaunay <[email protected]>Cc Patrice Chotard <[email protected]>--- arch/arm/mach-stm32mp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)arch/arm/mach-stm32mp/Makefile +1
-2@@ -3,6 +3,7 @@ # Copyright (C) 2018, STMicroelectronics - All Rights Reserved # +obj-y += bsec.o obj-y += cpu.o obj-y += dram_init.o obj-y += syscon.o@@ -10,7 +11,6 @@ obj-y += syscon.o ifdef CONFIG_SPL_BUILD obj-y += spl.o else -obj-y += bsec.o obj-$(CONFIG_CMD_STM32KEY) += cmd_stm32key.o obj-$(CONFIG_ARMV7_PSCI) += psci.o endif --
Quoted 1 line
2.25.1
See the sent patch:
[1/9] arm: stm32mp: spl: add bsec driver in SPL
http://patchwork.ozlabs.org/project/uboot/patch/20200421171123.1.I7a042a9ffbb5c2668034eddf5ace91271bb53c5f at changeid/
regards
Patrick