GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-05 14:21:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ARM: socfpga: Add support for selecting bridges in bridge command

Browse source 
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.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Chin Liang See <chin.liang.see@intel.com>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Cc: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
Cc: Tien Fong Chee <tien.fong.chee@intel.com>
This commit is contained in:
Marek Vasut 2019-04-16 22:28:08 +02:00
parent ba2cfcee88
commit 72c347ced8
5 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arm/mach-socfpga/include/mach/misc.h
View file

@ -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_ */

17
arch/arm/mach-socfpga/misc.c
View file

@ -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"
""
);

2
arch/arm/mach-socfpga/misc_arria10.c
View file

@ -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();

12
arch/arm/mach-socfpga/misc_gen5.c
View file

@ -239,9 +239,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);

2
arch/arm/mach-socfpga/misc_s10.c
View file

@ -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);
}