diff options
| author | Peter Wemm <peter@FreeBSD.org> | 2003-02-13 01:52:44 +0000 |
|---|---|---|
| committer | Peter Wemm <peter@FreeBSD.org> | 2003-02-13 01:52:44 +0000 |
| commit | 521871f1fad9af623901d054f671f03e4ab09726 (patch) | |
| tree | 73d501de2574069d440318c272878cd5924b34dc /sys | |
| parent | 1c425b874c53dcd1003102be1a8441c3bb93361b (diff) | |
Notes
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/amd64/amd64/pmap.c | 32 | ||||
| -rw-r--r-- | sys/i386/i386/pmap.c | 32 |
2 files changed, 60 insertions, 4 deletions
diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 46d8bb530822..e730ffc3208d 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -259,6 +259,13 @@ pmap_kmem_choose(vm_offset_t addr) { vm_offset_t newaddr = addr; +#ifdef I686_CPU + /* Deal with un-resolved Pentium4 issues */ + if (cpu_class == CPUCLASS_686 && + strcmp(cpu_vendor, "GenuineIntel") == 0 && + (cpu_id & 0xf00) == 0xf00) + return newaddr; +#endif #ifndef DISABLE_PSE if (cpu_feature & CPUID_PSE) newaddr = (addr + (NBPDR - 1)) & ~(NBPDR - 1); @@ -370,6 +377,15 @@ pmap_bootstrap(firstaddr, loadaddr) if (cpu_feature & CPUID_PGE) pgeflag = PG_G; #endif +#ifdef I686_CPU + /* Deal with un-resolved Pentium4 issues */ + if (cpu_class == CPUCLASS_686 && + strcmp(cpu_vendor, "GenuineIntel") == 0 && + (cpu_id & 0xf00) == 0xf00) { + printf("Warning: Pentium 4 cpu: PG_G disabled (global flag)\n"); + pgeflag = 0; + } +#endif /* * Initialize the 4MB page size flag @@ -382,12 +398,24 @@ pmap_bootstrap(firstaddr, loadaddr) pdir4mb = 0; #ifndef DISABLE_PSE - if (cpu_feature & CPUID_PSE) { + if (cpu_feature & CPUID_PSE) + pseflag = PG_PS; +#endif +#ifdef I686_CPU + /* Deal with un-resolved Pentium4 issues */ + if (cpu_class == CPUCLASS_686 && + strcmp(cpu_vendor, "GenuineIntel") == 0 && + (cpu_id & 0xf00) == 0xf00) { + printf("Warning: Pentium 4 cpu: PG_PS disabled (4MB pages)\n"); + pseflag = 0; + } +#endif +#ifndef DISABLE_PSE + if (pseflag) { pd_entry_t ptditmp; /* * Note that we have enabled PSE mode */ - pseflag = PG_PS; ptditmp = *(PTmap + i386_btop(KERNBASE)); ptditmp &= ~(NBPDR - 1); ptditmp |= PG_V | PG_RW | PG_PS | PG_U | pgeflag; diff --git a/sys/i386/i386/pmap.c b/sys/i386/i386/pmap.c index 46d8bb530822..e730ffc3208d 100644 --- a/sys/i386/i386/pmap.c +++ b/sys/i386/i386/pmap.c @@ -259,6 +259,13 @@ pmap_kmem_choose(vm_offset_t addr) { vm_offset_t newaddr = addr; +#ifdef I686_CPU + /* Deal with un-resolved Pentium4 issues */ + if (cpu_class == CPUCLASS_686 && + strcmp(cpu_vendor, "GenuineIntel") == 0 && + (cpu_id & 0xf00) == 0xf00) + return newaddr; +#endif #ifndef DISABLE_PSE if (cpu_feature & CPUID_PSE) newaddr = (addr + (NBPDR - 1)) & ~(NBPDR - 1); @@ -370,6 +377,15 @@ pmap_bootstrap(firstaddr, loadaddr) if (cpu_feature & CPUID_PGE) pgeflag = PG_G; #endif +#ifdef I686_CPU + /* Deal with un-resolved Pentium4 issues */ + if (cpu_class == CPUCLASS_686 && + strcmp(cpu_vendor, "GenuineIntel") == 0 && + (cpu_id & 0xf00) == 0xf00) { + printf("Warning: Pentium 4 cpu: PG_G disabled (global flag)\n"); + pgeflag = 0; + } +#endif /* * Initialize the 4MB page size flag @@ -382,12 +398,24 @@ pmap_bootstrap(firstaddr, loadaddr) pdir4mb = 0; #ifndef DISABLE_PSE - if (cpu_feature & CPUID_PSE) { + if (cpu_feature & CPUID_PSE) + pseflag = PG_PS; +#endif +#ifdef I686_CPU + /* Deal with un-resolved Pentium4 issues */ + if (cpu_class == CPUCLASS_686 && + strcmp(cpu_vendor, "GenuineIntel") == 0 && + (cpu_id & 0xf00) == 0xf00) { + printf("Warning: Pentium 4 cpu: PG_PS disabled (4MB pages)\n"); + pseflag = 0; + } +#endif +#ifndef DISABLE_PSE + if (pseflag) { pd_entry_t ptditmp; /* * Note that we have enabled PSE mode */ - pseflag = PG_PS; ptditmp = *(PTmap + i386_btop(KERNBASE)); ptditmp &= ~(NBPDR - 1); ptditmp |= PG_V | PG_RW | PG_PS | PG_U | pgeflag; |