From 5f6572ec8bc6eb2acd3a7882445913b0b9fe0d91 Mon Sep 17 00:00:00 2001 From: "Ronald G. Minnich" Date: Wed, 12 Aug 2009 15:39:38 +0000 Subject: Fix multiple missing files and errors from the recent commit. This happened when Patrick's tree and mine got out of sync. Link stage still fails. Signed-off-by: Ronald G. Minnich Acked-by: Ronald G. Minnich git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4536 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- documentation/Kconfig.tex | 7 +- src/cpu/Kconfig | 6 +- src/cpu/amd/Kconfig | 14 +- src/cpu/amd/model_fxx/Kconfig | 13 + src/cpu/amd/socket_F/Kconfig | 29 ++ src/mainboard/amd/serengeti_cheetah/Kconfig | 168 +++++++++- src/mainboard/amd/serengeti_cheetah/Makefile.inc | 11 +- src/mainboard/amd/serengeti_cheetah/rom.c | 398 +++++++++++++++++++++++ 8 files changed, 620 insertions(+), 26 deletions(-) create mode 100644 src/cpu/amd/model_fxx/Kconfig create mode 100644 src/mainboard/amd/serengeti_cheetah/rom.c diff --git a/documentation/Kconfig.tex b/documentation/Kconfig.tex index eb77fa9778..6b38dc15dd 100644 --- a/documentation/Kconfig.tex +++ b/documentation/Kconfig.tex @@ -458,7 +458,12 @@ obj-$(CONFIG_HAVE_ACPI_TABLES) += amdk8_acpi.o \subsection{southbridge} \subsubsection{vendor and part} \subsection{superio} -\subsection{i2cmux} +\subsection{drivers/i2c} +This is a rather special case. There are no Kconfig files or Makefile.inc files here. They are notneeed. +To compile in one of these files, name the .o directory. E.g. in serengeti_cheetah we have: +\begin{verbatim} +\end{verbatim} + \subsubsection{vendor and part} \end{document} diff --git a/src/cpu/Kconfig b/src/cpu/Kconfig index de2ceea557..516cac05c4 100644 --- a/src/cpu/Kconfig +++ b/src/cpu/Kconfig @@ -1,4 +1,4 @@ -#source src/cpu/amd/Kconfig +source src/cpu/amd/Kconfig source src/cpu/emulation/Kconfig source src/cpu/intel/Kconfig source src/cpu/via/Kconfig @@ -16,3 +16,7 @@ config DCACHE_RAM_SIZE config SMP bool default n + +config CPU_SOCKET_TYPE + hex + default 0 diff --git a/src/cpu/amd/Kconfig b/src/cpu/amd/Kconfig index fdf52fbd60..cec49160da 100644 --- a/src/cpu/amd/Kconfig +++ b/src/cpu/amd/Kconfig @@ -1,8 +1,8 @@ -source src/cpu/amd/socket_754/Kconfig -source src/cpu/amd/socket_939/Kconfig -source src/cpu/amd/socket_940/Kconfig -source src/cpu/amd/socket_AM2/Kconfig -source src/cpu/amd/socket_AM2r2/Kconfig +#source src/cpu/amd/socket_754/Kconfig +#source src/cpu/amd/socket_939/Kconfig +#source src/cpu/amd/socket_940/Kconfig +#source src/cpu/amd/socket_AM2/Kconfig +#source src/cpu/amd/socket_AM2r2/Kconfig source src/cpu/amd/socket_F/Kconfig -source src/cpu/amd/socket_F_1207/Kconfig -source src/cpu/amd/socket_S1G1/Kconfig +#source src/cpu/amd/socket_F_1207/Kconfig +#source src/cpu/amd/socket_S1G1/Kconfig diff --git a/src/cpu/amd/model_fxx/Kconfig b/src/cpu/amd/model_fxx/Kconfig new file mode 100644 index 0000000000..f397c3ea98 --- /dev/null +++ b/src/cpu/amd/model_fxx/Kconfig @@ -0,0 +1,13 @@ +config HAVE_INIT_TIMER + int + default 1 + +config HAVE_MOVNTI + int + default 1 + +config CPU_ADDR_BITS + int + default 40 + + diff --git a/src/cpu/amd/socket_F/Kconfig b/src/cpu/amd/socket_F/Kconfig index b63b596321..c933400398 100644 --- a/src/cpu/amd/socket_F/Kconfig +++ b/src/cpu/amd/socket_F/Kconfig @@ -1,3 +1,32 @@ config CPU_AMD_SOCKET_F bool default false + +config CPU_SOCKET_TYPE + hex + default 0x10 + depends on CPU_AMD_SOCKET_F + +config K8_REV_F_SUPPORT + hex + default 1 + depends on CPU_AMD_SOCKET_F + +#Opteron K8 1G HT Support +config K8_HT_FREQ_1G_SUPPORT + hex + default 1 + depends on CPU_AMD_SOCKET_F + +#DDR2 and REG +config DIMM_SUPPORT + hex + default 0x0104 + depends on CPU_AMD_SOCKET_F + +config CPU_SOCKET_TYPE + hex + default 0x10 + depends on CPU_AMD_SOCKET_F + +source src/cpu/amd/model_fxx/Kconfig diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig b/src/mainboard/amd/serengeti_cheetah/Kconfig index bb1571de95..3a64d0805a 100644 --- a/src/mainboard/amd/serengeti_cheetah/Kconfig +++ b/src/mainboard/amd/serengeti_cheetah/Kconfig @@ -10,9 +10,9 @@ config BOARD_AMD_SERENGETI_CHEETAH select NORTHBRIDGE_AMD_AMDK8 select NORTHBRIDGE_AMD_AMDK8_ROOT_COMPLEX select SOUTHBRIDGE_AMD_AMD8111 - select SUPERIO_WINBOND_W83627THF + select SOUTHBRIDGE_AMD_AMD8131 + select SUPERIO_WINBOND_W83627HF select PIRQ_TABLE - select MMCONF_SUPPORT select USE_PRINTK_IN_CAR help AMD Serengeti Series mainboards @@ -23,15 +23,45 @@ config MAINBOARD_DIR default amd/serengeti_cheetah depends on BOARD_AMD_SERENGETI_CHEETAH -#config DCACHE_RAM_BASE -# hex -# default 0xffdf8000 -# depends on BOARD_AMD_SERENGETI_CHEETAH -# -#config DCACHE_RAM_SIZE -# hex -# default 0x8000 -# depends on BOARD_AMD_SERENGETI_CHEETAH +config USE_DCACHE_RAM + int + default 1 + depends on BOARD_AMD_SERENGETI_CHEETAH + +config DCACHE_RAM_BASE + hex + default 0xc8000 + depends on BOARD_AMD_SERENGETI_CHEETAH + +config DCACHE_RAM_SIZE + hex + default 0x08000 + depends on BOARD_AMD_SERENGETI_CHEETAH + +config DCACHE_RAM_GLOBAL_VAR_SIZE + hex + default 0x01000 + depends on BOARD_AMD_SERENGETI_CHEETAH + +config APIC_ID_OFFSET + int + default 8 + depends on BOARD_AMD_SERENGETI_CHEETAH + +config HAVE_HARD_RESET + int + default 1 + depends on BOARD_AMD_SERENGETI_CHEETAH + +config IOAPIC + int + default 1 + depends on BOARD_AMD_SERENGETI_CHEETAH + +config SB_HT_CHAIN_ON_BUS0 + int + default 2 + depends on BOARD_AMD_SERENGETI_CHEETAH config LB_CKS_RANGE_END int @@ -47,3 +77,119 @@ config MAINBOARD_PART_NUMBER string default "Serengeti-Cheetah" depends on BOARD_AMD_SERENGETI_CHEETAH + +config PCI_64BIT_PREF_MEM + int + default 0 + depends on BOARD_AMD_SERENGETI_CHEETAH + +config USE_DCACHE_RAM + int + default 1 + depends on BOARD_AMD_SERENGETI_CHEETAH + +config DCACHE_RAM_BASE + hex + default 0xc8000 + depends on BOARD_AMD_SERENGETI_CHEETAH + +config DCACHE_RAM_SIZE + hex + default 0x08000 + depends on BOARD_AMD_SERENGETI_CHEETAH + +config DCACHE_RAM_GLOBAL_VAR_SIZE + hex + default 0x01000 + depends on BOARD_AMD_SERENGETI_CHEETAH + +config USE_FAILOVER_IMAGE + int + default 0 + depends on BOARD_AMD_SERENGETI_CHEETAH + +config HW_MEM_HOLE_SIZEK + hex + default 0x100000 + depends on BOARD_AMD_SERENGETI_CHEETAH + +config MEM_TRAIN_SEQ + int + default 1 + depends on BOARD_AMD_SERENGETI_CHEETAH + +config HAVE_FAILOVER_BOOT + int + default 0 + depends on BOARD_AMD_SERENGETI_CHEETAH + +config USE_FAILOVER_IMAGE + int + default 0 + depends on BOARD_AMD_SERENGETI_CHEETAH + +config MAX_CPUS + int + default 8 + depends on BOARD_AMD_SERENGETI_CHEETAH + +config MAX_PHYSICAL_CPUS + int + default 4 + depends on BOARD_AMD_SERENGETI_CHEETAH + +config MEM_TRAIN_SEQ + int + default 1 + depends on BOARD_AMD_SERENGETI_CHEETAH + +config AP_CODE_IN_CAR + int + default 1 + depends on BOARD_AMD_SERENGETI_CHEETAH + +config HW_MEM_HOLE_SIZE_AUTO_INC + int + default 0 + depends on BOARD_AMD_SERENGETI_CHEETAH + +config HT_CHAIN_END_UNITID_BASE + int + default 0x6 + depends on BOARD_AMD_SERENGETI_CHEETAH + +config USE_INIT + int + default 0 + depends on BOARD_AMD_SERENGETI_CHEETAH + +config SERIAL_CPU_INIT + int + default 0 + depends on BOARD_AMD_SERENGETI_CHEETAH + +config AP_CODE_IN_CAR + int + default 1 + depends on BOARD_AMD_SERENGETI_CHEETAH + +config WAIT_BEFORE_CPUS_INIT + int + default 1 + depends on BOARD_AMD_SERENGETI_CHEETAH + +config SB_HT_CHAIN_ON_BUS0 + int + default 2 + depends on BOARD_AMD_SERENGETI_CHEETAH + +config CONSOLE_VGA + bool + default y + depends on BOARD_AMD_SERENGETI_CHEETAH + +config PCI_ROM_RUN + int + default 1 + depends on BOARD_AMD_SERENGETI_CHEETAH + diff --git a/src/mainboard/amd/serengeti_cheetah/Makefile.inc b/src/mainboard/amd/serengeti_cheetah/Makefile.inc index c54df30683..d595db3d1b 100644 --- a/src/mainboard/amd/serengeti_cheetah/Makefile.inc +++ b/src/mainboard/amd/serengeti_cheetah/Makefile.inc @@ -37,6 +37,7 @@ obj-$(CONFIG_HAVE_ACPI_TABLES) += fadt.o obj-$(CONFIG_ACPI_SSDTX_NUM) += ssdt2.o obj-$(CONFIG_ACPI_SSDTX_NUM) += ssdt3.o obj-$(CONFIG_HAVE_ACPI_TABLES) += ssdt4.o +driver-y += ../../../drivers/i2c/i2cmux/i2cmux.o # This is part of the conversion to init-obj and away from included code. @@ -58,11 +59,9 @@ ldscript-y += ../../../../src/arch/i386/lib/failover.lds ifdef POST_EVALUATION MAINBOARD_OPTIONS=\ - -DCONFIG_AP_IN_SIPI_WAIT=1 \ + -DCONFIG_AP_IN_SIPI_WAIT=0 \ -DCONFIG_USE_PRINTK_IN_CAR=1 \ - -DCONFIG_HAVE_HIGH_TABLES=1 \ - -DCONFIG_MMCONF_SUPPORT=1 \ - -DCONFIG_MMCONF_BASE_ADDRESS=0xf0000000 + -DCONFIG_HAVE_HIGH_TABLES=1 $(obj)/dsdt.c: $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl iasl -p dsdt -tc $(src)/mainboard/$(MAINBOARDDIR)/dsdt.asl @@ -86,8 +85,8 @@ $(obj)/ssdt4.c: $(src)/mainboard/$(MAINBOARDDIR)/dx/pci4.asl" perl -pi -e 's/AmlCode/AmlCode_ssdt4/g' pci4.hex mv pci4.hex ssdt4.c -$(obj)/mainboard/$(MAINBOARDDIR)/auto.inc: $(src)/mainboard/$(MAINBOARDDIR)/auto.c $(obj)/option_table.h - $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/auto.c -o $@ +$(obj)/mainboard/$(MAINBOARDDIR)/auto.inc: $(src)/mainboard/$(MAINBOARDDIR)/rom.c $(obj)/option_table.h + $(CC) $(DISTRO_CFLAGS) $(CFLAGS) $(CPPFLAGS) $(DEBUG_CFLAGS) -I$(src) -I. -c -S $(src)/mainboard/$(MAINBOARDDIR)/rom.c -o $@ perl -e 's/\.rodata/.rom.data/g' -pi $@ perl -e 's/\.text/.section .rom.text/g' -pi $@ diff --git a/src/mainboard/amd/serengeti_cheetah/rom.c b/src/mainboard/amd/serengeti_cheetah/rom.c new file mode 100644 index 0000000000..fb1be8dd28 --- /dev/null +++ b/src/mainboard/amd/serengeti_cheetah/rom.c @@ -0,0 +1,398 @@ +#define ASSEMBLY 1 +#define __ROMCC__ + +#define RAMINIT_SYSINFO 1 +#define CACHE_AS_RAM_ADDRESS_DEBUG 0 + +#define SET_NB_CFG_54 1 + +//used by raminit +#define QRANK_DIMM_SUPPORT 1 + +//used by incoherent_ht +//#define K8_SCAN_PCI_BUS 1 +//#define K8_ALLOCATE_IO_RANGE 1 + + +//used by init_cpus and fidvid +#define K8_SET_FIDVID 0 +//if we want to wait for core1 done before DQS training, set it to 0 +#define K8_SET_FIDVID_CORE0_ONLY 1 + +#if CONFIG_K8_REV_F_SUPPORT == 1 +#define K8_REV_F_SUPPORT_F0_F1_WORKAROUND 0 +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include "option_table.h" +#include "pc80/mc146818rtc_early.c" + + +#if 0 +static void post_code(uint8_t value) { +#if 1 + int i; + for(i=0;i<0x80000;i++) { + outb(value, 0x80); + } +#endif +} +#endif +#if CONFIG_USE_FAILOVER_IMAGE==0 +#include "pc80/serial.c" +#include "arch/i386/lib/console.c" +#include +#include "southbridge/amd/amd8111/amd8111_early_smbus.c" +#include "northbridge/amd/amdk8/raminit.h" +#include "cpu/amd/model_fxx/apic_timer.c" +#endif + + + +#include "cpu/x86/lapic/boot_cpu.c" +#include "northbridge/amd/amdk8/reset_test.c" + +#if CONFIG_USE_FAILOVER_IMAGE==0 +#include "cpu/x86/bist.h" + +#include "lib/delay.c" + +#include "northbridge/amd/amdk8/debug.c" +#include "cpu/amd/mtrr/amd_earlymtrr.c" +#include "superio/winbond/w83627hf/w83627hf_early_serial.c" + +#include "northbridge/amd/amdk8/setup_resource_map.c" + +#define SERIAL_DEV PNP_DEV(0x2e, W83627HF_SP1) + +#include "southbridge/amd/amd8111/amd8111_early_ctrl.c" + +static void memreset_setup(void) +{ + //GPIO on amd8111 to enable MEMRST ???? + outb((0 << 7)|(0 << 6)|(0<<5)|(0<<4)|(1<<2)|(1<<0), SMBUS_IO_BASE + 0xc0 + 16); //REVC_MEMRST_EN=1 + outb((0 << 7)|(0 << 6)|(0<<5)|(0<<4)|(1<<2)|(0<<0), SMBUS_IO_BASE + 0xc0 + 17); +} + +static void memreset(int controllers, const struct mem_controller *ctrl) +{ +} + +static inline void activate_spd_rom(const struct mem_controller *ctrl) +{ +#define SMBUS_HUB 0x18 + int ret,i; + unsigned device=(ctrl->channel0[0])>>8; + /* the very first write always get COL_STS=1 and ABRT_STS=1, so try another time*/ + i=2; + do { + ret = smbus_write_byte(SMBUS_HUB, 0x01, device); + } while ((ret!=0) && (i-->0)); + + smbus_write_byte(SMBUS_HUB, 0x03, 0); +} +#if 0 +static inline void change_i2c_mux(unsigned device) +{ +#define SMBUS_HUB 0x18 + int ret, i; + print_debug("change_i2c_mux i="); print_debug_hex8(device); print_debug("\r\n"); + i=2; + do { + ret = smbus_write_byte(SMBUS_HUB, 0x01, device); + print_debug("change_i2c_mux 1 ret="); print_debug_hex32(ret); print_debug("\r\n"); + } while ((ret!=0) && (i-->0)); + ret = smbus_write_byte(SMBUS_HUB, 0x03, 0); + print_debug("change_i2c_mux 2 ret="); print_debug_hex32(ret); print_debug("\r\n"); +} +#endif + +static inline int spd_read_byte(unsigned device, unsigned address) +{ + return smbus_read_byte(device, address); +} + +#include "northbridge/amd/amdk8/amdk8.h" +#include "northbridge/amd/amdk8/coherent_ht.c" + +#include "northbridge/amd/amdk8/incoherent_ht.c" + +#include "northbridge/amd/amdk8/raminit_f.c" + +#include "sdram/generic_sdram.c" + + /* tyan does not want the default */ +#include "resourcemap.c" + +#include "cpu/amd/dualcore/dualcore.c" + +#define RC0 ((1<<0)<<8) +#define RC1 ((1<<1)<<8) +#define RC2 ((1<<2)<<8) +#define RC3 ((1<<3)<<8) + +#define DIMM0 0x50 +#define DIMM1 0x51 +#define DIMM2 0x52 +#define DIMM3 0x53 +#define DIMM4 0x54 +#define DIMM5 0x55 +#define DIMM6 0x56 +#define DIMM7 0x57 + + +#include "cpu/amd/car/copy_and_run.c" +#include "cpu/amd/car/post_cache_as_ram.c" + +#include "cpu/amd/model_fxx/init_cpus.c" + +#include "cpu/amd/model_fxx/fidvid.c" +#endif + +#if ((CONFIG_HAVE_FAILOVER_BOOT==1) && (CONFIG_USE_FAILOVER_IMAGE == 1)) || ((CONFIG_HAVE_FAILOVER_BOOT==0) && (CONFIG_USE_FALLBACK_IMAGE == 1)) + +#include "southbridge/amd/amd8111/amd8111_enable_rom.c" +#include "northbridge/amd/amdk8/early_ht.c" + +void failover_process(unsigned long bist, unsigned long cpu_init_detectedx) +{ + + unsigned last_boot_normal_x = last_boot_normal(); + + /* Is this a cpu only reset? or Is this a secondary cpu? */ + if ((cpu_init_detectedx) || (!boot_cpu())) { + if (last_boot_normal_x) { + goto normal_image; + } else { + goto fallback_image; + } + } + + /* Nothing special needs to be done to find bus 0 */ + /* Allow the HT devices to be found */ + + enumerate_ht_chain(); + + /* Setup the rom access for 4M */ + amd8111_enable_rom(); + + /* Is this a deliberate reset by the bios */ + if (bios_reset_detected() && last_boot_normal_x) { + goto normal_image; + } + /* This is the primary cpu how should I boot? */ + else if (do_normal_boot()) { + goto normal_image; + } + else { + goto fallback_image; + } + normal_image: + __asm__ volatile ("jmp __normal_image" + : /* outputs */ + : "a" (bist), "b" (cpu_init_detectedx) /* inputs */ + ); + + fallback_image: +#if CONFIG_HAVE_FAILOVER_BOOT==1 + __asm__ volatile ("jmp __fallback_image" + : /* outputs */ + : "a" (bist), "b" (cpu_init_detectedx) /* inputs */ + ) +#endif + ; +} +#endif + +void real_main(unsigned long bist, unsigned long cpu_init_detectedx); + +void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx) +{ +#if CONFIG_HAVE_FAILOVER_BOOT==1 + #if CONFIG_USE_FAILOVER_IMAGE==1 + failover_process(bist, cpu_init_detectedx); + #else + real_main(bist, cpu_init_detectedx); + #endif +#else + #if CONFIG_USE_FALLBACK_IMAGE == 1 + failover_process(bist, cpu_init_detectedx); + #endif + real_main(bist, cpu_init_detectedx); +#endif +} + +#if CONFIG_USE_FAILOVER_IMAGE==0 + +void real_main(unsigned long bist, unsigned long cpu_init_detectedx) +{ + static const uint16_t spd_addr[] = { + //first node + RC0|DIMM0, RC0|DIMM2, 0, 0, + RC0|DIMM1, RC0|DIMM3, 0, 0, +#if CONFIG_MAX_PHYSICAL_CPUS > 1 + //second node + RC1|DIMM0, RC1|DIMM2, RC1|DIMM4, RC1|DIMM6, + RC1|DIMM1, RC1|DIMM3, RC1|DIMM5, RC1|DIMM7, +#endif +#if CONFIG_MAX_PHYSICAL_CPUS > 2 + // third node + RC2|DIMM0, RC2|DIMM2, 0, 0, + RC2|DIMM1, RC2|DIMM3, 0, 0, + // four node + RC3|DIMM0, RC3|DIMM2, RC3|DIMM4, RC3|DIMM6, + RC3|DIMM1, RC3|DIMM3, RC3|DIMM5, RC3|DIMM7, +#endif + + }; + + struct sys_info *sysinfo = (CONFIG_DCACHE_RAM_BASE + CONFIG_DCACHE_RAM_SIZE - CONFIG_DCACHE_RAM_GLOBAL_VAR_SIZE); + + int needs_reset; int i; + unsigned bsp_apicid = 0; + struct cpuid_result cpuid1; + + if (bist == 0) { + bsp_apicid = init_cpus(cpu_init_detectedx, sysinfo); + } + +// post_code(0x32); + + w83627hf_enable_serial(SERIAL_DEV, CONFIG_TTYS0_BASE); + uart_init(); + console_init(); + +// dump_mem(CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE-0x200, CONFIG_DCACHE_RAM_BASE+CONFIG_DCACHE_RAM_SIZE); + + /* Halt if there was a built in self test failure */ + report_bist_failure(bist); + + print_debug("*sysinfo range: ["); print_debug_hex32(sysinfo); print_debug(","); print_debug_hex32((unsigned long)sysinfo+sizeof(struct sys_info)); print_debug(")\r\n"); + + setup_mb_resource_map(); +#if 0 + dump_pci_device(PCI_DEV(0, 0x18, 0)); + dump_pci_device(PCI_DEV(0, 0x19, 0)); +#endif + + print_debug("bsp_apicid="); print_debug_hex8(bsp_apicid); print_debug("\r\n"); + +#if CONFIG_MEM_TRAIN_SEQ == 1 + set_sysinfo_in_ram(0); // in BSP so could hold all ap until sysinfo is in ram +#endif + setup_coherent_ht_domain(); // routing table and start other core0 + + wait_all_core0_started(); +#if CONFIG_LOGICAL_CPUS==1 + // It is said that we should start core1 after all core0 launched + /* becase optimize_link_coherent_ht is moved out from setup_coherent_ht_domain, + * So here need to make sure last core0 is started, esp for two way system, + * (there may be apic id conflicts in that case) + */ + start_other_cores(); + wait_all_other_cores_started(bsp_apicid); +#endif + + /* it will set up chains and store link pair for optimization later */ + ht_setup_chains_x(sysinfo); // it will init sblnk and sbbusn, nodes, sbdn + +#if 0 + //it your CPU min fid is 1G, you can change HT to 1G and FID to max one time. + needs_reset = optimize_link_coherent_ht(); + needs_reset |= optimize_link_incoherent_ht(sysinfo); +#endif + +#if K8_SET_FIDVID == 1 + /* Check to see if processor is capable of changing FIDVID */ + /* otherwise it will throw a GP# when reading FIDVID_STATUS */ + cpuid1 = cpuid(0x80000007); + if( (cpuid1.edx & 0x6) == 0x6 ) { + + { + /* Read FIDVID_STATUS */ + msr_t msr; + msr=rdmsr(0xc0010042); + print_debug("begin msr fid, vid "); print_debug_hex32( msr.hi ); print_debug_hex32(msr.lo); print_debug("\r\n"); + + } + + enable_fid_change(); + + enable_fid_change_on_sb(sysinfo->sbbusn, sysinfo->sbdn); + + init_fidvid_bsp(bsp_apicid); + + // show final fid and vid + { + msr_t msr; + msr=rdmsr(0xc0010042); + print_debug("end msr fid, vid "); print_debug_hex32( msr.hi ); print_debug_hex32(msr.lo); print_debug("\r\n"); + + } + + } else { + print_debug("Changing FIDVID not supported\n"); + } + +#endif + +#if 1 + needs_reset = optimize_link_coherent_ht(); + needs_reset |= optimize_link_incoherent_ht(sysinfo); + + // fidvid change will issue one LDTSTOP and the HT change will be effective too + if (needs_reset) { + print_info("ht reset -\r\n"); + soft_reset_x(sysinfo->sbbusn, sysinfo->sbdn); + } +#endif + allow_all_aps_stop(bsp_apicid); + + //It's the time to set ctrl in sysinfo now; + fill_mem_ctrl(sysinfo->nodes, sysinfo->ctrl, spd_addr); + + enable_smbus(); + +#if 0 + for(i=0;i<4;i++) { + activate_spd_rom(&cpu[i]); + dump_smbus_registers(); + } +#endif + +#if 0 + for(i=1;i<256;i<<=1) { + change_i2c_mux(i); + dump_smbus_registers(); + } +#endif + + memreset_setup(); + + //do we need apci timer, tsc...., only debug need it for better output + /* all ap stopped? */ +// init_timer(); // Need to use TMICT to synconize FID/VID + + sdram_initialize(sysinfo->nodes, sysinfo->ctrl, sysinfo); + +#if 0 + print_pci_devices(); +#endif + +#if 0 +// dump_pci_devices(); + dump_pci_device_index_wait(PCI_DEV(0, 0x18, 2), 0x98); + dump_pci_device_index_wait(PCI_DEV(0, 0x19, 2), 0x98); +#endif + + post_cache_as_ram(); // bsp swtich stack to ram and copy sysinfo ram now + +} +#endif -- cgit v1.2.3