GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-28 01:51:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

driver/ddr: Fix DDR4 driver for ARM

Browse source 
Previously the driver was only tested on Power SoCs. Different barrier
instructions are needed for ARM SoCs.

Signed-off-by: York Sun <yorksun@freescale.com>
This commit is contained in:
York Sun 2014-06-23 15:36:44 -07:00
parent 6666017f44
commit 8340e7ac86
4 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/include/asm/arch-fsl-lsch3/config.h
View file

@ -43,7 +43,11 @@
/* DDR */ /* DDR */
#define CONFIG_SYS_FSL_DDR_LE #define CONFIG_SYS_FSL_DDR_LE
#define CONFIG_VERY_BIG_RAM #define CONFIG_VERY_BIG_RAM
#ifdef CONFIG_SYS_FSL_DDR4
#define CONFIG_SYS_FSL_DDRC_GEN4
#else
#define CONFIG_SYS_FSL_DDRC_ARM_GEN3 /* Enable Freescale ARM DDR3 driver */ #define CONFIG_SYS_FSL_DDRC_ARM_GEN3 /* Enable Freescale ARM DDR3 driver */
#endif
#define CONFIG_SYS_FSL_DDR /* Freescale DDR driver */ #define CONFIG_SYS_FSL_DDR /* Freescale DDR driver */
#define CONFIG_SYS_LS2_DDR_BLOCK1_SIZE ((phys_size_t)2 << 30) #define CONFIG_SYS_LS2_DDR_BLOCK1_SIZE ((phys_size_t)2 << 30)
#define CONFIG_MAX_MEM_MAPPED CONFIG_SYS_LS2_DDR_BLOCK1_SIZE #define CONFIG_MAX_MEM_MAPPED CONFIG_SYS_LS2_DDR_BLOCK1_SIZE

1
arch/arm/include/asm/io.h
View file

@ -136,6 +136,7 @@ extern inline void __raw_readsl(unsigned long addr, void *data, int longlen)
* TODO: The kernel offers some more advanced versions of barriers, it might * TODO: The kernel offers some more advanced versions of barriers, it might
* have some advantages to use them instead of the simple one here. * have some advantages to use them instead of the simple one here.
*/ */
#define mb() asm volatile("dsb sy" : : : "memory")
#define dmb() __asm__ __volatile__ ("" : : : "memory") #define dmb() __asm__ __volatile__ ("" : : : "memory")
#define __iormb() dmb() #define __iormb() dmb()
#define __iowmb() dmb() #define __iowmb() dmb()

3
arch/powerpc/include/asm/io.h
View file

@ -123,6 +123,9 @@ static inline void isync(void)
#define iobarrier_r() eieio() #define iobarrier_r() eieio()
#define iobarrier_w() eieio() #define iobarrier_w() eieio()
#define mb() sync()
#define isb() isync()
/* /*
* Non ordered and non-swapping "raw" accessors * Non ordered and non-swapping "raw" accessors
*/ */

7
drivers/ddr/fsl/fsl_ddr_gen4.c
View file

@ -8,6 +8,7 @@
#include <asm/io.h> #include <asm/io.h>
#include <fsl_ddr_sdram.h> #include <fsl_ddr_sdram.h>
#include <asm/processor.h> #include <asm/processor.h>
#include <fsl_immap.h>
#include <fsl_ddr.h> #include <fsl_ddr.h>
#if (CONFIG_CHIP_SELECTS_PER_CTRL > 4) #if (CONFIG_CHIP_SELECTS_PER_CTRL > 4)
@ -183,12 +184,14 @@ step2:
* we choose the max, that is 500 us for all of case. * we choose the max, that is 500 us for all of case.
*/ */
udelay(500); udelay(500);
asm volatile("sync;isync"); mb();
isb();
/* Let the controller go */ /* Let the controller go */
temp_sdram_cfg = ddr_in32(&ddr->sdram_cfg) & ~SDRAM_CFG_BI; temp_sdram_cfg = ddr_in32(&ddr->sdram_cfg) & ~SDRAM_CFG_BI;
ddr_out32(&ddr->sdram_cfg, temp_sdram_cfg | SDRAM_CFG_MEM_EN); ddr_out32(&ddr->sdram_cfg, temp_sdram_cfg | SDRAM_CFG_MEM_EN);
asm volatile("sync;isync"); mb();
isb();
total_gb_size_per_controller = 0; total_gb_size_per_controller = 0;
for (i = 0; i < CONFIG_CHIP_SELECTS_PER_CTRL; i++) { for (i = 0; i < CONFIG_CHIP_SELECTS_PER_CTRL; i++) {