ppc4xx: Merge PPC4xx DDR and DDR2 ECC handling
PATCH v2 1/1 ppc4xx: Merge PPC4xx DDR and DDR2 ECC handling
This patch merges the ECC handling (ECC parity byte writing) into one file (ecc.c) for all PPC4xx SDRAM controllers except for PPC440EPx/GRx. This exception is because only those PPC's use the completely different Denali SDRAM controller core.
Previously we had two routines to generate/write the ECC parity bytes. With this patch we now only have one core function left.
Tested on Kilauea (no ECC) and Katmai (with and without ECC).
---
v2:
- Removed not referenced defines from ppc405.h
cpu/ppc4xx/44x_spd_ddr2.c | 194 ++++------------------------------- cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c | 6 +- cpu/ppc4xx/ecc.c | 167 +++++++++++++++++++++--------- cpu/ppc4xx/ecc.h | 52 +++++---- include/asm-ppc/ppc4xx-sdram.h | 7 +- include/ppc405.h | 4 - 6 files changed, 173 insertions(+), 257 deletions(-)
cpu/ppc4xx/44x_spd_ddr2.c +21 -173
@@ -9,7 +9,7 @@* Copyright (c) 2008 Nuovation System Designs, LLC * Grant Erickson <[email protected]> -* (C) Copyright 2007-2008 +* (C) Copyright 2007-2009 * Stefan Roese, DENX Software Engineering, sr at denx.de. * * COPYRIGHT AMCC CORPORATION 2004
@@ -48,6 +48,8 @@#include <asm/mmu.h> #include <asm/cache.h> +#include "ecc.h" +#if defined(CONFIG_SDRAM_PPC4xx_IBM_DDR2)#define PPC4xx_IBM_DDR2_DUMP_REGISTER (mnemonic) \
@@ -93,24 +95,11 @@ void dcbz_area(u32 start_address, u32 num_bytes);#define MULDIV64 (m1, m2, d) (u32)(((u64)(m1) * (u64)(m2)) / (u64)(d)) -static unsigned long is_ecc_enabled (void ); - -/*-----------------------------------------------------------------------------+ -* wait_ddr_idle -*-----------------------------------------------------------------------------*/ -static void wait_ddr_idle (void ) -{ -u32 val; - -do { -mfsdram (SDRAM_MCSTAT , val); - }while ((val &SDRAM_MCSTAT_IDLE_MASK ) ==SDRAM_MCSTAT_IDLE_NOT ); -} - +#if !defined(CONFIG_NAND_SPL )/*-----------------------------------------------------------------------------+ * sdram_memsize *-----------------------------------------------------------------------------*/ -static phys_size_t sdram_memsize (void ) +phys_size_t sdram_memsize (void ) {phys_size_t mem_size;unsigned long mcopt2;
@@ -184,6 +173,18 @@ static phys_size_t sdram_memsize(void) }/*-----------------------------------------------------------------------------+ +* is_ecc_enabled +*-----------------------------------------------------------------------------*/ +static unsigned long is_ecc_enabled (void ) +{ +unsigned long val; + +mfsdram (SDRAM_MCOPT1 , val); + +return SDRAM_MCOPT1_MCHK_CHK_DECODE (val); +} + +/*-----------------------------------------------------------------------------+ * board_add_ram_info *-----------------------------------------------------------------------------*/ void board_add_ram_info (int use_default)
@@ -198,12 +199,11 @@ void board_add_ram_info(int use_default)get_sys_info (&board_cfg); -#if defined(CONFIG_440 ) +#if defined(CONFIG_405EX ) + val = board_cfg.freqPLB; +#else mfsdr (SDR0_DDR0 , val); val =MULDIV64 ((board_cfg.freqPLB),SDR0_DDR0_DDRM_DECODE (val),1 ); -#else -mfsdr (SDR0_SDSTP0 , val); - val =MULDIV64 ((board_cfg.freqPLB),SDR0_SDSTP0_PLB2xDV0_DECODE (val),1 );#endif printf (" enabled, %d MHz" , (val *2 ) /1000000 );
@@ -211,112 +211,7 @@ void board_add_ram_info(int use_default) val = (val &SDRAM_MMODE_DCL_MASK ) >>4 ; printf(", CL%d)", val); } - -#ifdef CONFIG_DDR_ECC -/*-----------------------------------------------------------------------------+ -* program_ecc_addr. -*-----------------------------------------------------------------------------*/ -static void program_ecc_addr (unsigned long start_address, -unsigned long num_bytes, -unsigned long tlb_word2_i_value) -{ -unsigned long current_address; -unsigned long end_address; -unsigned long address_increment; -unsigned long mcopt1; -char str[] ="ECC generation -" ; -char slash[] ="\\|/-\\|/-" ; -int loop =0 ; -int loopi =0 ; - - current_address = start_address; -mfsdram (SDRAM_MCOPT1 , mcopt1); -if ((mcopt1 &SDRAM_MCOPT1_MCHK_MASK ) !=SDRAM_MCOPT1_MCHK_NON ) { -mtsdram (SDRAM_MCOPT1 , - (mcopt1 & ~SDRAM_MCOPT1_MCHK_MASK ) |SDRAM_MCOPT1_MCHK_GEN ); -sync (); -eieio (); -wait_ddr_idle (); - -puts (str); - -#ifdef CONFIG_440 -if (tlb_word2_i_value ==TLB_WORD2_I_ENABLE ) { -#endif -/* ECC bit set method for non-cached memory */ -if ((mcopt1 &SDRAM_MCOPT1_DMWD_MASK ) ==SDRAM_MCOPT1_DMWD_32 ) - address_increment =4 ; -else - address_increment =8 ; - end_address = current_address + num_bytes; - -while (current_address < end_address) { - *((unsigned long *)current_address) =0x00000000 ; - current_address += address_increment; - -if ((loop++ % (2 <<20 )) ==0 ) { -putc ('\b' ); -putc (slash[loopi++ %8 ]); - } - } -#ifdef CONFIG_440 - }else { -/* ECC bit set method for cached memory */ -dcbz_area (start_address, num_bytes); -/* Write modified dcache lines back to memory */ -clean_dcache_range (start_address, start_address + num_bytes); - } -#endif /* CONFIG_440 */ - -blank_string (strlen (str)); - -sync (); -eieio (); -wait_ddr_idle (); - -/* clear ECC error repoting registers */ -mtsdram (SDRAM_ECCCR ,0xffffffff ); -mtdcr (0x4c ,0xffffffff ); - -mtsdram (SDRAM_MCOPT1 , - (mcopt1 & ~SDRAM_MCOPT1_MCHK_MASK ) |SDRAM_MCOPT1_MCHK_CHK_REP ); -sync (); -eieio (); -wait_ddr_idle (); - } -} - -/*-----------------------------------------------------------------------------+ -* do_program_ecc. -*-----------------------------------------------------------------------------*/ -static void do_program_ecc (unsigned long tlb_word2_i_value) -{ -unsigned long mcopt1; -unsigned long mcopt2; -unsigned long mcstat; -phys_size_t memsize =sdram_memsize (); - -if (memsize >CONFIG_MAX_MEM_MAPPED ) { -printf ("\nWarning: Can't enable ECC on systems with more than 2GB of SDRAM!\n" ); -return ; - } - -mfsdram (SDRAM_MCOPT1 , mcopt1); -mfsdram (SDRAM_MCOPT2 , mcopt2); - -if ((mcopt1 &SDRAM_MCOPT1_MCHK_MASK ) !=SDRAM_MCOPT1_MCHK_NON ) { -/* DDR controller must be enabled and not in self-refresh. */ -mfsdram (SDRAM_MCSTAT , mcstat); -if (((mcopt2 &SDRAM_MCOPT2_DCEN_MASK ) ==SDRAM_MCOPT2_DCEN_ENABLE ) - && ((mcopt2 &SDRAM_MCOPT2_SREN_MASK ) ==SDRAM_MCOPT2_SREN_EXIT ) - && ((mcstat & (SDRAM_MCSTAT_MIC_MASK |SDRAM_MCSTAT_SRMS_MASK )) - == (SDRAM_MCSTAT_MIC_COMP |SDRAM_MCSTAT_SRMS_NOT_SF ))) { - -program_ecc_addr (0 , memsize, tlb_word2_i_value); - } - } -} -#endif /* CONFIG_DDR_ECC */ +#endif /* !CONFIG_NAND_SPL */ #if defined(CONFIG_SPD_EEPROM )
@@ -439,7 +334,6 @@ typedef enum ddr_cas_id {/*-----------------------------------------------------------------------------+ * Prototypes *-----------------------------------------------------------------------------*/ -static phys_size_t sdram_memsize (void );static void get_spd_info (unsigned long *dimm_populated,unsigned char *iic0_dimm_addr,unsigned long num_dimm_banks);
@@ -2405,25 +2299,6 @@ static void program_memory_queue(unsigned long *dimm_populated,#endif } -/*-----------------------------------------------------------------------------+ -* is_ecc_enabled. -*-----------------------------------------------------------------------------*/ -static unsigned long is_ecc_enabled (void ) -{ -unsigned long dimm_num; -unsigned long ecc; -unsigned long val; - - ecc =0 ; -/* loop through all the DIMM slots on the board */ -for (dimm_num =0 ; dimm_num <MAXDIMMS ; dimm_num++) { -mfsdram (SDRAM_MCOPT1 , val); - ecc =max (ecc,SDRAM_MCOPT1_MCHK_CHK_DECODE (val)); - } - -return ecc; -} -#ifdef CONFIG_DDR_ECC /*-----------------------------------------------------------------------------+ * program_ecc.
@@ -2989,21 +2864,6 @@ static void test(void)#else /* CONFIG_SPD_EEPROM */ -/*-----------------------------------------------------------------------------+ -* is_ecc_enabled -*-----------------------------------------------------------------------------*/ -static unsigned long is_ecc_enabled (void ) -{ -unsigned long ecc; -unsigned long val; - - ecc =0 ; -mfsdram (SDRAM_MCOPT1 , val); - ecc =max (ecc,SDRAM_MCOPT1_MCHK_CHK_DECODE (val)); - -return ecc; -} -/*----------------------------------------------------------------------------- * Function: initdram * Description: Configures the PPC4xx IBM DDR1/DDR2 SDRAM memory controller.
@@ -3225,18 +3085,6 @@ void mtdcr_any(u32 dcr, u32 val) } }#endif /* defined(CONFIG_440) */ - -void blank_string (int size) -{ -int i; - -for (i =0 ; i < size; i++) -putc ('\b' ); -for (i =0 ; i < size; i++) -putc (' ' ); -for (i =0 ; i < size; i++) -putc ('\b' ); -}#endif /* !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL) */ inline void ppc4xx_ibm_ddr2_register_dump (void )
cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c +4 -2
@@ -42,6 +42,8 @@#include <asm/io.h> #include <asm/processor.h> +#include "ecc.h" +#if defined(CONFIG_PPC4xx_DDR_AUTOCALIBRATION)/*
@@ -177,7 +179,7 @@ static u32 *get_membase(int bxcr_num)static inline void ecc_clear_status_reg (void ) { -mtsdram (SDRAM_ECCCR ,0xffffffff ); +mtsdram (SDRAM_ECCES ,0xffffffff );#if defined(SDRAM_R0BAS )mtdcr (SDRAM_ERRSTATLL ,0xffffffff );#endif
@@ -210,7 +212,7 @@ static int ecc_check_status_reg(void)* ecc error, then don't count * this as a passing value */ -mfsdram (SDRAM_ECCCR , ecc_status); +mfsdram (SDRAM_ECCES , ecc_status);if (ecc_status !=0x00000000 ) {/* clear on error */ ecc_clear_status_reg ();
cpu/ppc4xx/ecc.c +115 -52
203 lines not on this page · raw message
cpu/ppc4xx/ecc.h +29 -23
78 lines not on this page · raw message
include/asm-ppc/ppc4xx-sdram.h +4 -3
@@ -117,6 +117,7 @@#define SDRAM_MCSTS_MRSC 0x80000000#define SDRAM_MCSTS_SRMS 0x40000000#define SDRAM_MCSTS_CIS 0x20000000 +#define SDRAM_MCSTS_IDLE_NOT 0x00000000/* Mem contr not idle */ /* * SDRAM Refresh Timer Register
@@ -416,8 +417,7 @@#define SDRAM_SDTR3 0x87/* DDR SDRAM timing 3 */ #define SDRAM_MMODE 0x88/* memory mode */ #define SDRAM_MEMODE 0x89/* memory extended mode */ -#define SDRAM_ECCCR 0x98/* ECC error status */ -#define SDRAM_ECCES SDRAM_ECCCR +#define SDRAM_ECCES 0x98/* ECC error status */ #define SDRAM_CID 0xA4/* core ID */ #ifndef CONFIG_405EX #define SDRAM_RID 0xA8/* revision ID */
@@ -1397,7 +1397,6 @@/* * Prototypes */ -void inline blank_string (int size);inline void ppc4xx_ibm_ddr2_register_dump (void );u32 mfdcr_any (u32 );void mtdcr_any (u32 ,u32 );
@@ -1405,6 +1404,8 @@ u32 ddr_wrdtr(u32);u32 ddr_clktr (u32 );void spd_ddr_init_hang (void );u32 DQS_autocalibration (void ); +phys_size_t sdram_memsize (void ); +void dcbz_area (u32 start_address,u32 num_bytes);#endif /* __ASSEMBLY__ */ #endif /* _PPC4xx_SDRAM_H_ */
include/ppc405.h +0 -4
@@ -768,10 +768,6 @@#define SDR0_SDCS_SDD (0x80000000 >> 31) -/* SDR0_SDSTP0 Serial Device Strap Register0 */ -#define SDR0_SDSTP0 0x0020 -#define SDR0_SDSTP0_PLB2xDV0_DECODE (n) ((((unsigned long)(n)) & 0x07)) -/* CUST0 Customer Configuration Register0 */ #define SDR0_CUST0 0x4000#define SDR0_CUST0_MUX_E_N_G_MASK 0xC0000000/* Mux_Emac_NDFC_GPIO */
Signature · 1 line
1.6.4.4
PATCH v2 1/1 ppc4xx: Merge PPC4xx DDR and DDR2 ECC handling
Quoted 9 lines · On Tuesday 29 September 2009 08:39:28 Stefan Roese wrote:
This patch merges the ECC handling (ECC parity byte writing) into one file (
ecc.c) for all PPC4xx SDRAM controllers except for PPC440EPx/GRx. This exception is because only those PPC's use the completely different Denali SDRAM controller core.Previously we had two routines to generate/write the ECC parity bytes. With this patch we now only have one core function left.
Tested on Kilauea (no ECC) and Katmai (with and without ECC).
Applied to u-boot-ppc4xx/master. Thanks.
Cheers,
Stefan
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-0 Fax: (+49)-8142-66989-80 Email: office at denx.de