summaryrefslogtreecommitdiff
path: root/sys/arch
diff options
context:
space:
mode:
authorMarco Peereboom <marco@cvs.openbsd.org>2007-11-15 03:34:47 +0000
committerMarco Peereboom <marco@cvs.openbsd.org>2007-11-15 03:34:47 +0000
commit8d3b7da0d8308360af956d2b6534b843755258ad (patch)
treea59e24dd3d3a54f81b5ddb9f0e973bbf6c2156af /sys/arch
parent8d2badfa2ab0c1a613c2aefb2e5298b2a1445dbf (diff)
Add struct for processors.
ok deraadt
Diffstat (limited to 'sys/arch')
-rw-r--r--sys/arch/amd64/include/smbiosvar.h33
-rw-r--r--sys/arch/i386/include/smbiosvar.h33
2 files changed, 64 insertions, 2 deletions
diff --git a/sys/arch/amd64/include/smbiosvar.h b/sys/arch/amd64/include/smbiosvar.h
index 7f60d238a9a..d179b8754d3 100644
--- a/sys/arch/amd64/include/smbiosvar.h
+++ b/sys/arch/amd64/include/smbiosvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: smbiosvar.h,v 1.3 2006/05/19 04:49:17 gwk Exp $ */
+/* $OpenBSD: smbiosvar.h,v 1.4 2007/11/15 03:34:46 marco Exp $ */
/*
* Copyright (c) 2006 Gordon Willem Klok <gklok@cogeco.ca>
* Copyright (c) 2005 Jordan Hargrave
@@ -177,6 +177,37 @@ struct smbios_board {
} __packed;
/*
+ * SMBIOS Structure Type 4 "processor Information"
+ * DMTF Specification DSP0134 v2.5 Section 3.3.5 p.g. 24
+ */
+struct smbios_cpu {
+ u_int8_t cpu_socket_designation; /* string */
+ u_int8_t cpu_type;
+ u_int8_t cpu_family;
+ u_int8_t cpu_mfg; /* string */
+ u_int64_t cpu_id;
+ u_int8_t cpu_version;
+ u_int8_t cpu_voltage;
+ u_int16_t cpu_clock;
+ u_int16_t cpu_max_speed;
+ u_int16_t cpu_current_speed;
+ u_int8_t cpu_status;
+#define SMBIOS_CPUSTATUS_POPULATED (1<<6)
+#define SMBIOS_CPUSTATUS_STATUSMASK (0x07)
+ u_int8_t cpu_upgrade;
+ u_int16_t cpu_l1_handle;
+ u_int16_t cpu_l2_handle;
+ u_int16_t cpu_l3_handle;
+ u_int8_t cpu_serial; /* string */
+ u_int8_t cpu_asset_tag;
+ u_int8_t cpu_part_nr;
+ u_int8_t cpu_core_count;
+ u_int8_t cpu_core_enabled;
+ u_int8_t cpu_thread_count;
+ u_int16_t cpu_characteristics;
+};
+
+/*
* SMBIOS Structure Type 38 "IPMI Information"
* DMTF Specification DSP0134 Section 3.3.39 p.g. 91
*/
diff --git a/sys/arch/i386/include/smbiosvar.h b/sys/arch/i386/include/smbiosvar.h
index 1c1795a5789..d179b8754d3 100644
--- a/sys/arch/i386/include/smbiosvar.h
+++ b/sys/arch/i386/include/smbiosvar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: smbiosvar.h,v 1.3 2006/07/17 20:34:31 fgsch Exp $ */
+/* $OpenBSD: smbiosvar.h,v 1.4 2007/11/15 03:34:46 marco Exp $ */
/*
* Copyright (c) 2006 Gordon Willem Klok <gklok@cogeco.ca>
* Copyright (c) 2005 Jordan Hargrave
@@ -177,6 +177,37 @@ struct smbios_board {
} __packed;
/*
+ * SMBIOS Structure Type 4 "processor Information"
+ * DMTF Specification DSP0134 v2.5 Section 3.3.5 p.g. 24
+ */
+struct smbios_cpu {
+ u_int8_t cpu_socket_designation; /* string */
+ u_int8_t cpu_type;
+ u_int8_t cpu_family;
+ u_int8_t cpu_mfg; /* string */
+ u_int64_t cpu_id;
+ u_int8_t cpu_version;
+ u_int8_t cpu_voltage;
+ u_int16_t cpu_clock;
+ u_int16_t cpu_max_speed;
+ u_int16_t cpu_current_speed;
+ u_int8_t cpu_status;
+#define SMBIOS_CPUSTATUS_POPULATED (1<<6)
+#define SMBIOS_CPUSTATUS_STATUSMASK (0x07)
+ u_int8_t cpu_upgrade;
+ u_int16_t cpu_l1_handle;
+ u_int16_t cpu_l2_handle;
+ u_int16_t cpu_l3_handle;
+ u_int8_t cpu_serial; /* string */
+ u_int8_t cpu_asset_tag;
+ u_int8_t cpu_part_nr;
+ u_int8_t cpu_core_count;
+ u_int8_t cpu_core_enabled;
+ u_int8_t cpu_thread_count;
+ u_int16_t cpu_characteristics;
+};
+
+/*
* SMBIOS Structure Type 38 "IPMI Information"
* DMTF Specification DSP0134 Section 3.3.39 p.g. 91
*/