summaryrefslogtreecommitdiff
path: root/src/cpu/amd
diff options
context:
space:
mode:
authorMarc Jones <marc.jones@amd.com>2008-08-07 22:00:51 +0000
committerMarc Jones <marc.jones@amd.com>2008-08-07 22:00:51 +0000
commita2c951edf7de94d64acd31e20b3fea7d3e869069 (patch)
tree66ef2b541029f13db386f7fa26519332ddeaaed8 /src/cpu/amd
parent88ad6b0f919bcb3b86e0a91c903be26934097125 (diff)
downloadcoreboot-a2c951edf7de94d64acd31e20b3fea7d3e869069.tar.xz
Clean up whitespace and comments style. (trivial)
Signed-off-by: Marc Jones <marc.jones@amd.com> Acked-by: Marc Jones <marc.jones@amd.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3480 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/cpu/amd')
-rw-r--r--src/cpu/amd/model_fxx/fidvid.c508
1 files changed, 263 insertions, 245 deletions
diff --git a/src/cpu/amd/model_fxx/fidvid.c b/src/cpu/amd/model_fxx/fidvid.c
index e35b5fc543..22ade3a4fd 100644
--- a/src/cpu/amd/model_fxx/fidvid.c
+++ b/src/cpu/amd/model_fxx/fidvid.c
@@ -6,8 +6,8 @@
#define K8_SET_FIDVID_STORE_AP_APICID_AT_FIRST 1
-#ifndef SB_VFSMAF
-#define SB_VFSMAF 1
+#ifndef SB_VFSMAF
+#define SB_VFSMAF 1
#endif
#define FX_SUPPORT 1
@@ -16,10 +16,10 @@ static inline void print_debug_fv(const char *str, unsigned val)
{
#if K8_SET_FIDVID_DEBUG == 1
#if CONFIG_USE_PRINTK_IN_CAR
- printk_debug("%s%x\r\n", str, val);
- #else
- print_debug(str); print_debug_hex32(val); print_debug("\r\n");
- #endif
+ printk_debug("%s%x\r\n", str, val);
+ #else
+ print_debug(str); print_debug_hex32(val); print_debug("\r\n");
+ #endif
#endif
}
@@ -27,10 +27,10 @@ static inline void print_debug_fv_8(const char *str, unsigned val)
{
#if K8_SET_FIDVID_DEBUG == 1
#if CONFIG_USE_PRINTK_IN_CAR
- printk_debug("%s%02x\r\n", str, val);
- #else
- print_debug(str); print_debug_hex8(val); print_debug("\r\n");
- #endif
+ printk_debug("%s%02x\r\n", str, val);
+ #else
+ print_debug(str); print_debug_hex8(val); print_debug("\r\n");
+ #endif
#endif
}
@@ -38,10 +38,10 @@ static inline void print_debug_fv_64(const char *str, unsigned val, unsigned val
{
#if K8_SET_FIDVID_DEBUG == 1
#if CONFIG_USE_PRINTK_IN_CAR
- printk_debug("%s%x%x\r\n", str, val, val2);
- #else
- print_debug(str); print_debug_hex32(val); print_debug_hex32(val2); print_debug("\r\n");
- #endif
+ printk_debug("%s%x%x\r\n", str, val, val2);
+ #else
+ print_debug(str); print_debug_hex32(val); print_debug_hex32(val2); print_debug("\r\n");
+ #endif
#endif
}
@@ -52,27 +52,29 @@ static void enable_fid_change(void)
unsigned nodes;
int i;
- nodes = ((pci_read_config32(PCI_DEV(0, 0x18, 0), 0x60)>>4) & 7) + 1;
+ nodes = ((pci_read_config32(PCI_DEV(0, 0x18, 0), 0x60) >> 4) & 7) + 1;
- for(i=0; i<nodes; i++) {
+ for (i = 0; i < nodes; i++) {
dword = pci_read_config32(PCI_DEV(0, 0x18+i, 3), 0xd8);
dword &= 0x8ff00000;
- dword |= (2<<28) | (0x02710);
- pci_write_config32(PCI_DEV(0, 0x18+i, 3), 0xd8, dword);
+ dword |= (2 << 28) | (0x02710);
+ pci_write_config32(PCI_DEV(0, 0x18+i, 3), 0xd8, dword);
dword = 0x04e2a707;
pci_write_config32(PCI_DEV(0, 0x18+i, 3), 0xd4, dword);
+ /* disable the DRAM interface at first, it will be enabled
+ * by raminit again */
dword = pci_read_config32(PCI_DEV(0, 0x18+i, 2), 0x94);
- dword |= (1<<14);// disable the DRAM interface at first, it will be enabled by raminit again
+ dword |= (1 << 14);
pci_write_config32(PCI_DEV(0, 0x18+i, 2), 0x94, dword);
- dword = 0x23070700; //enable FID/VID change
-// dword = 0x00070000; //enable FID/VID change
- pci_write_config32(PCI_DEV(0, 0x18+i, 3), 0x80, dword);
+ dword = 0x23070700; /* enable FID/VID change */
+// dword = 0x00070000; /* enable FID/VID change */
+ pci_write_config32(PCI_DEV(0, 0x18+i, 3), 0x80, dword);
- dword = 0x00132113;
- pci_write_config32(PCI_DEV(0, 0x18+i, 3), 0x84, dword);
+ dword = 0x00132113;
+ pci_write_config32(PCI_DEV(0, 0x18+i, 3), 0x84, dword);
}
}
@@ -80,48 +82,48 @@ static void enable_fid_change(void)
#if K8_SET_FIDVID_ONE_BY_ONE == 0
static unsigned set_fidvid_without_init(unsigned fidvid)
{
+ msr_t msr;
+ uint32_t vid;
+ uint32_t fid;
- msr_t msr;
- uint32_t vid;
- uint32_t fid;
-
- fid = (fidvid >> 8) & 0x3f;
- vid = (fidvid >> 16) & 0x3f;
+ fid = (fidvid >> 8) & 0x3f;
+ vid = (fidvid >> 16) & 0x3f;
- // set new FID/VID
- msr.hi = 1;
- msr.lo = (vid<<8) | fid;
- wrmsr(0xc0010041, msr);
- return fidvid;
+ /* set new FID/VID */
+ msr.hi = 1;
+ msr.lo = (vid<<8) | fid;
+ wrmsr(0xc0010041, msr);
+ return fidvid;
}
#endif
static unsigned set_fidvid(unsigned apicid, unsigned fidvid, int showmessage)
{
- //for (cur, new) there is one <1600MHz x8 to find out next_fid
+ /* for (cur, new) there is one <1600MHz x8 to find out next_fid */
static const uint8_t next_fid_a[] = {
- /* x4 x5 x6 x7 x8 x9 x10 x11 x12 x13 x14 x15 */ // 0:x4, 2:x5....BASE=4, MIN=4, MAX=25, INC=2 result = (xX-BASE)*INC
+ /* x4 x5 x6 x7 x8 x9 x10 x11 x12 x13 x14 x15 */
/* x4 */ 0, 9, 9, 8, 9, 9, 9, 9, 9, 9, 9, 9,
-/* x5 */ 9, 0, 11, 11, 9, 9, 10, 11, 11, 11, 11, 11,
+/* x5 */ 9, 0, 11, 11, 9, 9, 10, 11, 11, 11, 11, 11,
/* x6 */ 11, 11, 0, 13, 11, 11, 11, 11, 12, 13, 13, 13,
/* x7 */ 13, 13, 13, 0, 13, 13, 13, 13, 13, 13, 14, 15,
/* x8 */ 4, 9, 9, 9, 0, 9, 9, 9, 9, 9, 9, 9,
-/* x9 */ 4, 5, 10, 10, 8, 0, 0, 0, 0, 0, 0, 0,
-/*x10 */ 9, 5, 11, 11, 9, 0, 0, 0, 0, 0, 0, 0,
+/* x9 */ 4, 5, 10, 10, 8, 0, 0, 0, 0, 0, 0, 0,
+/*x10 */ 9, 5, 11, 11, 9, 0, 0, 0, 0, 0, 0, 0,
/*x11 */ 10, 5, 6, 12, 10, 0, 0, 0, 0, 0, 0, 0,
/*x12 */ 11, 11, 6, 13, 11, 0, 0, 0, 0, 0, 0, 0,
/*x13 */ 12, 12, 6, 7, 12, 0, 0, 0, 0, 0, 0, 0,
/*x14 */ 13, 13, 13, 7, 13, 0, 0, 0, 0, 0, 0, 0,
-/*x15 */ 14, 14, 14, 7, 14, 0, 0, 0, 0, 0, 0, 0,
+/*x15 */ 14, 14, 14, 7, 14, 0, 0, 0, 0, 0, 0, 0,
+/* 0:x4, 2:x5....BASE=4, MIN=4, MAX=25, INC=2 result = (xX-BASE)*INC */
};
- msr_t msr;
- uint32_t vid;
- uint32_t fid;
+ msr_t msr;
+ uint32_t vid;
+ uint32_t fid;
uint32_t vid_max;
uint32_t fid_max;
- uint32_t vid_cur;
- uint32_t fid_cur;
+ uint32_t vid_cur;
+ uint32_t fid_cur;
unsigned apicidx;
int steps;
@@ -129,13 +131,13 @@ static unsigned set_fidvid(unsigned apicid, unsigned fidvid, int showmessage)
apicidx = lapicid();
- if(apicid!=apicidx) {
-#if CONFIG_USE_PRINTK_IN_CAR
+ if (apicid != apicidx) {
+#if CONFIG_USE_PRINTK_IN_CAR
printk_err("wrong apicid, we want change %x, but it is %x\r\n", apicid, apicidx);
#else
print_err("wrong apicid, we want change "); print_err_hex8(apicid); print_err(" but it is "); print_err_hex8(apicidx); print_err("\r\n");
#endif
- return fidvid;
+ return fidvid;
}
fid = (fidvid >> 8) & 0x3f;
@@ -143,116 +145,122 @@ static unsigned set_fidvid(unsigned apicid, unsigned fidvid, int showmessage)
msr = rdmsr(0xc0010042);
- vid_cur = msr.hi & 0x3f;
- fid_cur = msr.lo & 0x3f;
+ vid_cur = msr.hi & 0x3f;
+ fid_cur = msr.lo & 0x3f;
- if((vid_cur==vid) && (fid_cur==fid)) return fidvid;
+ if ((vid_cur==vid) && (fid_cur==fid))
+ return fidvid;
- vid_max = (msr.hi>>(48-32)) & 0x3f;
- fid_max = ((msr.lo>>16) & 0x3f); //max fid
+ vid_max = (msr.hi>>(48-32)) & 0x3f;
+ fid_max = ((msr.lo>>16) & 0x3f); /* max fid */
#if FX_SUPPORT
- if(fid_max>=((25-4)*2)) { // FX max fid is 5G
- fid_max = ((msr.lo>>8) & 0x3f) + 5*2; // max FID is min fid + 1G
- if(fid_max >= ((25-4)*2)) {
- fid_max = (10-4)*2; // hard set to 2G
- }
- }
+ if (fid_max>=((25-4)*2)) { /* FX max fid is 5G */
+ fid_max = ((msr.lo >> 8) & 0x3f) + 5 * 2; /* max FID is min fid + 1G */
+ if (fid_max >= ((25-4) * 2)) {
+ fid_max = (10-4) * 2; /* hard set to 2G */
+ }
+ }
#endif
- //set vid to max
- msr.hi = 1;
- msr.lo = (vid_max<<8) | (fid_cur);
+ /* set vid to max */
+ msr.hi = 1;
+ msr.lo = (vid_max << 8) | (fid_cur);
#if SB_VFSMAF == 1
- msr.lo |= (1<<16); // init changes
+ msr.lo |= (1<<16); /* init changes */
#endif
- wrmsr(0xc0010041, msr);
+ wrmsr(0xc0010041, msr);
#if SB_VFSMAF == 0
ldtstop_sb();
#endif
-
- for(loop=0;loop<100000;loop++){
+
+ for (loop=0;loop<100000;loop++){
msr = rdmsr(0xc0010042);
- if(!(msr.lo & (1<<31))) break;
- }
+ if (!(msr.lo & (1<<31)))
+ break;
+ }
vid_cur = msr.hi & 0x3f;
steps = 8; //??
- while((fid_cur!=fid) && (steps-->0)) {
- uint32_t fid_temp;
- if((fid_cur > (8-4)*2) && (fid> (8-4)*2)) {
- if(fid_cur<fid) {
- fid_temp = fid_cur + 2;
- } else {
- fid_temp = fid_cur - 2;
- }
- }
- else { //there is one < 8, So we need to lookup the table to find the fid_cur
+ while ((fid_cur != fid) && (steps-- > 0)) {
+ uint32_t fid_temp;
+ if ((fid_cur > (8-4)*2) && (fid> (8-4)*2)) {
+ if (fid_cur<fid) {
+ fid_temp = fid_cur + 2;
+ } else {
+ fid_temp = fid_cur - 2;
+ }
+ } else {
+ /* there is one < 8, So we need to lookup the table to
+ * find the fid_cur */
int temp;
temp = next_fid_a[(fid_cur/2)*12+(fid/2)];
- if(temp <= 0) break;
+ if (temp <= 0) break;
fid_temp = (temp-4) * 2;
}
- if(fid_temp>fid_max) break;
+ if (fid_temp > fid_max)
+ break;
fid_cur = fid_temp;
- //set target fid
- msr.hi = (100000/5);
- msr.lo = (vid_cur<<8) | fid_cur;
+ /* set target fid */
+ msr.hi = (100000/5);
+ msr.lo = (vid_cur << 8) | fid_cur;
#if SB_VFSMAF == 1
- msr.lo |= (1<<16); // init changes
+ msr.lo |= (1 << 16); /* init changes */
#endif
- wrmsr(0xc0010041, msr);
+ wrmsr(0xc0010041, msr);
#if SB_VFSMAF == 0
ldtstop_sb();
#endif
#if K8_SET_FIDVID_DEBUG == 1
- if(showmessage) {
+ if (showmessage) {
print_debug_fv_8("\tapicid in set_fidvid = ", apicid);
- print_debug_fv_64("ctrl msr fid, vid ", msr.hi, msr.lo);
+ print_debug_fv_64("ctrl msr fid, vid ", msr.hi, msr.lo);
}
#endif
- for(loop=0;loop<100000;loop++){
- msr = rdmsr(0xc0010042);
- if(!(msr.lo & (1<<31))) break;
- }
- fid_cur = msr.lo & 0x3f;
+ for (loop = 0; loop < 100000; loop++){
+ msr = rdmsr(0xc0010042);
+ if (!(msr.lo & (1 << 31)))
+ break;
+ }
+ fid_cur = msr.lo & 0x3f;
#if K8_SET_FIDVID_DEBUG == 1
- if(showmessage) {
- print_debug_fv_64("status msr fid, vid ", msr.hi, msr.lo);
+ if (showmessage) {
+ print_debug_fv_64("status msr fid, vid ", msr.hi, msr.lo);
}
#endif
}
- //set vid to final
- msr.hi = 1;
- msr.lo = (vid<<8) | (fid_cur);
+ /* set vid to final */
+ msr.hi = 1;
+ msr.lo = (vid << 8) | (fid_cur);
#if SB_VFSMAF == 1
- msr.lo |= (1<<16); // init changes
+ msr.lo |= (1 << 16); // init changes
#endif
- wrmsr(0xc0010041, msr);
+ wrmsr(0xc0010041, msr);
#if SB_VFSMAF == 0
ldtstop_sb();
#endif
- for(loop=0;loop<100000;loop++){
- msr = rdmsr(0xc0010042);
- if(!(msr.lo & (1<<31))) break;
- }
- vid_cur = msr.hi & 0x3f;
+ for (loop = 0; loop < 100000; loop++){
+ msr = rdmsr(0xc0010042);
+ if (!(msr.lo & (1 << 31)))
+ break;
+ }
+ vid_cur = msr.hi & 0x3f;
- fidvid = (vid_cur<< 16) | (fid_cur<<8);
+ fidvid = (vid_cur << 16) | (fid_cur << 8);
- if(showmessage) {
- if(vid!=vid_cur) {
+ if (showmessage) {
+ if (vid!=vid_cur) {
print_err("set vid failed for apicid ="); print_err_hex8(apicidx); print_err("\r\n");
}
- if(fid!=fid_cur) {
+ if (fid!=fid_cur) {
print_err("set fid failed for apicid ="); print_err_hex8(apicidx); print_err("\r\n");
}
}
@@ -263,170 +271,178 @@ static unsigned set_fidvid(unsigned apicid, unsigned fidvid, int showmessage)
static void init_fidvid_ap(unsigned bsp_apicid, unsigned apicid)
{
-
uint32_t send;
- uint32_t readback = 0;
+ uint32_t readback = 0;
unsigned timeout = 1;
msr_t msr;
- uint32_t vid_cur;
- uint32_t fid_cur;
+ uint32_t vid_cur;
+ uint32_t fid_cur;
uint32_t fid_max;
int loop;
- msr = rdmsr(0xc0010042);
- fid_max = ((msr.lo>>16) & 0x3f); //max fid
+ msr = rdmsr(0xc0010042);
+ fid_max = ((msr.lo >> 16) & 0x3f); /* max fid */
#if FX_SUPPORT
- if(fid_max>=((25-4)*2)) { // FX max fid is 5G
- fid_max = ((msr.lo>>8) & 0x3f) + 5*2; // max FID is min fid + 1G
- if(fid_max >= ((25-4)*2)) {
- fid_max = (10-4)*2; // hard set to 2G
- }
- }
+ if (fid_max >= ((25-4) * 2)) { /* FX max fid is 5G */
+ fid_max = ((msr.lo>>8) & 0x3f) + 5*2; /* maxFID = minFID + 1G */
+ if (fid_max >= ((25-4) * 2)) {
+ fid_max = (10-4) * 2; // hard set to 2G
+ }
+ }
#endif
send = fid_max<<8;
- send |= ((msr.hi>>(48-32)) & 0x3f) << 16; //max vid
- send |= (apicid<<24); // ap apicid
+ send |= ((msr.hi >> (48-32)) & 0x3f) << 16; /* max vid */
+ send |= (apicid << 24); /* ap apicid */
#if K8_SET_FIDVID_ONE_BY_ONE == 1
- vid_cur = msr.hi & 0x3f;
- fid_cur = msr.lo & 0x3f;
+ vid_cur = msr.hi & 0x3f;
+ fid_cur = msr.lo & 0x3f;
- // set to current
- msr.hi = 1;
- msr.lo = (vid_cur<<8) | (fid_cur);
- wrmsr(0xc0010041, msr);
+ /* set to current */
+ msr.hi = 1;
+ msr.lo = (vid_cur << 8) | (fid_cur);
+ wrmsr(0xc0010041, msr);
#endif
timeout = wait_cpu_state(bsp_apicid, 1);
- if(timeout) {
- print_initcpu8("fidvid_ap_stage1: time out while reading from BSP on ", apicid);
+ if (timeout) {
+ print_initcpu8("fidvid_ap_stage1: time out while reading from BSP on ", apicid);
}
- //send signal to BSP about this AP max fid and vid
- lapic_write(LAPIC_MSG_REG, send | 1); //AP at state 1 that sent our fid and vid
+ /* send signal to BSP about this AP max fid and vid */
+ /* AP at state 1 that sent our fid and vid */
+ lapic_write(LAPIC_MSG_REG, send | 1);
-// wait_cpu_state(bsp_apicid, 2);// don't need we can use apicid directly
+// wait_cpu_state(bsp_apicid, 2); /* don't need we can use apicid directly */
loop = 1000000;
- while(--loop>0) {
- //remote read BSP signal that include vid and fid that need to set
- if(lapic_remote_read(bsp_apicid, LAPIC_MSG_REG, &readback)!=0) continue;
- if(((readback>>24) & 0xff) == apicid) break; // it is this cpu turn
- }
+ while (--loop > 0) {
+ /* remote read BSP signal that include vid/fid that need to set */
+ if (lapic_remote_read(bsp_apicid, LAPIC_MSG_REG, &readback)!=0)
+ continue;
+ if (((readback >> 24) & 0xff) == apicid)
+ break; /* it is this cpu turn */
+ }
- if(loop>0) {
+ if (loop > 0) {
#if K8_SET_FIDVID_ONE_BY_ONE == 1
- readback = set_fidvid(apicid, readback & 0xffff00, 1); // this AP
+ readback = set_fidvid(apicid, readback & 0xffff00, 1); // this AP
#else
readback = set_fidvid_without_init(readback & 0xffff00); // this AP
#endif
- //send signal to BSP that this AP fid/vid is set // allow to change state2 is together with apicid
- send = (apicid<<24) | (readback & 0x00ffff00); // AP at state that We set the requested fid/vid
+ /* send signal to BSP that this AP fid/vid is set */
+ /* allow to change state2 is together with apicid */
+ /* AP at state that We set the requested fid/vid */
+ send = (apicid<<24) | (readback & 0x00ffff00);
} else {
- print_initcpu8("fidvid_ap_stage2: time out while reading from BSP on ", apicid);
+ print_initcpu8("fidvid_ap_stage2: time out while reading from BSP on ", apicid);
}
- lapic_write(LAPIC_MSG_REG, send | 2);
+ lapic_write(LAPIC_MSG_REG, send | 2);
timeout = wait_cpu_state(bsp_apicid, 3);
- if(timeout) {
- print_initcpu8("fidvid_ap_stage3: time out while reading from BSP on ", apicid);
+ if (timeout) {
+ print_initcpu8("fidvid_ap_stage3: time out while reading from BSP on ", apicid);
}
}
static unsigned calc_common_fidvid(unsigned fidvid, unsigned fidvidx)
{
- /* FIXME: need to check the change path to verify if it is reachable when common fid is small than 1.6G */
- if((fidvid & 0xff00)<=(fidvidx & 0xff00)) {
+ /* FIXME: need to check the change path to verify if it is reachable
+ * when common fid is small than 1.6G */
+ if ((fidvid & 0xff00) <= (fidvidx & 0xff00)) {
return fidvid;
}
else {
return fidvidx;
}
-}
+}
struct fidvid_st {
unsigned common_fidvid;
};
-static void init_fidvid_bsp_stage1(unsigned ap_apicid, void *gp )
-{
- unsigned readback = 0;
- unsigned timeout = 1;
-
- struct fidvid_st *fvp = gp;
- int loop;
-
- print_debug_fv("state 1: ap_apicid=", ap_apicid);
-
- loop = 1000000;
- while(--loop > 0) {
- if(lapic_remote_read(ap_apicid, LAPIC_MSG_REG, &readback)!=0) continue;
- if((readback & 0xff) == 1) {
- timeout = 0;
- break; //target ap is in stage 1
- }
- }
- if(timeout) {
- print_initcpu8("fidvid_bsp_stage1: time out while reading from ap ", ap_apicid);
- return;
- }
+static void init_fidvid_bsp_stage1(unsigned ap_apicid, void *gp )
+{
+ unsigned readback = 0;
+ unsigned timeout = 1;
+
+ struct fidvid_st *fvp = gp;
+ int loop;
+
+ print_debug_fv("state 1: ap_apicid=", ap_apicid);
- print_debug_fv("\treadback=", readback);
+ loop = 1000000;
+ while (--loop > 0) {
+ if (lapic_remote_read(ap_apicid, LAPIC_MSG_REG, &readback)!=0)
+ continue;
+ if ((readback & 0xff) == 1) {
+ timeout = 0;
+ break; /* target ap is in stage 1 */
+ }
+ }
+ if (timeout) {
+ print_initcpu8("fidvid_bsp_stage1: time out while reading from ap ", ap_apicid);
+ return;
+ }
- fvp->common_fidvid = calc_common_fidvid(fvp->common_fidvid, readback & 0xffff00);
+ print_debug_fv("\treadback=", readback);
- print_debug_fv("\tcommon_fidvid=", fvp->common_fidvid);
+ fvp->common_fidvid = calc_common_fidvid(fvp->common_fidvid, readback & 0xffff00);
+ print_debug_fv("\tcommon_fidvid=", fvp->common_fidvid);
}
+
static void init_fidvid_bsp_stage2(unsigned ap_apicid, void *gp)
{
- unsigned readback = 0;
- unsigned timeout = 1;
-
- struct fidvid_st *fvp = gp;
- int loop;
-
- print_debug_fv("state 2: ap_apicid=", ap_apicid);
-
- lapic_write(LAPIC_MSG_REG, fvp->common_fidvid | (ap_apicid<<24) | 2); // all set to state2
-
- loop = 1000000;
- while(--loop > 0) {
- if(lapic_remote_read(ap_apicid, LAPIC_MSG_REG, &readback)!=0) continue;
- if((readback & 0xff) == 2) {
- timeout = 0;
- break; // target ap is stage 2, and it'd FID has beed set
- }
- }
-
- if(timeout) {
- print_initcpu8("fidvid_bsp_stage2: time out while reading from ap ", ap_apicid);
- return;
+ unsigned readback = 0;
+ unsigned timeout = 1;
+
+ struct fidvid_st *fvp = gp;
+ int loop;
+
+ print_debug_fv("state 2: ap_apicid=", ap_apicid);
+
+ /* all set to state2 */
+ lapic_write(LAPIC_MSG_REG, fvp->common_fidvid | (ap_apicid<<24) | 2);
+
+ loop = 1000000;
+ while (--loop > 0) {
+ if (lapic_remote_read(ap_apicid, LAPIC_MSG_REG, &readback)!=0)
+ continue;
+ if ((readback & 0xff) == 2) {
+ timeout = 0;
+ break; /* target ap is stage 2, it's FID has beed set */
}
+ }
+
+ if (timeout) {
+ print_initcpu8("fidvid_bsp_stage2: time out while reading from ap ", ap_apicid);
+ return;
+ }
- print_debug_fv("\treadback=", readback);
+ print_debug_fv("\treadback=", readback);
}
#if K8_SET_FIDVID_STORE_AP_APICID_AT_FIRST == 1
struct ap_apicid_st {
unsigned num;
- unsigned apicid[16]; // 8 way dual core need 16
+ unsigned apicid[16]; /* 8 way dual core need 16 */
/* FIXME: 32 node quad core, may need 128 */
};
static void store_ap_apicid(unsigned ap_apicid, void *gp)
{
struct ap_apicid_st *p = gp;
-
+
p->apicid[p->num++] = ap_apicid;
}
#endif
-static void init_fidvid_bsp(unsigned bsp_apicid)
+static void init_fidvid_bsp(unsigned bsp_apicid)
{
- uint32_t vid_max;
- uint32_t fid_max;
+ uint32_t vid_max;
+ uint32_t fid_max;
struct fidvid_st fv;
@@ -435,35 +451,35 @@ static void init_fidvid_bsp(unsigned bsp_apicid)
unsigned i;
#endif
-
- msr_t msr;
- msr = rdmsr(0xc0010042);
- fid_max = ((msr.lo>>16) & 0x3f); //max fid
+ msr_t msr;
+ msr = rdmsr(0xc0010042);
+ fid_max = ((msr.lo >> 16) & 0x3f); /* max fid */
#if FX_SUPPORT == 1
- if(fid_max>=((25-4)*2)) { // FX max fid is 5G
- fid_max = ((msr.lo>>8) & 0x3f) + 5*2; // max FID is min fid + 1G
- if(fid_max >= ((25-4)*2)) {
- fid_max = (10-4)*2; // hard set to 2G
+ if (fid_max >= ((25-4) * 2)) { /* FX max fid is 5G */
+ fid_max = ((msr.lo >> 8) & 0x3f) + 5*2; /* maxFID = minFID + 1G */
+ if (fid_max >= ((25-4) * 2)) {
+ fid_max = (10-4) * 2; /* hard set to 2G */
}
}
#endif
- vid_max = ((msr.hi>>(48-32)) & 0x3f); //max vid
- fv.common_fidvid = (fid_max<<8)|(vid_max<<16);
+ vid_max = ((msr.hi>>(48-32)) & 0x3f); //max vid
+ fv.common_fidvid = (fid_max << 8)|(vid_max << 16);
- // for all APs (We know the APIC ID of all APs even the APIC ID is lifted)
- // remote read from AP about max fid/vid
+ /* for all APs (We know the APIC ID of all APs even the APIC ID is lifted)
+ * remote read from AP about max fid/vid */
- //let all ap trains to state 1
- lapic_write(LAPIC_MSG_REG, (bsp_apicid<<24) | 1);
+ /* let all ap trains to state 1 */
+ lapic_write(LAPIC_MSG_REG, (bsp_apicid << 24) | 1);
- // calculate the common max fid/vid that could be used for all APs and BSP
+ /* calculate the common max fid/vid that could be used for
+ * all APs and BSP */
#if K8_SET_FIDVID_STORE_AP_APICID_AT_FIRST == 1
ap_apicidx.num = 0;
-
+
for_each_ap(bsp_apicid, K8_SET_FIDVID_CORE0_ONLY, store_ap_apicid, &ap_apicidx);
- for(i=0;i<ap_apicidx.num;i++) {
+ for (i = 0; i < ap_apicidx.num; i++) {
init_fidvid_bsp_stage1(ap_apicidx.apicid[i], &fv);
}
#else
@@ -473,20 +489,21 @@ static void init_fidvid_bsp(unsigned bsp_apicid)
#if 0
unsigned fid, vid;
- // Can we use max only? So we can only set fid in one around, otherwise we need to set that to max after raminit
- // set fid vid to DQS training required
+ /* Can we use max only? So we can only set fid in one around,
+ * otherwise we need to set that to max after raminit */
+ /* set fid vid to DQS training required */
fid = (fv.common_fidvid >> 8) & 0x3f;
vid = (fv.common_fidvid >> 16) & 0x3f;
- if(fid>(10-4)*2) {
- fid = (10-4)*2; //x10
- }
+ if (fid > (10-4) * 2) {
+ fid = (10-4) * 2; // x10
+ }
- if(vid>=0x1f) {
- vid+= 4; //unit is 12.5mV
- } else {
- vid+= 2; //unit is 25mV
- }
+ if (vid >= 0x1f) {
+ vid += 4; /* unit is 12.5mV */
+ } else {
+ vid += 2; /* unit is 25mV */
+ }
fv.common_fidvid = (fid<<8) | (vid<<16);
@@ -494,40 +511,41 @@ static void init_fidvid_bsp(unsigned bsp_apicid)
#endif
-#if K8_SET_FIDVID_ONE_BY_ONE == 1
- // set BSP fid and vid
+#if K8_SET_FIDVID_ONE_BY_ONE == 1
+ /* set BSP fid and vid */
print_debug_fv("bsp apicid=", bsp_apicid);
fv.common_fidvid = set_fidvid(bsp_apicid, fv.common_fidvid, 1);
- print_debug_fv("common_fidvid=", fv.common_fidvid);
-
+ print_debug_fv("common_fidvid=", fv.common_fidvid);
#endif
- //for all APs ( We know the APIC ID of all AP even the APIC ID is lifted)
- // send signal to the AP it could change it's fid/vid
- // remote read singnal from AP that AP is done
+ /* For all APs ( We know the APIC ID of all AP even the APIC ID is lifted)
+ * send signal to the AP it could change it's fid/vid */
+ /* remote read singnal from AP that AP is done */
- fv.common_fidvid &= 0xffff00;
+ fv.common_fidvid &= 0xffff00;
- //set state 2 allow is in init_fidvid_bsp_stage2
+ /* set state 2 allow is in init_fidvid_bsp_stage2 */
#if K8_SET_FIDVID_STORE_AP_APICID_AT_FIRST == 1
- for(i=0;i<ap_apicidx.num;i++) {
- init_fidvid_bsp_stage2(ap_apicidx.apicid[i], &fv);
- }
+ for (i = 0; i < ap_apicidx.num; i++) {
+ init_fidvid_bsp_stage2(ap_apicidx.apicid[i], &fv);
+ }
#else
for_each_ap(bsp_apicid, K8_SET_FIDVID_CORE0_ONLY, init_fidvid_bsp_stage2, &fv);
#endif
#if K8_SET_FIDVID_ONE_BY_ONE == 0
- // set BSP fid and vid
+ /* set BSP fid and vid */
print_debug_fv("bsp apicid=", bsp_apicid);
fv.common_fidvid = set_fidvid(bsp_apicid, fv.common_fidvid, 1);
print_debug_fv("common_fidvid=", fv.common_fidvid);
#endif
- lapic_write(LAPIC_MSG_REG, fv.common_fidvid | (bsp_apicid<<24) | 3); // clear the state
+ /* clear the state */
+ lapic_write(LAPIC_MSG_REG, fv.common_fidvid | (bsp_apicid << 24) | 3);
- //here wait a while, so last ap could read pack, and stop it, don't call init_timer too early or just don't use init_timer
+ /* here wait a while, so last ap could read pack, and stop it, don't
+ * call init_timer too early or just don't use init_timer */
}