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

armv8/ls1043: Add workaround for DDR erratum A-008850

Browse source 
Barrier transactions from CCI400 need to be disabled till
the DDR is configured, otherwise it may lead to system hang.
The patch adds workaround to fix the erratum.

Signed-off-by: Shengzhou Liu <Shengzhou.Liu@nxp.com>
Reviewed-by: York Sun <york.sun@nxp.com>
This commit is contained in:
Shengzhou Liu 2016-04-07 16:22:21 +08:00 • committed by York Sun
parent aeaec0e682
commit 074596c0b5
9 changed files with 49 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
arch/arm/cpu/armv8/fsl-layerscape/soc.c
View file

@ -12,6 +12,8 @@
#include <asm/io.h> #include <asm/io.h>
#include <asm/global_data.h> #include <asm/global_data.h>
#include <asm/arch-fsl-layerscape/config.h> #include <asm/arch-fsl-layerscape/config.h>
#include <fsl_ddr_sdram.h>
#include <fsl_ddr.h>
#ifdef CONFIG_CHAIN_OF_TRUST #ifdef CONFIG_CHAIN_OF_TRUST
#include <fsl_validate.h> #include <fsl_validate.h>
#endif #endif
@ -271,6 +273,39 @@ static void erratum_a009660(void)
#endif #endif
} }
static void erratum_a008850_early(void)
{
#ifdef CONFIG_SYS_FSL_ERRATUM_A008850
/* part 1 of 2 */
struct ccsr_cci400 __iomem *cci = (void *)CONFIG_SYS_CCI400_ADDR;
struct ccsr_ddr __iomem *ddr = (void *)CONFIG_SYS_FSL_DDR_ADDR;
/* disables propagation of barrier transactions to DDRC from CCI400 */
out_le32(&cci->ctrl_ord, CCI400_CTRLORD_TERM_BARRIER);
/* disable the re-ordering in DDRC */
ddr_out32(&ddr->eor, DDR_EOR_RD_REOD_DIS | DDR_EOR_WD_REOD_DIS);
#endif
}
void erratum_a008850_post(void)
{
#ifdef CONFIG_SYS_FSL_ERRATUM_A008850
/* part 2 of 2 */
struct ccsr_cci400 __iomem *cci = (void *)CONFIG_SYS_CCI400_ADDR;
struct ccsr_ddr __iomem *ddr = (void *)CONFIG_SYS_FSL_DDR_ADDR;
u32 tmp;
/* enable propagation of barrier transactions to DDRC from CCI400 */
out_le32(&cci->ctrl_ord, CCI400_CTRLORD_EN_BARRIER);
/* enable the re-ordering in DDRC */
tmp = ddr_in32(&ddr->eor);
tmp &= ~(DDR_EOR_RD_REOD_DIS | DDR_EOR_WD_REOD_DIS);
ddr_out32(&ddr->eor, tmp);
#endif
}
void fsl_lsch2_early_init_f(void) void fsl_lsch2_early_init_f(void)
{ {
struct ccsr_cci400 *cci = (struct ccsr_cci400 *)CONFIG_SYS_CCI400_ADDR; struct ccsr_cci400 *cci = (struct ccsr_cci400 *)CONFIG_SYS_CCI400_ADDR;
@ -295,6 +330,7 @@ void fsl_lsch2_early_init_f(void)
CCI400_DVM_MESSAGE_REQ_EN | CCI400_SNOOP_REQ_EN); CCI400_DVM_MESSAGE_REQ_EN | CCI400_SNOOP_REQ_EN);
/* Erratum */ /* Erratum */
erratum_a008850_early(); /* part 1 of 2 */
erratum_a009929(); erratum_a009929();
erratum_a009660(); erratum_a009660();
} }

1
arch/arm/include/asm/arch-fsl-layerscape/config.h
View file

@ -191,6 +191,7 @@
#define GICD_BASE 0x01401000 #define GICD_BASE 0x01401000
#define GICC_BASE 0x01402000 #define GICC_BASE 0x01402000
#define CONFIG_SYS_FSL_ERRATUM_A008850
#define CONFIG_SYS_FSL_ERRATUM_A009663 #define CONFIG_SYS_FSL_ERRATUM_A009663
#define CONFIG_SYS_FSL_ERRATUM_A009929 #define CONFIG_SYS_FSL_ERRATUM_A009929
#define CONFIG_SYS_FSL_ERRATUM_A009942 #define CONFIG_SYS_FSL_ERRATUM_A009942

1
board/freescale/ls1043aqds/ddr.c
View file

@ -116,6 +116,7 @@ phys_size_t initdram(int board_type)
dram_size = fsl_ddr_sdram(); dram_size = fsl_ddr_sdram();
#endif #endif
erratum_a008850_post();
#ifdef CONFIG_FSL_DEEP_SLEEP #ifdef CONFIG_FSL_DEEP_SLEEP
fsl_dp_ddr_restore(); fsl_dp_ddr_restore();

2
board/freescale/ls1043aqds/ddr.h
View file

@ -7,6 +7,8 @@
#ifndef __DDR_H__ #ifndef __DDR_H__
#define __DDR_H__ #define __DDR_H__
extern void erratum_a008850_post(void);
struct board_specific_parameters { struct board_specific_parameters {
u32 n_ranks; u32 n_ranks;
u32 datarate_mhz_high; u32 datarate_mhz_high;

8
board/freescale/ls1043aqds/ls1043aqds.c
View file

@ -307,14 +307,6 @@ int misc_init_r(void)
int board_init(void) int board_init(void)
{ {
struct ccsr_cci400 *cci = (struct ccsr_cci400 *)
CONFIG_SYS_CCI400_ADDR;
/* Set CCI-400 control override register to enable barrier
* transaction */
out_le32(&cci->ctrl_ord,
CCI400_CTRLORD_EN_BARRIER);
select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT); select_i2c_ch_pca9547(I2C_MUX_CH_DEFAULT);
board_retimer_init(); board_retimer_init();

2
board/freescale/ls1043ardb/ddr.c
View file

@ -177,6 +177,8 @@ phys_size_t initdram(int board_type)
#else #else
dram_size = fsl_ddr_sdram_size(); dram_size = fsl_ddr_sdram_size();
#endif #endif
erratum_a008850_post();
#ifdef CONFIG_FSL_DEEP_SLEEP #ifdef CONFIG_FSL_DEEP_SLEEP
fsl_dp_ddr_restore(); fsl_dp_ddr_restore();
#endif #endif

3
board/freescale/ls1043ardb/ddr.h
View file

@ -6,6 +6,9 @@
#ifndef __DDR_H__ #ifndef __DDR_H__
#define __DDR_H__ #define __DDR_H__
extern void erratum_a008850_post(void);
struct board_specific_parameters { struct board_specific_parameters {
u32 n_ranks; u32 n_ranks;
u32 datarate_mhz_high; u32 datarate_mhz_high;

8
board/freescale/ls1043ardb/ls1043ardb.c
View file

@ -83,14 +83,6 @@ int board_early_init_f(void)
int board_init(void) int board_init(void)
{ {
struct ccsr_cci400 *cci = (struct ccsr_cci400 *)CONFIG_SYS_CCI400_ADDR;
/*
* Set CCI-400 control override register to enable barrier
* transaction
*/
out_le32(&cci->ctrl_ord, CCI400_CTRLORD_EN_BARRIER);
#ifdef CONFIG_FSL_IFC #ifdef CONFIG_FSL_IFC
init_final_memctl_regs(); init_final_memctl_regs();
#endif #endif

4
include/fsl_ddr_sdram.h
View file

@ -146,6 +146,10 @@ typedef struct ddr4_spd_eeprom_s generic_spd_eeprom_t;
#define WR_DATA_DELAY_SHIFT 10 #define WR_DATA_DELAY_SHIFT 10
#endif #endif
/* DDR_EOR register */
#define DDR_EOR_RD_REOD_DIS 0x07000000
#define DDR_EOR_WD_REOD_DIS 0x00100000
/* DDR_MD_CNTL */ /* DDR_MD_CNTL */
#define MD_CNTL_MD_EN 0x80000000 #define MD_CNTL_MD_EN 0x80000000
#define MD_CNTL_CS_SEL_CS0 0x00000000 #define MD_CNTL_CS_SEL_CS0 0x00000000