mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-11-01 23:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

rtl8169: fix interrupt handling

Browse Source
This commit is contained in:
Matheus
2026-03-03 01:18:22 -03:00
parent b086212f21
commit 9418020ebb
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/io/net/rtl8169.c
+12 -11
View File
@@ -70,8 +70,8 @@ typedef struct {
typedef struct { typedef struct {
netdev_t netdev; netdev_t netdev;
descriptor_t *tx_ring; volatile descriptor_t *tx_ring;
descriptor_t *rx_ring; volatile descriptor_t *rx_ring;
dpc_t tx_dpc; dpc_t tx_dpc;
dpc_t rx_dpc; dpc_t rx_dpc;
pcibar_t bar; pcibar_t bar;
@@ -130,7 +130,7 @@ static void rtl8169_dpc_rx(context_t *, dpcarg_t arg) {
rtl8169dev_t *dev = arg; rtl8169dev_t *dev = arg;
while (!(dev->rx_ring[dev->rx_next].flags & DESCRIPTOR_OWN)) { while (!(dev->rx_ring[dev->rx_next].flags & DESCRIPTOR_OWN)) {
descriptor_t *descriptor = &dev->rx_ring[dev->rx_next]; volatile descriptor_t *descriptor = &dev->rx_ring[dev->rx_next];
void *buffer = MAKE_HHDM((void *)(descriptor->addr_low | ((uint64_t)descriptor->addr_high << 32))); void *buffer = MAKE_HHDM((void *)(descriptor->addr_low | ((uint64_t)descriptor->addr_high << 32)));
eth_process(&dev->netdev, buffer); eth_process(&dev->netdev, buffer);
@@ -148,16 +148,17 @@ static void rtl8169_isr(isr_t *self, context_t *) {
rtl8169dev_t *dev = self->priv; rtl8169dev_t *dev = self->priv;
uint16_t status = inw(dev->bar.address + REGISTER_IRQ_STATUS); uint16_t status = inw(dev->bar.address + REGISTER_IRQ_STATUS);
if (!status) while (status) {
return; outw(dev->bar.address + REGISTER_IRQ_STATUS, status);
if (status & (REGISTER_IRQ_STATUS_TX_OK | REGISTER_IRQ_STATUS_TX_ERROR)) if (status & (REGISTER_IRQ_STATUS_TX_OK | REGISTER_IRQ_STATUS_TX_ERROR))
dpc_enqueue(&dev->tx_dpc, rtl8169_dpc_tx, dev); dpc_enqueue(&dev->tx_dpc, rtl8169_dpc_tx, dev);
if (status & (REGISTER_IRQ_STATUS_RX_OK | REGISTER_IRQ_STATUS_RX_ERROR)) if (status & (REGISTER_IRQ_STATUS_RX_OK | REGISTER_IRQ_STATUS_RX_ERROR))
dpc_enqueue(&dev->rx_dpc, rtl8169_dpc_rx, dev); dpc_enqueue(&dev->rx_dpc, rtl8169_dpc_rx, dev);
outw(dev->bar.address + REGISTER_IRQ_STATUS, status); status = inw(dev->bar.address + REGISTER_IRQ_STATUS);
}
} }
static int rtl8169_sendpacket(netdev_t *internal, netdesc_t desc, mac_t target, int proto) { static int rtl8169_sendpacket(netdev_t *internal, netdesc_t desc, mac_t target, int proto) {
@@ -172,7 +173,7 @@ static int rtl8169_sendpacket(netdev_t *internal, netdesc_t desc, mac_t target,
long ipl = spinlock_acquire_raise_ipl(&netdev->tx_lock, IPL_DPC); long ipl = spinlock_acquire_raise_ipl(&netdev->tx_lock, IPL_DPC);
descriptor_t *descriptor = &netdev->tx_ring[netdev->tx_next]; volatile descriptor_t *descriptor = &netdev->tx_ring[netdev->tx_next];
uintptr_t physical_address = (uintptr_t)FROM_HHDM(desc.address); uintptr_t physical_address = (uintptr_t)FROM_HHDM(desc.address);
descriptor->addr_low = physical_address & 0xffffffff; descriptor->addr_low = physical_address & 0xffffffff;