From 99f5ffd2ccfbf7d416f7fd04fd42c9582f7846bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Holz?= Date: Sun, 25 Jan 2026 23:31:27 +0100 Subject: [PATCH] Kernel+Ports: Move SMBIOS sysfs paths to /sys/firmware/smbios Also use more fitting file names for the entry point and structure table. Now that we expose SMBIOS data on non-x86, putting this in a "bios" directory feels wrong. --- Kernel/Firmware/SMBIOS/SysFSComponent.cpp | 4 +-- Kernel/Firmware/SMBIOS/SysFSDirectory.h | 2 +- ...-Use-serenity-s-firmware-binary-path.patch | 22 ---------------- ...Use-serenity-s-firmware-binary-paths.patch | 26 +++++++++++++++++++ Ports/dmidecode/patches/ReadMe.md | 4 +-- 5 files changed, 31 insertions(+), 27 deletions(-) delete mode 100644 Ports/dmidecode/patches/0001-Use-serenity-s-firmware-binary-path.patch create mode 100644 Ports/dmidecode/patches/0001-Use-serenity-s-firmware-binary-paths.patch diff --git a/Kernel/Firmware/SMBIOS/SysFSComponent.cpp b/Kernel/Firmware/SMBIOS/SysFSComponent.cpp index c77f6978b3d..7d023db992d 100644 --- a/Kernel/Firmware/SMBIOS/SysFSComponent.cpp +++ b/Kernel/Firmware/SMBIOS/SysFSComponent.cpp @@ -43,9 +43,9 @@ StringView SysFSPCBIOSComponent::name() const { switch (m_type) { case Type::SMBIOSEntryPoint: - return "smbios_entry_point"sv; + return "entry_point"sv; case Type::SMBIOSTable: - return "DMI"sv; + return "structure_table"sv; default: break; } diff --git a/Kernel/Firmware/SMBIOS/SysFSDirectory.h b/Kernel/Firmware/SMBIOS/SysFSDirectory.h index b36016e04c5..a83ba9297c0 100644 --- a/Kernel/Firmware/SMBIOS/SysFSDirectory.h +++ b/Kernel/Firmware/SMBIOS/SysFSDirectory.h @@ -18,7 +18,7 @@ namespace Kernel { class SysFSBIOSDirectory : public SysFSDirectory { public: - virtual StringView name() const override { return "bios"sv; } + virtual StringView name() const override { return "smbios"sv; } static NonnullRefPtr must_create(SysFSFirmwareDirectory&); void create_components(); diff --git a/Ports/dmidecode/patches/0001-Use-serenity-s-firmware-binary-path.patch b/Ports/dmidecode/patches/0001-Use-serenity-s-firmware-binary-path.patch deleted file mode 100644 index 957cb41f01b..00000000000 --- a/Ports/dmidecode/patches/0001-Use-serenity-s-firmware-binary-path.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Liav A -Date: Fri, 1 Apr 2022 11:01:13 +0300 -Subject: [PATCH] Use serenity's firmware binary path - ---- - dmidecode.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/dmidecode.c b/dmidecode.c -index cd2b5c9..49bf30e 100644 ---- a/dmidecode.c -+++ b/dmidecode.c -@@ -90,7 +90,7 @@ static const char *bad_index = ""; - #define FLAG_NO_FILE_OFFSET (1 << 0) - #define FLAG_STOP_AT_EOT (1 << 1) - --#define SYS_FIRMWARE_DIR "/sys/firmware/dmi/tables" -+#define SYS_FIRMWARE_DIR "/sys/firmware/bios" - #define SYS_ENTRY_FILE SYS_FIRMWARE_DIR "/smbios_entry_point" - #define SYS_TABLE_FILE SYS_FIRMWARE_DIR "/DMI" - diff --git a/Ports/dmidecode/patches/0001-Use-serenity-s-firmware-binary-paths.patch b/Ports/dmidecode/patches/0001-Use-serenity-s-firmware-binary-paths.patch new file mode 100644 index 00000000000..ee2d42eda3b --- /dev/null +++ b/Ports/dmidecode/patches/0001-Use-serenity-s-firmware-binary-paths.patch @@ -0,0 +1,26 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Liav A +Date: Fri, 1 Apr 2022 11:01:13 +0300 +Subject: [PATCH] Use serenity's firmware binary paths + +--- + dmidecode.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/dmidecode.c b/dmidecode.c +index 463f12b2748c7e37f0e4345d26e6e804b21b0a28..af3a72c7d579ec21c8c0e9541bd984dd6850ed33 100644 +--- a/dmidecode.c ++++ b/dmidecode.c +@@ -94,9 +94,9 @@ enum cpuid_type cpuid_type = cpuid_none; + #define FLAG_NO_FILE_OFFSET (1 << 0) + #define FLAG_STOP_AT_EOT (1 << 1) + +-#define SYS_FIRMWARE_DIR "/sys/firmware/dmi/tables" +-#define SYS_ENTRY_FILE SYS_FIRMWARE_DIR "/smbios_entry_point" +-#define SYS_TABLE_FILE SYS_FIRMWARE_DIR "/DMI" ++#define SYS_FIRMWARE_DIR "/sys/firmware/smbios" ++#define SYS_ENTRY_FILE SYS_FIRMWARE_DIR "/entry_point" ++#define SYS_TABLE_FILE SYS_FIRMWARE_DIR "/structure_table" + + /* + * Type-independant Stuff diff --git a/Ports/dmidecode/patches/ReadMe.md b/Ports/dmidecode/patches/ReadMe.md index 754e32505a9..14a129c3843 100644 --- a/Ports/dmidecode/patches/ReadMe.md +++ b/Ports/dmidecode/patches/ReadMe.md @@ -1,7 +1,7 @@ # Patches for dmidecode on SerenityOS -## `0001-Use-serenity-s-firmware-binary-path.patch` +## `0001-Use-serenity-s-firmware-binary-paths.patch` -Use serenity's firmware binary path +Use serenity's firmware binary paths