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
This commit is contained in:
Marc Jones
parent
88ad6b0f91
commit
a2c951edf7
|
|
@ -63,12 +63,14 @@ static void enable_fid_change(void)
|
|||
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
|
||||
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;
|
||||
|
|
@ -80,7 +82,6 @@ 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;
|
||||
|
|
@ -88,7 +89,7 @@ static unsigned set_fidvid_without_init(unsigned fidvid)
|
|||
fid = (fidvid >> 8) & 0x3f;
|
||||
vid = (fidvid >> 16) & 0x3f;
|
||||
|
||||
// set new FID/VID
|
||||
/* set new FID/VID */
|
||||
msr.hi = 1;
|
||||
msr.lo = (vid<<8) | fid;
|
||||
wrmsr(0xc0010041, msr);
|
||||
|
|
@ -98,9 +99,9 @@ static unsigned set_fidvid_without_init(unsigned fidvid)
|
|||
|
||||
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,
|
||||
/* x6 */ 11, 11, 0, 13, 11, 11, 11, 11, 12, 13, 13, 13,
|
||||
|
|
@ -113,6 +114,7 @@ static unsigned set_fidvid(unsigned apicid, unsigned fidvid, int showmessage)
|
|||
/*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,
|
||||
/* 0:x4, 2:x5....BASE=4, MIN=4, MAX=25, INC=2 result = (xX-BASE)*INC */
|
||||
};
|
||||
|
||||
msr_t msr;
|
||||
|
|
@ -146,24 +148,25 @@ static unsigned set_fidvid(unsigned apicid, unsigned fidvid, int showmessage)
|
|||
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
|
||||
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)) { /* 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
|
||||
fid_max = (10-4) * 2; /* hard set to 2G */
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
//set vid to max
|
||||
/* 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);
|
||||
#if SB_VFSMAF == 0
|
||||
|
|
@ -173,7 +176,8 @@ static unsigned set_fidvid(unsigned apicid, unsigned fidvid, int showmessage)
|
|||
|
||||
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;
|
||||
|
||||
|
|
@ -186,22 +190,24 @@ static unsigned set_fidvid(unsigned apicid, unsigned fidvid, int showmessage)
|
|||
} else {
|
||||
fid_temp = fid_cur - 2;
|
||||
}
|
||||
}
|
||||
else { //there is one < 8, So we need to lookup the table to find the fid_cur
|
||||
} 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;
|
||||
fid_temp = (temp-4) * 2;
|
||||
}
|
||||
if(fid_temp>fid_max) break;
|
||||
if (fid_temp > fid_max)
|
||||
break;
|
||||
|
||||
fid_cur = fid_temp;
|
||||
|
||||
//set target fid
|
||||
/* 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);
|
||||
#if SB_VFSMAF == 0
|
||||
|
|
@ -218,7 +224,8 @@ static unsigned set_fidvid(unsigned apicid, unsigned fidvid, int showmessage)
|
|||
|
||||
for (loop = 0; loop < 100000; loop++){
|
||||
msr = rdmsr(0xc0010042);
|
||||
if(!(msr.lo & (1<<31))) break;
|
||||
if (!(msr.lo & (1 << 31)))
|
||||
break;
|
||||
}
|
||||
fid_cur = msr.lo & 0x3f;
|
||||
|
||||
|
|
@ -229,7 +236,7 @@ static unsigned set_fidvid(unsigned apicid, unsigned fidvid, int showmessage)
|
|||
#endif
|
||||
}
|
||||
|
||||
//set vid to final
|
||||
/* set vid to final */
|
||||
msr.hi = 1;
|
||||
msr.lo = (vid << 8) | (fid_cur);
|
||||
#if SB_VFSMAF == 1
|
||||
|
|
@ -242,7 +249,8 @@ static unsigned set_fidvid(unsigned apicid, unsigned fidvid, int showmessage)
|
|||
|
||||
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;
|
||||
|
||||
|
|
@ -263,7 +271,6 @@ 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;
|
||||
unsigned timeout = 1;
|
||||
|
|
@ -274,10 +281,10 @@ static void init_fidvid_ap(unsigned bsp_apicid, unsigned apicid)
|
|||
int loop;
|
||||
|
||||
msr = rdmsr(0xc0010042);
|
||||
fid_max = ((msr.lo>>16) & 0x3f); //max fid
|
||||
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)) { /* 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
|
||||
}
|
||||
|
|
@ -285,14 +292,14 @@ static void init_fidvid_ap(unsigned bsp_apicid, unsigned apicid)
|
|||
#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;
|
||||
|
||||
// set to current
|
||||
/* set to current */
|
||||
msr.hi = 1;
|
||||
msr.lo = (vid_cur << 8) | (fid_cur);
|
||||
wrmsr(0xc0010041, msr);
|
||||
|
|
@ -302,15 +309,18 @@ static void init_fidvid_ap(unsigned bsp_apicid, unsigned 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
|
||||
/* 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) {
|
||||
|
|
@ -319,8 +329,10 @@ static void init_fidvid_ap(unsigned bsp_apicid, unsigned apicid)
|
|||
#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);
|
||||
}
|
||||
|
|
@ -335,7 +347,8 @@ static void init_fidvid_ap(unsigned bsp_apicid, unsigned 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 */
|
||||
/* 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;
|
||||
}
|
||||
|
|
@ -360,10 +373,11 @@ static void init_fidvid_bsp_stage1(unsigned ap_apicid, void *gp )
|
|||
|
||||
loop = 1000000;
|
||||
while (--loop > 0) {
|
||||
if(lapic_remote_read(ap_apicid, LAPIC_MSG_REG, &readback)!=0) continue;
|
||||
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
|
||||
break; /* target ap is in stage 1 */
|
||||
}
|
||||
}
|
||||
if (timeout) {
|
||||
|
|
@ -376,8 +390,8 @@ static void init_fidvid_bsp_stage1(unsigned ap_apicid, void *gp )
|
|||
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;
|
||||
|
|
@ -388,14 +402,16 @@ static void init_fidvid_bsp_stage2(unsigned ap_apicid, void *gp)
|
|||
|
||||
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
|
||||
/* 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 (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
|
||||
break; /* target ap is stage 2, it's FID has beed set */
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -410,7 +426,7 @@ static void init_fidvid_bsp_stage2(unsigned ap_apicid, void *gp)
|
|||
#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 */
|
||||
};
|
||||
|
||||
|
|
@ -435,15 +451,14 @@ 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
|
||||
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)) { /* 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
|
||||
fid_max = (10-4) * 2; /* hard set to 2G */
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
|
@ -451,13 +466,14 @@ static void init_fidvid_bsp(unsigned bsp_apicid)
|
|||
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
|
||||
/* 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;
|
||||
|
||||
|
|
@ -473,8 +489,9 @@ 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;
|
||||
|
||||
|
|
@ -483,9 +500,9 @@ static void init_fidvid_bsp(unsigned bsp_apicid)
|
|||
}
|
||||
|
||||
if (vid >= 0x1f) {
|
||||
vid+= 4; //unit is 12.5mV
|
||||
vid += 4; /* unit is 12.5mV */
|
||||
} else {
|
||||
vid+= 2; //unit is 25mV
|
||||
vid += 2; /* unit is 25mV */
|
||||
}
|
||||
|
||||
fv.common_fidvid = (fid<<8) | (vid<<16);
|
||||
|
|
@ -495,20 +512,19 @@ static void init_fidvid_bsp(unsigned bsp_apicid)
|
|||
#endif
|
||||
|
||||
#if K8_SET_FIDVID_ONE_BY_ONE == 1
|
||||
// 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
|
||||
|
||||
//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;
|
||||
|
||||
//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);
|
||||
|
|
@ -518,16 +534,18 @@ static void init_fidvid_bsp(unsigned bsp_apicid)
|
|||
#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 */
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue