Skip to contentSkip to conversation

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

PATCH New Dinh Nguyen 2 participants 4 messages Jan 19, 2016 FPGA manager framework

lore
Share & tools
lore

Dinh Nguyen

author
#0 lore raw

PATCH 1/1 arm: socfpga: revert "set the fpga global bit to disable HPS to FPGA signals"

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 <[email protected]>
---
 drivers/fpga/socfpga.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/fpga/socfpga.c +1 -1
index 431e159..4448250 100644
@@ -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
Signature · 1 line
1.9.1.315.g3f09db0
author
#1 lore raw

PATCH 1/1 arm: socfpga: revert "set the fpga global bit to disable HPS to FPGA signals"

Hi Marek,

Quoted 2 lines · Dinh Nguyen

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

#2 lore raw

PATCH 1/1 arm: socfpga: revert "set the fpga global bit to disable HPS to FPGA signals"

Quoted 1 line · Dinh Nguyen

Hi Marek,

Hi Dinh,

Quoted 9 lines · Dinh Nguyen
Quoted 2 lines

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

Applied
#3 lore raw

PATCH 1/1 arm: socfpga: revert "set the fpga global bit to disable HPS to FPGA signals"

In reply to Dinh Nguyen
Quoted 8 lines · 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 <[email protected]>

Applied, thanks.

Best regards,
Marek Vasut