diff options
| author | Klemens Nanni <kn@cvs.openbsd.org> | 2024-06-16 14:01:27 +0000 |
|---|---|---|
| committer | Klemens Nanni <kn@cvs.openbsd.org> | 2024-06-16 14:01:27 +0000 |
| commit | a4cd6a6c8b8562f8ce80d006393bcc28914326bf (patch) | |
| tree | ef2ba2529166d29c616c3780d2554c1345e38bcb | |
| parent | 91215733c5467c2e98ac022cb204ed8d1e17c5f5 (diff) | |
Make GENERIC boot on ZHAOXIN KaiXian KX-6640MA
The Unchartevice 6640MA notebook comes with such a CentaurHauls CPU,
installs via RAMDISK_CD (with AHCI fix), but GENERIC would hang after
cpu0: 4MB 64b/line 16-way L2 cache
Pretty sure Intel TPM sensor code should run on Intel CPUs, anyway.
Idea from brynet
OK deraadt brynet
| -rw-r--r-- | sys/arch/amd64/amd64/identcpu.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/arch/amd64/amd64/identcpu.c b/sys/arch/amd64/amd64/identcpu.c index 8a6008cccd6..ecf130c393f 100644 --- a/sys/arch/amd64/amd64/identcpu.c +++ b/sys/arch/amd64/amd64/identcpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: identcpu.c,v 1.143 2024/05/14 01:42:07 guenther Exp $ */ +/* $OpenBSD: identcpu.c,v 1.144 2024/06/16 14:01:26 kn Exp $ */ /* $NetBSD: identcpu.c,v 1.1 2003/04/26 18:39:28 fvdl Exp $ */ /* @@ -727,7 +727,8 @@ identifycpu(struct cpu_info *ci) } #ifndef SMALL_KERNEL - if (CPU_IS_PRIMARY(ci) && (ci->ci_feature_tpmflags & TPM_SENSOR)) { + if (CPU_IS_PRIMARY(ci) && (ci->ci_feature_tpmflags & TPM_SENSOR) && + ci->ci_vendor == CPUV_INTEL) { ci->ci_sensor.type = SENSOR_TEMP; sensor_task_register(ci, intelcore_update_sensor, 5); sensor_attach(&ci->ci_sensordev, &ci->ci_sensor); |