git: 7abbfbda1ea7 - stable/13 - smbios: Move smbios driver out from x86 machdep code
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 03 Mar 2022 14:20:37 UTC
The branch stable/13 has been updated by vangyzen:
URL: https://cgit.FreeBSD.org/src/commit/?id=7abbfbda1ea783d104e250e339556feaded13f8f
commit 7abbfbda1ea783d104e250e339556feaded13f8f
Author: Allan Jude <allanjude@FreeBSD.org>
AuthorDate: 2021-02-23 21:14:18 +0000
Commit: Eric van Gyzen <vangyzen@FreeBSD.org>
CommitDate: 2022-03-03 14:20:07 +0000
smbios: Move smbios driver out from x86 machdep code
Add it to the x86 GENERIC and MINIMAL kernels
Sponsored by: Ampere Computing LLC
Submitted by: Klara Inc.
Reviewed by: rpokala
Differential Revision: https://reviews.freebsd.org/D28738
(cherry picked from commit d0673fe160b04f8162f380926d455dfb966f08fb)
---
sys/amd64/conf/GENERIC | 1 +
sys/amd64/conf/MINIMAL | 1 +
sys/amd64/include/pc/bios.h | 32 -----------------
sys/conf/files | 1 +
sys/conf/files.x86 | 1 -
sys/dev/ipmi/ipmi_smbios.c | 3 ++
sys/{x86/bios => dev/smbios}/smbios.c | 22 ++++++++----
sys/dev/smbios/smbios.h | 67 +++++++++++++++++++++++++++++++++++
sys/i386/conf/GENERIC | 1 +
sys/i386/conf/MINIMAL | 1 +
sys/i386/include/pc/bios.h | 32 -----------------
sys/modules/bios/smbios/Makefile | 2 +-
12 files changed, 92 insertions(+), 72 deletions(-)
diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
index 3fbb421a44b1..0be9ed389b06 100644
--- a/sys/amd64/conf/GENERIC
+++ b/sys/amd64/conf/GENERIC
@@ -116,6 +116,7 @@ device cpufreq
# Bus support.
device acpi
+device smbios
options IOMMU
device pci
options PCI_HP # PCI-Express native HotPlug
diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL
index a55a63d6b3ad..030fb171c43a 100644
--- a/sys/amd64/conf/MINIMAL
+++ b/sys/amd64/conf/MINIMAL
@@ -93,6 +93,7 @@ device cpufreq
# Bus support.
device acpi
+device smbios
options IOMMU
device pci
diff --git a/sys/amd64/include/pc/bios.h b/sys/amd64/include/pc/bios.h
index 99e346a4a344..4b2d9af02558 100644
--- a/sys/amd64/include/pc/bios.h
+++ b/sys/amd64/include/pc/bios.h
@@ -64,38 +64,6 @@ struct bios_smap_xattr {
u_int32_t xattr;
} __packed;
-/*
- * System Management BIOS
- */
-#define SMBIOS_START 0xf0000
-#define SMBIOS_STEP 0x10
-#define SMBIOS_OFF 0
-#define SMBIOS_LEN 4
-#define SMBIOS_SIG "_SM_"
-
-struct smbios_eps {
- uint8_t anchor_string[4]; /* '_SM_' */
- uint8_t checksum;
- uint8_t length;
- uint8_t major_version;
- uint8_t minor_version;
- uint16_t maximum_structure_size;
- uint8_t entry_point_revision;
- uint8_t formatted_area[5];
- uint8_t intermediate_anchor_string[5]; /* '_DMI_' */
- uint8_t intermediate_checksum;
- uint16_t structure_table_length;
- uint32_t structure_table_address;
- uint16_t number_structures;
- uint8_t BCD_revision;
-};
-
-struct smbios_structure_header {
- uint8_t type;
- uint8_t length;
- uint16_t handle;
-};
-
#ifdef _KERNEL
#define BIOS_PADDRTOVADDR(x) ((x) + KERNBASE)
#define BIOS_VADDRTOPADDR(x) ((x) - KERNBASE)
diff --git a/sys/conf/files b/sys/conf/files
index 949c0b5ecd86..3e727f952ac2 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -3119,6 +3119,7 @@ dev/sge/if_sge.c optional sge pci
dev/siis/siis.c optional siis pci
dev/sis/if_sis.c optional sis pci
dev/sk/if_sk.c optional sk pci
+dev/smbios/smbios.c optional smbios
dev/smbus/smb.c optional smb
dev/smbus/smbconf.c optional smbus
dev/smbus/smbus.c optional smbus
diff --git a/sys/conf/files.x86 b/sys/conf/files.x86
index 69e1f7fd6802..ae68faa002ff 100644
--- a/sys/conf/files.x86
+++ b/sys/conf/files.x86
@@ -304,7 +304,6 @@ libkern/x86/crc32_sse42.c standard
x86/acpica/OsdEnvironment.c optional acpi
x86/acpica/acpi_apm.c optional acpi
x86/acpica/srat.c optional acpi
-x86/bios/smbios.c optional smbios
x86/bios/vpd.c optional vpd
x86/cpufreq/est.c optional cpufreq
x86/cpufreq/hwpstate_amd.c optional cpufreq
diff --git a/sys/dev/ipmi/ipmi_smbios.c b/sys/dev/ipmi/ipmi_smbios.c
index df0a7f70e9cd..308a3b076ef7 100644
--- a/sys/dev/ipmi/ipmi_smbios.c
+++ b/sys/dev/ipmi/ipmi_smbios.c
@@ -39,7 +39,10 @@ __FBSDID("$FreeBSD$");
#include <vm/vm.h>
#include <vm/pmap.h>
+#if defined(__amd64__) || defined(__i386__)
#include <machine/pc/bios.h>
+#endif
+#include <dev/smbios/smbios.h>
#ifdef LOCAL_MODULE
#include <ipmi.h>
diff --git a/sys/x86/bios/smbios.c b/sys/dev/smbios/smbios.c
similarity index 93%
rename from sys/x86/bios/smbios.c
rename to sys/dev/smbios/smbios.c
index 2e3a80c9c7e4..10589ed8d49d 100644
--- a/sys/x86/bios/smbios.c
+++ b/sys/dev/smbios/smbios.c
@@ -46,7 +46,10 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_param.h>
#include <vm/pmap.h>
#include <machine/md_var.h>
+#if defined(__amd64__) || defined(__i386__)
#include <machine/pc/bios.h>
+#endif
+#include <dev/smbios/smbios.h>
/*
* System Management BIOS Reference Specification, v2.4 Final
@@ -62,7 +65,6 @@ struct smbios_softc {
};
#define RES2EPS(res) ((struct smbios_eps *)rman_get_virtual(res))
-#define ADDR2EPS(addr) ((struct smbios_eps *)BIOS_PADDRTOVADDR(addr))
static devclass_t smbios_devclass;
@@ -77,25 +79,32 @@ static int smbios_cksum (struct smbios_eps *);
static void
smbios_identify (driver_t *driver, device_t parent)
{
+ struct smbios_eps *eps;
device_t child;
- u_int32_t addr;
+ vm_paddr_t addr;
int length;
int rid;
if (!device_is_alive(parent))
return;
+#if defined(__amd64__) || defined(__i386__)
addr = bios_sigsearch(SMBIOS_START, SMBIOS_SIG, SMBIOS_LEN,
- SMBIOS_STEP, SMBIOS_OFF);
+ SMBIOS_STEP, SMBIOS_OFF);
+#else
+ addr = 0;
+#endif
+
if (addr != 0) {
+ eps = pmap_mapbios(addr, 0x1f);
rid = 0;
- length = ADDR2EPS(addr)->length;
+ length = eps->length;
if (length != 0x1f) {
u_int8_t major, minor;
- major = ADDR2EPS(addr)->major_version;
- minor = ADDR2EPS(addr)->minor_version;
+ major = eps->major_version;
+ minor = eps->minor_version;
/* SMBIOS v2.1 implementation might use 0x1e. */
if (length == 0x1e && major == 2 && minor == 1)
@@ -108,6 +117,7 @@ smbios_identify (driver_t *driver, device_t parent)
device_set_driver(child, driver);
bus_set_resource(child, SYS_RES_MEMORY, rid, addr, length);
device_set_desc(child, "System Management BIOS");
+ pmap_unmapbios((vm_offset_t)eps, 0x1f);
}
return;
diff --git a/sys/dev/smbios/smbios.h b/sys/dev/smbios/smbios.h
new file mode 100644
index 000000000000..6503cdb73c4c
--- /dev/null
+++ b/sys/dev/smbios/smbios.h
@@ -0,0 +1,67 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (c) 1997 Michael Smith
+ * Copyright (c) 1998 Jonathan Lemon
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef _SMBIOS_H_
+#define _SMBIOS_H_
+
+/*
+ * System Management BIOS
+ */
+#define SMBIOS_START 0xf0000
+#define SMBIOS_STEP 0x10
+#define SMBIOS_OFF 0
+#define SMBIOS_LEN 4
+#define SMBIOS_SIG "_SM_"
+
+struct smbios_eps {
+ uint8_t anchor_string[4]; /* '_SM_' */
+ uint8_t checksum;
+ uint8_t length;
+ uint8_t major_version;
+ uint8_t minor_version;
+ uint16_t maximum_structure_size;
+ uint8_t entry_point_revision;
+ uint8_t formatted_area[5];
+ uint8_t intermediate_anchor_string[5]; /* '_DMI_' */
+ uint8_t intermediate_checksum;
+ uint16_t structure_table_length;
+ uint32_t structure_table_address;
+ uint16_t number_structures;
+ uint8_t BCD_revision;
+};
+
+struct smbios_structure_header {
+ uint8_t type;
+ uint8_t length;
+ uint16_t handle;
+};
+
+#endif /* _SMBIOS_H_ */
diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
index 55ff71a4f05b..0bac5ba4c846 100644
--- a/sys/i386/conf/GENERIC
+++ b/sys/i386/conf/GENERIC
@@ -105,6 +105,7 @@ device cpufreq
# Bus support.
device acpi
+device smbios
device pci
options PCI_HP # PCI-Express native HotPlug
options PCI_IOV # PCI SR-IOV support
diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL
index 7e1f71f42eb4..1b45dc6d77ff 100644
--- a/sys/i386/conf/MINIMAL
+++ b/sys/i386/conf/MINIMAL
@@ -94,6 +94,7 @@ device cpufreq
# Bus support.
device acpi
+device smbios
device pci
# atkbdc0 controls both the keyboard and the PS/2 mouse
diff --git a/sys/i386/include/pc/bios.h b/sys/i386/include/pc/bios.h
index aced9712e846..eec5983bee46 100644
--- a/sys/i386/include/pc/bios.h
+++ b/sys/i386/include/pc/bios.h
@@ -234,38 +234,6 @@ struct bios_smap_xattr {
u_int32_t xattr;
} __packed;
-/*
- * System Management BIOS
- */
-#define SMBIOS_START 0xf0000
-#define SMBIOS_STEP 0x10
-#define SMBIOS_OFF 0
-#define SMBIOS_LEN 4
-#define SMBIOS_SIG "_SM_"
-
-struct smbios_eps {
- uint8_t anchor_string[4]; /* '_SM_' */
- uint8_t checksum;
- uint8_t length;
- uint8_t major_version;
- uint8_t minor_version;
- uint16_t maximum_structure_size;
- uint8_t entry_point_revision;
- uint8_t formatted_area[5];
- uint8_t intermediate_anchor_string[5]; /* '_DMI_' */
- uint8_t intermediate_checksum;
- uint16_t structure_table_length;
- uint32_t structure_table_address;
- uint16_t number_structures;
- uint8_t BCD_revision;
-};
-
-struct smbios_structure_header {
- uint8_t type;
- uint8_t length;
- uint16_t handle;
-};
-
#ifdef _KERNEL
#define BIOS_PADDRTOVADDR(x) ((x) + PMAP_MAP_LOW)
#define BIOS_VADDRTOPADDR(x) ((x) - PMAP_MAP_LOW)
diff --git a/sys/modules/bios/smbios/Makefile b/sys/modules/bios/smbios/Makefile
index ff8d22b764aa..58301eca17d6 100644
--- a/sys/modules/bios/smbios/Makefile
+++ b/sys/modules/bios/smbios/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$
#
-.PATH: ${SRCTOP}/sys/x86/bios
+.PATH: ${SRCTOP}/sys/dev/smbios
KMOD= smbios
SRCS= smbios.c \