LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-20 09:49:15 +03:00
Code Issues Packages Projects Releases Wiki Activity

Kernel/SysFS: Remove derived BIOSSysFSComponent classes

Browse Source 
These are not needed, because both do exactly the same thing, so we can
move the code to the BIOSSysFSComponent class.
This commit is contained in:
Liav A 2022-04-22 15:32:45 +03:00 committed by Andreas Kling
parent 23c1c40e86
commit 30b58cd06c
Notes: sideshowbarker 2024-07-17 18:08:55 +09:00 
Author: https://github.com/supercomputer7
Commit: https://github.com/SerenityOS/serenity/commit/30b58cd06c
Pull-request: https://github.com/SerenityOS/serenity/pull/13772
8 changed files with 49 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Kernel/CMakeLists.txt
View File

@ -155,8 +155,6 @@ set(KERNEL_SOURCES
FileSystem/SysFS/Subsystems/Devices/CharacterDevicesDirectory.cpp
FileSystem/SysFS/Subsystems/Devices/DeviceComponent.cpp
FileSystem/SysFS/Subsystems/Devices/Directory.cpp
FileSystem/SysFS/Subsystems/Firmware/BIOS/DMI/EntryPointBlob.cpp
FileSystem/SysFS/Subsystems/Firmware/BIOS/DMI/Table.cpp
FileSystem/SysFS/Subsystems/Firmware/BIOS/Component.cpp
FileSystem/SysFS/Subsystems/Firmware/BIOS/Directory.cpp
FileSystem/SysFS/Subsystems/Firmware/Directory.cpp

29
Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Component.cpp
View File

@ -15,7 +15,16 @@
namespace Kernel {
UNMAP_AFTER_INIT BIOSSysFSComponent::BIOSSysFSComponent()
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)
{
}
@ -31,4 +40,22 @@ ErrorOr<size_t> BIOSSysFSComponent::read_bytes(off_t offset, size_t count, UserO
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(Span<u8> { blob.ptr(), m_blob_length });
}
}

23
Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Component.h
View File

@ -15,13 +15,26 @@
namespace Kernel {
class BIOSSysFSComponent : public SysFSComponent {
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;
protected:
virtual ErrorOr<NonnullOwnPtr<KBuffer>> try_to_generate_buffer() const = 0;
BIOSSysFSComponent();
};
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 };
};
}

35
Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/DMI/EntryPointBlob.cpp
View File

@ -1,35 +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/DMI/EntryPointBlob.h>
#include <Kernel/KBufferBuilder.h>
#include <Kernel/Memory/MemoryManager.h>
#include <Kernel/Memory/TypedMapping.h>
#include <Kernel/Sections.h>
namespace Kernel {
UNMAP_AFTER_INIT NonnullRefPtr<DMIEntryPointExposedBlob> DMIEntryPointExposedBlob::must_create(PhysicalAddress dmi_entry_point, size_t blob_size)
{
return adopt_ref(*new (nothrow) DMIEntryPointExposedBlob(dmi_entry_point, blob_size));
}
UNMAP_AFTER_INIT DMIEntryPointExposedBlob::DMIEntryPointExposedBlob(PhysicalAddress dmi_entry_point, size_t blob_size)
: BIOSSysFSComponent()
, m_dmi_entry_point(dmi_entry_point)
, m_dmi_entry_point_length(blob_size)
{
}
ErrorOr<NonnullOwnPtr<KBuffer>> DMIEntryPointExposedBlob::try_to_generate_buffer() const
{
auto dmi_blob = TRY(Memory::map_typed<u8>((m_dmi_entry_point), m_dmi_entry_point_length));
return KBuffer::try_create_with_bytes(Span<u8> { dmi_blob.ptr(), m_dmi_entry_point_length });
}
}

35
Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/DMI/EntryPointBlob.h
View File

@ -1,35 +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/BIOS/Component.h>
#include <Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/DMI/Definitions.h>
#include <Kernel/KBuffer.h>
#include <Kernel/Memory/Region.h>
#include <Kernel/PhysicalAddress.h>
namespace Kernel {
class DMIEntryPointExposedBlob final : public BIOSSysFSComponent {
public:
virtual StringView name() const override { return "smbios_entry_point"sv; }
static NonnullRefPtr<DMIEntryPointExposedBlob> must_create(PhysicalAddress dmi_entry_point, size_t blob_size);
private:
DMIEntryPointExposedBlob(PhysicalAddress dmi_entry_point, size_t blob_size);
virtual ErrorOr<NonnullOwnPtr<KBuffer>> try_to_generate_buffer() const override;
virtual size_t size() const override { return m_dmi_entry_point_length; }
PhysicalAddress m_dmi_entry_point;
size_t const m_dmi_entry_point_length { 0 };
};
}

34
Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/DMI/Table.cpp
View File

@ -1,34 +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/DMI/Table.h>
#include <Kernel/KBufferBuilder.h>
#include <Kernel/Memory/TypedMapping.h>
#include <Kernel/Sections.h>
namespace Kernel {
UNMAP_AFTER_INIT NonnullRefPtr<SMBIOSExposedTable> SMBIOSExposedTable::must_create(PhysicalAddress smbios_structure_table, size_t smbios_structure_table_length)
{
return adopt_ref(*new (nothrow) SMBIOSExposedTable(smbios_structure_table, smbios_structure_table_length));
}
UNMAP_AFTER_INIT SMBIOSExposedTable::SMBIOSExposedTable(PhysicalAddress smbios_structure_table, size_t smbios_structure_table_length)
: BIOSSysFSComponent()
, m_smbios_structure_table(smbios_structure_table)
, m_smbios_structure_table_length(smbios_structure_table_length)
{
}
ErrorOr<NonnullOwnPtr<KBuffer>> SMBIOSExposedTable::try_to_generate_buffer() const
{
auto dmi_blob = TRY(Memory::map_typed<u8>((m_smbios_structure_table), m_smbios_structure_table_length));
return KBuffer::try_create_with_bytes(Span<u8> { dmi_blob.ptr(), m_smbios_structure_table_length });
}
}

34
Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/DMI/Table.h
View File

@ -1,34 +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/BIOS/Component.h>
#include <Kernel/KBuffer.h>
#include <Kernel/Memory/Region.h>
#include <Kernel/PhysicalAddress.h>
namespace Kernel {
class SMBIOSExposedTable final : public BIOSSysFSComponent {
public:
virtual StringView name() const override { return "DMI"sv; }
static NonnullRefPtr<SMBIOSExposedTable> must_create(PhysicalAddress, size_t blob_size);
private:
SMBIOSExposedTable(PhysicalAddress dmi_entry_point, size_t blob_size);
virtual ErrorOr<NonnullOwnPtr<KBuffer>> try_to_generate_buffer() const override;
virtual size_t size() const override { return m_smbios_structure_table_length; }
PhysicalAddress m_smbios_structure_table;
size_t const m_smbios_structure_table_length { 0 };
};
}

7
Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Directory.cpp
View File

@ -6,9 +6,8 @@
#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/DMI/EntryPointBlob.h>
#include <Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/DMI/Table.h>
#include <Kernel/FileSystem/SysFS/Subsystems/Firmware/BIOS/Directory.h>
#include <Kernel/Firmware/BIOS.h>
#include <Kernel/KBufferBuilder.h>
@ -59,8 +58,8 @@ void BIOSSysFSDirectory::create_components()
dbgln("BIOSSysFSDirectory: invalid smbios structure table length");
return;
}
m_components.append(DMIEntryPointExposedBlob::must_create(m_dmi_entry_point, m_dmi_entry_point_length));
m_components.append(SMBIOSExposedTable::must_create(m_smbios_structure_table, m_smbios_structure_table_length));
m_components.append(BIOSSysFSComponent::must_create(BIOSSysFSComponent::Type::DMIEntryPoint, m_dmi_entry_point, m_dmi_entry_point_length));
m_components.append(BIOSSysFSComponent::must_create(BIOSSysFSComponent::Type::SMBIOSTable, m_smbios_structure_table, m_smbios_structure_table_length));
}
UNMAP_AFTER_INIT void BIOSSysFSDirectory::initialize_dmi_exposer()