summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>2005-10-16 08:58:27 +0000
committerobrien <obrien@FreeBSD.org>2005-10-16 08:58:27 +0000
commit8004d24aabc240486341f33c1e4a053853395397 (patch)
tree23db7420075de96118e2d6ab18352b49ed640b1a /sys
parentef9b7e3a143f69b35878f93fb6795869a20cea19 (diff)
downloadFreeBSD-src-8004d24aabc240486341f33c1e4a053853395397.zip
FreeBSD-src-8004d24aabc240486341f33c1e4a053853395397.tar.gz
For AMD processors, nullify CPUID.HTT. FreeBSD has no need for the
information it conveys, and it is only confusing people. This fixes incorrect output in the previous commit.
Diffstat (limited to 'sys')
-rw-r--r--sys/amd64/amd64/identcpu.c9
-rw-r--r--sys/i386/i386/identcpu.c9
2 files changed, 18 insertions, 0 deletions
diff --git a/sys/amd64/amd64/identcpu.c b/sys/amd64/amd64/identcpu.c
index 4e69a7d..30cb219 100644
--- a/sys/amd64/amd64/identcpu.c
+++ b/sys/amd64/amd64/identcpu.c
@@ -334,6 +334,15 @@ printcpuinfo(void)
);
}
+ if (cpu_feature & CPUID_HTT && strcmp(cpu_vendor,
+ "AuthenticAMD") == 0) {
+ cpu_feature &= ~CPUID_HTT;
+ if (bootverbose)
+ printf("\nHTT bit cleared - FreeBSD"
+ " does not have licenseing issues"
+ " requiring it.\n");
+ }
+
/*
* If this CPU supports HTT or CMP then mention the
* number of physical/logical cores it contains.
diff --git a/sys/i386/i386/identcpu.c b/sys/i386/i386/identcpu.c
index 7d4ef86..72cda28 100644
--- a/sys/i386/i386/identcpu.c
+++ b/sys/i386/i386/identcpu.c
@@ -824,6 +824,15 @@ printcpuinfo(void)
);
}
+ if (cpu_feature & CPUID_HTT && strcmp(cpu_vendor,
+ "AuthenticAMD") == 0) {
+ cpu_feature &= ~CPUID_HTT;
+ if (bootverbose)
+ printf("\nHTT bit cleared - FreeBSD"
+ " does not have licenseing issues"
+ " requiring it.\n");
+ }
+
/*
* If this CPU supports HTT or CMP then mention the
* number of physical/logical cores it contains.
OpenPOWER on IntegriCloud