[U-Boot] [PATCH] arm: socfpga: revert "set the fpga global bit to disable HPS to FPGA signals"

[U-Boot] [PATCH] arm: socfpga: revert "set the fpga global bit to disable HPS to FPGA signals"

[Dinh Nguyen]

Revert "arm: socfpga: set the fpga global bit to disable HPS to FPGA signals"

Apparently, the logic for the FPGA global bit is not universal between Gen5
and Gen10 devices is not the same. Disabling this bit, while applicable to
Gen10 devices, will break FPGA programming on Gen5 devices.

Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>
---
 drivers/fpga/socfpga.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/socfpga.c
index 431e159..4448250 100644
--- a/drivers/fpga/socfpga.c
+++ b/drivers/fpga/socfpga.c
@@ -269,7 +269,7 @@ int socfpga_load(Altera_desc *desc, const void *rbf_data, size_t rbf_size)
 	/* Prior programming the FPGA, all bridges need to be shut off */
 
 	/* Disable all signals from hps peripheral controller to fpga */
-	writel(0, &sysmgr_regs->fpgaintfgrp_gbl);
+	writel(0, &sysmgr_regs->fpgaintfgrp_module);
 
 	/* Disable all signals from FPGA to HPS SDRAM */
 #define SDR_CTRLGRP_FPGAPORTRST_ADDRESS	0x5080
-- 
1.9.1.315.g3f09db0

[U-Boot] [PATCH] arm: socfpga: revert "set the fpga global bit to disable HPS to FPGA signals"

[Dinh Nguyen]

Hi Marek,

On 01/19/2016 09:16 AM, Dinh Nguyen wrote:
> Revert "arm: socfpga: set the fpga global bit to disable HPS to FPGA signals"
> 

I apologize for the original patch "arm: socfpga: set the fpga global
bit to disable HPS to FPGA signals". I did not test the patch when it
was sent out. I did go back to testing it after I was able to
consolidate a bit the FPGA driver for Gen5 and Gen10 devices, and found
out that behavior for the global FPGA bit is different.

Dinh

[U-Boot] [PATCH] arm: socfpga: revert "set the fpga global bit to disable HPS to FPGA signals"

[Marek Vasut]

On Tuesday, January 19, 2016 at 04:50:06 PM, Dinh Nguyen wrote:
> Hi Marek,

Hi Dinh,

> On 01/19/2016 09:16 AM, Dinh Nguyen wrote:
> > Revert "arm: socfpga: set the fpga global bit to disable HPS to FPGA
> > signals"
> 
> I apologize for the original patch "arm: socfpga: set the fpga global
> bit to disable HPS to FPGA signals". I did not test the patch when it
> was sent out. I did go back to testing it after I was able to
> consolidate a bit the FPGA driver for Gen5 and Gen10 devices, and found
> out that behavior for the global FPGA bit is different.

Good thing it went in after 2016.01 was out, so nothing that bad really
happened. Thanks for finding this.

Best regards,
Marek Vasut

[U-Boot] [PATCH] arm: socfpga: revert "set the fpga global bit to disable HPS to FPGA signals"

[Marek Vasut]

On Tuesday, January 19, 2016 at 04:16:21 PM, Dinh Nguyen wrote:
> Revert "arm: socfpga: set the fpga global bit to disable HPS to FPGA
> signals"
> 
> Apparently, the logic for the FPGA global bit is not universal between Gen5
> and Gen10 devices is not the same. Disabling this bit, while applicable to
> Gen10 devices, will break FPGA programming on Gen5 devices.
> 
> Signed-off-by: Dinh Nguyen <dinguyen@opensource.altera.com>

Applied, thanks.

Best regards,
Marek Vasut