Page MenuHomeFreeBSD
Files F148629510

D29276.id86683.diff
No OneTemporary
Actions

D29276.id86683.diff
View Options

diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL
--- a/sys/amd64/conf/MINIMAL
+++ b/sys/amd64/conf/MINIMAL
@@ -103,7 +103,6 @@
# Bus support.
device acpi
-device smbios
options IOMMU
device pci
diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES
--- a/sys/amd64/conf/NOTES
+++ b/sys/amd64/conf/NOTES
@@ -517,7 +517,7 @@
#
# ipmi: Intelligent Platform Management Interface
# pbio: Parallel (8255 PPI) basic I/O (mode 0) port (e.g. Advantech PCL-724)
-# smbios: DMI/SMBIOS entry point
+# smbios: DMI/SMBIOS entry point (requires EFIRT option)
# vpd: Vital Product Data kernel interface
# asmc: Apple System Management Controller
# si: Specialix International SI/XIO or SX intelligent serial card
diff --git a/sys/amd64/include/efi.h b/sys/amd64/include/efi.h
--- a/sys/amd64/include/efi.h
+++ b/sys/amd64/include/efi.h
@@ -47,6 +47,7 @@
#ifdef _KERNEL
#include <isa/rtc.h>
+#define ARCH_MAY_USE_EFI
#define EFI_TIME_LOCK() mtx_lock(&atrtc_time_lock)
#define EFI_TIME_UNLOCK() mtx_unlock(&atrtc_time_lock)
diff --git a/sys/arm64/include/efi.h b/sys/arm64/include/efi.h
--- a/sys/arm64/include/efi.h
+++ b/sys/arm64/include/efi.h
@@ -36,6 +36,8 @@
#define EFIABI_ATTR
#ifdef _KERNEL
+#define ARCH_MAY_USE_EFI
+
#define EFI_TIME_LOCK()
#define EFI_TIME_UNLOCK()
#define EFI_TIME_OWNED()
diff --git a/sys/dev/smbios/smbios.c b/sys/dev/smbios/smbios.c
--- a/sys/dev/smbios/smbios.c
+++ b/sys/dev/smbios/smbios.c
@@ -34,6 +34,7 @@
#include <sys/kernel.h>
#include <sys/malloc.h>
#include <sys/socket.h>
+#include <sys/efi.h>
#include <sys/module.h>
#include <sys/bus.h>
@@ -79,20 +80,28 @@
static void
smbios_identify (driver_t *driver, device_t parent)
{
+#ifdef ARCH_MAY_USE_EFI
+ struct uuid efi_smbios = EFI_TABLE_SMBIOS;
+ void *addr_efi;
+#endif
struct smbios_eps *eps;
device_t child;
- vm_paddr_t addr;
+ vm_paddr_t addr = 0;
int length;
int rid;
if (!device_is_alive(parent))
return;
+#ifdef ARCH_MAY_USE_EFI
+ if (!efi_get_table(&efi_smbios, &addr_efi))
+ addr = (vm_paddr_t)addr_efi;
+#endif
+
#if defined(__amd64__) || defined(__i386__)
- addr = bios_sigsearch(SMBIOS_START, SMBIOS_SIG, SMBIOS_LEN,
- SMBIOS_STEP, SMBIOS_OFF);
-#else
- addr = 0;
+ if (addr == 0)
+ addr = bios_sigsearch(SMBIOS_START, SMBIOS_SIG, SMBIOS_LEN,
+ SMBIOS_STEP, SMBIOS_OFF);
#endif
if (addr != 0) {
@@ -242,6 +251,9 @@
};
DRIVER_MODULE(smbios, nexus, smbios_driver, smbios_devclass, smbios_modevent, 0);
+#ifdef ARCH_MAY_USE_EFI
+MODULE_DEPEND(smbios, efirt, 1, 1, 1);
+#endif
MODULE_VERSION(smbios, 1);
static int
diff --git a/sys/sys/efi.h b/sys/sys/efi.h
--- a/sys/sys/efi.h
+++ b/sys/sys/efi.h
@@ -36,10 +36,10 @@
#define EFI_PAGE_SIZE (1 << EFI_PAGE_SHIFT)
#define EFI_PAGE_MASK (EFI_PAGE_SIZE - 1)
-#define EFI_TABLE_ACPI20 \
- {0x8868e871,0xe4f1,0x11d3,0xbc,0x22,{0x00,0x80,0xc7,0x3c,0x88,0x81}}
-#define EFI_TABLE_SAL \
- {0xeb9d2d32,0x2d88,0x11d3,0x9a,0x16,{0x00,0x90,0x27,0x3f,0xc1,0x4d}}
+#define EFI_TABLE_SMBIOS \
+ {0xeb9d2d31,0x2d88,0x11d3,0x9a,0x16,{0x00,0x90,0x27,0x3f,0xc1,0x4d}}
+#define EFI_TABLE_SMBIOS3 \
+ {0xf2fd1544,0x9794,0x4a2c,0x99,0x2e,{0xe5,0xbb,0xcf,0x20,0xe3,0x94}}
enum efi_reset {
EFI_RESET_COLD = 0,

File Metadata

Mime Type
text/plain
Expires
Fri, Mar 20, 6:05 AM (16 h, 52 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29934866
Default Alt Text
D29276.id86683.diff (3 KB)

Event Timeline