mirrors/Astral
1
0
Fork 0
mirror of https://github.com/Mathewnd/Astral.git synced 2026-10-31 06:28:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

io: use isr->priv

Browse Source
This commit is contained in:
Matheus
2024-09-07 11:21:38 -03:00
parent feff654109
commit c596244010
4 changed files with 10 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel-src/io/net/vionet.c
+5 -14
View File
@@ -38,8 +38,6 @@ typedef struct {
uint16_t buffercount;
} __attribute__((packed)) vioframe_t;
static hashtable_t irqtable; // isr id -> netdev
static void rx_dpc(context_t *context, dpcarg_t arg) {
vionetdev_t *netdev = arg;
volatile viobuffer_t *buffers = VIO_QUEUE_BUFFERS(&netdev->rxqueue);
@@ -54,9 +52,7 @@ static void rx_dpc(context_t *context, dpcarg_t arg) {
}
static void rx_irq(isr_t *isr, context_t *context) {
void *v;
__assert(hashtable_get(&irqtable, &v, &isr->id, sizeof(isr->id)) == 0);
vionetdev_t *netdev = v;
vionetdev_t *netdev = isr->priv;
dpc_enqueue(&netdev->txdpc, rx_dpc, netdev);
}
@@ -77,9 +73,7 @@ static void tx_dpc(context_t *context, dpcarg_t arg) {
}
static void tx_irq(isr_t *isr, context_t *context) {
void *v;
__assert(hashtable_get(&irqtable, &v, &isr->id, sizeof(isr->id)) == 0);
vionetdev_t *netdev = v;
vionetdev_t *netdev = isr->priv;
dpc_enqueue(&netdev->txdpc, tx_dpc, netdev);
}
@@ -196,12 +190,13 @@ int vionet_newdevice(viodevice_t *viodevice) {
isr_t *rxisr = interrupt_allocate(rx_irq, ARCH_EOI, IPL_NET);
__assert(rxisr);
pci_msixadd(viodevice->e, 0, INTERRUPT_IDTOVECTOR(rxisr->id), 1, 0);
__assert(hashtable_set(&irqtable, netdev, &rxisr->id, sizeof(rxisr->id), true) == 0);
rxisr->priv = netdev;
isr_t *txisr = interrupt_allocate(tx_irq, ARCH_EOI, IPL_NET);
__assert(txisr);
pci_msixadd(viodevice->e, 1, INTERRUPT_IDTOVECTOR(txisr->id), 1, 0);
__assert(hashtable_set(&irqtable, netdev, &txisr->id, sizeof(txisr->id), true) == 0);
txisr->priv = netdev;
pci_msixsetmask(viodevice->e, 0);
virtio_enablequeue(viodevice, 0);
@@ -236,7 +231,3 @@ int vionet_newdevice(viodevice_t *viodevice) {
return 0;
}
void vionet_init() {
__assert(hashtable_init(&irqtable, 20) == 0);
}