GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

his patch fixes the CAS map for -.5 and -1 CAS settings. The -.5 setting should only shift the mask one bit, not two. 

Signed-off-by: Marc Jones <marc.jones@amd.com>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>
Acked-by: Jordan Crouse <jordan.crouse@amd.com>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@2722 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Marc Jones 2007-06-14 17:00:50 +00:00 committed by Jordan Crouse
parent d9e56e9cd3
commit dd55e86a52
1 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/northbridge/amd/lx/raminit.c
View File

@ -151,7 +151,7 @@ static void checkDDRMax(void)
} }
/* I don't think you need this check. /* I don't think you need this check.
if (spd_byte0 < 0xA0 || spd_byte0 < 0xA0){ if (spd_byte0 >= 0xA0 || spd_byte1 >= 0xA0){
print_debug("DIMM overclocked. Check GeodeLink Speed\n"); print_debug("DIMM overclocked. Check GeodeLink Speed\n");
POST_CODE(POST_PLL_MEM_FAIL); POST_CODE(POST_PLL_MEM_FAIL);
__asm__ __volatile__("hlt\n"); __asm__ __volatile__("hlt\n");
@ -231,7 +231,7 @@ static void setCAS(void)
;* Destroys: We really use everything ! ;* Destroys: We really use everything !
;*****************************************************************************/ ;*****************************************************************************/
uint16_t glspeed, dimm_speed; uint16_t glspeed, dimm_speed;
uint8_t spd_byte, casmap0, casmap1; uint8_t spd_byte, casmap0, casmap1, casmap_shift;
msr_t msr; msr_t msr;
glspeed = GeodeLinkSpeed(); glspeed = GeodeLinkSpeed();
@ -246,25 +246,24 @@ static void setCAS(void)
dimm_speed = 2 * (10000 / (((spd_byte >> 4) * 10) + dimm_speed = 2 * (10000 / (((spd_byte >> 4) * 10) +
(spd_byte & 0x0F))); (spd_byte & 0x0F)));
if (dimm_speed >= glspeed) { if (dimm_speed >= glspeed) {
casmap_shift = 1; /* -.5 is a shift of 1 */
/* IF -1 timing is supported, check -1 timing > GeodeLink */ /* IF -1 timing is supported, check -1 timing > GeodeLink */
spd_byte = spd_read_byte(DIMM0, SPD_SDRAM_CYCLE_TIME_3RD); spd_byte = spd_read_byte(DIMM0, SPD_SDRAM_CYCLE_TIME_3RD);
if (spd_byte != 0) { if (spd_byte != 0) {
/* Turn SPD ns time into MHZ. Check what the asm does to this math. */ /* Turn SPD ns time into MHZ. Check what the asm does to this math. */
dimm_speed = 2 * (10000 / (((spd_byte >> 4) * 10) + (spd_byte & 0x0F))); dimm_speed = 2 * (10000 / (((spd_byte >> 4) * 10) + (spd_byte & 0x0F)));
if (dimm_speed <= glspeed) { if (dimm_speed >= glspeed) {
/* set we can use -.5 timing but not -1 */ casmap_shift = 2; /* -1 is a shift of 2 */
spd_byte = 31 - __builtin_clz((uint32_t) casmap0);
/* just want bits in the lower byte since we have to cast to a 32 */
casmap0 &= 0xFF << (--spd_byte);
} }
} /*MIN_CYCLE_10 !=0 */ } /* SPD_SDRAM_CYCLE_TIME_3RD (-1) !=0 */
} else { } else {
/* Timing_05 < GLspeed, can't use -.5 or -1 timing */ casmap_shift = 0;
}
} /* SPD_SDRAM_CYCLE_TIME_2ND (-.5) !=0 */
/* set the casmap based on the shift to limit possible CAS settings */
spd_byte = 31 - __builtin_clz((uint32_t) casmap0); spd_byte = 31 - __builtin_clz((uint32_t) casmap0);
/* just want bits in the lower byte since we have to cast to a 32 */ /* just want bits in the lower byte since we have to cast to a 32 */
casmap0 &= 0xFF << (spd_byte); casmap0 &= 0xFF << (spd_byte - casmap_shift);
}
} /*MIN_CYCLE_05 !=0 */
} else { /* No DIMM */ } else { /* No DIMM */
casmap0 = 0; casmap0 = 0;
} }
@ -278,25 +277,25 @@ static void setCAS(void)
/* Turn SPD ns time into MHZ. Check what the asm does to this math. */ /* Turn SPD ns time into MHZ. Check what the asm does to this math. */
dimm_speed = 2 * (10000 / (((spd_byte >> 4) * 10) + (spd_byte & 0x0F))); dimm_speed = 2 * (10000 / (((spd_byte >> 4) * 10) + (spd_byte & 0x0F)));
if (dimm_speed >= glspeed) { if (dimm_speed >= glspeed) {
casmap_shift = 1; /* -.5 is a shift of 1 */
/* IF -1 timing is supported, check -1 timing > GeodeLink */ /* IF -1 timing is supported, check -1 timing > GeodeLink */
spd_byte = spd_read_byte(DIMM1, SPD_SDRAM_CYCLE_TIME_3RD); spd_byte = spd_read_byte(DIMM1, SPD_SDRAM_CYCLE_TIME_3RD);
if (spd_byte != 0) { if (spd_byte != 0) {
/* Turn SPD ns time into MHZ. Check what the asm does to this math. */ /* Turn SPD ns time into MHZ. Check what the asm does to this math. */
dimm_speed = 2 * (10000 / (((spd_byte >> 4) * 10) + (spd_byte & 0x0F))); dimm_speed = 2 * (10000 / (((spd_byte >> 4) * 10) + (spd_byte & 0x0F)));
if (dimm_speed <= glspeed) { if (dimm_speed >= glspeed) {
/* set we can use -.5 timing but not -1 */ casmap_shift = 2; /* -1 is a shift of 2 */
spd_byte = 31 - __builtin_clz((uint32_t) casmap1);
/* just want bits in the lower byte since we have to cast to a 32 */
casmap1 &= 0xFF << (--spd_byte);
} }
} /*MIN_CYCLE_10 !=0 */ /* note that the -1 result doesn't need to change the available CAS map */
} /* SPD_SDRAM_CYCLE_TIME_3RD (-1) !=0 */
} else { } else {
/* Timing_05 < GLspeed, can't use -.5 or -1 timing */ casmap_shift = 0;
}
} /* SPD_SDRAM_CYCLE_TIME_2ND (-.5) !=0 */
/* set the casmap based on the shift to limit possible CAS settings */
spd_byte = 31 - __builtin_clz((uint32_t) casmap1); spd_byte = 31 - __builtin_clz((uint32_t) casmap1);
/* just want bits in the lower byte since we have to cast to a 32 */ /* just want bits in the lower byte since we have to cast to a 32 */
casmap1 &= 0xFF << (spd_byte); casmap1 &= 0xFF << (spd_byte - casmap_shift);
}
} /*MIN_CYCLE_05 !=0 */
} else { /* No DIMM */ } else { /* No DIMM */
casmap1 = 0; casmap1 = 0;
} }