RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 16:27:35 +00:00
Code Issues Activity Actions

Kernel: More work on bringing up E1000 support.

Browse source
This commit is contained in:
Andreas Kling 2019-03-11 11:11:29 +01:00
parent a36eaeb18c
commit 47b096feb4
4 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Kernel/E1000NetworkAdapter.cpp
View file

@ -108,6 +108,9 @@ E1000NetworkAdapter::E1000NetworkAdapter(PCI::Address pci_address, byte irq)
{ {
s_the = this; s_the = this;
kprintf("E1000: Found at PCI address %b:%b:%b\n", pci_address.bus(), pci_address.slot(), pci_address.function()); kprintf("E1000: Found at PCI address %b:%b:%b\n", pci_address.bus(), pci_address.slot(), pci_address.function());
enable_bus_mastering(m_pci_address);
m_mmio_base = PhysicalAddress(PCI::get_BAR0(m_pci_address)); m_mmio_base = PhysicalAddress(PCI::get_BAR0(m_pci_address));
MM.map_for_kernel(LinearAddress(m_mmio_base.get()), m_mmio_base); MM.map_for_kernel(LinearAddress(m_mmio_base.get()), m_mmio_base);
MM.map_for_kernel(LinearAddress(m_mmio_base.offset(4096).get()), m_mmio_base.offset(4096)); MM.map_for_kernel(LinearAddress(m_mmio_base.offset(4096).get()), m_mmio_base.offset(4096));

3
Kernel/MemoryManager.cpp
View file

@ -56,6 +56,9 @@ void MemoryManager::populate_page_directory(PageDirectory& page_directory)
{ {
page_directory.m_directory_page = allocate_supervisor_physical_page(); page_directory.m_directory_page = allocate_supervisor_physical_page();
page_directory.entries()[0] = kernel_page_directory().entries()[0]; page_directory.entries()[0] = kernel_page_directory().entries()[0];
// Defer to the kernel page tables for 0xC0000000-0xFFFFFFFF
for (int i = 768; i < 1024; ++i)
page_directory.entries()[i] = kernel_page_directory().entries()[i];
} }
void MemoryManager::initialize_paging() void MemoryManager::initialize_paging()

8
Kernel/PCI.cpp
View file

@ -103,6 +103,14 @@ dword get_BAR3(Address address) { return read_field<dword>(address, PCI_BAR3); }
dword get_BAR4(Address address) { return read_field<dword>(address, PCI_BAR4); } dword get_BAR4(Address address) { return read_field<dword>(address, PCI_BAR4); }
dword get_BAR5(Address address) { return read_field<dword>(address, PCI_BAR5); } dword get_BAR5(Address address) { return read_field<dword>(address, PCI_BAR5); }
void enable_bus_mastering(Address address)
{
auto value = read_field<word>(address, PCI_COMMAND);
value |= (1 << 2);
value |= (1 << 0);
write_field<word>(address, PCI_COMMAND, value);
}
void enumerate_all(Function<void(Address, ID)> callback) void enumerate_all(Function<void(Address, ID)> callback)
{ {
// Single PCI host controller. // Single PCI host controller.

1
Kernel/PCI.h
View file

@ -47,5 +47,6 @@ dword get_BAR2(Address);
dword get_BAR3(Address); dword get_BAR3(Address);
dword get_BAR4(Address); dword get_BAR4(Address);
dword get_BAR5(Address); dword get_BAR5(Address);
void enable_bus_mastering(Address);
} }