ARM: socfpga: Factor out handoff register configuration
Subsystems (3)
PATCH 1/4 ARM: socfpga: Factor out handoff register configuration
Factor out the code for programming preloader handoff register values, the ISWGRP Handoff 0 and 1. These registers later control which bridges are enabled by the "bridge" command on Gen5 devices.
--- .../include/mach/reset_manager_gen5.h | 1 + arch/arm/mach-socfpga/reset_manager_gen5.c | 25 +++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-)
arch/arm/mach-socfpga/include/mach/reset_manager_gen5.h +1 -0
@@ -9,6 +9,7 @@#include <dt-bindings/reset/altr,rst-mgr.h> void reset_deassert_peripherals_handoff (void ); +void socfpga_bridges_set_handoff_regs (bool h2f,bool lwh2f,bool f2h);void socfpga_bridges_reset (int enable);struct socfpga_reset_manager {
arch/arm/mach-socfpga/reset_manager_gen5.c +23 -2
@@ -73,6 +73,28 @@ void reset_deassert_peripherals_handoff(void)#define L3REGS_REMAP_HPS2FPGA_MASK 0x08#define L3REGS_REMAP_OCRAM_MASK 0x01 +void socfpga_bridges_set_handoff_regs (bool h2f,bool lwh2f,bool f2h) +{ +u32 brgmask =0x0 ; +u32 l3rmask =L3REGS_REMAP_OCRAM_MASK ; + +if (h2f) + brgmask |=BIT (0 ); +else + l3rmask |=L3REGS_REMAP_HPS2FPGA_MASK ; + +if (lwh2f) + brgmask |=BIT (1 ); +else + l3rmask |=L3REGS_REMAP_LWHPS2FPGA_MASK ; + +if (f2h) + brgmask |=BIT (2 ); + +writel (brgmask, &sysmgr_regs->iswgrp_handoff[0 ]); +writel (l3rmask, &sysmgr_regs->iswgrp_handoff[1 ]); +} +void socfpga_bridges_reset (int enable) { const u32 l3mask = L3REGS_REMAP_LWHPS2FPGA_MASK |
@@ -83,8 +105,7 @@ void socfpga_bridges_reset(int enable)/* brdmodrst */ writel (0xffffffff , &reset_manager_base->brg_mod_reset); }else { -writel (0 , &sysmgr_regs->iswgrp_handoff[0 ]); -writel (l3mask, &sysmgr_regs->iswgrp_handoff[1 ]); +socfpga_bridges_set_handoff_regs (false, false, false);/* Check signal from FPGA. */ if (!fpgamgr_test_fpga_ready ()) {
Signature · 1 line
2.20.1
PATCH 2/4 ARM: socfpga: Disable bridges in SPL unless booting from FPGA
Disable bridges between L3 Main switch and FPGA unless booting from FPGA and keep them disabled to prevent glitches and possible hangs of the L3 Main switch.
The current version of the code could have enabled the bridges between the L3 Main switch and FPGA for a short period of time in board_init_f() in case the FPGA was programmed and then again disable them at the end of board_init_f(). Replace this with a code which only sets up the handoff registers and let the user enable the bridges later on.
--- arch/arm/mach-socfpga/spl_gen5.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
arch/arm/mach-socfpga/spl_gen5.c +1 -4
@@ -188,7 +188,7 @@ void board_init_f(ulong dummy)/* De-assert reset for peripherals and bridges based on handoff */ reset_deassert_peripherals_handoff (); -socfpga_bridges_reset (0 ); +socfpga_bridges_set_handoff_regs (true, true, true);debug ("Unfreezing/Thaw all I/O banks\n" );/* unfreeze / thaw all IO banks */
@@ -228,7 +228,4 @@ void board_init_f(ulong dummy)puts ("SDRAM size check failed!\n" );hang (); } - -if (!socfpga_is_booting_from_fpga ()) -socfpga_bridges_reset (1 ); }
Signature · 1 line
2.20.1
PATCH 2/4 ARM: socfpga: Disable bridges in SPL unless booting from FPGA
Quoted 11 lines · Marek Vasut
Disable bridges between L3 Main switch and FPGA unless booting from FPGA and keep them disabled to prevent glitches and possible hangs of the L3 Main switch.
The current version of the code could have enabled the bridges between the L3 Main switch and FPGA for a short period of time in
board_init_f()in case the FPGA was programmed and then again disable them at the end ofboard_init_f(). Replace this with a code which only sets up the handoff registers and let the user enable the bridges later on.
Quoted 5 lines
Signed-off-by Marek Vasut <[email protected]>Cc Chin Liang See <[email protected]>Cc Dinh Nguyen <[email protected]>Cc Simon Goldschmidt <[email protected]>Cc Tien Fong Chee <[email protected]>
Quoted 26 lines
--- arch/arm/mach-socfpga/spl_gen5.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)arch/arm/mach-socfpga/spl_gen5.c +1
-4@@ -188,7 +188,7 @@ void board_init_f(ulong dummy)/* De-assert reset for peripherals and bridges based on handoff */ reset_deassert_peripherals_handoff (); -socfpga_bridges_reset (0 ); +socfpga_bridges_set_handoff_regs (true, true, true);debug ("Unfreezing/Thaw all I/O banks\n" );/* unfreeze / thaw all IO banks */ @@ -228,7 +228,4 @@ void board_init_f(ulong dummy)puts ("SDRAM size check failed!\n" );hang (); } - -if (!socfpga_is_booting_from_fpga ()) -socfpga_bridges_reset (1 ); }
PATCH 3/4 ARM: socfpga: Fully unmap the FPGA bridges from L3 space
In reply to Marek VasutInstead of just putting the bridges into reset, fully remove the bridges from the L3 main bridge space when disabling them by clearing bits in NIC-301 remap register. Moreover, only touch the 3 LSbits in brgmodrst register as the rest of the bits are undefined.
--- arch/arm/mach-socfpga/reset_manager_gen5.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-socfpga/reset_manager_gen5.c +2 -1
@@ -103,7 +103,8 @@ void socfpga_bridges_reset(int enable)if (enable) {/* brdmodrst */ -writel (0xffffffff , &reset_manager_base->brg_mod_reset); +writel (0x7 , &reset_manager_base->brg_mod_reset); +writel (L3REGS_REMAP_OCRAM_MASK ,SOCFPGA_L3REGS_ADDRESS ); }else {socfpga_bridges_set_handoff_regs (false, false, false);
Signature · 1 line
2.20.1
PATCH 3/4 ARM: socfpga: Fully unmap the FPGA bridges from L3 space
Quoted 10 lines · Marek Vasut
Instead of just putting the bridges into reset, fully remove the bridges from the L3 main bridge space when disabling them by clearing bits in NIC-301 remap register. Moreover, only touch the 3 LSbits in brgmodrst register as the rest of the bits are undefined.
Signed-off-by Marek Vasut <[email protected]>Cc Chin Liang See <[email protected]>Cc Dinh Nguyen <[email protected]>Cc Simon Goldschmidt <[email protected]>Cc Tien Fong Chee <[email protected]>
Quoted 19 lines
--- arch/arm/mach-socfpga/reset_manager_gen5.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)arch/arm/mach-socfpga/reset_manager_gen5.c +2
-1@@ -103,7 +103,8 @@ void socfpga_bridges_reset(int enable)if (enable) {/* brdmodrst */ -writel (0xffffffff , &reset_manager_base->brg_mod_reset); +writel (0x7 , &reset_manager_base->brg_mod_reset); +writel (L3REGS_REMAP_OCRAM_MASK ,SOCFPGA_L3REGS_ADDRESS ); }else {socfpga_bridges_set_handoff_regs (false, false, false);
PATCH 4/4 ARM: socfpga: Add support for selecting bridges in bridge command
In reply to Marek VasutAdd optional "mask" argument to the SoCFPGA bridge command, to select which bridges should be enabled/disabled. This allows the user to avoid enabling bridges which are not connected into the FPGA fabric. Default behavior is to enable/disable all bridges.
--- arch/arm/mach-socfpga/include/mach/misc.h | 2 +- arch/arm/mach-socfpga/misc.c | 17 +++++++++++------ arch/arm/mach-socfpga/misc_arria10.c | 2 +- arch/arm/mach-socfpga/misc_gen5.c | 12 +++++++++++- arch/arm/mach-socfpga/misc_s10.c | 2 +- 5 files changed, 25 insertions(+), 10 deletions(-)
arch/arm/mach-socfpga/include/mach/misc.h +1 -1
@@ -39,6 +39,6 @@ void socfpga_init_security_policies(void);void socfpga_sdram_remap_zero (void );#endif -void do_bridge_reset (int enable); +void do_bridge_reset (int enable,unsigned int mask);#endif /* _MISC_H_ */
arch/arm/mach-socfpga/misc.c +11 -6
@@ -126,17 +126,22 @@ int arch_cpu_init(void)#ifndef CONFIG_SPL_BUILD static int do_bridge (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) { -if (argc !=2 ) +unsigned int mask = ~0 ; + +if (argc <2 || argc >3 )return CMD_RET_USAGE ; argv++; +if (argc ==3 ) + mask =simple_strtoul (argv[1 ],NULL ,16 ); +switch (*argv[0 ]) {case 'e' :/* Enable */ -do_bridge_reset (1 ); +do_bridge_reset (1 , mask);break ;case 'd' :/* Disable */ -do_bridge_reset (0 ); +do_bridge_reset (0 , mask);break ;default :return CMD_RET_USAGE ;
@@ -145,10 +150,10 @@ static int do_bridge(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])return 0 ; } -U_BOOT_CMD (bridge,2 ,1 , do_bridge, +U_BOOT_CMD (bridge,3 ,1 , do_bridge,"SoCFPGA HPS FPGA bridge control" , -"enable - Enable HPS-to-FPGA, FPGA-to-HPS, LWHPS-to-FPGA bridges\n" -"bridge disable - Enable HPS-to-FPGA, FPGA-to-HPS, LWHPS-to-FPGA bridges\n" +"enable [mask] - Enable HPS-to-FPGA, FPGA-to-HPS, LWHPS-to-FPGA bridges\n" +"bridge disable [mask] - Enable HPS-to-FPGA, FPGA-to-HPS, LWHPS-to-FPGA bridges\n" "" );
arch/arm/mach-socfpga/misc_arria10.c +1 -1
@@ -115,7 +115,7 @@ int print_cpuinfo(void) }#endif -void do_bridge_reset (int enable) +void do_bridge_reset (int enable,unsigned int mask) {if (enable)socfpga_reset_deassert_bridges_handoff ();
arch/arm/mach-socfpga/misc_gen5.c +11 -1
@@ -249,9 +249,19 @@ static void socfpga_sdram_apply_static_cfg(void) : : "r"(val), "r"(&sdr_ctrl->static_cfg) : "memory", "cc"); } -void do_bridge_reset (int enable) +void do_bridge_reset (int enable,unsigned int mask) { +int i; +if (enable) { +socfpga_bridges_set_handoff_regs (!(mask &BIT (0 )), + !(mask &BIT (1 )), + !(mask &BIT (2 ))); +for (i =0 ; i <2 ; i++) {/* Reload SW setting cache */ + iswgrp_handoff[i] = +readl (&sysmgr_regs->iswgrp_handoff[i]); + } +writel (iswgrp_handoff[2 ], &sysmgr_regs->fpgaintfgrp_module);socfpga_sdram_apply_static_cfg ();writel (iswgrp_handoff[3 ], &sdr_ctrl->fpgaport_rst);
arch/arm/mach-socfpga/misc_s10.c +1 -1
@@ -150,7 +150,7 @@ int arch_early_init_r(void)return 0 ; } -void do_bridge_reset (int enable) +void do_bridge_reset (int enable,unsigned int mask) {socfpga_bridges_reset (enable); }
Signature · 1 line
2.20.1
PATCH 4/4 ARM: socfpga: Add support for selecting bridges in bridge command
Quoted 4 lines · Marek Vasut
Add optional "mask" argument to the SoCFPGA bridge command, to select which bridges should be enabled/disabled. This allows the user to avoid enabling bridges which are not connected into the FPGA fabric. Default behavior is to enable/disable all bridges.
So does this change the command? Seems like leaving away the new 'mask' argument would now lead to enabling all bridges by overwriting whatever the handoff values were before?
Regards,
Simon
Quoted 122 lines
Signed-off-by Marek Vasut <[email protected]>Cc Chin Liang See <[email protected]>Cc Dinh Nguyen <[email protected]>Cc Simon Goldschmidt <[email protected]>Cc Tien Fong Chee <[email protected]>--- arch/arm/mach-socfpga/include/mach/misc.h | 2 +- arch/arm/mach-socfpga/misc.c | 17 +++++++++++------ arch/arm/mach-socfpga/misc_arria10.c | 2 +- arch/arm/mach-socfpga/misc_gen5.c | 12 +++++++++++- arch/arm/mach-socfpga/misc_s10.c | 2 +- 5 files changed, 25 insertions(+), 10 deletions(-)arch/arm/mach-socfpga/include/mach/misc.h +1
-1@@ -39,6 +39,6 @@ void socfpga_init_security_policies(void);void socfpga_sdram_remap_zero (void );#endif -void do_bridge_reset (int enable); +void do_bridge_reset (int enable,unsigned int mask);#endif /* _MISC_H_ */ arch/arm/mach-socfpga/misc.c +11
-6@@ -126,17 +126,22 @@ int arch_cpu_init(void)#ifndef CONFIG_SPL_BUILD static int do_bridge (cmd_tbl_t *cmdtp,int flag,int argc,char *const argv[]) { -if (argc !=2 ) +unsigned int mask = ~0 ; + +if (argc <2 || argc >3 )return CMD_RET_USAGE ; argv++; +if (argc ==3 ) + mask =simple_strtoul (argv[1 ],NULL ,16 ); +switch (*argv[0 ]) {case 'e' :/* Enable */ -do_bridge_reset (1 ); +do_bridge_reset (1 , mask);break ;case 'd' :/* Disable */ -do_bridge_reset (0 ); +do_bridge_reset (0 , mask);break ;default :return CMD_RET_USAGE ;@@ -145,10 +150,10 @@ static int do_bridge(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])return 0 ; } -U_BOOT_CMD (bridge,2 ,1 , do_bridge, +U_BOOT_CMD (bridge,3 ,1 , do_bridge,"SoCFPGA HPS FPGA bridge control" , -"enable - Enable HPS-to-FPGA, FPGA-to-HPS, LWHPS-to-FPGA bridges\n" -"bridge disable - Enable HPS-to-FPGA, FPGA-to-HPS, LWHPS-to-FPGA bridges\n" +"enable [mask] - Enable HPS-to-FPGA, FPGA-to-HPS, LWHPS-to-FPGA bridges\n" +"bridge disable [mask] - Enable HPS-to-FPGA, FPGA-to-HPS, LWHPS-to-FPGA bridges\n" "" );arch/arm/mach-socfpga/misc_arria10.c +1
-1@@ -115,7 +115,7 @@ int print_cpuinfo(void) }#endif -void do_bridge_reset (int enable) +void do_bridge_reset (int enable,unsigned int mask) {if (enable)socfpga_reset_deassert_bridges_handoff ();arch/arm/mach-socfpga/misc_gen5.c +11
-1@@ -249,9 +249,19 @@ static void socfpga_sdram_apply_static_cfg(void) : : "r"(val), "r"(&sdr_ctrl->static_cfg) : "memory", "cc"); } -void do_bridge_reset (int enable) +void do_bridge_reset (int enable,unsigned int mask) { +int i; +if (enable) { +socfpga_bridges_set_handoff_regs (!(mask &BIT (0 )), + !(mask &BIT (1 )), + !(mask &BIT (2 ))); +for (i =0 ; i <2 ; i++) {/* Reload SW setting cache */ + iswgrp_handoff[i] = +readl (&sysmgr_regs->iswgrp_handoff[i]); + } +writel (iswgrp_handoff[2 ], &sysmgr_regs->fpgaintfgrp_module);socfpga_sdram_apply_static_cfg ();writel (iswgrp_handoff[3 ], &sdr_ctrl->fpgaport_rst);arch/arm/mach-socfpga/misc_s10.c +1
-1@@ -150,7 +150,7 @@ int arch_early_init_r(void)return 0 ; } -void do_bridge_reset (int enable) +void do_bridge_reset (int enable,unsigned int mask) {socfpga_bridges_reset (enable); }
PATCH 4/4 ARM: socfpga: Add support for selecting bridges in bridge command
Quoted 11 lines · Simon Goldschmidt
Quoted 4 lines · Marek Vasut
Add optional "mask" argument to the SoCFPGA bridge command, to select which bridges should be enabled/disabled. This allows the user to avoid enabling bridges which are not connected into the FPGA fabric. Default behavior is to enable/disable all bridges.
So does this change the command? Seems like leaving away the new 'mask' argument would now lead to enabling all bridges by overwriting whatever the handoff values were before?
That's how it behaved before though -- all the bridges were enabled. Now it's possible to explicitly select which bridges to enable/disable.
Signature · 2 lines
Best regards, Marek Vasut
PATCH 4/4 ARM: socfpga: Add support for selecting bridges in bridge command
Am 22.04.2019 um 20:01 schrieb Marek Vasut:
Quoted 9 lines · Simon Goldschmidt
Quoted 8 lines · Marek Vasut
Quoted 4 lines
Add optional "mask" argument to the SoCFPGA bridge command, to select which bridges should be enabled/disabled. This allows the user to avoid enabling bridges which are not connected into the FPGA fabric. Default behavior is to enable/disable all bridges.
Quoted 6 lines
Quoted 3 lines
So does this change the command? Seems like leaving away the new 'mask' argument would now lead to enabling all bridges by overwriting whatever the handoff values were before?
That's how it behaved before though -- all the bridges were enabled. Now it's possible to explicitly select which bridges to enable/disable.
As I read the code, before it wrote iswgrp_handoff[x] to the registers. The question is what is iswgrp_handoff[x]. It's not the bridges status from Quartus (as the "handoff" suffix might suggest). Instead (if I remember correctly), it's either "all bridges" or "no bridges", depending on the FPGA configuration status at SPL runtime.
In this case, we're probably better off with leaving it to the command line scripts to say which bridges shall be enabled...
PATCH 4/4 ARM: socfpga: Add support for selecting bridges in bridge command
Quoted 10 lines · Simon Goldschmidt
Am 22.04.2019 um 20:01 schrieb Marek Vasut:
Quoted 9 lines · Simon Goldschmidt
Quoted 8 lines · Marek Vasut
Quoted 4 lines
Add optional "mask" argument to the SoCFPGA bridge command, to select which bridges should be enabled/disabled. This allows the user to avoid enabling bridges which are not connected into the FPGA fabric. Default behavior is to enable/disable all bridges.
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
So does this change the command? Seems like leaving away the new 'mask' argument would now lead to enabling all bridges by overwriting whatever the handoff values were before?
That's how it behaved before though -- all the bridges were enabled. Now it's possible to explicitly select which bridges to enable/disable.
As I read the code, before it wrote iswgrp_handoff[x] to the registers.
Nope, before it was the SPL that wrote the iswgrp_handoff registers (iswgrp_handoff[0] to 0x0 and iswgrp_handoff[1] to 0x7)
Quoted 1 line
The question is what is iswgrp_handoff[x].
Just regular scratch registers with special name. The [0] is used to indicate to the software how the brg_mod_reset register is supposed to be configured. The [1] is used to indicate how the l3remap register is supposed to be configured.
The SPL currently sets these registers as -- all bridges released out of reset ; all bridges mapped into the L3 space. I believe this patch does not change that behavior.
Quoted 7 lines
It's not the bridges status
from Quartus (as the "handoff" suffix might suggest). Instead (if I remember correctly), it's either "all bridges" or "no bridges", depending on the FPGA configuration status at SPL runtime.In this case, we're probably better off with leaving it to the command line scripts to say which bridges shall be enabled...
This patch only changes things in that it updates the handoff registers when the user selects a new mask, so that any software which runs after U-Boot would be aware of which bridges U-Boot configured.
But maybe I'm missing something obvious, this stuff is so convoluted that I'd really appreciate if you could review thoroughly if there's something that doesn't seem right.
Quoted 3 lines
Reviewed-by Simon Goldschmidt <[email protected]>
Signature · 2 lines
Best regards, Marek Vasut
PATCH 4/4 ARM: socfpga: Add support for selecting bridges in bridge command
Quoted 42 lines · Marek Vasut
Quoted 10 lines · Simon Goldschmidt
Am 22.04.2019 um 20:01 schrieb Marek Vasut:
Quoted 9 lines · Simon Goldschmidt
Quoted 8 lines · Marek Vasut
Quoted 4 lines
Add optional "mask" argument to the SoCFPGA bridge command, to select which bridges should be enabled/disabled. This allows the user to avoid enabling bridges which are not connected into the FPGA fabric. Default behavior is to enable/disable all bridges.
Quoted 8 lines
Quoted 6 lines
Quoted 3 lines
So does this change the command? Seems like leaving away the new 'mask' argument would now lead to enabling all bridges by overwriting whatever the handoff values were before?
That's how it behaved before though -- all the bridges were enabled. Now it's possible to explicitly select which bridges to enable/disable.
As I read the code, before it wrote iswgrp_handoff[x] to the registers.
Nope, before it was the SPL that wrote the
iswgrp_handoffregisters (iswgrp_handoff[0] to0x0and iswgrp_handoff[1] to0x7)Quoted 1 line
The question is what is iswgrp_handoff[x].
Just regular scratch registers with special name. The [0] is used to indicate to the software how the
brg_mod_resetregister is supposed to be configured. The [1] is used to indicate how the l3remap register is supposed to be configured.The SPL currently sets these registers as -- all bridges released out of reset ; all bridges mapped into the L3 space. I believe this patch does not change that behavior.
Quoted 7 lines
It's not the bridges status
from Quartus (as the "handoff" suffix might suggest). Instead (if I remember correctly), it's either "all bridges" or "no bridges", depending on the FPGA configuration status at SPL runtime.In this case, we're probably better off with leaving it to the command line scripts to say which bridges shall be enabled...
Quoted 7 lines
This patch only changes things in that it updates the handoff registers when the user selects a new mask, so that any software which runs after U-Boot would be aware of which bridges U-Boot configured.
But maybe I'm missing something obvious, this stuff is so convoluted that I'd really appreciate if you could review thoroughly if there's something that doesn't seem right.
Hmm, if you're not 100% sure yourself, let me take the time to check again. What made me stumble accross this is that "bridge enable" did not work when no FPGA had been configured during SPL.
And the duplication of names where U-Boot caches the handoff registers doesn't really help to make it easy to follow...
Regards,
Simon
Quoted 6 lines
Quoted 4 lines
Reviewed-by Simon Goldschmidt <[email protected]>
PATCH 4/4 ARM: socfpga: Add support for selecting bridges in bridge command
Quoted 53 lines · Simon Goldschmidt
Quoted 50 lines · Marek Vasut
Quoted 18 lines · Simon Goldschmidt
Am 22.04.2019 um 20:01 schrieb Marek Vasut:
Quoted 17 lines · Simon Goldschmidt
Quoted 15 lines · Marek Vasut
Quoted 6 lines
Add optional "mask" argument to the SoCFPGA bridge command, to select which bridges should be enabled/disabled. This allows the user to avoid
enabling bridges which are not connected into the FPGA fabric. Default
behavior is to enable/disable all bridges.So does this change the command? Seems like leaving away the new 'mask'
argument would now lead to enabling all bridges by overwriting whatever
the handoff values were before?Quoted 4 lines
Quoted 2 lines
That's how it behaved before though -- all the bridges were enabled. Now it's possible to explicitly select which bridges to enable/disable.
As I read the code, before it wrote iswgrp_handoff[x] to the registers.
Nope, before it was the SPL that wrote the
iswgrp_handoffregisters (iswgrp_handoff[0] to0x0and iswgrp_handoff[1] to0x7)Quoted 1 line
The question is what is iswgrp_handoff[x].
Just regular scratch registers with special name. The [0] is used to indicate to the software how the
brg_mod_resetregister is supposed to be configured. The [1] is used to indicate how the l3remap register is supposed to be configured.The SPL currently sets these registers as -- all bridges released out of reset ; all bridges mapped into the L3 space. I believe this patch does not change that behavior.
Quoted 7 lines
It's not the bridges status
from Quartus (as the "handoff" suffix might suggest). Instead (if I remember correctly), it's either "all bridges" or "no bridges", depending on the FPGA configuration status at SPL runtime.In this case, we're probably better off with leaving it to the command line scripts to say which bridges shall be enabled...
This patch only changes things in that it updates the handoff registers when the user selects a new mask, so that any software which runs after U-Boot would be aware of which bridges U-Boot configured.
Quoted 7 lines
Quoted 3 lines
But maybe I'm missing something obvious, this stuff is so convoluted that I'd really appreciate if you could review thoroughly if there's something that doesn't seem right.
Hmm, if you're not 100% sure yourself, let me take the time to check again. What made me stumble accross this is that "bridge enable" did not work when no FPGA had been configured during SPL.
I'm reasonably sure it's OK, but another pair of eyeballs and all that ...
If the FPGA isn't configured, you shouldn't even run bridge enable, the result of that is undefined.
Quoted 2 lines
And the duplication of names where U-Boot caches the handoff registers doesn't really help to make it easy to follow...
Look at arch/arm/mach-socfpga/misc_gen5.c do_bridge_reset() , that should clarify how the handoff registers are used. Keep in mind, they are only scratch registers , they have no real impact on the HW (except some are also read by BootROM during warm reset).
Signature · 2 lines
Best regards, Marek Vasut
PATCH 4/4 ARM: socfpga: Add support for selecting bridges in bridge command
Quoted 59 lines · Marek Vasut
Quoted 57 lines · Simon Goldschmidt
Quoted 53 lines · Marek Vasut
Quoted 18 lines · Simon Goldschmidt
Am 22.04.2019 um 20:01 schrieb Marek Vasut:
Quoted 17 lines · Simon Goldschmidt
Quoted 15 lines · Marek Vasut
Quoted 6 lines
Add optional "mask" argument to the SoCFPGA bridge command, to select which bridges should be enabled/disabled. This allows the user to avoid
enabling bridges which are not connected into the FPGA fabric. Default
behavior is to enable/disable all bridges.So does this change the command? Seems like leaving away the new 'mask'
argument would now lead to enabling all bridges by overwriting whatever
the handoff values were before?Quoted 4 lines
Quoted 2 lines
That's how it behaved before though -- all the bridges were enabled. Now it's possible to explicitly select which bridges to enable/disable.
As I read the code, before it wrote iswgrp_handoff[x] to the registers.
Nope, before it was the SPL that wrote the
iswgrp_handoffregisters (iswgrp_handoff[0] to0x0and iswgrp_handoff[1] to0x7)Quoted 1 line
The question is what is iswgrp_handoff[x].
Just regular scratch registers with special name. The [0] is used to indicate to the software how the
brg_mod_resetregister is supposed to be configured. The [1] is used to indicate how the l3remap register is supposed to be configured.The SPL currently sets these registers as -- all bridges released out of reset ; all bridges mapped into the L3 space. I believe this patch does not change that behavior.
Quoted 7 lines
It's not the bridges status
from Quartus (as the "handoff" suffix might suggest). Instead (if I remember correctly), it's either "all bridges" or "no bridges", depending on the FPGA configuration status at SPL runtime.In this case, we're probably better off with leaving it to the command line scripts to say which bridges shall be enabled...
This patch only changes things in that it updates the handoff registers when the user selects a new mask, so that any software which runs after U-Boot would be aware of which bridges U-Boot configured.
But maybe I'm missing something obvious, this stuff is so convoluted that I'd really appreciate if you could review thoroughly if there's something that doesn't seem right.
Quoted 8 lines
Quoted 3 lines
Hmm, if you're not 100% sure yourself, let me take the time to check again. What made me stumble accross this is that "bridge enable" did not work when no FPGA had been configured during SPL.
I'm reasonably sure it's OK, but another pair of eyeballs and all that ...
If the FPGA isn't configured, you shouldn't even run bridge enable, the result of that is undefined.
Well, what I meant is FPGA is configured later. Not in SPL but before the bridge command is run. But nevermind, I got it now...
Quoted 8 lines
Quoted 3 lines
And the duplication of names where U-Boot caches the handoff registers doesn't really help to make it easy to follow...
Look at
arch/arm/mach-socfpga/misc_gen5.cdo_bridge_reset(), that should clarify how the handoff registers are used. Keep in mind, they are only scratch registers , they have no real impact on the HW (except some are also read by BootROM during warm reset).
I know. What I was missing is that iswgrp_handoff[3] is never written and keeps its reset value of 0, so yes, your patch shouldn't change the current behaviour. So:
Regards,
Simon
PATCH 4/4 ARM: socfpga: Add support for selecting bridges in bridge command
Quoted 81 lines · Simon Goldschmidt
Quoted 59 lines · Marek Vasut
Quoted 57 lines · Simon Goldschmidt
Quoted 53 lines · Marek Vasut
Quoted 18 lines · Simon Goldschmidt
Am 22.04.2019 um 20:01 schrieb Marek Vasut:
Quoted 17 lines · Simon Goldschmidt
Quoted 15 lines · Marek Vasut
Quoted 6 lines
Add optional "mask" argument to the SoCFPGA bridge command, to select which bridges should be enabled/disabled. This allows the user to avoid
enabling bridges which are not connected into the FPGA fabric. Default
behavior is to enable/disable all bridges.So does this change the command? Seems like leaving away the new 'mask'
argument would now lead to enabling all bridges by overwriting whatever
the handoff values were before?Quoted 4 lines
Quoted 2 lines
That's how it behaved before though -- all the bridges were enabled. Now it's possible to explicitly select which bridges to enable/disable.
As I read the code, before it wrote iswgrp_handoff[x] to the registers.
Nope, before it was the SPL that wrote the
iswgrp_handoffregisters (iswgrp_handoff[0] to0x0and iswgrp_handoff[1] to0x7)Quoted 1 line
The question is what is iswgrp_handoff[x].
Just regular scratch registers with special name. The [0] is used to indicate to the software how the
brg_mod_resetregister is supposed to be configured. The [1] is used to indicate how the l3remap register is supposed to be configured.The SPL currently sets these registers as -- all bridges released out of reset ; all bridges mapped into the L3 space. I believe this patch does not change that behavior.
Quoted 7 lines
It's not the bridges status
from Quartus (as the "handoff" suffix might suggest). Instead (if I remember correctly), it's either "all bridges" or "no bridges", depending on the FPGA configuration status at SPL runtime.In this case, we're probably better off with leaving it to the command line scripts to say which bridges shall be enabled...
This patch only changes things in that it updates the handoff registers when the user selects a new mask, so that any software which runs after U-Boot would be aware of which bridges U-Boot configured.
But maybe I'm missing something obvious, this stuff is so convoluted that I'd really appreciate if you could review thoroughly if there's something that doesn't seem right.
Quoted 8 lines
Quoted 3 lines
Hmm, if you're not 100% sure yourself, let me take the time to check again. What made me stumble accross this is that "bridge enable" did not work when no FPGA had been configured during SPL.
I'm reasonably sure it's OK, but another pair of eyeballs and all that ...
If the FPGA isn't configured, you shouldn't even run bridge enable, the result of that is undefined.
Well, what I meant is FPGA is configured later. Not in SPL but before the bridge command is run. But nevermind, I got it now...
Quoted 8 lines
Quoted 3 lines
And the duplication of names where U-Boot caches the handoff registers doesn't really help to make it easy to follow...
Look at
arch/arm/mach-socfpga/misc_gen5.cdo_bridge_reset(), that should clarify how the handoff registers are used. Keep in mind, they are only scratch registers , they have no real impact on the HW (except some are also read by BootROM during warm reset).
Quoted 5 lines
I know. What I was missing is that iswgrp_handoff[3] is never written and keeps its reset value of 0, so yes, your patch shouldn't change the current behaviour. So:
Reviewed-by Simon Goldschmidt <[email protected]>
All right, in that case, let me enqueue the current bulk for 2019.07.
Signature · 2 lines
Best regards, Marek Vasut
PATCH 1/4 ARM: socfpga: Factor out handoff register configuration
In reply to Marek VasutQuoted 49 lines · Marek Vasut
Factor out the code for programming preloader handoff register values, the ISWGRP Handoff 0 and 1. These registers later control which bridges are enabled by the "bridge" command on Gen5 devices.
Signed-off-by Marek Vasut <[email protected]>Cc Chin Liang See <[email protected]>Cc Dinh Nguyen <[email protected]>Cc Simon Goldschmidt <[email protected]>Cc Tien Fong Chee <[email protected]>--- .../include/mach/reset_manager_gen5.h | 1 + arch/arm/mach-socfpga/reset_manager_gen5.c | 25 +++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-)arch/arm/mach-socfpga/include/mach/reset_manager_gen5.h +1
-0@@ -9,6 +9,7 @@#include <dt-bindings/reset/altr,rst-mgr.h> void reset_deassert_peripherals_handoff (void ); +void socfpga_bridges_set_handoff_regs (bool h2f,bool lwh2f,bool f2h);void socfpga_bridges_reset (int enable);struct socfpga_reset_manager {arch/arm/mach-socfpga/reset_manager_gen5.c +15
-0@@ -73,6 +73,28 @@ void reset_deassert_peripherals_handoff(void)#define L3REGS_REMAP_HPS2FPGA_MASK 0x08#define L3REGS_REMAP_OCRAM_MASK 0x01 +void socfpga_bridges_set_handoff_regs (bool h2f,bool lwh2f,bool f2h) +{ +u32 brgmask =0x0 ; +u32 l3rmask =L3REGS_REMAP_OCRAM_MASK ; + +if (h2f) + brgmask |=BIT (0 ); +else + l3rmask |=L3REGS_REMAP_HPS2FPGA_MASK ; + +if (lwh2f) + brgmask |=BIT (1 ); +else + l3rmask |=L3REGS_REMAP_LWHPS2FPGA_MASK ; +
arch/arm/mach-socfpga/reset_manager_gen5.c void reset_deassert_peripherals_handoff(void) · line 100
Quoted 10 lines
arch/arm/mach-socfpga/reset_manager_gen5.c +7
-0+if (f2h) + brgmask |=BIT (2 ); + +writel (brgmask, &sysmgr_regs->iswgrp_handoff[0 ]); +writel (l3rmask, &sysmgr_regs->iswgrp_handoff[1 ]); +} +void socfpga_bridges_reset (int enable) { const u32 l3mask = L3REGS_REMAP_LWHPS2FPGA_MASK |
'l3mask' seems unused after this change, no?
Other than that:
Quoted 11 lines
arch/arm/mach-socfpga/reset_manager_gen5.c +1
-2@@ -83,8 +105,7 @@ void socfpga_bridges_reset(int enable)/* brdmodrst */ writel (0xffffffff , &reset_manager_base->brg_mod_reset); }else { -writel (0 , &sysmgr_regs->iswgrp_handoff[0 ]); -writel (l3mask, &sysmgr_regs->iswgrp_handoff[1 ]); +socfpga_bridges_set_handoff_regs (false, false, false);/* Check signal from FPGA. */ if (!fpgamgr_test_fpga_ready ()) {
PATCH 1/4 ARM: socfpga: Factor out handoff register configuration
Quoted 55 lines · Simon Goldschmidt
Quoted 52 lines · Marek Vasut
Factor out the code for programming preloader handoff register values, the ISWGRP Handoff 0 and 1. These registers later control which bridges are enabled by the "bridge" command on Gen5 devices.
Signed-off-by Marek Vasut <[email protected]>Cc Chin Liang See <[email protected]>Cc Dinh Nguyen <[email protected]>Cc Simon Goldschmidt <[email protected]>Cc Tien Fong Chee <[email protected]>---
.../include/mach/reset_manager_gen5.h | 1 + arch/arm/mach-socfpga/reset_manager_gen5.c | 25 +++++++++++++++++--2 files changed, 24 insertions(+), 2 deletions(-)arch/arm/mach-socfpga/include/mach/reset_manager_gen5.h +1
-0@@ -9,6 +9,7 @@ #include <dt-bindings/reset/altr,rst-mgr.h> void reset_deassert_peripherals_handoff(void); +void socfpga_bridges_set_handoff_regs (bool h2f,bool lwh2f,bool f2h); void socfpga_bridges_reset(int enable); struct socfpga_reset_manager {arch/arm/mach-socfpga/reset_manager_gen5.c +18
-0@@ -73,6 +73,28 @@ void reset_deassert_peripherals_handoff(void) #define L3REGS_REMAP_HPS2FPGA_MASK 0x08 #define L3REGS_REMAP_OCRAM_MASK 0x01 +void socfpga_bridges_set_handoff_regs(bool h2f, bool lwh2f, bool f2h) +{ + u32 brgmask = 0x0; + u32 l3rmask = L3REGS_REMAP_OCRAM_MASK; + + if (h2f) + brgmask |= BIT(0); + else + l3rmask |= L3REGS_REMAP_HPS2FPGA_MASK; + + if (lwh2f) + brgmask |= BIT(1); + else + l3rmask |= L3REGS_REMAP_LWHPS2FPGA_MASK; + + if (f2h) + brgmask |= BIT(2); + + writel(brgmask, &sysmgr_regs->iswgrp_handoff[0]);
Quoted 8 lines
Quoted 6 lines
arch/arm/mach-socfpga/reset_manager_gen5.c +3
-0+ writel(l3rmask, &sysmgr_regs->iswgrp_handoff[1]); +} + void socfpga_bridges_reset(int enable) {const u32 l3mask =
L3REGS_REMAP_LWHPS2FPGA_MASK|'l3mask' seems unused after this change, no?
Nope, it's still used in the else {} branch of the conditional below.
[...]
Quoted 10 lines
Quoted 10 lines
arch/arm/mach-socfpga/reset_manager_gen5.c +1
-2@@ -83,8 +105,7 @@ void socfpga_bridges_reset(int enable) /* brdmodrst */ writel(0xffffffff, &reset_manager_base->brg_mod_reset); } else { - writel(0, &sysmgr_regs->iswgrp_handoff[0]); - writel(l3mask, &sysmgr_regs->iswgrp_handoff[1]); + socfpga_bridges_set_handoff_regs(false, false, false); /* Check signal from FPGA. */ if (!fpgamgr_test_fpga_ready()) {
Signature · 2 lines
Best regards, Marek Vasut
PATCH 1/4 ARM: socfpga: Factor out handoff register configuration
Am 22.04.2019 um 19:59 schrieb Marek Vasut:
Quoted 65 lines · Simon Goldschmidt
Quoted 55 lines · Marek Vasut
Quoted 52 lines
Factor out the code for programming preloader handoff register values, the ISWGRP Handoff 0 and 1. These registers later control which bridges are enabled by the "bridge" command on Gen5 devices.
Signed-off-by Marek Vasut <[email protected]>Cc Chin Liang See <[email protected]>Cc Dinh Nguyen <[email protected]>Cc Simon Goldschmidt <[email protected]>Cc Tien Fong Chee <[email protected]>--- .../include/mach/reset_manager_gen5.h | 1 + arch/arm/mach-socfpga/reset_manager_gen5.c | 25 +++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-)arch/arm/mach-socfpga/include/mach/reset_manager_gen5.h +1
-0@@ -9,6 +9,7 @@ #include <dt-bindings/reset/altr,rst-mgr.h> void reset_deassert_peripherals_handoff(void); +void socfpga_bridges_set_handoff_regs (bool h2f,bool lwh2f,bool f2h); void socfpga_bridges_reset(int enable); struct socfpga_reset_manager {arch/arm/mach-socfpga/reset_manager_gen5.c +18
-0@@ -73,6 +73,28 @@ void reset_deassert_peripherals_handoff(void) #define L3REGS_REMAP_HPS2FPGA_MASK 0x08 #define L3REGS_REMAP_OCRAM_MASK 0x01 +void socfpga_bridges_set_handoff_regs(bool h2f, bool lwh2f, bool f2h) +{ + u32 brgmask = 0x0; + u32 l3rmask = L3REGS_REMAP_OCRAM_MASK; + + if (h2f) + brgmask |= BIT(0); + else + l3rmask |= L3REGS_REMAP_HPS2FPGA_MASK; + + if (lwh2f) + brgmask |= BIT(1); + else + l3rmask |= L3REGS_REMAP_LWHPS2FPGA_MASK; + + if (f2h) + brgmask |= BIT(2); + + writel(brgmask, &sysmgr_regs->iswgrp_handoff[0]);Quoted 8 lines
arch/arm/mach-socfpga/reset_manager_gen5.c void reset_deassert_peripherals_handoff(void) · line 100
Quoted 6 lines
arch/arm/mach-socfpga/reset_manager_gen5.c +3
-0+ writel(l3rmask, &sysmgr_regs->iswgrp_handoff[1]); +} + void socfpga_bridges_reset(int enable) { const u32 l3mask = L3REGS_REMAP_LWHPS2FPGA_MASK |'l3mask' seems unused after this change, no?
Quoted 1 line
Nope, it's still used in the else {} branch of the conditional below.
Oops, missed that. In that case:
Quoted 15 lines
[...]
Quoted 10 lines
Quoted 10 lines
arch/arm/mach-socfpga/reset_manager_gen5.c +1
-2@@ -83,8 +105,7 @@ void socfpga_bridges_reset(int enable) /* brdmodrst */ writel(0xffffffff, &reset_manager_base->brg_mod_reset); } else { - writel(0, &sysmgr_regs->iswgrp_handoff[0]); - writel(l3mask, &sysmgr_regs->iswgrp_handoff[1]); + socfpga_bridges_set_handoff_regs(false, false, false); /* Check signal from FPGA. */ if (!fpgamgr_test_fpga_ready()) {