diff --git a/sys/sparc64/include/ver.h b/sys/sparc64/include/ver.h index fec56ce04e9..78e57d822b8 100644 --- a/sys/sparc64/include/ver.h +++ b/sys/sparc64/include/ver.h @@ -62,13 +62,16 @@ extern int cpu_impl; extern char sparc64_model[]; /* Known implementations. */ -#define CPU_IMPL_SPARC64 0x01 -#define CPU_IMPL_ULTRASPARCI 0x10 -#define CPU_IMPL_ULTRASPARCII 0x11 -#define CPU_IMPL_ULTRASPARCIIi 0x12 -#define CPU_IMPL_ULTRASPARCIIe 0x13 -#define CPU_IMPL_ULTRASPARCIII 0x14 -#define CPU_IMPL_ULTRASPARCIIIp 0x15 -#define CPU_IMPL_ULTRASPARCIIIi 0x16 +#define CPU_IMPL_SPARC64 0x01 +#define CPU_IMPL_ULTRASPARCI 0x10 +#define CPU_IMPL_ULTRASPARCII 0x11 +#define CPU_IMPL_ULTRASPARCIIi 0x12 +#define CPU_IMPL_ULTRASPARCIIe 0x13 +#define CPU_IMPL_ULTRASPARCIII 0x14 +#define CPU_IMPL_ULTRASPARCIIIp 0x15 +#define CPU_IMPL_ULTRASPARCIIIi 0x16 +#define CPU_IMPL_ULTRASPARCIV 0x18 +#define CPU_IMPL_ULTRASPARCIVp 0x19 +#define CPU_IMPL_ULTRASPARCIIIip 0x22 #endif /* !_MACHINE_VER_H_ */ diff --git a/sys/sparc64/sparc64/identcpu.c b/sys/sparc64/sparc64/identcpu.c index cfd0df052f2..28cd5237e05 100644 --- a/sys/sparc64/sparc64/identcpu.c +++ b/sys/sparc64/sparc64/identcpu.c @@ -5,9 +5,11 @@ * * As long as the above copyright statement and this notice remain * unchanged, you can do what ever you want with this file. - * - * $FreeBSD$ */ + +#include +__FBSDID("$FreeBSD$"); + #include #include #include @@ -25,9 +27,7 @@ static char cpu_model[128]; SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD, cpu_model, 0, "Machine model"); -#ifndef SUN4V int cpu_impl; -#endif void setPQL2(int *const size, int *const ways); @@ -88,6 +88,15 @@ cpu_identify(u_long vers, u_int freq, u_int id) case CPU_IMPL_ULTRASPARCIIIi: impls = "UltraSparc-IIIi"; break; + case CPU_IMPL_ULTRASPARCIV: + impls = "UltraSparc-IV"; + break; + case CPU_IMPL_ULTRASPARCIVp: + impls = "UltraSparc-IV+"; + break; + case CPU_IMPL_ULTRASPARCIIIip: + impls = "UltraSparc-IIIi+"; + break; default: impls = NULL; break;