ARM: socfpga: Fix SDRAM firewall init
Subsystems (3)
PATCH v2 1/2 ARM: socfpga: Fix SDRAM firewall init
From: Vyacheslav Yurkov <[email protected]>
Incorrect enable bits were used in initialization sequence of SDRAM firewall. This enables the FPGA to access regions of SDRAM, which were previously inaccessible.
Signed-off-by Vyacheslav Yurkov <[email protected]>
--- arch/arm/mach-socfpga/arria10-sdram.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/mach-socfpga/arria10-sdram.c +3 -3
@@ -486,7 +486,7 @@ static int arria10_sdram_firewall_setup(void)writel (0x00000000 ,ARRIA10_SDR_FW_MPU_FPGA_MPUREGION3ADDR );writel (0xffff0000 ,ARRIA10_SDR_FW_MPU_FPGA_FPGA2SDRAM0REGION0ADDR ); - mpu_en |=ARRIA10_NOC_FW_DDR_MPU_MPUREG1EN ; + mpu_en |=ARRIA10_NOC_FW_DDR_MPU_F2SDR0REG0EN ;writel (mpu_en,ARRIA10_SDR_FW_MPU_FPGA_EN );writel (0x00000000 ,ARRIA10_SDR_FW_MPU_FPGA_FPGA2SDRAM0REGION1ADDR );
@@ -494,7 +494,7 @@ static int arria10_sdram_firewall_setup(void)writel (0x00000000 ,ARRIA10_SDR_FW_MPU_FPGA_FPGA2SDRAM0REGION3ADDR );writel (0xffff0000 ,ARRIA10_SDR_FW_MPU_FPGA_FPGA2SDRAM1REGION0ADDR ); - mpu_en |=ARRIA10_NOC_FW_DDR_MPU_MPUREG2EN ; + mpu_en |=ARRIA10_NOC_FW_DDR_MPU_F2SDR1REG0EN ;writel (mpu_en,ARRIA10_SDR_FW_MPU_FPGA_EN );writel (0x00000000 ,ARRIA10_SDR_FW_MPU_FPGA_FPGA2SDRAM1REGION1ADDR );
@@ -502,7 +502,7 @@ static int arria10_sdram_firewall_setup(void)writel (0x00000000 ,ARRIA10_SDR_FW_MPU_FPGA_FPGA2SDRAM1REGION3ADDR );writel (0xffff0000 ,ARRIA10_SDR_FW_MPU_FPGA_FPGA2SDRAM2REGION0ADDR ); - mpu_en |=ARRIA10_NOC_FW_DDR_MPU_MPUREG3EN ; + mpu_en |=ARRIA10_NOC_FW_DDR_MPU_F2SDR2REG0EN ;writel (mpu_en,ARRIA10_SDR_FW_MPU_FPGA_EN );writel (0x00000000 ,ARRIA10_SDR_FW_MPU_FPGA_FPGA2SDRAM2REGION1ADDR );
Signature · 1 line
2.25.1
PATCH v2 2/2 ARM: socfpga: Configure F2SDRAM bridges
From: Vyacheslav Yurkov <[email protected]>
When DDR firewall configuration is updated the F2SDRAM bridges need to be brought from reset.
Signed-off-by Vyacheslav Yurkov <[email protected]>
--- arch/arm/mach-socfpga/arria10-sdram.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
arch/arm/mach-socfpga/arria10-sdram.c +14 -0
@@ -468,6 +468,18 @@ static void arria10_sdram_mmr_init(void) } } +static void arria10_f2sdram_bridges_reset (void ) +{ +uint32_t val; + +/* Release F2SDRAM bridges from reset */ + val =readl (ARRIA10_RSTMGR_ADDR +ARRIA10_RSTMGR_BRGMODRST ); + val &= ~(ARRIA10_RSTMGR_BRGMODRST_F2SSDRAM0 | +ARRIA10_RSTMGR_BRGMODRST_F2SSDRAM1 | +ARRIA10_RSTMGR_BRGMODRST_F2SSDRAM2 ); +writel (val,ARRIA10_RSTMGR_ADDR +ARRIA10_RSTMGR_BRGMODRST ); +} +static int arria10_sdram_firewall_setup (void ) {uint32_t mpu_en =0 ;
@@ -512,6 +524,8 @@ static int arria10_sdram_firewall_setup(void)writel (0xffff0000 ,ARRIA10_NOC_FW_DDR_L3_HPSREGION0ADDR );writel (ARRIA10_NOC_FW_DDR_L3_HPSREG0EN ,ARRIA10_NOC_FW_DDR_L3_EN ); +arria10_f2sdram_bridges_reset (); +return 0 ; }
Signature · 1 line
2.25.1
Sascha Hauer
AppliedQuoted 10 lines · Vyacheslav Yurkov
From: Vyacheslav Yurkov <[email protected]>
Incorrect enable bits were used in initialization sequence of SDRAM firewall. This enables the FPGA to access regions of SDRAM, which were previously inaccessible.
Signed-off-by Vyacheslav Yurkov <[email protected]>--- arch/arm/mach-socfpga/arria10-sdram.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Applied, thanks
Sascha
Quoted 37 lines
arch/arm/mach-socfpga/arria10-sdram.c +3
-3@@ -486,7 +486,7 @@ static int arria10_sdram_firewall_setup(void)writel (0x00000000 ,ARRIA10_SDR_FW_MPU_FPGA_MPUREGION3ADDR );writel (0xffff0000 ,ARRIA10_SDR_FW_MPU_FPGA_FPGA2SDRAM0REGION0ADDR ); - mpu_en |=ARRIA10_NOC_FW_DDR_MPU_MPUREG1EN ; + mpu_en |=ARRIA10_NOC_FW_DDR_MPU_F2SDR0REG0EN ;writel (mpu_en,ARRIA10_SDR_FW_MPU_FPGA_EN );writel (0x00000000 ,ARRIA10_SDR_FW_MPU_FPGA_FPGA2SDRAM0REGION1ADDR );@@ -494,7 +494,7 @@ static int arria10_sdram_firewall_setup(void)writel (0x00000000 ,ARRIA10_SDR_FW_MPU_FPGA_FPGA2SDRAM0REGION3ADDR );writel (0xffff0000 ,ARRIA10_SDR_FW_MPU_FPGA_FPGA2SDRAM1REGION0ADDR ); - mpu_en |=ARRIA10_NOC_FW_DDR_MPU_MPUREG2EN ; + mpu_en |=ARRIA10_NOC_FW_DDR_MPU_F2SDR1REG0EN ;writel (mpu_en,ARRIA10_SDR_FW_MPU_FPGA_EN );writel (0x00000000 ,ARRIA10_SDR_FW_MPU_FPGA_FPGA2SDRAM1REGION1ADDR );@@ -502,7 +502,7 @@ static int arria10_sdram_firewall_setup(void)writel (0x00000000 ,ARRIA10_SDR_FW_MPU_FPGA_FPGA2SDRAM1REGION3ADDR );writel (0xffff0000 ,ARRIA10_SDR_FW_MPU_FPGA_FPGA2SDRAM2REGION0ADDR ); - mpu_en |=ARRIA10_NOC_FW_DDR_MPU_MPUREG3EN ; + mpu_en |=ARRIA10_NOC_FW_DDR_MPU_F2SDR2REG0EN ;writel (mpu_en,ARRIA10_SDR_FW_MPU_FPGA_EN );writel (0x00000000 ,ARRIA10_SDR_FW_MPU_FPGA_FPGA2SDRAM2REGION1ADDR );Signature · 1 line
2.25.1
Signature · 4 lines
Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |