2006-03-14 15:24:38 +00:00
|
|
|
/*
|
|
|
|
* (C) Copyright 2006
|
|
|
|
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
|
|
|
|
*
|
|
|
|
* See file CREDITS for list of people who contributed to this
|
|
|
|
* project.
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License as
|
|
|
|
* published by the Free Software Foundation; either version 2 of
|
|
|
|
* the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
|
|
|
|
* MA 02111-1307 USA
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <common.h>
|
|
|
|
#include <ioports.h>
|
|
|
|
#include <mpc83xx.h>
|
|
|
|
#include <asm/mpc8349_pci.h>
|
|
|
|
#include <i2c.h>
|
|
|
|
#include <spd.h>
|
|
|
|
#include <miiphy.h>
|
2006-03-16 14:19:35 +00:00
|
|
|
#include <command.h>
|
2006-03-14 15:24:38 +00:00
|
|
|
#if defined(CONFIG_SPD_EEPROM)
|
|
|
|
#include <spd_sdram.h>
|
|
|
|
#endif
|
2006-11-01 06:10:40 +00:00
|
|
|
#if defined(CONFIG_OF_FLAT_TREE)
|
|
|
|
#include <ft_build.h>
|
|
|
|
#endif
|
|
|
|
|
2006-03-14 15:24:38 +00:00
|
|
|
int fixed_sdram(void);
|
|
|
|
void sdram_init(void);
|
|
|
|
|
|
|
|
#if defined(CONFIG_DDR_ECC) && defined(CONFIG_MPC83XX)
|
|
|
|
void ddr_enable_ecc(unsigned int dram_size);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
int board_early_init_f (void)
|
|
|
|
{
|
|
|
|
volatile u8* bcsr = (volatile u8*)CFG_BCSR;
|
|
|
|
|
|
|
|
/* Enable flash write */
|
|
|
|
bcsr[1] &= ~0x01;
|
|
|
|
|
2006-04-20 18:45:32 +00:00
|
|
|
#ifdef CFG_USE_MPC834XSYS_USB_PHY
|
|
|
|
/* Use USB PHY on SYS board */
|
|
|
|
bcsr[5] |= 0x02;
|
|
|
|
#endif
|
|
|
|
|
2006-03-14 15:24:38 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
#define ns2clk(ns) (ns / (1000000000 / CONFIG_8349_CLKIN) + 1)
|
|
|
|
|
|
|
|
long int initdram (int board_type)
|
|
|
|
{
|
2006-11-03 18:00:28 +00:00
|
|
|
volatile immap_t *im = (immap_t *)CFG_IMMR;
|
2006-03-14 15:24:38 +00:00
|
|
|
u32 msize = 0;
|
|
|
|
|
|
|
|
if ((im->sysconf.immrbar & IMMRBAR_BASE_ADDR) != (u32)im)
|
|
|
|
return -1;
|
|
|
|
|
2006-03-16 16:46:46 +00:00
|
|
|
puts("Initializing\n");
|
|
|
|
|
2006-03-14 15:24:38 +00:00
|
|
|
/* DDR SDRAM - Main SODIMM */
|
|
|
|
im->sysconf.ddrlaw[0].bar = CFG_DDR_BASE & LAWBAR_BAR;
|
|
|
|
#if defined(CONFIG_SPD_EEPROM)
|
2006-03-16 16:46:46 +00:00
|
|
|
msize = spd_sdram();
|
2006-03-14 15:24:38 +00:00
|
|
|
#else
|
|
|
|
msize = fixed_sdram();
|
|
|
|
#endif
|
|
|
|
/*
|
|
|
|
* Initialize SDRAM if it is on local bus.
|
|
|
|
*/
|
|
|
|
sdram_init();
|
|
|
|
|
|
|
|
#if defined(CONFIG_DDR_ECC) && !defined(CONFIG_ECC_INIT_VIA_DDRCONTROLLER)
|
|
|
|
/*
|
|
|
|
* Initialize and enable DDR ECC.
|
|
|
|
*/
|
|
|
|
ddr_enable_ecc(msize * 1024 * 1024);
|
|
|
|
#endif
|
|
|
|
puts(" DDR RAM: ");
|
|
|
|
/* return total bus SDRAM size(bytes) -- DDR */
|
|
|
|
return (msize * 1024 * 1024);
|
|
|
|
}
|
|
|
|
|
|
|
|
#if !defined(CONFIG_SPD_EEPROM)
|
|
|
|
/*************************************************************************
|
|
|
|
* fixed sdram init -- doesn't use serial presence detect.
|
|
|
|
************************************************************************/
|
|
|
|
int fixed_sdram(void)
|
|
|
|
{
|
2006-11-03 18:00:28 +00:00
|
|
|
volatile immap_t *im = (immap_t *)CFG_IMMR;
|
2006-03-14 15:24:38 +00:00
|
|
|
u32 msize = 0;
|
|
|
|
u32 ddr_size;
|
|
|
|
u32 ddr_size_log2;
|
|
|
|
|
|
|
|
msize = CFG_DDR_SIZE;
|
|
|
|
for (ddr_size = msize << 20, ddr_size_log2 = 0;
|
|
|
|
(ddr_size > 1);
|
|
|
|
ddr_size = ddr_size>>1, ddr_size_log2++) {
|
|
|
|
if (ddr_size & 1) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
2006-03-16 16:46:46 +00:00
|
|
|
im->sysconf.ddrlaw[0].bar = ((CFG_DDR_SDRAM_BASE>>12) & 0xfffff);
|
2006-03-14 15:24:38 +00:00
|
|
|
im->sysconf.ddrlaw[0].ar = LAWAR_EN | ((ddr_size_log2 - 1) & LAWAR_SIZE);
|
2006-03-16 16:46:46 +00:00
|
|
|
|
2006-03-14 15:24:38 +00:00
|
|
|
#if (CFG_DDR_SIZE != 256)
|
|
|
|
#warning Currenly any ddr size other than 256 is not supported
|
|
|
|
#endif
|
2006-03-16 16:46:46 +00:00
|
|
|
im->ddr.csbnds[2].csbnds = 0x0000000f;
|
2006-03-14 15:24:38 +00:00
|
|
|
im->ddr.cs_config[2] = CFG_DDR_CONFIG;
|
2006-03-16 16:46:46 +00:00
|
|
|
|
2006-04-16 08:51:58 +00:00
|
|
|
/* currently we use only one CS, so disable the other banks */
|
2006-03-16 16:46:46 +00:00
|
|
|
im->ddr.cs_config[0] = 0;
|
|
|
|
im->ddr.cs_config[1] = 0;
|
|
|
|
im->ddr.cs_config[3] = 0;
|
|
|
|
|
|
|
|
im->ddr.timing_cfg_1 = CFG_DDR_TIMING_1;
|
|
|
|
im->ddr.timing_cfg_2 = CFG_DDR_TIMING_2;
|
2006-04-16 08:51:58 +00:00
|
|
|
|
2006-03-14 15:24:38 +00:00
|
|
|
im->ddr.sdram_cfg =
|
|
|
|
SDRAM_CFG_SREN
|
|
|
|
#if defined(CONFIG_DDR_2T_TIMING)
|
|
|
|
| SDRAM_CFG_2T_EN
|
|
|
|
#endif
|
|
|
|
| 2 << SDRAM_CFG_SDRAM_TYPE_SHIFT;
|
2006-03-16 16:46:46 +00:00
|
|
|
#if defined (CONFIG_DDR_32BIT)
|
|
|
|
/* for 32-bit mode burst length is 8 */
|
|
|
|
im->ddr.sdram_cfg |= (SDRAM_CFG_32_BE | SDRAM_CFG_8_BE);
|
|
|
|
#endif
|
|
|
|
im->ddr.sdram_mode = CFG_DDR_MODE;
|
2006-03-14 15:24:38 +00:00
|
|
|
|
2006-04-16 08:51:58 +00:00
|
|
|
im->ddr.sdram_interval = CFG_DDR_INTERVAL;
|
2006-03-14 15:24:38 +00:00
|
|
|
udelay(200);
|
|
|
|
|
2006-03-16 16:46:46 +00:00
|
|
|
/* enable DDR controller */
|
2006-03-14 15:24:38 +00:00
|
|
|
im->ddr.sdram_cfg |= SDRAM_CFG_MEM_EN;
|
|
|
|
return msize;
|
|
|
|
}
|
|
|
|
#endif/*!CFG_SPD_EEPROM*/
|
|
|
|
|
|
|
|
|
|
|
|
int checkboard (void)
|
|
|
|
{
|
|
|
|
puts("Board: Freescale MPC8349EMDS\n");
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* if MPC8349EMDS is soldered with SDRAM
|
|
|
|
*/
|
|
|
|
#if defined(CFG_BR2_PRELIM) \
|
|
|
|
&& defined(CFG_OR2_PRELIM) \
|
|
|
|
&& defined(CFG_LBLAWBAR2_PRELIM) \
|
|
|
|
&& defined(CFG_LBLAWAR2_PRELIM)
|
|
|
|
/*
|
|
|
|
* Initialize SDRAM memory on the Local Bus.
|
|
|
|
*/
|
|
|
|
|
|
|
|
void sdram_init(void)
|
|
|
|
{
|
2006-11-03 18:00:28 +00:00
|
|
|
volatile immap_t *immap = (immap_t *)CFG_IMMR;
|
2006-10-25 19:41:21 +00:00
|
|
|
volatile lbus83xx_t *lbc= &immap->lbus;
|
2006-03-14 15:24:38 +00:00
|
|
|
uint *sdram_addr = (uint *)CFG_LBC_SDRAM_BASE;
|
|
|
|
|
|
|
|
puts("\n SDRAM on Local Bus: ");
|
|
|
|
print_size (CFG_LBC_SDRAM_SIZE * 1024 * 1024, "\n");
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Setup SDRAM Base and Option Registers, already done in cpu_init.c
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* setup mtrpt, lsrt and lbcr for LB bus */
|
|
|
|
lbc->lbcr = CFG_LBC_LBCR;
|
|
|
|
lbc->mrtpr = CFG_LBC_MRTPR;
|
|
|
|
lbc->lsrt = CFG_LBC_LSRT;
|
|
|
|
asm("sync");
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Configure the SDRAM controller Machine Mode Register.
|
|
|
|
*/
|
|
|
|
lbc->lsdmr = CFG_LBC_LSDMR_5; /* 0x40636733; normal operation */
|
|
|
|
|
|
|
|
lbc->lsdmr = CFG_LBC_LSDMR_1; /* 0x68636733; precharge all the banks */
|
|
|
|
asm("sync");
|
|
|
|
*sdram_addr = 0xff;
|
|
|
|
udelay(100);
|
|
|
|
|
|
|
|
lbc->lsdmr = CFG_LBC_LSDMR_2; /* 0x48636733; auto refresh */
|
|
|
|
asm("sync");
|
|
|
|
/*1 times*/
|
|
|
|
*sdram_addr = 0xff;
|
|
|
|
udelay(100);
|
|
|
|
/*2 times*/
|
|
|
|
*sdram_addr = 0xff;
|
|
|
|
udelay(100);
|
|
|
|
/*3 times*/
|
|
|
|
*sdram_addr = 0xff;
|
|
|
|
udelay(100);
|
|
|
|
/*4 times*/
|
|
|
|
*sdram_addr = 0xff;
|
|
|
|
udelay(100);
|
|
|
|
/*5 times*/
|
|
|
|
*sdram_addr = 0xff;
|
|
|
|
udelay(100);
|
|
|
|
/*6 times*/
|
|
|
|
*sdram_addr = 0xff;
|
|
|
|
udelay(100);
|
|
|
|
/*7 times*/
|
|
|
|
*sdram_addr = 0xff;
|
|
|
|
udelay(100);
|
|
|
|
/*8 times*/
|
|
|
|
*sdram_addr = 0xff;
|
|
|
|
udelay(100);
|
|
|
|
|
|
|
|
/* 0x58636733; mode register write operation */
|
|
|
|
lbc->lsdmr = CFG_LBC_LSDMR_4;
|
|
|
|
asm("sync");
|
|
|
|
*sdram_addr = 0xff;
|
|
|
|
udelay(100);
|
|
|
|
|
|
|
|
lbc->lsdmr = CFG_LBC_LSDMR_5; /* 0x40636733; normal operation */
|
|
|
|
asm("sync");
|
|
|
|
*sdram_addr = 0xff;
|
|
|
|
udelay(100);
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
void sdram_init(void)
|
|
|
|
{
|
|
|
|
put("SDRAM on Local Bus is NOT available!\n");
|
|
|
|
}
|
|
|
|
#endif
|
2006-03-16 14:19:35 +00:00
|
|
|
|
|
|
|
#if defined(CONFIG_DDR_ECC) && defined(CONFIG_DDR_ECC_CMD)
|
|
|
|
/*
|
|
|
|
* ECC user commands
|
|
|
|
*/
|
|
|
|
void ecc_print_status(void)
|
|
|
|
{
|
2006-11-03 18:00:28 +00:00
|
|
|
volatile immap_t *immap = (immap_t *)CFG_IMMR;
|
2006-10-25 19:41:21 +00:00
|
|
|
volatile ddr83xx_t *ddr = &immap->ddr;
|
2006-03-16 14:19:35 +00:00
|
|
|
|
|
|
|
printf("\nECC mode: %s\n\n", (ddr->sdram_cfg & SDRAM_CFG_ECC_EN) ? "ON" : "OFF");
|
|
|
|
|
|
|
|
/* Interrupts */
|
|
|
|
printf("Memory Error Interrupt Enable:\n");
|
|
|
|
printf(" Multiple-Bit Error Interrupt Enable: %d\n",
|
|
|
|
(ddr->err_int_en & ECC_ERR_INT_EN_MBEE) ? 1 : 0);
|
|
|
|
printf(" Single-Bit Error Interrupt Enable: %d\n",
|
|
|
|
(ddr->err_int_en & ECC_ERR_INT_EN_SBEE) ? 1 : 0);
|
|
|
|
printf(" Memory Select Error Interrupt Enable: %d\n\n",
|
|
|
|
(ddr->err_int_en & ECC_ERR_INT_EN_MSEE) ? 1 : 0);
|
|
|
|
|
|
|
|
/* Error disable */
|
|
|
|
printf("Memory Error Disable:\n");
|
|
|
|
printf(" Multiple-Bit Error Disable: %d\n",
|
|
|
|
(ddr->err_disable & ECC_ERROR_DISABLE_MBED) ? 1 : 0);
|
|
|
|
printf(" Sinle-Bit Error Disable: %d\n",
|
|
|
|
(ddr->err_disable & ECC_ERROR_DISABLE_SBED) ? 1 : 0);
|
|
|
|
printf(" Memory Select Error Disable: %d\n\n",
|
|
|
|
(ddr->err_disable & ECC_ERROR_DISABLE_MSED) ? 1 : 0);
|
|
|
|
|
|
|
|
/* Error injection */
|
|
|
|
printf("Memory Data Path Error Injection Mask High/Low: %08lx %08lx\n",
|
|
|
|
ddr->data_err_inject_hi, ddr->data_err_inject_lo);
|
|
|
|
|
|
|
|
printf("Memory Data Path Error Injection Mask ECC:\n");
|
|
|
|
printf(" ECC Mirror Byte: %d\n",
|
|
|
|
(ddr->ecc_err_inject & ECC_ERR_INJECT_EMB) ? 1 : 0);
|
|
|
|
printf(" ECC Injection Enable: %d\n",
|
|
|
|
(ddr->ecc_err_inject & ECC_ERR_INJECT_EIEN) ? 1 : 0);
|
|
|
|
printf(" ECC Error Injection Mask: 0x%02x\n\n",
|
|
|
|
ddr->ecc_err_inject & ECC_ERR_INJECT_EEIM);
|
|
|
|
|
|
|
|
/* SBE counter/threshold */
|
|
|
|
printf("Memory Single-Bit Error Management (0..255):\n");
|
|
|
|
printf(" Single-Bit Error Threshold: %d\n",
|
|
|
|
(ddr->err_sbe & ECC_ERROR_MAN_SBET) >> ECC_ERROR_MAN_SBET_SHIFT);
|
|
|
|
printf(" Single-Bit Error Counter: %d\n\n",
|
|
|
|
(ddr->err_sbe & ECC_ERROR_MAN_SBEC) >> ECC_ERROR_MAN_SBEC_SHIFT);
|
|
|
|
|
|
|
|
/* Error detect */
|
|
|
|
printf("Memory Error Detect:\n");
|
|
|
|
printf(" Multiple Memory Errors: %d\n",
|
|
|
|
(ddr->err_detect & ECC_ERROR_DETECT_MME) ? 1 : 0);
|
|
|
|
printf(" Multiple-Bit Error: %d\n",
|
|
|
|
(ddr->err_detect & ECC_ERROR_DETECT_MBE) ? 1 : 0);
|
|
|
|
printf(" Single-Bit Error: %d\n",
|
|
|
|
(ddr->err_detect & ECC_ERROR_DETECT_SBE) ? 1 : 0);
|
|
|
|
printf(" Memory Select Error: %d\n\n",
|
|
|
|
(ddr->err_detect & ECC_ERROR_DETECT_MSE) ? 1 : 0);
|
|
|
|
|
|
|
|
/* Capture data */
|
|
|
|
printf("Memory Error Address Capture: 0x%08lx\n", ddr->capture_address);
|
|
|
|
printf("Memory Data Path Read Capture High/Low: %08lx %08lx\n",
|
|
|
|
ddr->capture_data_hi, ddr->capture_data_lo);
|
|
|
|
printf("Memory Data Path Read Capture ECC: 0x%02x\n\n",
|
|
|
|
ddr->capture_ecc & CAPTURE_ECC_ECE);
|
|
|
|
|
|
|
|
printf("Memory Error Attributes Capture:\n");
|
|
|
|
printf(" Data Beat Number: %d\n",
|
|
|
|
(ddr->capture_attributes & ECC_CAPT_ATTR_BNUM) >> ECC_CAPT_ATTR_BNUM_SHIFT);
|
|
|
|
printf(" Transaction Size: %d\n",
|
|
|
|
(ddr->capture_attributes & ECC_CAPT_ATTR_TSIZ) >> ECC_CAPT_ATTR_TSIZ_SHIFT);
|
|
|
|
printf(" Transaction Source: %d\n",
|
|
|
|
(ddr->capture_attributes & ECC_CAPT_ATTR_TSRC) >> ECC_CAPT_ATTR_TSRC_SHIFT);
|
|
|
|
printf(" Transaction Type: %d\n",
|
|
|
|
(ddr->capture_attributes & ECC_CAPT_ATTR_TTYP) >> ECC_CAPT_ATTR_TTYP_SHIFT);
|
|
|
|
printf(" Error Information Valid: %d\n\n",
|
|
|
|
ddr->capture_attributes & ECC_CAPT_ATTR_VLD);
|
|
|
|
}
|
|
|
|
|
|
|
|
int do_ecc ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
|
|
|
|
{
|
2006-11-03 18:00:28 +00:00
|
|
|
volatile immap_t *immap = (immap_t *)CFG_IMMR;
|
2006-10-25 19:41:21 +00:00
|
|
|
volatile ddr83xx_t *ddr = &immap->ddr;
|
2006-03-16 14:19:35 +00:00
|
|
|
volatile u32 val;
|
|
|
|
u64 *addr, count, val64;
|
|
|
|
register u64 *i;
|
2006-04-16 08:51:58 +00:00
|
|
|
|
2006-03-16 14:19:35 +00:00
|
|
|
if (argc > 4) {
|
|
|
|
printf ("Usage:\n%s\n", cmdtp->usage);
|
|
|
|
return 1;
|
|
|
|
}
|
2006-04-16 08:51:58 +00:00
|
|
|
|
2006-03-16 14:19:35 +00:00
|
|
|
if (argc == 2) {
|
|
|
|
if (strcmp(argv[1], "status") == 0) {
|
|
|
|
ecc_print_status();
|
|
|
|
return 0;
|
|
|
|
} else if (strcmp(argv[1], "captureclear") == 0) {
|
|
|
|
ddr->capture_address = 0;
|
|
|
|
ddr->capture_data_hi = 0;
|
|
|
|
ddr->capture_data_lo = 0;
|
|
|
|
ddr->capture_ecc = 0;
|
|
|
|
ddr->capture_attributes = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
2006-04-16 08:51:58 +00:00
|
|
|
}
|
|
|
|
|
2006-03-16 14:19:35 +00:00
|
|
|
if (argc == 3) {
|
|
|
|
if (strcmp(argv[1], "sbecnt") == 0) {
|
|
|
|
val = simple_strtoul(argv[2], NULL, 10);
|
|
|
|
if (val > 255) {
|
|
|
|
printf("Incorrect Counter value, should be 0..255\n");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
val = (val << ECC_ERROR_MAN_SBEC_SHIFT);
|
|
|
|
val |= (ddr->err_sbe & ECC_ERROR_MAN_SBET);
|
|
|
|
|
|
|
|
ddr->err_sbe = val;
|
|
|
|
return 0;
|
|
|
|
} else if (strcmp(argv[1], "sbethr") == 0) {
|
|
|
|
val = simple_strtoul(argv[2], NULL, 10);
|
|
|
|
if (val > 255) {
|
|
|
|
printf("Incorrect Counter value, should be 0..255\n");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
val = (val << ECC_ERROR_MAN_SBET_SHIFT);
|
|
|
|
val |= (ddr->err_sbe & ECC_ERROR_MAN_SBEC);
|
|
|
|
|
|
|
|
ddr->err_sbe = val;
|
|
|
|
return 0;
|
|
|
|
} else if (strcmp(argv[1], "errdisable") == 0) {
|
|
|
|
val = ddr->err_disable;
|
|
|
|
|
|
|
|
if (strcmp(argv[2], "+sbe") == 0) {
|
|
|
|
val |= ECC_ERROR_DISABLE_SBED;
|
|
|
|
} else if (strcmp(argv[2], "+mbe") == 0) {
|
|
|
|
val |= ECC_ERROR_DISABLE_MBED;
|
|
|
|
} else if (strcmp(argv[2], "+mse") == 0) {
|
|
|
|
val |= ECC_ERROR_DISABLE_MSED;
|
|
|
|
} else if (strcmp(argv[2], "+all") == 0) {
|
2006-04-16 08:51:58 +00:00
|
|
|
val |= (ECC_ERROR_DISABLE_SBED |
|
|
|
|
ECC_ERROR_DISABLE_MBED |
|
2006-03-16 14:19:35 +00:00
|
|
|
ECC_ERROR_DISABLE_MSED);
|
|
|
|
} else if (strcmp(argv[2], "-sbe") == 0) {
|
|
|
|
val &= ~ECC_ERROR_DISABLE_SBED;
|
|
|
|
} else if (strcmp(argv[2], "-mbe") == 0) {
|
|
|
|
val &= ~ECC_ERROR_DISABLE_MBED;
|
|
|
|
} else if (strcmp(argv[2], "-mse") == 0) {
|
|
|
|
val &= ~ECC_ERROR_DISABLE_MSED;
|
|
|
|
} else if (strcmp(argv[2], "-all") == 0) {
|
2006-04-16 08:51:58 +00:00
|
|
|
val &= ~(ECC_ERROR_DISABLE_SBED |
|
|
|
|
ECC_ERROR_DISABLE_MBED |
|
2006-03-16 14:19:35 +00:00
|
|
|
ECC_ERROR_DISABLE_MSED);
|
|
|
|
} else {
|
|
|
|
printf("Incorrect err_disable field\n");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
ddr->err_disable = val;
|
|
|
|
__asm__ __volatile__ ("sync");
|
|
|
|
__asm__ __volatile__ ("isync");
|
|
|
|
return 0;
|
|
|
|
} else if (strcmp(argv[1], "errdetectclr") == 0) {
|
|
|
|
val = ddr->err_detect;
|
|
|
|
|
|
|
|
if (strcmp(argv[2], "mme") == 0) {
|
|
|
|
val |= ECC_ERROR_DETECT_MME;
|
|
|
|
} else if (strcmp(argv[2], "sbe") == 0) {
|
|
|
|
val |= ECC_ERROR_DETECT_SBE;
|
|
|
|
} else if (strcmp(argv[2], "mbe") == 0) {
|
|
|
|
val |= ECC_ERROR_DETECT_MBE;
|
|
|
|
} else if (strcmp(argv[2], "mse") == 0) {
|
|
|
|
val |= ECC_ERROR_DETECT_MSE;
|
|
|
|
} else if (strcmp(argv[2], "all") == 0) {
|
|
|
|
val |= (ECC_ERROR_DETECT_MME |
|
|
|
|
ECC_ERROR_DETECT_MBE |
|
|
|
|
ECC_ERROR_DETECT_SBE |
|
|
|
|
ECC_ERROR_DETECT_MSE);
|
|
|
|
} else {
|
|
|
|
printf("Incorrect err_detect field\n");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
ddr->err_detect = val;
|
|
|
|
return 0;
|
|
|
|
} else if (strcmp(argv[1], "injectdatahi") == 0) {
|
|
|
|
val = simple_strtoul(argv[2], NULL, 16);
|
|
|
|
|
|
|
|
ddr->data_err_inject_hi = val;
|
|
|
|
return 0;
|
|
|
|
} else if (strcmp(argv[1], "injectdatalo") == 0) {
|
|
|
|
val = simple_strtoul(argv[2], NULL, 16);
|
|
|
|
|
|
|
|
ddr->data_err_inject_lo = val;
|
|
|
|
return 0;
|
|
|
|
} else if (strcmp(argv[1], "injectecc") == 0) {
|
|
|
|
val = simple_strtoul(argv[2], NULL, 16);
|
|
|
|
if (val > 0xff) {
|
|
|
|
printf("Incorrect ECC inject mask, should be 0x00..0xff\n");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
val |= (ddr->ecc_err_inject & ~ECC_ERR_INJECT_EEIM);
|
|
|
|
|
|
|
|
ddr->ecc_err_inject = val;
|
|
|
|
return 0;
|
|
|
|
} else if (strcmp(argv[1], "inject") == 0) {
|
|
|
|
val = ddr->ecc_err_inject;
|
|
|
|
|
|
|
|
if (strcmp(argv[2], "en") == 0)
|
|
|
|
val |= ECC_ERR_INJECT_EIEN;
|
|
|
|
else if (strcmp(argv[2], "dis") == 0)
|
|
|
|
val &= ~ECC_ERR_INJECT_EIEN;
|
|
|
|
else
|
|
|
|
printf("Incorrect command\n");
|
|
|
|
|
|
|
|
ddr->ecc_err_inject = val;
|
|
|
|
__asm__ __volatile__ ("sync");
|
|
|
|
__asm__ __volatile__ ("isync");
|
|
|
|
return 0;
|
|
|
|
} else if (strcmp(argv[1], "mirror") == 0) {
|
|
|
|
val = ddr->ecc_err_inject;
|
|
|
|
|
|
|
|
if (strcmp(argv[2], "en") == 0)
|
|
|
|
val |= ECC_ERR_INJECT_EMB;
|
|
|
|
else if (strcmp(argv[2], "dis") == 0)
|
|
|
|
val &= ~ECC_ERR_INJECT_EMB;
|
|
|
|
else
|
|
|
|
printf("Incorrect command\n");
|
|
|
|
|
|
|
|
ddr->ecc_err_inject = val;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (argc == 4) {
|
|
|
|
if (strcmp(argv[1], "test") == 0) {
|
|
|
|
addr = (u64 *)simple_strtoul(argv[2], NULL, 16);
|
|
|
|
count = simple_strtoul(argv[3], NULL, 16);
|
|
|
|
|
|
|
|
if ((u32)addr % 8) {
|
|
|
|
printf("Address not alligned on double word boundary\n");
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
disable_interrupts();
|
|
|
|
icache_disable();
|
|
|
|
|
|
|
|
for (i = addr; i < addr + count; i++) {
|
|
|
|
/* enable injects */
|
|
|
|
ddr->ecc_err_inject |= ECC_ERR_INJECT_EIEN;
|
|
|
|
__asm__ __volatile__ ("sync");
|
|
|
|
__asm__ __volatile__ ("isync");
|
|
|
|
|
|
|
|
/* write memory location injecting errors */
|
|
|
|
*i = 0x1122334455667788ULL;
|
|
|
|
__asm__ __volatile__ ("sync");
|
|
|
|
|
|
|
|
/* disable injects */
|
|
|
|
ddr->ecc_err_inject &= ~ECC_ERR_INJECT_EIEN;
|
|
|
|
__asm__ __volatile__ ("sync");
|
|
|
|
__asm__ __volatile__ ("isync");
|
|
|
|
|
|
|
|
/* read data, this generates ECC error */
|
|
|
|
val64 = *i;
|
|
|
|
__asm__ __volatile__ ("sync");
|
|
|
|
|
|
|
|
/* disable errors for ECC */
|
|
|
|
ddr->err_disable |= ~ECC_ERROR_ENABLE;
|
|
|
|
__asm__ __volatile__ ("sync");
|
|
|
|
__asm__ __volatile__ ("isync");
|
|
|
|
|
|
|
|
/* re-initialize memory, write the location again
|
|
|
|
* NOT injecting errors this time */
|
|
|
|
*i = 0xcafecafecafecafeULL;
|
|
|
|
__asm__ __volatile__ ("sync");
|
|
|
|
|
|
|
|
/* enable errors for ECC */
|
|
|
|
ddr->err_disable &= ECC_ERROR_ENABLE;
|
|
|
|
__asm__ __volatile__ ("sync");
|
|
|
|
__asm__ __volatile__ ("isync");
|
|
|
|
}
|
|
|
|
|
|
|
|
icache_enable();
|
|
|
|
enable_interrupts();
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
printf ("Usage:\n%s\n", cmdtp->usage);
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
U_BOOT_CMD(
|
|
|
|
ecc, 4, 0, do_ecc,
|
|
|
|
"ecc - support for DDR ECC features\n",
|
|
|
|
"status - print out status info\n"
|
|
|
|
"ecc captureclear - clear capture regs data\n"
|
|
|
|
"ecc sbecnt <val> - set Single-Bit Error counter\n"
|
|
|
|
"ecc sbethr <val> - set Single-Bit Threshold\n"
|
|
|
|
"ecc errdisable <flag> - clear/set disable Memory Error Disable, flag:\n"
|
|
|
|
" [-|+]sbe - Single-Bit Error\n"
|
|
|
|
" [-|+]mbe - Multiple-Bit Error\n"
|
|
|
|
" [-|+]mse - Memory Select Error\n"
|
|
|
|
" [-|+]all - all errors\n"
|
|
|
|
"ecc errdetectclr <flag> - clear Memory Error Detect, flag:\n"
|
|
|
|
" mme - Multiple Memory Errors\n"
|
|
|
|
" sbe - Single-Bit Error\n"
|
|
|
|
" mbe - Multiple-Bit Error\n"
|
|
|
|
" mse - Memory Select Error\n"
|
|
|
|
" all - all errors\n"
|
|
|
|
"ecc injectdatahi <hi> - set Memory Data Path Error Injection Mask High\n"
|
|
|
|
"ecc injectdatalo <lo> - set Memory Data Path Error Injection Mask Low\n"
|
|
|
|
"ecc injectecc <ecc> - set ECC Error Injection Mask\n"
|
|
|
|
"ecc inject <en|dis> - enable/disable error injection\n"
|
|
|
|
"ecc mirror <en|dis> - enable/disable mirror byte\n"
|
|
|
|
"ecc test <addr> <cnt> - test mem region:\n"
|
|
|
|
" - enables injects\n"
|
|
|
|
" - writes pattern injecting errors\n"
|
|
|
|
" - disables injects\n"
|
|
|
|
" - reads pattern back, generates error\n"
|
|
|
|
" - re-inits memory"
|
|
|
|
);
|
|
|
|
#endif /* if defined(CONFIG_DDR_ECC) && defined(CONFIG_DDR_ECC_CMD) */
|
2006-11-01 06:10:40 +00:00
|
|
|
|
|
|
|
#if defined(CONFIG_OF_FLAT_TREE) && defined(CONFIG_OF_BOARD_SETUP)
|
|
|
|
void
|
|
|
|
ft_board_setup(void *blob, bd_t *bd)
|
|
|
|
{
|
|
|
|
u32 *p;
|
|
|
|
int len;
|
|
|
|
|
|
|
|
#ifdef CONFIG_PCI
|
|
|
|
ft_pci_setup(blob, bd);
|
|
|
|
#endif
|
|
|
|
ft_cpu_setup(blob, bd);
|
|
|
|
|
|
|
|
p = ft_get_prop(blob, "/memory/reg", &len);
|
|
|
|
if (p != NULL) {
|
|
|
|
*p++ = cpu_to_be32(bd->bi_memstart);
|
|
|
|
*p = cpu_to_be32(bd->bi_memsize);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|