[U-Boot] [PATCH v1] ARM: socfpga: stratix10: Probe FPGA status before bridge enable

[U-Boot] [PATCH v1] ARM: socfpga: stratix10: Probe FPGA status before bridge enable

[chee.hong.ang at intel.com]

From: "Ang, Chee Hong" <chee.hong.ang@intel.com>

Send CONFIG_STATUS and RECONFIG_STATUS mailbox commands to Secure
Device Manager (SDM) to get the status of FPGA and make sure the
FPGA is in user mode before enable the bridge.

Signed-off-by: Ang, Chee Hong <chee.hong.ang@intel.com>
---
 arch/arm/mach-socfpga/misc_s10.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/arch/arm/mach-socfpga/misc_s10.c b/arch/arm/mach-socfpga/misc_s10.c
index 113eace..0e4133f 100644
--- a/arch/arm/mach-socfpga/misc_s10.c
+++ b/arch/arm/mach-socfpga/misc_s10.c
@@ -16,6 +16,7 @@
 #include <asm/arch/misc.h>
 #include <asm/pl310.h>
 #include <linux/libfdt.h>
+#include <asm/arch/mailbox_s10.h>
 
 #include <dt-bindings/reset/altr,rst-mgr-s10.h>
 
@@ -152,5 +153,16 @@ int arch_early_init_r(void)
 
 void do_bridge_reset(int enable)
 {
+	/* Check FPGA status before bridge enable */
+	if (enable) {
+		int ret = mbox_get_fpga_config_status(MBOX_RECONFIG_STATUS);
+
+		if (ret && ret != MBOX_CFGSTAT_STATE_CONFIG)
+			ret = mbox_get_fpga_config_status(MBOX_CONFIG_STATUS);
+
+		if (ret)
+			return;
+	}
+
 	socfpga_bridges_reset(enable);
 }
-- 
2.7.4

[U-Boot] [PATCH v1] ARM: socfpga: stratix10: Probe FPGA status before bridge enable

[Marek Vasut]

On 5/3/19 10:18 AM, chee.hong.ang at intel.com wrote:
> From: "Ang, Chee Hong" <chee.hong.ang@intel.com>
> 
> Send CONFIG_STATUS and RECONFIG_STATUS mailbox commands to Secure
> Device Manager (SDM) to get the status of FPGA and make sure the
> FPGA is in user mode before enable the bridge.
> 
> Signed-off-by: Ang, Chee Hong <chee.hong.ang@intel.com>
> ---
>  arch/arm/mach-socfpga/misc_s10.c | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> diff --git a/arch/arm/mach-socfpga/misc_s10.c b/arch/arm/mach-socfpga/misc_s10.c
> index 113eace..0e4133f 100644
> --- a/arch/arm/mach-socfpga/misc_s10.c
> +++ b/arch/arm/mach-socfpga/misc_s10.c
> @@ -16,6 +16,7 @@
>  #include <asm/arch/misc.h>
>  #include <asm/pl310.h>
>  #include <linux/libfdt.h>
> +#include <asm/arch/mailbox_s10.h>
>  
>  #include <dt-bindings/reset/altr,rst-mgr-s10.h>
>  
> @@ -152,5 +153,16 @@ int arch_early_init_r(void)
>  
>  void do_bridge_reset(int enable)
>  {
> +	/* Check FPGA status before bridge enable */
> +	if (enable) {
> +		int ret = mbox_get_fpga_config_status(MBOX_RECONFIG_STATUS);
> +
> +		if (ret && ret != MBOX_CFGSTAT_STATE_CONFIG)
> +			ret = mbox_get_fpga_config_status(MBOX_CONFIG_STATUS);
> +
> +		if (ret)
> +			return;
> +	}
> +
>  	socfpga_bridges_reset(enable);
>  }
> 
Applied, thanks

-- 
Best regards,
Marek Vasut