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

refactored k8_cpufixup, added IORR support for AGP aperture 

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1565 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Li-Ta Lo 2004-05-14 17:28:47 +00:00
parent d34b943d36
commit 2e6d1c9fe0
1 changed files with 102 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

153
src/cpu/k8/cpufixup.c
View File

@ -66,8 +66,6 @@ static inline void wrmsr_amd(unsigned index, msr_t msr)
); );
} }
#define MTRR_COUNT 8 #define MTRR_COUNT 8
#define ZERO_CHUNK_KB 0x800UL /* 2M */ #define ZERO_CHUNK_KB 0x800UL /* 2M */
#define TOLM_KB 0x400000UL #define TOLM_KB 0x400000UL
@ -292,13 +290,64 @@ static void init_ecc_memory(void)
printk_debug(" done\n"); printk_debug(" done\n");
} }
void k8_cpufixup(struct mem_range *mem) static void k8_errata(void)
{ {
unsigned long mmio_basek, tomk;
unsigned long i;
msr_t msr; msr_t msr;
disable_cache(); if (is_cpu_pre_c0()) {
/* Erratum 63... */
msr = rdmsr(HWCR_MSR);
msr.lo |= (1 << 6);
wrmsr(HWCR_MSR, msr);
/* Erratum 69... */
msr = rdmsr_amd(BU_CFG_MSR);
msr.hi |= (1 << (45 - 32));
wrmsr_amd(BU_CFG_MSR, msr);
/* Erratum 81... */
msr = rdmsr_amd(DC_CFG_MSR);
msr.lo |= (1 << 10);
wrmsr_amd(DC_CFG_MSR, msr);
}
/* I can't touch this msr on early buggy cpus */
if (!is_cpu_pre_b3()) {
/* Erratum 89 ... */
msr = rdmsr(NB_CFG_MSR);
msr.lo |= 1 << 3;
if (!is_cpu_pre_c0()) {
/* Erratum 86 Disable data masking on C0 and
* later processor revs.
* FIXME this is only needed if ECC is enabled.
*/
msr.hi |= 1 << (36 - 32);
}
wrmsr(NB_CFG_MSR, msr);
}
/* Erratum 97 ... */
if (!is_cpu_pre_c0()) {
msr = rdmsr_amd(DC_CFG_MSR);
msr.lo |= 1 << 3;
wrmsr_amd(DC_CFG_MSR, msr);
}
/* Erratum 94 ... */
msr = rdmsr_amd(IC_CFG_MSR);
msr.lo |= 1 << 11;
wrmsr_amd(IC_CFG_MSR, msr);
/* Erratum 91 prefetch miss is handled in the kernel */
}
static void setup_toms(struct mem_range *mem)
{
unsigned long i;
msr_t msr;
unsigned long mmio_basek, tomk;
printk_spew("%s\n", __FUNCTION__);
/* Except for the PCI MMIO hold just before 4GB there are no /* Except for the PCI MMIO hold just before 4GB there are no
* significant holes in the address space, so just account * significant holes in the address space, so just account
@ -332,15 +381,55 @@ void k8_cpufixup(struct mem_range *mem)
msr.hi = tomk >> 22; msr.hi = tomk >> 22;
msr.lo = tomk << 10; msr.lo = tomk << 10;
wrmsr(TOP_MEM2, msr); wrmsr(TOP_MEM2, msr);
}
static void setup_iorrs(void)
{
unsigned long i;
msr_t msr;
device_t f3_dev;
uint32_t base, size;
/* zero the IORR's before we enable to prevent /* zero the IORR's before we enable to prevent
* undefined side effects. * undefined side effects. */
*/
msr.lo = msr.hi = 0; msr.lo = msr.hi = 0;
for (i = IORR_FIRST; i <= IORR_LAST; i++) { for (i = IORR_FIRST; i <= IORR_LAST; i++) {
wrmsr(i, msr); wrmsr(i, msr);
} }
/* enable IORR1 for AGP Aperture */
f3_dev = dev_find_slot(0, PCI_DEVFN(0x18, 3));
if (!f3_dev) {
die("Cannot find cpu function 3\n");
}
size = (pci_read_config32(f3_dev, 0x90) & 0x0E) >> 1;
size = (32*1024*1024) << size;
base = pci_read_config32(f3_dev, 0x94) << 25;
printk_debug("%s: setting IORR1 for AGP aperture base 0x%x, size 0x%x\n",
__FUNCTION__, base, size);
msr.lo = base;
msr.hi = 0xff;
wrmsr(IORR1_BASE, msr);
msr.lo = ~(size - 1);
msr.hi = 0xff;
wrmsr(IORR1_MASK, msr);
}
void k8_cpufixup(struct mem_range *mem)
{
unsigned long i;
msr_t msr;
disable_cache();
setup_toms(mem);
setup_iorrs();
/* Enable TOMs and IORRs */
msr = rdmsr(SYSCFG_MSR); msr = rdmsr(SYSCFG_MSR);
msr.lo |= SYSCFG_MSR_MtrrVarDramEn | SYSCFG_MSR_TOM2En; msr.lo |= SYSCFG_MSR_MtrrVarDramEn | SYSCFG_MSR_TOM2En;
wrmsr(SYSCFG_MSR, msr); wrmsr(SYSCFG_MSR, msr);
@ -352,53 +441,7 @@ void k8_cpufixup(struct mem_range *mem)
wrmsr(MCI_STATUS + (i*4),msr); wrmsr(MCI_STATUS + (i*4),msr);
} }
if (is_cpu_pre_c0()) { k8_errata();
/* Erratum 63... */
msr = rdmsr(HWCR_MSR);
msr.lo |= (1 << 6);
wrmsr(HWCR_MSR, msr);
/* Erratum 69... */
msr = rdmsr_amd(BU_CFG_MSR);
msr.hi |= (1 << (45 - 32));
wrmsr_amd(BU_CFG_MSR, msr);
/* Erratum 81... */
msr = rdmsr_amd(DC_CFG_MSR);
msr.lo |= (1 << 10);
wrmsr_amd(DC_CFG_MSR, msr);
}
/* I can't touch this msr on early buggy cpus */
if (!is_cpu_pre_b3()) {
/* Erratum 89 ... */
msr = rdmsr(NB_CFG_MSR);
msr.lo |= 1 << 3;
if (!is_cpu_pre_c0()) {
/* Erratum 86 Disable data masking on C0 and
* later processor revs.
* FIXME this is only needed if ECC is enabled.
*/
msr.hi |= 1 << (36 - 32);
}
wrmsr(NB_CFG_MSR, msr);
}
/* Erratum 97 ... */
if (!is_cpu_pre_c0()) {
msr = rdmsr_amd(DC_CFG_MSR);
msr.lo |= 1 << 3;
wrmsr_amd(DC_CFG_MSR, msr);
}
/* Erratum 94 ... */
msr = rdmsr_amd(IC_CFG_MSR);
msr.lo |= 1 << 11;
wrmsr_amd(IC_CFG_MSR, msr);
/* Erratum 91 prefetch miss is handled in the kernel */
enable_cache(); enable_cache();