diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2005-02-24 17:20:54 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2005-02-24 17:20:54 +0000 |
| commit | f58312625236d1cd77e2df24df37ceedd64581f5 (patch) | |
| tree | a489dea17995334de81c2f89b0e039d05c032e5f | |
| parent | ee1d4c7704f7169c4600fd512ff98a8a38314196 (diff) | |
do not even ask for btlb on 8k cpus as pdc pretends there is some but then it does not work; found w/ Moritz Kiese <mbk@mytum.de> on c180; add a debug print and fix pcxu entry
| -rw-r--r-- | sys/arch/hppa/hppa/machdep.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sys/arch/hppa/hppa/machdep.c b/sys/arch/hppa/hppa/machdep.c index 9e002721f6a..835c90dfd56 100644 --- a/sys/arch/hppa/hppa/machdep.c +++ b/sys/arch/hppa/hppa/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.140 2004/11/17 16:06:50 mickey Exp $ */ +/* $OpenBSD: machdep.c,v 1.141 2005/02/24 17:20:53 mickey Exp $ */ /* * Copyright (c) 1999-2003 Michael Shalayeff @@ -254,7 +254,7 @@ const struct hppa_cpu_typed { #endif #ifdef HP8000_CPU { "PCXU", hpcxu, HPPA_CPU_PCXU, HPPA_FTRS_W32B, - 4, desidhash_u, ibtlb_u, NULL, pbtlb_g }, + 4, desidhash_u, ibtlb_u, NULL, pbtlb_u }, #endif #ifdef HP8200_CPU { "PCXU+", hpcxu2,HPPA_CPU_PCXUP, HPPA_FTRS_W32B, @@ -494,8 +494,9 @@ cpuid() } /* BTLB params */ - if ((error = pdc_call((iodcio_t)pdc, 0, PDC_BLOCK_TLB, - PDC_BTLB_DEFAULT, &pdc_btlb)) < 0) { + if (cpu_type < HPPA_FPU_PCXU && + (error = pdc_call((iodcio_t)pdc, 0, PDC_BLOCK_TLB, + PDC_BTLB_DEFAULT, &pdc_btlb)) < 0) { #ifdef DEBUG printf("WARNING: PDC_BTLB error %d\n", error); #endif @@ -628,6 +629,9 @@ cpuid() snprintf(cpu_model, sizeof cpu_model, "HP 9000/%s PA-RISC %s%x", p, q, lev); } +#ifdef DEBUG + printf("cpu: %s\n", cpu_model); +#endif } void |