Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/arch Unify i386 and amd64 procfs MD code into x86.
details: https://anonhg.NetBSD.org/src/rev/df4c6685a85a
branches: trunk
changeset: 756183:df4c6685a85a
user: rmind <rmind%NetBSD.org@localhost>
date: Thu Jul 08 11:24:59 2010 +0000
description:
Unify i386 and amd64 procfs MD code into x86.
diffstat:
sys/arch/amd64/amd64/procfs_machdep.c | 235 --------------------------
sys/arch/amd64/conf/files.amd64 | 3 +-
sys/arch/i386/conf/files.i386 | 3 +-
sys/arch/i386/i386/procfs_machdep.c | 262 -----------------------------
sys/arch/x86/conf/files.x86 | 3 +-
sys/arch/x86/x86/procfs_machdep.c | 300 ++++++++++++++++++++++++++++++++++
sys/arch/xen/conf/files.xen | 5 +-
7 files changed, 306 insertions(+), 505 deletions(-)
diffs (truncated from 893 to 300 lines):
diff -r 6cbbfbd5f995 -r df4c6685a85a sys/arch/amd64/amd64/procfs_machdep.c
--- a/sys/arch/amd64/amd64/procfs_machdep.c Thu Jul 08 11:22:24 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,235 +0,0 @@
-/* $NetBSD: procfs_machdep.c,v 1.15 2010/04/18 23:47:50 jym Exp $ */
-
-/*
- * Copyright (c) 2001 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Frank van der Linden and Jason R. Thorpe for
- * Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed for the NetBSD Project by
- * Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- * or promote products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY WASABI SYSTEMS, INC. ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
- * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL WASABI SYSTEMS, INC
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-/*
- * NOTE: We simply use the primary CPU's cpuid_level and tsc_freq
- * here. Might want to change this later.
- */
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: procfs_machdep.c,v 1.15 2010/04/18 23:47:50 jym Exp $");
-
-#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/mount.h>
-#include <sys/stat.h>
-#include <sys/vnode.h>
-
-#include <miscfs/procfs/procfs.h>
-
-#include <machine/cpu.h>
-#include <machine/reg.h>
-#include <machine/specialreg.h>
-
-extern int i386_fpu_present, i386_fpu_exception, i386_fpu_fdivbug;
-extern char cpu_model[];
-
-static const char * const x86_features[] = {
- /* Intel-defined */
- "fpu", "vme", "de", "pse", "tsc", "msr", "pae", "mce",
- "cx8", "apic", NULL, "sep", "mtrr", "pge", "mca", "cmov",
- "pat", "pse36", "pn", "clflush", NULL, "dts", "acpi", "mmx",
- "fxsr", "sse", "sse2", "ss", "ht", "tm", "ia64", NULL,
-
- /* AMD-defined */
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, "syscall", NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, "nx", NULL, "mmxext", NULL,
- NULL, "fxsr_opt", "rdtscp", NULL, NULL, "lm", "3dnowext", "3dnow",
-
- /* Transmeta-defined */
- "recovery", "longrun", NULL, "lrti", NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-
- /* Linux-defined */
- "cxmmx", NULL, "cyrix_arr", "centaur_mcr", NULL,
- "constant_tsc", NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-
- /* Intel-defined */
- "pni", NULL, NULL, "monitor", "ds_cpi", "vmx", NULL, "est",
- "tm2", NULL, "cid", NULL, NULL, "cx16", "xtpr", NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-
- /* VIA/Cyrix/Centaur-defined */
- NULL, NULL, "rng", "rng_en", NULL, NULL, "ace", "ace_en",
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-
- /* AMD defined */
- "lahf_lm", "cmp_legacy", "svm", NULL, "cr8_legacy", NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
- NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
-};
-
-static int procfs_getonecpu(int, struct cpu_info *, char *, int *);
-
-/*
- * Linux-style /proc/cpuinfo.
- * Only used when procfs is mounted with -o linux.
- *
- * In the multiprocessor case, this should be a loop over all CPUs.
- */
-int
-procfs_getcpuinfstr(char *bf, int *len)
-{
- struct cpu_info *ci;
- CPU_INFO_ITERATOR cii;
- int i = 0, used = *len, total = *len;
-
- *len = 0;
- for (CPU_INFO_FOREACH(cii, ci)) {
- if (procfs_getonecpu(i++, ci, bf, &used) == 0) {
- *len += used;
- total = 0;
- break;
- }
- total -= used;
- if (total > 0) {
- bf += used;
- *bf++ = '\n';
- *len += used + 1;
- used = --total;
- if (used == 0)
- break;
- } else {
- *len += used;
- break;
- }
- }
- return total == 0 ? -1 : 0;
-}
-
-static int
-procfs_getonecpu(int xcpu, struct cpu_info *ci, char *bf, int *len)
-{
- int left, l, i;
- char featurebuf[256], *p;
-
- p = featurebuf;
- left = sizeof(featurebuf);
- for (i = 0; i < 32; i++) {
- if ((ci->ci_feat_val[0] & (1 << i)) && x86_features[i]) {
- l = snprintf(p, left, "%s ", x86_features[i]);
- left -= l;
- p += l;
- if (left <= 0)
- break;
- }
- }
-
- p = bf;
- left = *len;
- l = snprintf(p, left,
- "processor\t: %d\n"
- "vendor_id\t: %s\n"
- "cpu family\t: %d\n"
- "model\t\t: %d\n"
- "model name\t: %s\n"
- "stepping\t: ",
- xcpu,
- (char *)ci->ci_vendor,
- cpuid_level >= 0 ? ((ci->ci_signature >> 8) & 15) : cpu_class + 3,
- cpuid_level >= 0 ? ((ci->ci_signature >> 4) & 15) : 0,
- cpu_brand_string
- );
-
- left -= l;
- p += l;
- if (left <= 0)
- return 0;
-
- if (cpuid_level >= 0)
- l = snprintf(p, left, "%d\n", ci->ci_signature & 15);
- else
- l = snprintf(p, left, "unknown\n");
-
- left -= l;
- p += l;
- if (left <= 0)
- return 0;
-
- if (ci->ci_data.cpu_cc_freq != 0) {
- uint64_t freq, fraq;
-
- freq = (ci->ci_data.cpu_cc_freq + 4999) / 1000000;
- fraq = ((ci->ci_data.cpu_cc_freq + 4999) / 10000) % 100;
- l = snprintf(p, left, "cpu MHz\t\t: %" PRIu64 ".%" PRIu64 "\n",
- freq, fraq);
- } else
- l = snprintf(p, left, "cpu MHz\t\t: unknown\n");
-
- left -= l;
- p += l;
- if (left <= 0)
- return 0;
-
- l = snprintf(p, left,
- "fdiv_bug\t: %s\n"
- "fpu\t\t: %s\n"
- "fpu_exception\t: %s\n"
- "cpuid level\t: %d\n"
- "wp\t\t: %s\n"
- "flags\t\t: %s\n",
-#ifdef __x86_64__
- "no", /* XXX */
- "yes", /* XXX */
- "yes", /* XXX */
-#else
- i386_fpu_fdivbug ? "yes" : "no",
- i386_fpu_present ? "yes" : "no",
- i386_fpu_exception ? "yes" : "no",
-#endif
- cpuid_level,
- (rcr0() & CR0_WP) ? "yes" : "no",
- featurebuf
- );
-
- if (l > left)
- return 0;
- *len = (p + l) - bf;
-
- return 1;
-}
diff -r 6cbbfbd5f995 -r df4c6685a85a sys/arch/amd64/conf/files.amd64
--- a/sys/arch/amd64/conf/files.amd64 Thu Jul 08 11:22:24 2010 +0000
+++ b/sys/arch/amd64/conf/files.amd64 Thu Jul 08 11:24:59 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.amd64,v 1.68 2009/06/16 21:05:33 bouyer Exp $
+# $NetBSD: files.amd64,v 1.69 2010/07/08 11:24:59 rmind Exp $
#
# new style config file for amd64 architecture
#
@@ -44,7 +44,6 @@
file arch/amd64/amd64/machdep.c
file arch/amd64/amd64/mem.c
file arch/amd64/amd64/process_machdep.c
-file arch/amd64/amd64/procfs_machdep.c procfs
file arch/amd64/amd64/trap.c
file arch/amd64/amd64/fpu.c
file arch/amd64/amd64/lock_stubs.S
diff -r 6cbbfbd5f995 -r df4c6685a85a sys/arch/i386/conf/files.i386
--- a/sys/arch/i386/conf/files.i386 Thu Jul 08 11:22:24 2010 +0000
+++ b/sys/arch/i386/conf/files.i386 Thu Jul 08 11:24:59 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.i386,v 1.354 2010/04/10 17:55:25 jruoho Exp $
+# $NetBSD: files.i386,v 1.355 2010/07/08 11:24:59 rmind Exp $
#
# new style config file for i386 architecture
#
@@ -85,7 +85,6 @@
file arch/i386/i386/mem.c
file arch/i386/i386/mtrr_k6.c mtrr
file arch/i386/i386/process_machdep.c
-file arch/i386/i386/procfs_machdep.c procfs
file arch/i386/i386/trap.c
file dev/cons.c
diff -r 6cbbfbd5f995 -r df4c6685a85a sys/arch/i386/i386/procfs_machdep.c
--- a/sys/arch/i386/i386/procfs_machdep.c Thu Jul 08 11:22:24 2010 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,262 +0,0 @@
-/* $NetBSD: procfs_machdep.c,v 1.34 2010/04/18 23:47:51 jym Exp $ */
-
-/*
- * Copyright (c) 2001 Wasabi Systems, Inc.
- * All rights reserved.
- *
- * Written by Frank van der Linden and Jason R. Thorpe for
- * Wasabi Systems, Inc.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- * must display the following acknowledgement:
- * This product includes software developed for the NetBSD Project by
- * Wasabi Systems, Inc.
- * 4. The name of Wasabi Systems, Inc. may not be used to endorse
- * or promote products derived from this software without specific prior
Home |
Main Index |
Thread Index |
Old Index