diff options
| author |   jasper <jasper@openbsd.org> | 2013-03-27 18:32:05 +0000 |
|---|---|---|
| committer | jasper <jasper@openbsd.org> | 2013-03-27 18:32:05 +0000 |
| commit | 534dab3bfc5800adfdc2df6770046db909bb7360 (patch) | |
| tree | f9e6d21cd0fa28fd930c7b423d272be33f800635 | |
| parent | sync (diff) | |
| download | wireguard-openbsd-534dab3bfc5800adfdc2df6770046db909bb7360.tar.xz wireguard-openbsd-534dab3bfc5800adfdc2df6770046db909bb7360.zip | |
fill in cpu_model.
| -rw-r--r-- | sys/arch/octeon/octeon/machdep.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/sys/arch/octeon/octeon/machdep.c b/sys/arch/octeon/octeon/machdep.c index fd9cf650814..7b057b91b55 100644 --- a/sys/arch/octeon/octeon/machdep.c +++ b/sys/arch/octeon/octeon/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.29 2013/03/19 09:19:10 jasper Exp $ */ +/* $OpenBSD: machdep.c,v 1.30 2013/03/27 18:32:05 jasper Exp $ */ /* * Copyright (c) 2009, 2010 Miodrag Vallat. @@ -84,7 +84,7 @@ /* The following is used externally (sysctl_hw) */ char machine[] = MACHINE; /* Machine "architecture" */ -char cpu_model[30]; +char cpu_model[64]; struct uvm_constraint_range dma_constraint = { 0x0, 0xffffffffUL }; struct uvm_constraint_range *uvm_md_constraints[] = { NULL }; @@ -372,6 +372,11 @@ mips_init(__register_t a0, __register_t a1, __register_t a2 __unused, bcopy(&boot_info, &octeon_boot_info, sizeof(octeon_boot_info)); bcopy(&boot_desc, &octeon_boot_desc, sizeof(octeon_boot_desc)); + snprintf(cpu_model, sizeof(cpu_model), "Cavium OCTEON (rev %d.%d) @ %d MHz", + (bootcpu_hwinfo.c0prid >> 4) & 0x0f, + bootcpu_hwinfo.c0prid & 0x0f, + bootcpu_hwinfo.clock / 1000000); + cpu_cpuspeed = octeon_cpuspeed; /* @@ -500,7 +505,7 @@ consinit() } /* - * cpu_startup: allocate memory for variable-sized tables, initialize CPU, and + * cpu_startup: allocate memory for variable-sized tables, initialize CPU, and * do auto-configuration. */ void |