mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 13:57:35 +00:00
Kernel: Move PC BIOS-related code to the x86_64 architecture directory
All code that is related to PC BIOS should not be in the Kernel/Firmware directory as this directory is for abstracted and platform-agnostic code like ACPI (and device tree parsing in the future). This fixes a problem with the aarch64 architecure, as these machines don't have any PC-BIOS in them so actually trying to access these memory locations (EBDA, BIOS ROM) does not make any sense, as they're specific to x86 machines only.
This commit is contained in:
Liav A
Jelle Raaijmakers
parent
5fd975da8f
commit
d550b09871
12 changed files with 49 additions and 44 deletions
|
|
@ -1,61 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2022, Liav A. <liavalb@hotmail.co.il>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <AK/StringView.h>
|
||||
#include <Kernel/FileSystem/OpenFileDescription.h>
|
||||
#include <Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Component.h>
|
||||
#include <Kernel/Firmware/BIOS.h>
|
||||
#include <Kernel/Library/KBufferBuilder.h>
|
||||
#include <Kernel/Memory/MemoryManager.h>
|
||||
#include <Kernel/Memory/TypedMapping.h>
|
||||
#include <Kernel/Sections.h>
|
||||
|
||||
namespace Kernel {
|
||||
|
||||
NonnullRefPtr<BIOSSysFSComponent> BIOSSysFSComponent::must_create(Type type, PhysicalAddress blob_paddr, size_t blob_size)
|
||||
{
|
||||
return adopt_ref_if_nonnull(new (nothrow) BIOSSysFSComponent(type, blob_paddr, blob_size)).release_nonnull();
|
||||
}
|
||||
|
||||
UNMAP_AFTER_INIT BIOSSysFSComponent::BIOSSysFSComponent(Type type, PhysicalAddress blob_paddr, size_t blob_size)
|
||||
: SysFSComponent()
|
||||
, m_blob_paddr(blob_paddr)
|
||||
, m_blob_length(blob_size)
|
||||
, m_type(type)
|
||||
{
|
||||
}
|
||||
|
||||
ErrorOr<size_t> BIOSSysFSComponent::read_bytes(off_t offset, size_t count, UserOrKernelBuffer& buffer, OpenFileDescription*) const
|
||||
{
|
||||
auto blob = TRY(try_to_generate_buffer());
|
||||
|
||||
if ((size_t)offset >= blob->size())
|
||||
return 0;
|
||||
|
||||
ssize_t nread = min(static_cast<off_t>(blob->size() - offset), static_cast<off_t>(count));
|
||||
TRY(buffer.write(blob->data() + offset, nread));
|
||||
return nread;
|
||||
}
|
||||
|
||||
StringView BIOSSysFSComponent::name() const
|
||||
{
|
||||
switch (m_type) {
|
||||
case Type::DMIEntryPoint:
|
||||
return "smbios_entry_point"sv;
|
||||
case Type::SMBIOSTable:
|
||||
return "DMI"sv;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
VERIFY_NOT_REACHED();
|
||||
}
|
||||
|
||||
ErrorOr<NonnullOwnPtr<KBuffer>> BIOSSysFSComponent::try_to_generate_buffer() const
|
||||
{
|
||||
auto blob = TRY(Memory::map_typed<u8>((m_blob_paddr), m_blob_length));
|
||||
return KBuffer::try_create_with_bytes("BIOSSysFSComponent: Blob"sv, Span<u8> { blob.ptr(), m_blob_length });
|
||||
}
|
||||
}
|
||||
|
|
@ -1,41 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2022, Liav A. <liavalb@hotmail.co.il>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <AK/RefPtr.h>
|
||||
#include <AK/Types.h>
|
||||
#include <AK/Vector.h>
|
||||
#include <Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.h>
|
||||
#include <Kernel/Library/KBuffer.h>
|
||||
#include <Kernel/Library/LockRefPtr.h>
|
||||
#include <Kernel/Memory/PhysicalAddress.h>
|
||||
|
||||
namespace Kernel {
|
||||
|
||||
class BIOSSysFSComponent final : public SysFSComponent {
|
||||
public:
|
||||
enum class Type {
|
||||
DMIEntryPoint,
|
||||
SMBIOSTable,
|
||||
};
|
||||
|
||||
public:
|
||||
static NonnullRefPtr<BIOSSysFSComponent> must_create(Type, PhysicalAddress, size_t blob_size);
|
||||
virtual StringView name() const override;
|
||||
virtual ErrorOr<size_t> read_bytes(off_t, size_t, UserOrKernelBuffer&, OpenFileDescription*) const override;
|
||||
|
||||
private:
|
||||
ErrorOr<NonnullOwnPtr<KBuffer>> try_to_generate_buffer() const;
|
||||
BIOSSysFSComponent(Type, PhysicalAddress, size_t blob_size);
|
||||
|
||||
virtual size_t size() const override { return m_blob_length; }
|
||||
|
||||
PhysicalAddress const m_blob_paddr;
|
||||
size_t const m_blob_length { 0 };
|
||||
Type const m_type { Type::DMIEntryPoint };
|
||||
};
|
||||
}
|
||||
|
|
@ -1,46 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2022, Liav A. <liavalb@hotmail.co.il>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <AK/Types.h>
|
||||
|
||||
namespace Kernel::SMBIOS {
|
||||
|
||||
struct [[gnu::packed]] LegacyEntryPoint32bit {
|
||||
char legacy_sig[5];
|
||||
u8 checksum2;
|
||||
u16 smbios_table_length;
|
||||
u32 smbios_table_ptr;
|
||||
u16 smbios_tables_count;
|
||||
u8 smbios_bcd_revision;
|
||||
};
|
||||
|
||||
struct [[gnu::packed]] EntryPoint32bit {
|
||||
char sig[4];
|
||||
u8 checksum;
|
||||
u8 length;
|
||||
u8 major_version;
|
||||
u8 minor_version;
|
||||
u16 maximum_structure_size;
|
||||
u8 implementation_revision;
|
||||
char formatted_area[5];
|
||||
LegacyEntryPoint32bit legacy_structure;
|
||||
};
|
||||
|
||||
struct [[gnu::packed]] EntryPoint64bit {
|
||||
char sig[5];
|
||||
u8 checksum;
|
||||
u8 length;
|
||||
u8 major_version;
|
||||
u8 minor_version;
|
||||
u8 document_revision;
|
||||
u8 revision;
|
||||
u8 reserved;
|
||||
u32 table_maximum_size;
|
||||
u64 table_ptr;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,113 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2022, Liav A. <liavalb@hotmail.co.il>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <AK/StringView.h>
|
||||
#include <Kernel/FileSystem/OpenFileDescription.h>
|
||||
#include <Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Component.h>
|
||||
#include <Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/DMI/Definitions.h>
|
||||
#include <Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Directory.h>
|
||||
#include <Kernel/Firmware/BIOS.h>
|
||||
#include <Kernel/Library/KBufferBuilder.h>
|
||||
#include <Kernel/Memory/MemoryManager.h>
|
||||
#include <Kernel/Memory/TypedMapping.h>
|
||||
#include <Kernel/Sections.h>
|
||||
|
||||
namespace Kernel {
|
||||
|
||||
#define SMBIOS_BASE_SEARCH_ADDR 0xf0000
|
||||
#define SMBIOS_END_SEARCH_ADDR 0xfffff
|
||||
#define SMBIOS_SEARCH_AREA_SIZE (SMBIOS_END_SEARCH_ADDR - SMBIOS_BASE_SEARCH_ADDR)
|
||||
|
||||
UNMAP_AFTER_INIT void BIOSSysFSDirectory::set_dmi_64_bit_entry_initialization_values()
|
||||
{
|
||||
dbgln("BIOSSysFSDirectory: SMBIOS 64bit Entry point @ {}", m_dmi_entry_point);
|
||||
auto smbios_entry = Memory::map_typed<SMBIOS::EntryPoint64bit>(m_dmi_entry_point, SMBIOS_SEARCH_AREA_SIZE).release_value_but_fixme_should_propagate_errors();
|
||||
m_smbios_structure_table = PhysicalAddress(smbios_entry.ptr()->table_ptr);
|
||||
m_dmi_entry_point_length = smbios_entry.ptr()->length;
|
||||
m_smbios_structure_table_length = smbios_entry.ptr()->table_maximum_size;
|
||||
}
|
||||
|
||||
UNMAP_AFTER_INIT void BIOSSysFSDirectory::set_dmi_32_bit_entry_initialization_values()
|
||||
{
|
||||
dbgln("BIOSSysFSDirectory: SMBIOS 32bit Entry point @ {}", m_dmi_entry_point);
|
||||
auto smbios_entry = Memory::map_typed<SMBIOS::EntryPoint32bit>(m_dmi_entry_point, SMBIOS_SEARCH_AREA_SIZE).release_value_but_fixme_should_propagate_errors();
|
||||
m_smbios_structure_table = PhysicalAddress(smbios_entry.ptr()->legacy_structure.smbios_table_ptr);
|
||||
m_dmi_entry_point_length = smbios_entry.ptr()->length;
|
||||
m_smbios_structure_table_length = smbios_entry.ptr()->legacy_structure.smbios_table_length;
|
||||
}
|
||||
|
||||
UNMAP_AFTER_INIT NonnullRefPtr<BIOSSysFSDirectory> BIOSSysFSDirectory::must_create(SysFSFirmwareDirectory& firmware_directory)
|
||||
{
|
||||
auto bios_directory = MUST(adopt_nonnull_ref_or_enomem(new (nothrow) BIOSSysFSDirectory(firmware_directory)));
|
||||
bios_directory->create_components();
|
||||
return bios_directory;
|
||||
}
|
||||
|
||||
void BIOSSysFSDirectory::create_components()
|
||||
{
|
||||
if (m_dmi_entry_point.is_null() || m_smbios_structure_table.is_null())
|
||||
return;
|
||||
if (m_dmi_entry_point_length == 0) {
|
||||
dbgln("BIOSSysFSDirectory: invalid dmi entry length");
|
||||
return;
|
||||
}
|
||||
if (m_smbios_structure_table_length == 0) {
|
||||
dbgln("BIOSSysFSDirectory: invalid smbios structure table length");
|
||||
return;
|
||||
}
|
||||
MUST(m_child_components.with([&](auto& list) -> ErrorOr<void> {
|
||||
list.append(BIOSSysFSComponent::must_create(BIOSSysFSComponent::Type::DMIEntryPoint, m_dmi_entry_point, m_dmi_entry_point_length));
|
||||
list.append(BIOSSysFSComponent::must_create(BIOSSysFSComponent::Type::SMBIOSTable, m_smbios_structure_table, m_smbios_structure_table_length));
|
||||
return {};
|
||||
}));
|
||||
}
|
||||
|
||||
UNMAP_AFTER_INIT void BIOSSysFSDirectory::initialize_dmi_exposer()
|
||||
{
|
||||
VERIFY(!(m_dmi_entry_point.is_null()));
|
||||
if (m_using_64bit_dmi_entry_point) {
|
||||
set_dmi_64_bit_entry_initialization_values();
|
||||
} else {
|
||||
set_dmi_32_bit_entry_initialization_values();
|
||||
}
|
||||
dbgln("BIOSSysFSDirectory: Data table @ {}", m_smbios_structure_table);
|
||||
}
|
||||
|
||||
UNMAP_AFTER_INIT BIOSSysFSDirectory::BIOSSysFSDirectory(SysFSFirmwareDirectory& firmware_directory)
|
||||
: SysFSDirectory(firmware_directory)
|
||||
{
|
||||
auto entry_32bit = find_dmi_entry32bit_point();
|
||||
if (entry_32bit.has_value()) {
|
||||
m_dmi_entry_point = entry_32bit.value();
|
||||
}
|
||||
|
||||
auto entry_64bit = find_dmi_entry64bit_point();
|
||||
if (entry_64bit.has_value()) {
|
||||
m_dmi_entry_point = entry_64bit.value();
|
||||
m_using_64bit_dmi_entry_point = true;
|
||||
}
|
||||
if (m_dmi_entry_point.is_null())
|
||||
return;
|
||||
initialize_dmi_exposer();
|
||||
}
|
||||
|
||||
UNMAP_AFTER_INIT Optional<PhysicalAddress> BIOSSysFSDirectory::find_dmi_entry64bit_point()
|
||||
{
|
||||
auto bios_or_error = map_bios();
|
||||
if (bios_or_error.is_error())
|
||||
return {};
|
||||
return bios_or_error.value().find_chunk_starting_with("_SM3_"sv, 16);
|
||||
}
|
||||
|
||||
UNMAP_AFTER_INIT Optional<PhysicalAddress> BIOSSysFSDirectory::find_dmi_entry32bit_point()
|
||||
{
|
||||
auto bios_or_error = map_bios();
|
||||
if (bios_or_error.is_error())
|
||||
return {};
|
||||
return bios_or_error.value().find_chunk_starting_with("_SM_"sv, 16);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2022, Liav A. <liavalb@hotmail.co.il>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <AK/RefPtr.h>
|
||||
#include <AK/Types.h>
|
||||
#include <AK/Vector.h>
|
||||
#include <Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.h>
|
||||
#include <Kernel/Library/LockRefPtr.h>
|
||||
#include <Kernel/Memory/PhysicalAddress.h>
|
||||
|
||||
namespace Kernel {
|
||||
|
||||
class BIOSSysFSDirectory : public SysFSDirectory {
|
||||
public:
|
||||
virtual StringView name() const override { return "bios"sv; }
|
||||
static NonnullRefPtr<BIOSSysFSDirectory> must_create(SysFSFirmwareDirectory&);
|
||||
|
||||
void create_components();
|
||||
|
||||
private:
|
||||
explicit BIOSSysFSDirectory(SysFSFirmwareDirectory&);
|
||||
|
||||
void set_dmi_64_bit_entry_initialization_values();
|
||||
void set_dmi_32_bit_entry_initialization_values();
|
||||
void initialize_dmi_exposer();
|
||||
|
||||
Optional<PhysicalAddress> find_dmi_entry64bit_point();
|
||||
Optional<PhysicalAddress> find_dmi_entry32bit_point();
|
||||
|
||||
PhysicalAddress m_dmi_entry_point;
|
||||
PhysicalAddress m_smbios_structure_table;
|
||||
bool m_using_64bit_dmi_entry_point { false };
|
||||
size_t m_smbios_structure_table_length { 0 };
|
||||
size_t m_dmi_entry_point_length { 0 };
|
||||
};
|
||||
|
||||
}
|
||||
|
|
@ -4,8 +4,11 @@
|
|||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include <AK/Platform.h>
|
||||
#if ARCH(X86_64)
|
||||
# include <Kernel/Arch/x86_64/Firmware/PCBIOS/SysFSDirectory.h>
|
||||
#endif
|
||||
#include <Kernel/FileSystem/SysFS/Registry.h>
|
||||
#include <Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Directory.h>
|
||||
#include <Kernel/FileSystem/SysFS/Subsystems/Firmware/Directory.h>
|
||||
#include <Kernel/Firmware/ACPI/Parser.h>
|
||||
#include <Kernel/Sections.h>
|
||||
|
|
@ -22,7 +25,9 @@ UNMAP_AFTER_INIT void SysFSFirmwareDirectory::initialize()
|
|||
void SysFSFirmwareDirectory::create_components()
|
||||
{
|
||||
MUST(m_child_components.with([&](auto& list) -> ErrorOr<void> {
|
||||
list.append(BIOSSysFSDirectory::must_create(*this));
|
||||
#if ARCH(X86_64)
|
||||
list.append(SysFSBIOSDirectory::must_create(*this));
|
||||
#endif
|
||||
if (ACPI::is_enabled())
|
||||
list.append(ACPI::ACPISysFSDirectory::must_create(*this));
|
||||
return {};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue