RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-19 12:57:39 +00:00
Code Issues Activity Actions

Kernel: Use regular kmalloc for buffers in rtl8139 driver

Browse source
This commit is contained in:
Conrad Pankoff 2019-09-03 23:12:12 +10:00 • committed by Andreas Kling
parent 87808e535a
commit ff2997f018
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Kernel/Net/RTL8139NetworkAdapter.cpp
View file

@ -131,21 +131,16 @@ RTL8139NetworkAdapter::RTL8139NetworkAdapter(PCI::Address pci_address, u8 irq)
// we add space to account for overhang from the last packet - the rtl8139 // we add space to account for overhang from the last packet - the rtl8139
// can optionally guarantee that packets will be contiguous by // can optionally guarantee that packets will be contiguous by
// purposefully overrunning the rx buffer // purposefully overrunning the rx buffer
auto rx_buffer_addr = (u32)kmalloc_eternal(RX_BUFFER_SIZE + PACKET_SIZE_MAX); m_rx_buffer_addr = (u32)kmalloc_aligned(RX_BUFFER_SIZE + PACKET_SIZE_MAX, 16);
if (rx_buffer_addr % 16)
rx_buffer_addr = (rx_buffer_addr + 16) - (rx_buffer_addr % 16);
m_rx_buffer_addr = rx_buffer_addr;
kprintf("RTL8139: RX buffer: P%p\n", m_rx_buffer_addr); kprintf("RTL8139: RX buffer: P%p\n", m_rx_buffer_addr);
auto tx_buffer_addr = (u32)kmalloc_aligned(TX_BUFFER_SIZE * 4, 16);
for (int i = 0; i < RTL8139_TX_BUFFER_COUNT; i++) { for (int i = 0; i < RTL8139_TX_BUFFER_COUNT; i++) {
auto tx_buffer_addr = (u32)kmalloc_eternal(TX_BUFFER_SIZE); m_tx_buffer_addr[i] = tx_buffer_addr + TX_BUFFER_SIZE * i;
if (tx_buffer_addr % 16)
tx_buffer_addr = (tx_buffer_addr + 16) - (tx_buffer_addr % 16);
m_tx_buffer_addr[i] = tx_buffer_addr;
kprintf("RTL8139: TX buffer %d: P%p\n", i, m_tx_buffer_addr[i]); kprintf("RTL8139: TX buffer %d: P%p\n", i, m_tx_buffer_addr[i]);
} }
m_packet_buffer = (u32)kmalloc_eternal(PACKET_SIZE_MAX); m_packet_buffer = (u32)kmalloc(PACKET_SIZE_MAX);
kprintf("RTL8139: Packet buffer: P%p\n", m_packet_buffer); kprintf("RTL8139: Packet buffer: P%p\n", m_packet_buffer);
reset(); reset();