summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/dev/dmi/dmi.c57
-rw-r--r--sys/dev/dmi/dmi_board.c104
-rw-r--r--sys/include/dev/dmi/dmi.h2
-rw-r--r--sys/include/dev/dmi/dmivar.h41
-rw-r--r--sys/include/fs/ctlfs.h6
-rw-r--r--sys/include/sys/dmi.h63
6 files changed, 268 insertions, 5 deletions
diff --git a/sys/dev/dmi/dmi.c b/sys/dev/dmi/dmi.c
index 84288cf..73a9ab7 100644
--- a/sys/dev/dmi/dmi.c
+++ b/sys/dev/dmi/dmi.c
@@ -35,7 +35,9 @@
#include <sys/cdefs.h>
#include <sys/syslog.h>
#include <dev/dmi/dmi.h>
+#include <dev/dmi/dmivar.h>
#include <dev/acpi/tables.h>
+#include <fs/ctlfs.h>
#include <string.h>
#define DMI_BIOS_INFO 0
@@ -46,8 +48,10 @@
/* String offsets */
#define BIOSINFO_VENDOR 0x01
#define SYSINFO_PRODUCT 0x02
-#define SYSINFO_FAMILY 0x03
+#define SYSINFO_VERSION 0x03
+#define SYSINFO_FAMILY 0x06
#define PROCINFO_MANUFACT 0x02
+#define PROCINFO_VERSION 0x03
#define PROCINFO_PARTNO 0x06
static struct limine_smbios_request smbios_req = {
@@ -177,6 +181,24 @@ dmi_prodver(void)
return NULL;
}
+ return dmi_str_index(hdr, SYSINFO_VERSION);
+}
+
+/*
+ * Return the product family from the DMI/SMBIOS
+ * System Info structure
+ *
+ * Returns NULL if not found
+ */
+const char *
+dmi_prodfam(void)
+{
+ struct dmi_shdr *hdr;
+
+ if ((hdr = dmi_shdr(DMI_SYSTEM_INFO)) == NULL) {
+ return NULL;
+ }
+
return dmi_str_index(hdr, SYSINFO_FAMILY);
}
@@ -198,6 +220,38 @@ dmi_cpu_manufact(void)
return dmi_str_index(hdr, PROCINFO_MANUFACT);
}
+/*
+ * Return the CPU version string from the
+ * DMI/SMBIOS Processor Info structure
+ *
+ * Returns NULL if not found
+ */
+const char *
+dmi_cpu_version(void)
+{
+ struct dmi_shdr *hdr;
+
+ if ((hdr = dmi_shdr(DMI_PROCESSOR_INFO)) == NULL) {
+ return NULL;
+ }
+
+ return dmi_str_index(hdr, PROCINFO_VERSION);
+}
+
+static void
+dmi_init_ctl(void)
+{
+ struct ctlfs_dev ctl;
+ char ctlname[] = "dmi";
+
+ /* Create '/ctl/dmi/board' */
+ ctl.mode = 0444;
+ ctlfs_create_node(ctlname, &ctl);
+ ctl.devname = ctlname;
+ ctl.ops = &g_ctl_board_ident;
+ ctlfs_create_entry("board", &ctl);
+}
+
static int
dmi_init(void)
{
@@ -245,6 +299,7 @@ dmi_init(void)
hdr = PTR_OFFSET(hdr, cur_nbytes);
}
+ dmi_init_ctl();
return 0;
}
diff --git a/sys/dev/dmi/dmi_board.c b/sys/dev/dmi/dmi_board.c
new file mode 100644
index 0000000..23709bd
--- /dev/null
+++ b/sys/dev/dmi/dmi_board.c
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2023-2025 Ian Marco Moffett and the Osmora Team.
+ * All rights reserved.
+ *
+ * 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. Neither the name of Hyra nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ */
+
+#include <sys/types.h>
+#include <sys/errno.h>
+#include <sys/dmi.h>
+#include <dev/dmi/dmi.h>
+#include <dev/dmi/dmivar.h>
+#include <fs/ctlfs.h>
+#include <string.h>
+
+extern struct ctlops ctl_cpu_ident;
+
+static int
+board_ctl_read(struct ctlfs_dev *cdp, struct sio_txn *sio)
+{
+ struct dmi_board board;
+ const char *cpu_manuf, *prodver;
+ const char *product, *vendor;
+ const char *cpu_ver, *p;
+ size_t len;
+
+ if (cdp == NULL || sio == NULL) {
+ return -EINVAL;
+ }
+ /* Cannot copy zero bytes */
+ if (sio->len == 0) {
+ return -EINVAL;
+ }
+
+ /* Check offset and clamp length */
+ if (sio->offset >= sizeof(board)) {
+ return 0;
+ }
+ if ((sio->offset + sio->len) > sizeof(board)) {
+ sio->len = sizeof(board);
+ }
+
+ memset(&board, 0, sizeof(board));
+ cpu_ver = dmi_cpu_version();
+ if (cpu_ver != NULL) {
+ len = strlen(cpu_ver);
+ memcpy(board.cpu_version, cpu_ver, len);
+ }
+
+ prodver = dmi_prodver();
+ if (prodver != NULL) {
+ len = strlen(prodver);
+ memcpy(board.version, prodver, len);
+ }
+
+ cpu_manuf = dmi_cpu_manufact();
+ if (cpu_manuf != NULL) {
+ len = strlen(cpu_manuf);
+ memcpy(board.cpu_manuf, cpu_manuf, len);
+ }
+
+ product = dmi_product();
+ if (product != NULL) {
+ len = strlen(product);
+ memcpy(board.product, product, len);
+ }
+
+ vendor = dmi_vendor();
+ if (vendor != NULL) {
+ len = strlen(vendor);
+ memcpy(board.vendor, vendor, len);
+ }
+
+ p = (char *)&board;
+ memcpy(sio->buf, &p[sio->offset], sio->len);
+ return sio->len;
+}
+
+struct ctlops g_ctl_board_ident = {
+ .read = board_ctl_read,
+ .write = NULL
+};
diff --git a/sys/include/dev/dmi/dmi.h b/sys/include/dev/dmi/dmi.h
index d24397a..8b7030c 100644
--- a/sys/include/dev/dmi/dmi.h
+++ b/sys/include/dev/dmi/dmi.h
@@ -34,7 +34,9 @@
const char *dmi_vendor(void);
const char *dmi_prodver(void);
+const char *dmi_prodfam(void);
const char *dmi_product(void);
const char *dmi_cpu_manufact(void);
+const char *dmi_cpu_version(void);
#endif /* !_DMI_DMI_H_ */
diff --git a/sys/include/dev/dmi/dmivar.h b/sys/include/dev/dmi/dmivar.h
new file mode 100644
index 0000000..e5da92f
--- /dev/null
+++ b/sys/include/dev/dmi/dmivar.h
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2023-2025 Ian Marco Moffett and the Osmora Team.
+ * All rights reserved.
+ *
+ * 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. Neither the name of Hyra nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ */
+
+#ifndef _DEV_DMIVAR_H_
+#define _DEV_DMIVAR_H_
+
+#include <sys/types.h>
+#include <sys/sio.h>
+#include <fs/ctlfs.h>
+
+extern struct ctlops g_ctl_board_ident;
+
+int dmi_board_ctl_read(struct ctlfs_dev *cdp, struct sio_txn *sio);
+
+#endif /* !_DEV_DMIVAR_H_ */
diff --git a/sys/include/fs/ctlfs.h b/sys/include/fs/ctlfs.h
index 90f42f0..29ae358 100644
--- a/sys/include/fs/ctlfs.h
+++ b/sys/include/fs/ctlfs.h
@@ -42,12 +42,10 @@ struct ctlops {
/*
* Ctlfs op arguments
*
- * @devname: Device name.
- * @major: Device major
- * @minor: Device minor.
- * @mode: Access flags.
* @devname [1]: Device name (node name)
* @ctlname: [1]: Control name (node entry name)
+ * @ops: Callbacks / fs hooks
+ * @mode: Access flags.
*/
struct ctlfs_dev {
union {
diff --git a/sys/include/sys/dmi.h b/sys/include/sys/dmi.h
new file mode 100644
index 0000000..a21cff6
--- /dev/null
+++ b/sys/include/sys/dmi.h
@@ -0,0 +1,63 @@
+/*
+ * Copyright (c) 2023-2025 Ian Marco Moffett and the Osmora Team.
+ * All rights reserved.
+ *
+ * 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. Neither the name of Hyra nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
+ */
+
+#ifndef _SYS_DMI_H_
+#define _SYS_DMI_H_
+
+#if defined(_KERNEL)
+#include <sys/types.h>
+#else
+#include <stdint.h>
+#include <stddef.h>
+#endif /* _KERNEL */
+
+/*
+ * Provides board information through
+ * DMI.
+ *
+ * @cpu_version: CPU version string
+ * @cpu_manuf: CPU manufacturer string
+ * @product: Board product string
+ * @vendor: Board vendor string
+ * @version: Product version string
+ *
+ * If index 0 of any of the strings contain
+ * '\0', then they are unsupported/unused.
+ *
+ * XXX: Strings are null terminated
+ */
+struct dmi_board {
+ char cpu_version[64];
+ char cpu_manuf[32];
+ char product[32];
+ char vendor[32];
+ char version[32];
+};
+
+#endif /* !_SYS_DMI_H_ */
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-02 18:54:19 +0000