Great work, but I'm gonna be a pain...
ron minnich wrote:
Updated support for the ALIX 1C. This code gets as far as pll_reset and dies.
Signed-off-by: Ronald G. Minnich rminnich@gmail.com
Index: mainboard/pcengines/Kconfig
--- mainboard/pcengines/Kconfig (revision 524) +++ mainboard/pcengines/Kconfig (working copy) @@ -30,6 +30,7 @@ select OPTION_TABLE select NORTHBRIDGE_AMD_GEODELX select SOUTHBRIDGE_AMD_CS5536
- select SUPERIO_WINBOND_W83627HF help PC Engines ALIX1.C.
Index: mainboard/pcengines/alix1c/initram.c
--- mainboard/pcengines/alix1c/initram.c (revision 524) +++ mainboard/pcengines/alix1c/initram.c (working copy) @@ -30,47 +30,117 @@ #include <io.h> #include <amd_geodelx.h> #include <northbridge/amd/geodelx/raminit.h> +#include <spd.h>
-#define MANUALCONF 0 /* Do automatic strapped PLL config. */
-#define PLLMSRHI 0x00001490 /* Manual settings for the PLL */ +#define MANUALCONF 0 /* Do automatic strapped PLL config */ +#define PLLMSRHI 0x00001490 /* manual settings for the PLL */ #define PLLMSRLO 0x02000030
#define DIMM0 ((u8) 0xA0) #define DIMM1 ((u8) 0xA2)
+/* The part is a Hynix hy5du121622ctp-d43.
- HY 5D U 12 16 2 2 C <blank> T <blank> P D43
- Hynix
- DDR SDRAM (5D)
- VDD 2.5 VDDQ 2.5 (U)
- 512M 8K REFRESH (12)
- x16 (16)
- 4banks (2)
- SSTL_2 (2)
- 4th GEN die (C)
- Normal Power Consumption (<blank> )
- TSOP (T)
- Single Die (<blank>)
- Lead Free (P)
- DDR400 3-3-3 (D43)
- */
+/* SPD array */ +static const u8 spdbytes[] = {
- [SPD_ACCEPTABLE_CAS_LATENCIES] = 0x10,
- [SPD_BANK_DENSITY] = 0x40,
- [SPD_DEVICE_ATTRIBUTES_GENERAL] = 0xff,
- [SPD_MEMORY_TYPE] = 7,
- [SPD_MIN_CYCLE_TIME_AT_CAS_MAX] = 10, /* A guess for the tRAC value */
This looks like it's wrong, a normal DDR400 dimm is 0x50 or so.
- [SPD_MODULE_ATTRIBUTES] = 0xff, /* FIXME later when we figure out. */
0x20 for an unbuffered dimm, 0x26 for registered.
- [SPD_NUM_BANKS_PER_SDRAM] = 4,
- [SPD_PRIMARY_SDRAM_WIDTH] = 8,
- [SPD_NUM_DIMM_BANKS] = 1, /* ALIX1.C is 1 bank. */
- [SPD_NUM_COLUMNS] = 0xa,
- [SPD_NUM_ROWS] = 3,
- [SPD_REFRESH] = 0x3a,
- [SPD_SDRAM_CYCLE_TIME_2ND] = 60,
- [SPD_SDRAM_CYCLE_TIME_3RD] = 75,
- [SPD_tRAS] = 40,
- [SPD_tRCD] = 15,
- [SPD_tRFC] = 70,
- [SPD_tRP] = 15,
- [SPD_tRRD] = 10,
+};
+u8 spd_read_byte(u16 device, u8 address) +{
- printk(BIOS_DEBUG, "spd_read_byte dev %04x\n", device);
- if (device != (0x50 << 1)) {
printk(BIOS_DEBUG, " returns 0xff\n");
return 0xff;
- }
- printk(BIOS_DEBUG, " addr %02x returns %02x\n", address, spdbytes[address]);
- return spdbytes[address];
+}
/**
- Placeholder in case we ever need it. Since this file is a template for
- other boards, we want this here and we want the call in the right place.
- */
- Place holder in case we ever need it. Since this file is a
place holder -> placeholder?
- template for other motherboards, we want this here and we want the
- call in the right place.
- */
static void mb_gpio_init(void) { /* Early mainboard specific GPIO setup */ }
-/**
- Main for initram for the PC Engines ALIX1.C. It might seem that you could
- somehow do these functions in, e.g., the CPU code, but the order of
- operations and what those operations are is VERY strongly mainboard
- dependent. It's best to leave it in the mainboard code.
- */
+/**
- main for initram for the PC Engines Alix 1C. It might seem that you
main()?
- could somehow do these functions in, e.g., the cpu code, but the
- order of operations and what those operations are is VERY strongly
- mainboard dependent. It's best to leave it in the mainboard code.
- */
int main(void) {
- u8 smb_devices[] = { DIMM0, DIMM1 };
u8 smb_devices[] = {
DIMM0, DIMM1
};
printk(BIOS_DEBUG, "Hi there from stage1\n"); post_code(POST_START_OF_MAIN);
system_preinit();
printk(BIOS_DEBUG, "done preinit\n");
mb_gpio_init();
printk(BIOS_DEBUG, "done gpio init\n");
pll_reset(MANUALCONF, PLLMSRHI, PLLMSRLO);
printk(BIOS_DEBUG, "done pll reset\n");
cpu_reg_init(0, DIMM0, DIMM1);
printk(BIOS_DEBUG, "done cpu reg init\n");
sdram_set_registers();
printk(BIOS_DEBUG, "done sdram set registers\n");
sdram_set_spd_registers(DIMM0, DIMM1);
printk(BIOS_DEBUG, "done sdram set spd registers\n");
sdram_enable(DIMM0, DIMM1);
printk(BIOS_DEBUG, "done sdram enable\n");
- /* Check memory. */
- /* ram_check(0, 640 * 1024); */
/* Check low memory */
/*ram_check(0x00000000, 640*1024); */
printk(BIOS_DEBUG, "stage1 returns\n"); return 0;
} Index: mainboard/pcengines/alix1c/stage1.c =================================================================== --- mainboard/pcengines/alix1c/stage1.c (revision 524) +++ mainboard/pcengines/alix1c/stage1.c (working copy) @@ -28,20 +28,24 @@ #include <io.h> #include <amd_geodelx.h> #include <southbridge/amd/cs5536/cs5536.h> +#include <superio/winbond/w83627hf/w83627hf.h>
+#define SERIAL_DEV W83627HF_SP1 +#define SERIAL_IOBASE 0x3f8
void hardware_stage1(void) {
- void w83627hf_enable_serial(u8 dev, u8 serial, u16 iobase); post_code(POST_START_OF_MAIN);
geodelx_msr_init();
cs5536_stage1();
/* NOTE: Must do this AFTER the early_setup! It is counting on some
* early MSR setup for the CS5536. We do this early for debug.
* Real setup should be done in chipset init via Config.lb.
*
* TODO: Drop Config.lb reference, update comment.
- /* NOTE: must do this AFTER the early_setup!
* it is counting on some early MSR setup
*/* for cs5536.
- cs5536_setup_onchipuart();
- cs5536_disable_internal_uart();
- w83627hf_enable_serial(0x2e, SERIAL_DEV, SERIAL_IOBASE);
} Index: mainboard/pcengines/alix1c/dts =================================================================== --- mainboard/pcengines/alix1c/dts (revision 524) +++ mainboard/pcengines/alix1c/dts (working copy) @@ -37,5 +37,9 @@ pcipath = "0xf,1"; enabled; };
superio {
/config/("superio/winbond/w83627hf");
com1enable = "1";
};};
}; Index: mainboard/pcengines/alix1c/Makefile =================================================================== --- mainboard/pcengines/alix1c/Makefile (revision 524) +++ mainboard/pcengines/alix1c/Makefile (working copy) @@ -21,9 +21,8 @@
STAGE0_MAINBOARD_OBJ := $(obj)/mainboard/$(MAINBOARDDIR)/stage1.o
-INITRAM_OBJ = $(obj)/mainboard/$(MAINBOARDDIR)/initram.o \ +INITRAM_OBJ = $(obj)/mainboard/$(MAINBOARDDIR)/initram.o \
Any reason for an extra space?
$(obj)/northbridge/amd/geodelx/raminit.o \
$(obj)/arch/x86/geodelx/geodelx.o$(obj)/southbridge/amd/cs5536/smbus_initram.o \
STAGE2_MAINBOARD_OBJ =
-Corey