Fix all warnings in the tree

[coreboot.git] / src / cpu / amd / dualcore / dualcore.c

diff --git a/src/cpu/amd/dualcore/dualcore.c b/src/cpu/amd/dualcore/dualcore.c
index e2158424e639b0d1bb9d3b1127d7957fe34c7d5e..f13a62cbe7fa01bf09e8b158e2e8863145a6ab72 100644 (file)
--- a/src/cpu/amd/dualcore/dualcore.c
+++ b/src/cpu/amd/dualcore/dualcore.c
@@ -6,6 +6,7 @@
 #endif
 
 #include "cpu/amd/dualcore/dualcore_id.c"
+#include <pc80/mc146818rtc.h>
 
 static inline unsigned get_core_num_in_bsp(unsigned nodeid)
 {
@@ -19,7 +20,9 @@ static inline unsigned get_core_num_in_bsp(unsigned nodeid)
 #if SET_NB_CFG_54 == 1
 static inline uint8_t set_apicid_cpuid_lo(void)
 {
+#if CONFIG_K8_REV_F_SUPPORT == 0
         if(is_cpu_pre_e0()) return 0; // pre_e0 can not be set
+#endif
 
         // set the NB_CFG[54]=1; why the OS will be happy with that ???
         msr_t msr;
@@ -54,9 +57,9 @@ static inline void start_other_cores(void)
        unsigned nodes;
        unsigned nodeid;
 
-        if(read_option(CMOS_VSTART_dual_core, CMOS_VLEN_dual_core, 0) != 0)  { // disable dual_core
-                return;
-        }
+       if (read_option(CMOS_VSTART_multi_core, CMOS_VLEN_multi_core, 0))  {
+               return; // disable multi_core
+       }
 
         nodes = get_nodes();
 
@@ -67,95 +70,5 @@ static inline void start_other_cores(void)
        }
 
 }
-#if USE_DCACHE_RAM == 0
-static void do_k8_init_and_stop_secondaries(void)
-{
-       struct node_core_id id;
-       device_t dev;
-       unsigned apicid;
-       unsigned max_siblings;
-       msr_t msr;
-       
-       /* Skip this if there was a built in self test failure */
-
-       if (is_cpu_pre_e0()) {
-               id.nodeid = lapicid() & 0x7;
-               id.coreid = 0;
-       } else {
-               /* Which cpu are we on? */
-               id = get_node_core_id_x();
-
-               /* Set NB_CFG_MSR
-                * Linux expect the core to be in the least signficant bits.
-                */
-               msr = rdmsr(NB_CFG_MSR);
-               msr.hi |= (1<<(54-32)); // InitApicIdCpuIdLo
-               wrmsr(NB_CFG_MSR, msr);
-       }
-
-       /* For now assume all cpus have the same number of siblings */
-       max_siblings = (cpuid_ecx(0x80000008) & 0xff) + 1;
-
-       /* Enable extended apic ids */
-       device_t dev_f0 = PCI_DEV(0, 0x18+id.nodeid, 0);
-       unsigned val = pci_read_config32(dev_f0, 0x68);
-       val |= (1 << 18) | (1 << 17);
-       pci_write_config32(dev_f0, 0x68, val);
-
-       /* Set the lapicid */
-        #if (ENABLE_APIC_EXT_ID == 1)
-                unsigned initial_apicid = get_initial_apicid();
-                #if LIFT_BSP_APIC_ID == 0
-                if( initial_apicid != 0 ) // other than bsp
-                #endif
-                {
-                                /* use initial apic id to lift it */
-                                uint32_t dword = lapic_read(LAPIC_ID);
-                                dword &= ~(0xff<<24);
-                                dword |= (((initial_apicid + APIC_ID_OFFSET) & 0xff)<<24);
-
-                                lapic_write(LAPIC_ID, dword);
-                }
-
-                #if LIFT_BSP_APIC_ID == 1
-                bsp_apicid += APIC_ID_OFFSET;
-                #endif
-
-        #endif
-
-
-       /* Remember the cpuid */
-       if (id.coreid == 0) {
-               dev = PCI_DEV(0, 0x18 + id.nodeid, 2);
-               pci_write_config32(dev, 0x9c, cpuid_eax(1));    
-       }
-       
-       /* Maybe call distinguish_cpu_resets only on the last core? */
-       distinguish_cpu_resets(id.nodeid);
-       if (!boot_cpu()) {
-               stop_this_cpu();
-       }
-}
 
-static void k8_init_and_stop_secondaries(void)
-{
-       /* This doesn't work with Cache As Ram because it messes with 
-          the MTRR state, which breaks the init detection.
-          do_k8_init_and_stop_secondaries should be usable by CAR code.
-       */
-
-       int init_detected;
-
-       init_detected = early_mtrr_init_detected();
-       amd_early_mtrr_init();
-
-       enable_lapic();
-       init_timer();
-       if (init_detected) {
-               asm volatile ("jmp __cpu_reset");
-       }
-
-       do_k8_init_and_stop_secondaries();
-}
 
-#endif