coreboot November 2007

coreboot@coreboot.org

75 participants
397 discussions

[LinuxBIOS] r529 - in LinuxBIOSv3: arch/x86 mainboard/adl/msm800sev mainboard/amd/norwich mainboard/artecgroup/dbe61 mainboard/emulation/qemu-x86 mainboard/pcengines/alix1c
by svn＠openbios.org 27 Nov '07

27 Nov '07

Author: hailfinger Date: 2007-11-27 20:06:45 +0100 (Tue, 27 Nov 2007) New Revision: 529 Modified: LinuxBIOSv3/arch/x86/Makefile LinuxBIOSv3/mainboard/adl/msm800sev/Makefile LinuxBIOSv3/mainboard/amd/norwich/Makefile LinuxBIOSv3/mainboard/artecgroup/dbe61/Makefile LinuxBIOSv3/mainboard/emulation/qemu-x86/Makefile LinuxBIOSv3/mainboard/pcengines/alix1c/Makefile Log: Factor out one identical makefile rule from all mainboard makefiles to the x86 arch makefile. This makes porting to a new mainboard less confusing. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Acked-by: Ronald G. Minnich <rminnich(a)gmail.com> Modified: LinuxBIOSv3/arch/x86/Makefile =================================================================== --- LinuxBIOSv3/arch/x86/Makefile 2007-11-27 18:17:59 UTC (rev 528) +++ LinuxBIOSv3/arch/x86/Makefile 2007-11-27 19:06:45 UTC (rev 529) @@ -232,4 +232,12 @@ $(Q)printf " AS $(subst $(shell pwd)/,,$(@))\n" $(Q)$(AS) $(obj)/arch/x86/stage0_asm.s -o $@ +$(obj)/linuxbios.initram.o $(obj)/linuxbios.initram.map: $(obj)/stage0.init $(obj)/stage0-prefixed.o $(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) + $(Q)# initram links against stage0 + $(Q)printf " LD $(subst $(shell pwd)/,,$(@))\n" + $(Q)$(LD) -Ttext 0 --entry main -N -R $(obj)/stage0-prefixed.o \ + $(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) -o $(obj)/linuxbios.initram.o + $(Q)printf " NM $(subst $(shell pwd)/,,$(@))\n" + $(Q)$(NM) $(obj)/linuxbios.initram.o | sort -u > $(obj)/linuxbios.initram.map + endif Modified: LinuxBIOSv3/mainboard/adl/msm800sev/Makefile =================================================================== --- LinuxBIOSv3/mainboard/adl/msm800sev/Makefile 2007-11-27 18:17:59 UTC (rev 528) +++ LinuxBIOSv3/mainboard/adl/msm800sev/Makefile 2007-11-27 19:06:45 UTC (rev 529) @@ -32,11 +32,3 @@ $(obj)/southbridge/amd/cs5536/smbus_initram.o \ $(obj)/arch/x86/geodelx/geodelx.o -$(obj)/linuxbios.initram.o $(obj)/linuxbios.initram.map: $(obj)/stage0.init $(obj)/stage0-prefixed.o $(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) - $(Q)# initram links against stage0 - $(Q)printf " LD $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(LD) -Ttext 0 --entry main -N -R $(obj)/stage0-prefixed.o \ - $(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) -o $(obj)/linuxbios.initram.o - $(Q)printf " NM $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(NM) $(obj)/linuxbios.initram.o | sort -u > $(obj)/linuxbios.initram.map - Modified: LinuxBIOSv3/mainboard/amd/norwich/Makefile =================================================================== --- LinuxBIOSv3/mainboard/amd/norwich/Makefile 2007-11-27 18:17:59 UTC (rev 528) +++ LinuxBIOSv3/mainboard/amd/norwich/Makefile 2007-11-27 19:06:45 UTC (rev 529) @@ -32,11 +32,3 @@ $(Q)printf " BUILD DUMMY VPD\n" $(Q)dd if=/dev/zero of=$(obj)/linuxbios.vpd bs=256 count=1 $(SILENT) -$(obj)/linuxbios.initram.o $(obj)/linuxbios.initram.map: $(obj)/stage0.init $(obj)/stage0-prefixed.o $(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) - $(Q)# initram links against stage0 - $(Q)printf " LD $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(LD) -Ttext 0 --entry main -N -R $(obj)/stage0-prefixed.o \ - $(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) -o $(obj)/linuxbios.initram.o - $(Q)printf " NM $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(NM) $(obj)/linuxbios.initram.o | sort -u > $(obj)/linuxbios.initram.map - Modified: LinuxBIOSv3/mainboard/artecgroup/dbe61/Makefile =================================================================== --- LinuxBIOSv3/mainboard/artecgroup/dbe61/Makefile 2007-11-27 18:17:59 UTC (rev 528) +++ LinuxBIOSv3/mainboard/artecgroup/dbe61/Makefile 2007-11-27 19:06:45 UTC (rev 529) @@ -30,11 +30,3 @@ INITRAM_OBJ = $(obj)/mainboard/$(MAINBOARDDIR)/initram.o \ $(obj)/arch/x86/geodelx/geodelx.o -$(obj)/linuxbios.initram.o $(obj)/linuxbios.initram.map: $(obj)/stage0.init $(obj)/stage0-prefixed.o $(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) - $(Q)# initram links against stage0 - $(Q)printf " LD $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(LD) -Ttext 0 --entry main -N -R $(obj)/stage0-prefixed.o \ - $(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) -o $(obj)/linuxbios.initram.o - $(Q)printf " NM $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(NM) $(obj)/linuxbios.initram.o | sort -u > $(obj)/linuxbios.initram.map - Modified: LinuxBIOSv3/mainboard/emulation/qemu-x86/Makefile =================================================================== --- LinuxBIOSv3/mainboard/emulation/qemu-x86/Makefile 2007-11-27 18:17:59 UTC (rev 528) +++ LinuxBIOSv3/mainboard/emulation/qemu-x86/Makefile 2007-11-27 19:06:45 UTC (rev 529) @@ -42,11 +42,3 @@ INITRAM_OBJ = $(obj)/mainboard/$(MAINBOARDDIR)/initram.o -$(obj)/linuxbios.initram.o $(obj)/linuxbios.initram.map: $(obj)/stage0.init $(obj)/stage0-prefixed.o $(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) - $(Q)# initram links against stage0 - $(Q)printf " LD $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(LD) -Ttext 0 --entry main -N -R $(obj)/stage0-prefixed.o \ - $(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) -o $(obj)/linuxbios.initram.o - $(Q)printf " NM $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(NM) $(obj)/linuxbios.initram.o | sort -u > $(obj)/linuxbios.initram.map - Modified: LinuxBIOSv3/mainboard/pcengines/alix1c/Makefile =================================================================== --- LinuxBIOSv3/mainboard/pcengines/alix1c/Makefile 2007-11-27 18:17:59 UTC (rev 528) +++ LinuxBIOSv3/mainboard/pcengines/alix1c/Makefile 2007-11-27 19:06:45 UTC (rev 529) @@ -31,11 +31,3 @@ $(Q)printf " BUILD DUMMY VPD\n" $(Q)dd if=/dev/zero of=$(obj)/linuxbios.vpd bs=256 count=1 $(SILENT) -$(obj)/linuxbios.initram.o $(obj)/linuxbios.initram.map: $(obj)/stage0.init $(obj)/stage0-prefixed.o $(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) - $(Q)# initram links against stage0 - $(Q)printf " LD $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(LD) -Ttext 0 --entry main -N -R $(obj)/stage0-prefixed.o \ - $(patsubst %.o,%_xip.o,$(INITRAM_OBJ)) -o $(obj)/linuxbios.initram.o - $(Q)printf " NM $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(NM) $(obj)/linuxbios.initram.o | sort -u > $(obj)/linuxbios.initram.map -

1 0

[LinuxBIOS] [PATCH] v3: convert stage2 to multi-segment LAR
by Carl-Daniel Hailfinger 27 Nov '07

27 Nov '07

This is on top of the patch I sent 50 minutes ago titled: "Re: [LinuxBIOS] patch: prepare v3 tree for new way of doing initram". Convert stage2 handling from binary blob to multi-segment LAR which is created by parsing the ELF file linuxbios.stage2.o. That way, we avoid manual specification of the entry point for stage2 code. A few LAR functions are now unused and can be removed in a following cleanup session. Another suggested cleanup would be factoring out a load_all_segments function, resulting in less code duplication. Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> diff -ur LinuxBIOSv3-testron/arch/x86/Makefile LinuxBIOSv3-testron-withstage2/arch/x86/Makefile --- LinuxBIOSv3-testron/arch/x86/Makefile 2007-11-27 02:44:39.000000000 +0100 +++ LinuxBIOSv3-testron-withstage2/arch/x86/Makefile 2007-11-27 03:24:21.000000000 +0100 @@ -36,7 +36,7 @@ ROM_SIZE := $(shell expr $(CONFIG_LINUXBIOS_ROMSIZE_KB) \* 1024) -LARFILES := nocompress:normal/initram.o normal/stage2 nocompress:normal/option_table +LARFILES := nocompress:normal/initram.o normal/stage2.o nocompress:normal/option_table ifneq ($(CONFIG_PAYLOAD_NONE),y) LARFILES += normal/payload endif @@ -57,12 +57,12 @@ COMPRESSFLAG := -C nrv2b endif -$(obj)/linuxbios.rom $(obj)/linuxbios.map: $(obj)/linuxbios.bootblock $(obj)/util/lar/lar lzma nrv2b $(obj)/linuxbios.initram.o $(obj)/linuxbios.stage2 $(obj)/option_table +$(obj)/linuxbios.rom $(obj)/linuxbios.map: $(obj)/linuxbios.bootblock $(obj)/util/lar/lar lzma nrv2b $(obj)/linuxbios.initram.o $(obj)/linuxbios.stage2.o $(obj)/option_table $(Q)rm -rf $(obj)/lar.tmp $(Q)mkdir $(obj)/lar.tmp $(Q)mkdir $(obj)/lar.tmp/normal $(Q)cp $(obj)/linuxbios.initram.o $(obj)/lar.tmp/normal/initram.o - $(Q)cp $(obj)/linuxbios.stage2 $(obj)/lar.tmp/normal/stage2 + $(Q)cp $(obj)/linuxbios.stage2.o $(obj)/lar.tmp/normal/stage2.o $(Q)cp $(obj)/option_table $(obj)/lar.tmp/normal/option_table ifeq ($(CONFIG_PAYLOAD_NONE),y) $(Q)printf " PAYLOAD none (as specified by user)\n" @@ -198,13 +198,11 @@ STAGE2_OBJ += $(obj)/util/x86emu/libx86emu.a $(LIBGCC_FILE_NAME) endif -$(obj)/linuxbios.stage2 $(obj)/linuxbios.stage2.map: $(obj)/stage0.init $(STAGE2_OBJ) +$(obj)/linuxbios.stage2.o $(obj)/linuxbios.stage2.map: $(obj)/stage0.init $(STAGE2_OBJ) $(Q)# leave a .o with full symbols in it for debugging. $(Q)printf " LD $(subst $(shell pwd)/,,$(@))\n" $(Q)$(LD) -R $(obj)/stage0.o -Ttext 0x1000 --entry=stage2 \ -o $(obj)/linuxbios.stage2.o $(STAGE2_OBJ) - $(Q)printf " OBJCOPY $(subst $(shell pwd)/,,$(@))\n" - $(Q)$(OBJCOPY) -O binary $(obj)/linuxbios.stage2.o $(obj)/linuxbios.stage2 $(Q)$(NM) $(obj)/linuxbios.stage2.o | sort -u > $(obj)/linuxbios.stage2.map # diff -ur LinuxBIOSv3-testron/arch/x86/stage1.c LinuxBIOSv3-testron-withstage2/arch/x86/stage1.c --- LinuxBIOSv3-testron/arch/x86/stage1.c 2007-11-27 03:03:17.000000000 +0100 +++ LinuxBIOSv3-testron-withstage2/arch/x86/stage1.c 2007-11-27 03:41:08.000000000 +0100 @@ -161,7 +161,12 @@ /* Turn off Cache-As-Ram */ disable_car(); - ret = run_file(&archive, "normal/stage2", (void *)0x1000); + entry = load_file(&archive, "normal/stage2.o/segment0"); + if (entry == (void *)-1) + die("FATAL: Failed loading stage2 segment0."); + if (load_file(&archive, "normal/stage2.o/segment1") == (void *)-1) + die("FATAL: Failed loading stage2 segment1."); + ret = run_address(entry); if (ret) die("FATAL: Failed in stage2 code.");

6 26

[LinuxBIOS] r528 - LinuxBIOSv3/northbridge/amd/geodelx
by svn＠openbios.org 27 Nov '07

27 Nov '07

Author: rminnich Date: 2007-11-27 19:17:59 +0100 (Tue, 27 Nov 2007) New Revision: 528 Modified: LinuxBIOSv3/northbridge/amd/geodelx/raminit.c Log: move smbus_read to spd_read_byte. Add debug prints. These debug prints and hcf may move to a common library later. Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> Acked-by: Marc Jones <marc.jones(a)amd.com> Modified: LinuxBIOSv3/northbridge/amd/geodelx/raminit.c =================================================================== --- LinuxBIOSv3/northbridge/amd/geodelx/raminit.c 2007-11-27 16:47:34 UTC (rev 527) +++ LinuxBIOSv3/northbridge/amd/geodelx/raminit.c 2007-11-27 18:17:59 UTC (rev 528) @@ -33,7 +33,40 @@ 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, }; +u8 spd_read_byte(u16 device, u8 address); + /** + * Print a nice banner so we know what step we died on. + * + * @param s String to put in the middle of the banner + */ + +void banner(char *s) +{ + printk(BIOS_DEBUG, "==========================="); + printk(BIOS_DEBUG, s); + printk(BIOS_DEBUG, "======================================\n"); +} + +/** + * Halt and Catch Fire. Print an error, then loop, sending NULLs on serial port, + * to ensure the message is visible. + * + */ + +void hcf(void) +{ + printk(BIOS_EMERG, "DIE\r\n"); + /* this guarantees we flush the UART fifos (if any) and also + * ensures that things, in general, keep going so no debug output + * is lost + */ + while (1) + printk(BIOS_EMERG, "\r"); +} + + +/** * Auto-detect, using SPD, the DIMM size. It's the usual magic, with * all the usual failure points that can happen. * @@ -50,11 +83,15 @@ dimm_setting = 0; + banner("Check present"); /* Check that we have a DIMM. */ - if (smbus_read_byte(dimm, SPD_MEMORY_TYPE) == 0xFF) + if (spd_read_byte(dimm, SPD_MEMORY_TYPE) == 0xFF) return; - spd_byte = smbus_read_byte(dimm, SPD_NUM_DIMM_BANKS); + /* Field: Module Banks per DIMM */ + /* EEPROM byte usage: (5) Number of DIMM Banks */ + banner("MODBANKS"); + spd_byte = spd_read_byte(dimm, SPD_NUM_DIMM_BANKS); if ((MIN_MOD_BANKS > spd_byte) && (spd_byte > MAX_MOD_BANKS)) { printk(BIOS_EMERG, "Number of module banks not compatible\n"); post_code(ERROR_BANK_SET); @@ -62,7 +99,10 @@ } dimm_setting |= (spd_byte >> 1) << CF07_UPPER_D0_MB_SHIFT; - spd_byte = smbus_read_byte(dimm, SPD_NUM_BANKS_PER_SDRAM); + /* Field: Banks per SDRAM device */ + /* EEPROM byte usage: (17) Number of Banks on SDRAM Device */ + banner("FIELDBANKS"); + spd_byte = spd_read_byte(dimm, SPD_NUM_BANKS_PER_SDRAM); if ((MIN_DEV_BANKS > spd_byte) && (spd_byte > MAX_DEV_BANKS)) { printk(BIOS_EMERG, "Number of device banks not compatible\n"); post_code(ERROR_BANK_SET); @@ -70,15 +110,25 @@ } dimm_setting |= (spd_byte >> 2) << CF07_UPPER_D0_CB_SHIFT; - if ((smbus_read_byte(dimm, SPD_NUM_ROWS) & 0xF0) - || (smbus_read_byte(dimm, SPD_NUM_COLUMNS) & 0xF0)) { + /*; Field: DIMM size + *; EEPROM byte usage: (3) Number of Row Addresses + *; (4) Number of Column Addresses + *; (5) Number of DIMM Banks + *; (31) Module Bank Density + *; Size = Module Density * Module Banks + */ + banner("SPDNUMROWS"); + + if ((spd_read_byte(dimm, SPD_NUM_ROWS) & 0xF0) + || (spd_read_byte(dimm, SPD_NUM_COLUMNS) & 0xF0)) { printk(BIOS_EMERG, "Asymmetric DIMM not compatible\n"); post_code(ERROR_UNSUPPORTED_DIMM); hlt(); } /* Size = Module Density * Module Banks */ - dimm_size = smbus_read_byte(dimm, SPD_BANK_DENSITY); + banner("SPDBANKDENSITY"); + dimm_size = spd_read_byte(dimm, SPD_BANK_DENSITY); /* Align so 1 GB (bit 0) is bit 8. This is a little weird to get gcc * to not optimize this out. @@ -93,7 +143,9 @@ /* Module Density * Module Banks */ /* Shift to multiply by the number of DIMM banks. */ dimm_size <<= (dimm_setting >> CF07_UPPER_D0_MB_SHIFT) & 1; + banner("BEFORT CTZ"); dimm_size = __builtin_ctz(dimm_size); + banner("TEST DIMM SIZE>8"); if (dimm_size > 8) { /* 8 is 1 GB only support 1 GB per DIMM */ printk(BIOS_EMERG, "Only support up to 1 GB per DIMM\n"); post_code(ERROR_DENSITY_DIMM); @@ -125,8 +177,9 @@ * example, #col_addr_bits = 7 (06h), it adds 3 to get 10, then does * 2^10=1K. Get it? */ - - spd_byte = num_col_addr[smbus_read_byte(dimm, SPD_NUM_COLUMNS) & 0xF]; + banner("PAGESIZE"); + spd_byte = num_col_addr[spd_read_byte(dimm, SPD_NUM_COLUMNS) & 0xF]; + banner("MAXCOLADDR"); if (spd_byte > MAX_COL_ADDR) { printk(BIOS_EMERG, "DIMM page size not compatible\n"); post_code(ERROR_SET_PAGE); @@ -140,7 +193,9 @@ /* 0 = 1k, 1 = 2k, 2 = 4k, etc. */ dimm_setting |= spd_byte << CF07_UPPER_D0_PSZ_SHIFT; + banner("RDMSR CF07"); msr = rdmsr(MC_CF07_DATA); + banner("WRMSR CF07"); if (dimm == dimm0) { msr.hi &= 0xFFFF0000; msr.hi |= dimm_setting; @@ -148,6 +203,7 @@ msr.hi &= 0x0000FFFF; msr.hi |= dimm_setting << 16; } + banner("ALL DONE"); wrmsr(MC_CF07_DATA, msr); } @@ -166,10 +222,10 @@ u16 speed; /* PC133 identifier */ - spd_byte0 = smbus_read_byte(dimm0, SPD_MIN_CYCLE_TIME_AT_CAS_MAX); + spd_byte0 = spd_read_byte(dimm0, SPD_MIN_CYCLE_TIME_AT_CAS_MAX); if (spd_byte0 == 0xFF) spd_byte0 = 0; - spd_byte1 = smbus_read_byte(dimm1, SPD_MIN_CYCLE_TIME_AT_CAS_MAX); + spd_byte1 = spd_read_byte(dimm1, SPD_MIN_CYCLE_TIME_AT_CAS_MAX); if (spd_byte1 == 0xFF) spd_byte1 = 0; @@ -213,13 +269,13 @@ u16 rate0, rate1; struct msr msr; - spd_byte0 = smbus_read_byte(dimm0, SPD_REFRESH); + spd_byte0 = spd_read_byte(dimm0, SPD_REFRESH); spd_byte0 &= 0xF; if (spd_byte0 > 5) spd_byte0 = 5; rate0 = REFRESH_RATE[spd_byte0]; - spd_byte1 = smbus_read_byte(dimm1, SPD_REFRESH); + spd_byte1 = spd_read_byte(dimm1, SPD_REFRESH); spd_byte1 &= 0xF; if (spd_byte1 > 5) spd_byte1 = 5; @@ -268,11 +324,11 @@ glspeed = geode_link_speed(); /* DIMM 0 */ - casmap0 = smbus_read_byte(dimm0, SPD_ACCEPTABLE_CAS_LATENCIES); + casmap0 = spd_read_byte(dimm0, SPD_ACCEPTABLE_CAS_LATENCIES); if (casmap0 != 0xFF) { /* If -.5 timing is supported, check -.5 timing > GeodeLink. */ /* EEPROM byte usage: (23) SDRAM Minimum Clock Cycle Time @ CLX -.5 */ - spd_byte = smbus_read_byte(dimm0, SPD_SDRAM_CYCLE_TIME_2ND); + spd_byte = spd_read_byte(dimm0, SPD_SDRAM_CYCLE_TIME_2ND); if (spd_byte != 0) { /* Turn SPD ns time into MHz. Check what the asm does * to this math. @@ -282,7 +338,7 @@ if (dimm_speed >= glspeed) { /* If -1 timing is supported, check -1 timing > GeodeLink. */ /* EEPROM byte usage: (25) SDRAM Minimum Clock Cycle Time @ CLX -1 */ - spd_byte = smbus_read_byte(dimm0, SPD_SDRAM_CYCLE_TIME_3RD); + spd_byte = spd_read_byte(dimm0, SPD_SDRAM_CYCLE_TIME_3RD); if (spd_byte != 0) { /* Turn SPD ns time into MHz. Check what the asm does to this math. */ dimm_speed = 2 * (10000 / (((spd_byte >> 4) * 10) + (spd_byte & 0x0F))); @@ -305,18 +361,18 @@ } /* DIMM 1 */ - casmap1 = smbus_read_byte(dimm1, SPD_ACCEPTABLE_CAS_LATENCIES); + casmap1 = spd_read_byte(dimm1, SPD_ACCEPTABLE_CAS_LATENCIES); if (casmap1 != 0xFF) { /* If -.5 timing is supported, check -.5 timing > GeodeLink. */ /* EEPROM byte usage: (23) SDRAM Minimum Clock Cycle Time @ CLX -.5 */ - spd_byte = smbus_read_byte(dimm1, SPD_SDRAM_CYCLE_TIME_2ND); + spd_byte = spd_read_byte(dimm1, SPD_SDRAM_CYCLE_TIME_2ND); if (spd_byte != 0) { /* Turn SPD ns time into MHz. Check what the asm does to this math. */ dimm_speed = 2 * (10000 / (((spd_byte >> 4) * 10) + (spd_byte & 0x0F))); if (dimm_speed >= glspeed) { /* If -1 timing is supported, check -1 timing > GeodeLink. */ /* EEPROM byte usage: (25) SDRAM Minimum Clock Cycle Time @ CLX -1 */ - spd_byte = smbus_read_byte(dimm1, SPD_SDRAM_CYCLE_TIME_3RD); + spd_byte = spd_read_byte(dimm1, SPD_SDRAM_CYCLE_TIME_3RD); if (spd_byte != 0) { /* Turn SPD ns time into MHz. Check what the asm does to this math. */ dimm_speed = 2 * (10000 / (((spd_byte >> 4) * 10) + (spd_byte & 0x0F))); @@ -359,10 +415,10 @@ static inline void helper_spd(u8 dimm0, u8 dimm1, u8 addr, u8 *spd0, u8 *spd1) { - *spd0 = smbus_read_byte(dimm0, addr); + *spd0 = spd_read_byte(dimm0, addr); if (*spd0 == 0xFF) *spd0 = 0; - *spd1 = smbus_read_byte(dimm1, addr); + *spd1 = spd_read_byte(dimm1, addr); if (*spd1 == 0xFF) *spd1 = 0; if (*spd0 < *spd1) @@ -477,10 +533,10 @@ u8 spd_byte0, spd_byte1; struct msr msr; - spd_byte0 = smbus_read_byte(dimm0, SPD_DEVICE_ATTRIBUTES_GENERAL); + spd_byte0 = spd_read_byte(dimm0, SPD_DEVICE_ATTRIBUTES_GENERAL); if (spd_byte0 == 0xFF) spd_byte0 = 0; - spd_byte1 = smbus_read_byte(dimm1, SPD_DEVICE_ATTRIBUTES_GENERAL); + spd_byte1 = spd_read_byte(dimm1, SPD_DEVICE_ATTRIBUTES_GENERAL); if (spd_byte1 == 0xFF) spd_byte1 = 0; spd_byte1 &= spd_byte0; @@ -558,7 +614,7 @@ post_code(POST_MEM_SETUP); - spd_byte = smbus_read_byte(dimm0, SPD_MODULE_ATTRIBUTES); + spd_byte = spd_read_byte(dimm0, SPD_MODULE_ATTRIBUTES); /* Check DIMM is not Registered and not Buffered DIMMs. */ if ((spd_byte != 0xFF) && (spd_byte & 3)) { @@ -566,7 +622,7 @@ post_code(ERROR_UNSUPPORTED_DIMM); hlt(); } - spd_byte = smbus_read_byte(dimm1, SPD_MODULE_ATTRIBUTES); + spd_byte = spd_read_byte(dimm1, SPD_MODULE_ATTRIBUTES); if ((spd_byte != 0xFF) && (spd_byte & 3)) { printk(BIOS_EMERG, "DIMM 1 NOT COMPATIBLE!\n"); post_code(ERROR_UNSUPPORTED_DIMM);

1 0

[LinuxBIOS] my status
by ron minnich 27 Nov '07

27 Nov '07

here is my svn status with notes. I go on travel friday and would like to resolve all these. M include/post_code.h (trying to pin this down) M mainboard/pcengines/alix1c/initram.c (trivial misspelling, waiting more changes) M mainboard/pcengines/alix1c/Makefile (whitespace change) M lib/console.c (added banner and modified die, waiting ack from someone) M northbridge/amd/geodelx/raminit.c (waiting ack, spd_read_byte and printk changes) M arch/x86/geodelx/stage0.S (added POST calls, but we have a problem ... POST collision) the last one is hard. For why, see this file:include/arch/x86/amd_geodelx.h Marc is a pro, so his POST codes cover the space. Now what? ron

2 1

[LinuxBIOS] patch: post code standard
by ron minnich 27 Nov '07

27 Nov '07

comments welcome. ron

3 2

[LinuxBIOS] patch: lx northbridge use spd_read_byte and add debug prints
by ron minnich 27 Nov '07

27 Nov '07

attached ron

3 4

[LinuxBIOS] alix1c for v3 update
by ron minnich 27 Nov '07

27 Nov '07

This gets as far as pll_reset and dies. ron

5 9

[LinuxBIOS] r527 - LinuxBIOSv3/arch/x86/geodelx
by svn＠openbios.org 27 Nov '07

27 Nov '07

Author: rminnich Date: 2007-11-27 17:47:34 +0100 (Tue, 27 Nov 2007) New Revision: 527 Modified: LinuxBIOSv3/arch/x86/geodelx/geodelx.c Log: add one debug print, move all smbus_read_byte to spd_read_byte. Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> Acked-by: Corey Osgood <corey.osgood(a)gmail.com> Modified: LinuxBIOSv3/arch/x86/geodelx/geodelx.c =================================================================== --- LinuxBIOSv3/arch/x86/geodelx/geodelx.c 2007-11-27 16:24:57 UTC (rev 526) +++ LinuxBIOSv3/arch/x86/geodelx/geodelx.c 2007-11-27 16:47:34 UTC (rev 527) @@ -150,6 +150,7 @@ { struct msr msr_glcp_sys_pll; /* GeodeLink PLL control MSR */ + printk(BIOS_DEBUG, "pll_reset: read msr %#x\n", GLCP_SYS_RSTPLL); msr_glcp_sys_pll = rdmsr(GLCP_SYS_RSTPLL); printk(BIOS_DEBUG, "_MSR GLCP_SYS_RSTPLL (%08x) value is: %08x:%08x\n", @@ -346,20 +347,20 @@ * Note: We only support a module width of 64. */ dimms = 0; - spdbyte0 = smbus_read_byte(dimm0, SPD_PRIMARY_SDRAM_WIDTH); + spdbyte0 = spd_read_byte(dimm0, SPD_PRIMARY_SDRAM_WIDTH); if (spdbyte0 != 0xFF) { dimms++; spdbyte0 = (u8)64 / spdbyte0 * - (u8)(smbus_read_byte(dimm0, SPD_NUM_DIMM_BANKS)); + (u8)(spd_read_byte(dimm0, SPD_NUM_DIMM_BANKS)); } else { spdbyte0 = 0; } - spdbyte1 = smbus_read_byte(dimm1, SPD_PRIMARY_SDRAM_WIDTH); + spdbyte1 = spd_read_byte(dimm1, SPD_PRIMARY_SDRAM_WIDTH); if (spdbyte1 != 0xFF) { dimms++; spdbyte1 = (u8)64 / spdbyte1 * - (u8)(smbus_read_byte(dimm1, SPD_NUM_DIMM_BANKS)); + (u8)(spd_read_byte(dimm1, SPD_NUM_DIMM_BANKS)); } else { spdbyte1 = 0; }

1 0

[LinuxBIOS] patch: add spd_read_byte prototype to spd.h
by ron minnich 27 Nov '07

27 Nov '07

I just put this inline, it's simple. Add an spd_read_byte prototype to spd.h. This is because I am going to in a later patch make sure all dram functions call spd_read_byte, not smbus_read_byte. Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> Index: include/spd.h =================================================================== --- include/spd.h (revision 524) +++ include/spd.h (working copy) @@ -139,5 +139,8 @@ #define MODULE_BUFFERED 1 #define MODULE_REGISTERED 2 +/* prototypes for dealing with spd */ +u8 spd_read_byte(u16 device, u8 address); + #endif /* _SPD_H_ */

3 3

[LinuxBIOS] r526 - LinuxBIOSv3/include
by svn＠openbios.org 27 Nov '07

27 Nov '07

Author: rminnich Date: 2007-11-27 17:24:57 +0100 (Tue, 27 Nov 2007) New Revision: 526 Modified: LinuxBIOSv3/include/spd.h Log: Add an spd_read_byte prototype to spd.h. This is because I am going to in a later patch make sure all dram functions call spd_read_byte, not smbus_read_byte. Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> Acked-by: Corey Osgood <corey.osgood(a)gmail.com> Modified: LinuxBIOSv3/include/spd.h =================================================================== --- LinuxBIOSv3/include/spd.h 2007-11-27 16:19:34 UTC (rev 525) +++ LinuxBIOSv3/include/spd.h 2007-11-27 16:24:57 UTC (rev 526) @@ -139,5 +139,8 @@ #define MODULE_BUFFERED 1 #define MODULE_REGISTERED 2 +/* prototypes for dealing with spd */ +u8 spd_read_byte(u16 device, u8 address); + #endif /* _SPD_H_ */

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
40
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot November 2007