Since some people disapprove of white space cleanups mixed in regular commits

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

diff --git a/src/cpu/amd/dualcore/dualcore_id.c b/src/cpu/amd/dualcore/dualcore_id.c
index 389969795b49fd5c9a9304fbb2b5712366aceb90..9a1a9c53d4040562e5d21a257c5c116f43ca5714 100644 (file)
--- a/src/cpu/amd/dualcore/dualcore_id.c
+++ b/src/cpu/amd/dualcore/dualcore_id.c
@@ -1,8 +1,8 @@
 /* 2004.12 yhlu add dual core support */
 
 #include <arch/cpu.h>
-#include <cpu/amd/dualcore.h>
-#ifdef __ROMCC__
+#include <cpu/amd/multicore.h>
+#ifdef __PRE_RAM__
 #include <cpu/amd/model_fxx_msr.h>
 #endif
 
@@ -14,28 +14,30 @@ unsigned int read_nb_cfg_54(void)
         return ( ( msr.hi >> (54-32)) & 1);
 }
 
-static inline unsigned get_initial_apicid(void) 
+static inline unsigned get_initial_apicid(void)
 {
        return ((cpuid_ebx(1) >> 24) & 0xf);
 }
 
 //called by amd_siblings too
-struct node_core_id get_node_core_id(unsigned nb_cfg_54) 
+#define CORE_ID_BIT 1
+#define NODE_ID_BIT 3
+struct node_core_id get_node_core_id(unsigned nb_cfg_54)
 {
        struct node_core_id id;
        //    get the apicid via cpuid(1) ebx[27:24]
        if( nb_cfg_54) {
                 //   when NB_CFG[54] is set, nodeid = ebx[27:25], coreid = ebx[24]
                 id.coreid = (cpuid_ebx(1) >> 24) & 0xf;
-                id.nodeid = (id.coreid>>1);
-                id.coreid &= 1;
-        } 
-       else 
+                id.nodeid = (id.coreid>>CORE_ID_BIT);
+                id.coreid &= ((1<<CORE_ID_BIT)-1);
+        }
+       else
        {
                 // when NB_CFG[54] is clear, nodeid = ebx[26:24], coreid = ebx[27]
                 id.nodeid = (cpuid_ebx(1) >> 24) & 0xf;
-                id.coreid = (id.nodeid>>3);
-                id.nodeid &= 7;
+                id.coreid = (id.nodeid>>NODE_ID_BIT);
+                id.nodeid &= ((1<<NODE_ID_BIT)-1);
        }
        return id;
 }
@@ -45,8 +47,9 @@ static inline unsigned get_core_num(void)
        return (cpuid_ecx(0x80000008) & 0xff);
 }
 
-static inline struct node_core_id get_node_core_id_x(void) {
+static inline struct node_core_id get_node_core_id_x(void)
+{
 
-       return get_node_core_id( read_nb_cfg_54() ); // for pre_e0() nb_cfg_54 always be 0
+       return get_node_core_id(read_nb_cfg_54()); // for pre_e0() nb_cfg_54 always be 0
 }