Index: boot/Makefile.common =================================================================== --- boot/Makefile.common (revision 597c948125ea3c675750b1739ef29f8ddbcc8b74) +++ boot/Makefile.common (revision f902d362683090a4d4d8714b068ea5f2987efb8c) @@ -98,5 +98,5 @@ $(USPACE_PATH)/srv/fs/fat/fat \ $(USPACE_PATH)/srv/taskmon/taskmon \ - $(USPACE_PATH)/srv/hw/netif/dp8390/dp8390 \ + $(USPACE_PATH)/srv/hw/netif/ne2000/ne2000 \ $(USPACE_PATH)/srv/net/netif/lo/lo \ $(USPACE_PATH)/srv/net/nil/eth/eth \ Index: kernel/arch/amd64/include/interrupt.h =================================================================== --- kernel/arch/amd64/include/interrupt.h (revision 597c948125ea3c675750b1739ef29f8ddbcc8b74) +++ kernel/arch/amd64/include/interrupt.h (revision f902d362683090a4d4d8714b068ea5f2987efb8c) @@ -55,5 +55,5 @@ #define IRQ_PIC_SPUR 7 #define IRQ_MOUSE 12 -#define IRQ_DP8390 9 +#define IRQ_NE2000 9 /* This one must have four least significant bits set to ones */ Index: kernel/arch/amd64/src/amd64.c =================================================================== --- kernel/arch/amd64/src/amd64.c (revision 597c948125ea3c675750b1739ef29f8ddbcc8b74) +++ kernel/arch/amd64/src/amd64.c (revision f902d362683090a4d4d8714b068ea5f2987efb8c) @@ -238,5 +238,5 @@ sysinfo_set_item_val(irqs_info, NULL, true); - sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390); + sysinfo_set_item_val("netif.ne2000.inr", NULL, IRQ_NE2000); } Index: kernel/arch/ia32/include/interrupt.h =================================================================== --- kernel/arch/ia32/include/interrupt.h (revision 597c948125ea3c675750b1739ef29f8ddbcc8b74) +++ kernel/arch/ia32/include/interrupt.h (revision f902d362683090a4d4d8714b068ea5f2987efb8c) @@ -55,5 +55,5 @@ #define IRQ_PIC_SPUR 7 #define IRQ_MOUSE 12 -#define IRQ_DP8390 5 +#define IRQ_NE2000 5 /* This one must have four least significant bits set to ones */ Index: kernel/arch/ia32/src/ia32.c =================================================================== --- kernel/arch/ia32/src/ia32.c (revision 597c948125ea3c675750b1739ef29f8ddbcc8b74) +++ kernel/arch/ia32/src/ia32.c (revision f902d362683090a4d4d8714b068ea5f2987efb8c) @@ -196,5 +196,5 @@ sysinfo_set_item_val(irqs_info, NULL, true); - sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390); + sysinfo_set_item_val("netif.ne2000.inr", NULL, IRQ_NE2000); } Index: kernel/arch/ia64/include/interrupt.h =================================================================== --- kernel/arch/ia64/include/interrupt.h (revision 597c948125ea3c675750b1739ef29f8ddbcc8b74) +++ kernel/arch/ia64/include/interrupt.h (revision f902d362683090a4d4d8714b068ea5f2987efb8c) @@ -61,5 +61,5 @@ #define IRQ_KBD (0x01 + LEGACY_INTERRUPT_BASE) #define IRQ_MOUSE (0x0c + LEGACY_INTERRUPT_BASE) -#define IRQ_DP8390 (0x09 + LEGACY_INTERRUPT_BASE) +#define IRQ_NE2000 (0x09 + LEGACY_INTERRUPT_BASE) /** General Exception codes. */ Index: kernel/arch/ia64/src/ia64.c =================================================================== --- kernel/arch/ia64/src/ia64.c (revision 597c948125ea3c675750b1739ef29f8ddbcc8b74) +++ kernel/arch/ia64/src/ia64.c (revision f902d362683090a4d4d8714b068ea5f2987efb8c) @@ -222,5 +222,5 @@ #endif - sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390); + sysinfo_set_item_val("netif.ne2000.inr", NULL, IRQ_NE2000); sysinfo_set_item_val("ia64_iospace", NULL, true); Index: uspace/Makefile =================================================================== --- uspace/Makefile (revision 597c948125ea3c675750b1739ef29f8ddbcc8b74) +++ uspace/Makefile (revision f902d362683090a4d4d8714b068ea5f2987efb8c) @@ -80,5 +80,5 @@ srv/hw/char/i8042 \ srv/hw/char/s3c24xx_uart \ - srv/hw/netif/dp8390 \ + srv/hw/netif/ne2000 \ srv/net/netif/lo \ srv/net/il/arp \ Index: uspace/doc/doxygroups.h =================================================================== --- uspace/doc/doxygroups.h (revision 597c948125ea3c675750b1739ef29f8ddbcc8b74) +++ uspace/doc/doxygroups.h (revision f902d362683090a4d4d8714b068ea5f2987efb8c) @@ -43,12 +43,7 @@ /** - * @defgroup dp8390 Generic DP8390 network interface family service + * @defgroup ne2000 NE2000 network interface service * @ingroup netif */ - - /** - * @defgroup ne2k NE2000 network interface family - * @ingroup dp8390 - */ /** Index: uspace/lib/c/include/ipc/services.h =================================================================== --- uspace/lib/c/include/ipc/services.h (revision 597c948125ea3c675750b1739ef29f8ddbcc8b74) +++ uspace/lib/c/include/ipc/services.h (revision f902d362683090a4d4d8714b068ea5f2987efb8c) @@ -54,5 +54,5 @@ SERVICE_NETWORKING, SERVICE_LO, - SERVICE_DP8390, + SERVICE_NE2000, SERVICE_ETHERNET, SERVICE_NILDUMMY, Index: uspace/lib/net/generic/protocol_map.c =================================================================== --- uspace/lib/net/generic/protocol_map.c (revision 597c948125ea3c675750b1739ef29f8ddbcc8b74) +++ uspace/lib/net/generic/protocol_map.c (revision f902d362683090a4d4d8714b068ea5f2987efb8c) @@ -50,5 +50,5 @@ switch (nil) { case SERVICE_ETHERNET: - case SERVICE_DP8390: + case SERVICE_NE2000: switch (il) { case SERVICE_IP: @@ -76,5 +76,5 @@ switch (nil) { case SERVICE_ETHERNET: - case SERVICE_DP8390: + case SERVICE_NE2000: switch (protocol) { case ETH_P_IP: @@ -139,5 +139,5 @@ switch (nil) { case SERVICE_ETHERNET: - case SERVICE_DP8390: + case SERVICE_NE2000: return HW_ETHER; default: Index: pace/srv/hw/netif/dp8390/Makefile =================================================================== --- uspace/srv/hw/netif/dp8390/Makefile (revision 597c948125ea3c675750b1739ef29f8ddbcc8b74) +++ (revision ) @@ -1,47 +1,0 @@ -# -# Copyright (c) 2005 Martin Decky -# Copyright (c) 2007 Jakub Jermar -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# - Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# - Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# - The name of the author may not be used to endorse or promote products -# derived from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR -# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES -# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, -# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT -# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF -# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -USPACE_PREFIX = ../../../.. -ROOT_PATH = $(USPACE_PREFIX)/.. -LIBS = $(LIBNET_PREFIX)/libnet.a -EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include - -COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common -CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config - --include $(COMMON_MAKEFILE) --include $(CONFIG_MAKEFILE) - -BINARY = dp8390 - -SOURCES = \ - dp8390.c \ - ne2000.c - -include $(USPACE_PREFIX)/Makefile.common Index: pace/srv/hw/netif/dp8390/dp8390.c =================================================================== --- uspace/srv/hw/netif/dp8390/dp8390.c (revision 597c948125ea3c675750b1739ef29f8ddbcc8b74) +++ (revision ) @@ -1,653 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * Copyright (c) 2011 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * This code is based upon the NE2000 driver for MINIX, - * distributed according to a BSD-style license. - * - * Copyright (c) 1987, 1997, 2006 Vrije Universiteit - * Copyright (c) 1992, 1994 Philip Homburg - * Copyright (c) 1996 G. Falzoni - * - */ - -/** @addtogroup ne2000 - * @{ - */ - -/** @file - * - * NE2000 (based on DP8390) network interface core implementation. - * Only the basic NE2000 PIO (ISA) interface is supported, remote - * DMA is completely absent from this code for simplicity. - * - */ - -#include -#include -#include -#include -#include -#include -#include "dp8390.h" - -/** Page size */ -#define DP_PAGE 256 - -/** 6 * DP_PAGE >= 1514 bytes */ -#define SQ_PAGES 6 - -/* NE2000 implementation. */ - -/** NE2000 Data Register */ -#define NE2K_DATA 0x0010 - -/** NE2000 Reset register */ -#define NE2K_RESET 0x001f - -/** NE2000 data start */ -#define NE2K_START 0x4000 - -/** NE2000 data size */ -#define NE2K_SIZE 0x4000 - -/** NE2000 retry count */ -#define NE2K_RETRY 0x1000 - -/** NE2000 error messages rate limiting */ -#define NE2K_ERL 10 - -/** Minimum Ethernet packet size in bytes */ -#define ETH_MIN_PACK_SIZE 60 - -/** Maximum Ethernet packet size in bytes */ -#define ETH_MAX_PACK_SIZE_TAGGED 1518 - -/** Type definition of the receive header - * - */ -typedef struct { - /** Copy of RSR */ - uint8_t status; - - /** Pointer to next packet */ - uint8_t next; - - /** Receive Byte Count Low */ - uint8_t rbcl; - - /** Receive Byte Count High */ - uint8_t rbch; -} recv_header_t; - -/** Read a memory block word by word. - * - * @param[in] port Source address. - * @param[out] buf Destination buffer. - * @param[in] size Memory block size in bytes. - * - */ -static void pio_read_buf_16(void *port, void *buf, size_t size) -{ - size_t i; - - for (i = 0; (i << 1) < size; i++) - *((uint16_t *) buf + i) = pio_read_16((ioport16_t *) (port)); -} - -/** Write a memory block word by word. - * - * @param[in] port Destination address. - * @param[in] buf Source buffer. - * @param[in] size Memory block size in bytes. - * - */ -static void pio_write_buf_16(void *port, void *buf, size_t size) -{ - size_t i; - - for (i = 0; (i << 1) < size; i++) - pio_write_16((ioport16_t *) port, *((uint16_t *) buf + i)); -} - -static void ne2k_download(ne2k_t *ne2k, void *buf, size_t addr, size_t size) -{ - size_t esize = size & ~1; - - pio_write_8(ne2k->port + DP_RBCR0, esize & 0xff); - pio_write_8(ne2k->port + DP_RBCR1, (esize >> 8) & 0xff); - pio_write_8(ne2k->port + DP_RSAR0, addr & 0xff); - pio_write_8(ne2k->port + DP_RSAR1, (addr >> 8) & 0xff); - pio_write_8(ne2k->port + DP_CR, CR_DM_RR | CR_PS_P0 | CR_STA); - - if (esize != 0) { - pio_read_buf_16(ne2k->data_port, buf, esize); - size -= esize; - buf += esize; - } - - if (size) { - assert(size == 1); - - uint16_t word = pio_read_16(ne2k->data_port); - memcpy(buf, &word, 1); - } -} - -static void ne2k_upload(ne2k_t *ne2k, void *buf, size_t addr, size_t size) -{ - size_t esize = size & ~1; - - pio_write_8(ne2k->port + DP_RBCR0, esize & 0xff); - pio_write_8(ne2k->port + DP_RBCR1, (esize >> 8) & 0xff); - pio_write_8(ne2k->port + DP_RSAR0, addr & 0xff); - pio_write_8(ne2k->port + DP_RSAR1, (addr >> 8) & 0xff); - pio_write_8(ne2k->port + DP_CR, CR_DM_RW | CR_PS_P0 | CR_STA); - - if (esize != 0) { - pio_write_buf_16(ne2k->data_port, buf, esize); - size -= esize; - buf += esize; - } - - if (size) { - assert(size == 1); - - uint16_t word = 0; - - memcpy(&word, buf, 1); - pio_write_16(ne2k->data_port, word); - } -} - -static void ne2k_init(ne2k_t *ne2k) -{ - unsigned int i; - - /* Reset the ethernet card */ - uint8_t val = pio_read_8(ne2k->port + NE2K_RESET); - usleep(2000); - pio_write_8(ne2k->port + NE2K_RESET, val); - usleep(2000); - - /* Reset the DP8390 */ - pio_write_8(ne2k->port + DP_CR, CR_STP | CR_DM_ABORT); - for (i = 0; i < NE2K_RETRY; i++) { - if (pio_read_8(ne2k->port + DP_ISR) != 0) - break; - } -} - -/** Probe and initialize the network interface. - * - * @param[in,out] ne2k Network interface structure. - * @param[in] port Device address. - * @param[in] irq Device interrupt vector. - * - * @return EOK on success. - * @return EXDEV if the network interface was not recognized. - * - */ -int ne2k_probe(ne2k_t *ne2k, void *port, int irq) -{ - unsigned int i; - - /* General initialization */ - ne2k->port = port; - ne2k->data_port = ne2k->port + NE2K_DATA; - ne2k->irq = irq; - ne2k->probed = false; - ne2k->up = false; - - ne2k_init(ne2k); - - /* Check if the DP8390 is really there */ - uint8_t val = pio_read_8(ne2k->port + DP_CR); - if ((val & (CR_STP | CR_DM_ABORT)) != (CR_STP | CR_DM_ABORT)) - return EXDEV; - - /* Disable the receiver and init TCR and DCR */ - pio_write_8(ne2k->port + DP_RCR, RCR_MON); - pio_write_8(ne2k->port + DP_TCR, TCR_NORMAL); - pio_write_8(ne2k->port + DP_DCR, DCR_WORDWIDE | DCR_8BYTES | DCR_BMS); - - /* Setup a transfer to get the MAC address */ - pio_write_8(ne2k->port + DP_RBCR0, ETH_ADDR << 1); - pio_write_8(ne2k->port + DP_RBCR1, 0); - pio_write_8(ne2k->port + DP_RSAR0, 0); - pio_write_8(ne2k->port + DP_RSAR1, 0); - pio_write_8(ne2k->port + DP_CR, CR_DM_RR | CR_PS_P0 | CR_STA); - - for (i = 0; i < ETH_ADDR; i++) - ne2k->mac[i] = pio_read_16(ne2k->data_port); - - ne2k->probed = true; - return EOK; -} - -/** Start the network interface. - * - * @param[in,out] ne2k Network interface structure. - * - * @return EOK on success. - * @return EXDEV if the network interface is disabled. - * - */ -int ne2k_up(ne2k_t *ne2k) -{ - if (!ne2k->probed) - return EXDEV; - - ne2k_init(ne2k); - - /* - * Setup send queue. Use the first - * SQ_PAGES of NE2000 memory for the send - * buffer. - */ - ne2k->sq.dirty = false; - ne2k->sq.page = NE2K_START / DP_PAGE; - fibril_mutex_initialize(&ne2k->sq_mutex); - fibril_condvar_initialize(&ne2k->sq_cv); - - /* - * Setup receive ring buffer. Use all the rest - * of the NE2000 memory (except the first SQ_PAGES - * reserved for the send buffer) for the receive - * ring buffer. - */ - ne2k->start_page = ne2k->sq.page + SQ_PAGES; - ne2k->stop_page = ne2k->sq.page + NE2K_SIZE / DP_PAGE; - - /* - * Initialization of the DP8390 following the mandatory procedure - * in reference manual ("DP8390D/NS32490D NIC Network Interface - * Controller", National Semiconductor, July 1995, Page 29). - */ - - /* Step 1: */ - pio_write_8(ne2k->port + DP_CR, CR_PS_P0 | CR_STP | CR_DM_ABORT); - - /* Step 2: */ - pio_write_8(ne2k->port + DP_DCR, DCR_WORDWIDE | DCR_8BYTES | DCR_BMS); - - /* Step 3: */ - pio_write_8(ne2k->port + DP_RBCR0, 0); - pio_write_8(ne2k->port + DP_RBCR1, 0); - - /* Step 4: */ - pio_write_8(ne2k->port + DP_RCR, RCR_AB); - - /* Step 5: */ - pio_write_8(ne2k->port + DP_TCR, TCR_INTERNAL); - - /* Step 6: */ - pio_write_8(ne2k->port + DP_BNRY, ne2k->start_page); - pio_write_8(ne2k->port + DP_PSTART, ne2k->start_page); - pio_write_8(ne2k->port + DP_PSTOP, ne2k->stop_page); - - /* Step 7: */ - pio_write_8(ne2k->port + DP_ISR, 0xff); - - /* Step 8: */ - pio_write_8(ne2k->port + DP_IMR, - IMR_PRXE | IMR_PTXE | IMR_RXEE | IMR_TXEE | IMR_OVWE | IMR_CNTE); - - /* Step 9: */ - pio_write_8(ne2k->port + DP_CR, CR_PS_P1 | CR_DM_ABORT | CR_STP); - - pio_write_8(ne2k->port + DP_PAR0, ne2k->mac[0]); - pio_write_8(ne2k->port + DP_PAR1, ne2k->mac[1]); - pio_write_8(ne2k->port + DP_PAR2, ne2k->mac[2]); - pio_write_8(ne2k->port + DP_PAR3, ne2k->mac[3]); - pio_write_8(ne2k->port + DP_PAR4, ne2k->mac[4]); - pio_write_8(ne2k->port + DP_PAR5, ne2k->mac[5]); - - pio_write_8(ne2k->port + DP_MAR0, 0xff); - pio_write_8(ne2k->port + DP_MAR1, 0xff); - pio_write_8(ne2k->port + DP_MAR2, 0xff); - pio_write_8(ne2k->port + DP_MAR3, 0xff); - pio_write_8(ne2k->port + DP_MAR4, 0xff); - pio_write_8(ne2k->port + DP_MAR5, 0xff); - pio_write_8(ne2k->port + DP_MAR6, 0xff); - pio_write_8(ne2k->port + DP_MAR7, 0xff); - - pio_write_8(ne2k->port + DP_CURR, ne2k->start_page + 1); - - /* Step 10: */ - pio_write_8(ne2k->port + DP_CR, CR_PS_P0 | CR_DM_ABORT | CR_STA); - - /* Step 11: */ - pio_write_8(ne2k->port + DP_TCR, TCR_NORMAL); - - /* Reset counters by reading */ - pio_read_8(ne2k->port + DP_CNTR0); - pio_read_8(ne2k->port + DP_CNTR1); - pio_read_8(ne2k->port + DP_CNTR2); - - /* Finish the initialization */ - ne2k->up = true; - return EOK; -} - -/** Stop the network interface. - * - * @param[in,out] ne2k Network interface structure. - * - */ -void ne2k_down(ne2k_t *ne2k) -{ - if ((ne2k->probed) && (ne2k->up)) { - pio_write_8(ne2k->port + DP_CR, CR_STP | CR_DM_ABORT); - ne2k_init(ne2k); - ne2k->up = false; - } -} - -/** Send a frame. - * - * @param[in,out] ne2k Network interface structure. - * @param[in] packet Frame to be sent. - * - */ -void ne2k_send(ne2k_t *ne2k, packet_t *packet) -{ - assert(ne2k->probed); - assert(ne2k->up); - - fibril_mutex_lock(&ne2k->sq_mutex); - - while (ne2k->sq.dirty) - fibril_condvar_wait(&ne2k->sq_cv, &ne2k->sq_mutex); - - void *buf = packet_get_data(packet); - size_t size = packet_get_data_length(packet); - - if ((size < ETH_MIN_PACK_SIZE) || (size > ETH_MAX_PACK_SIZE_TAGGED)) { - fprintf(stderr, "%s: Frame dropped (invalid size %zu bytes)\n", - NAME, size); - return; - } - - /* Upload the frame to the ethernet card */ - ne2k_upload(ne2k, buf, ne2k->sq.page * DP_PAGE, size); - ne2k->sq.dirty = true; - ne2k->sq.size = size; - - /* Initialize the transfer */ - pio_write_8(ne2k->port + DP_TPSR, ne2k->sq.page); - pio_write_8(ne2k->port + DP_TBCR0, size & 0xff); - pio_write_8(ne2k->port + DP_TBCR1, (size >> 8) & 0xff); - pio_write_8(ne2k->port + DP_CR, CR_TXP | CR_STA); - - fibril_mutex_unlock(&ne2k->sq_mutex); -} - -static void ne2k_reset(ne2k_t *ne2k) -{ - unsigned int i; - - /* Stop the chip */ - pio_write_8(ne2k->port + DP_CR, CR_STP | CR_DM_ABORT); - pio_write_8(ne2k->port + DP_RBCR0, 0); - pio_write_8(ne2k->port + DP_RBCR1, 0); - - for (i = 0; i < NE2K_RETRY; i++) { - if ((pio_read_8(ne2k->port + DP_ISR) & ISR_RST) != 0) - break; - } - - pio_write_8(ne2k->port + DP_TCR, TCR_1EXTERNAL | TCR_OFST); - pio_write_8(ne2k->port + DP_CR, CR_STA | CR_DM_ABORT); - pio_write_8(ne2k->port + DP_TCR, TCR_NORMAL); - - /* Acknowledge the ISR_RDC (remote DMA) interrupt */ - for (i = 0; i < NE2K_RETRY; i++) { - if ((pio_read_8(ne2k->port + DP_ISR) & ISR_RDC) != 0) - break; - } - - uint8_t val = pio_read_8(ne2k->port + DP_ISR); - pio_write_8(ne2k->port + DP_ISR, val & ~ISR_RDC); - - /* - * Reset the transmit ring. If we were transmitting a frame, - * we pretend that the packet is processed. Higher layers will - * retransmit if the packet wasn't actually sent. - */ - fibril_mutex_lock(&ne2k->sq_mutex); - ne2k->sq.dirty = false; - fibril_mutex_unlock(&ne2k->sq_mutex); -} - -static frame_t *ne2k_receive_frame(ne2k_t *ne2k, uint8_t page, size_t length) -{ - frame_t *frame = (frame_t *) malloc(sizeof(frame_t)); - if (frame == NULL) - return NULL; - - link_initialize(&frame->link); - - frame->packet = netif_packet_get_1(length); - if (frame->packet == NULL) { - free(frame); - return NULL; - } - - void *buf = packet_suffix(frame->packet, length); - bzero(buf, length); - uint8_t last = page + length / DP_PAGE; - - if (last >= ne2k->stop_page) { - size_t left = (ne2k->stop_page - page) * DP_PAGE - - sizeof(recv_header_t); - - ne2k_download(ne2k, buf, page * DP_PAGE + sizeof(recv_header_t), - left); - ne2k_download(ne2k, buf + left, ne2k->start_page * DP_PAGE, - length - left); - } else - ne2k_download(ne2k, buf, page * DP_PAGE + sizeof(recv_header_t), - length); - - ne2k->stats.receive_packets++; - return frame; -} - -static link_t *ne2k_receive(ne2k_t *ne2k) -{ - /* - * Allocate memory for the list of received frames. - * If the allocation fails here we still receive the - * frames from the network, but they will be lost. - */ - link_t *frames = (link_t *) malloc(sizeof(link_t)); - if (frames != NULL) - list_initialize(frames); - - while (true) { - uint8_t boundary = pio_read_8(ne2k->port + DP_BNRY) + 1; - - if (boundary == ne2k->stop_page) - boundary = ne2k->start_page; - - pio_write_8(ne2k->port + DP_CR, CR_PS_P1 | CR_STA); - uint8_t current = pio_read_8(ne2k->port + DP_CURR); - pio_write_8(ne2k->port + DP_CR, CR_PS_P0 | CR_STA); - - if (current == boundary) - /* No more frames to process */ - break; - - recv_header_t header; - size_t size = sizeof(header); - size_t offset = boundary * DP_PAGE; - - /* Get the frame header */ - pio_write_8(ne2k->port + DP_RBCR0, size & 0xff); - pio_write_8(ne2k->port + DP_RBCR1, (size >> 8) & 0xff); - pio_write_8(ne2k->port + DP_RSAR0, offset & 0xff); - pio_write_8(ne2k->port + DP_RSAR1, (offset >> 8) & 0xff); - pio_write_8(ne2k->port + DP_CR, CR_DM_RR | CR_PS_P0 | CR_STA); - - pio_read_buf_16(ne2k->data_port, (void *) &header, size); - - size_t length = - (((size_t) header.rbcl) | (((size_t) header.rbch) << 8)) - size; - uint8_t next = header.next; - - if ((length < ETH_MIN_PACK_SIZE) - || (length > ETH_MAX_PACK_SIZE_TAGGED)) { - fprintf(stderr, "%s: Rant frame (%zu bytes)\n", NAME, length); - next = current; - } else if ((header.next < ne2k->start_page) - || (header.next > ne2k->stop_page)) { - fprintf(stderr, "%s: Malformed next frame %u\n", NAME, - header.next); - next = current; - } else if (header.status & RSR_FO) { - /* - * This is very serious, so we issue a warning and - * reset the buffers. - */ - fprintf(stderr, "%s: FIFO overrun\n", NAME); - ne2k->overruns++; - next = current; - } else if ((header.status & RSR_PRX) && (ne2k->up)) { - if (frames != NULL) { - frame_t *frame = ne2k_receive_frame(ne2k, boundary, length); - if (frame != NULL) - list_append(&frame->link, frames); - } - } - - /* - * Update the boundary pointer - * to the value of the page - * prior to the next packet to - * be processed. - */ - if (next == ne2k->start_page) - next = ne2k->stop_page - 1; - else - next--; - - pio_write_8(ne2k->port + DP_BNRY, next); - } - - return frames; -} - -link_t *ne2k_interrupt(ne2k_t *ne2k, uint8_t isr, uint8_t tsr) -{ - /* List of received frames */ - link_t *frames = NULL; - - if (isr & (ISR_PTX | ISR_TXE)) { - if (isr & ISR_TXE) - ne2k->stats.send_errors++; - else { - if (tsr & TSR_PTX) - ne2k->stats.send_packets++; - - if (tsr & TSR_COL) - ne2k->stats.collisions++; - - if (tsr & TSR_ABT) - ne2k->stats.send_aborted_errors++; - - if (tsr & TSR_CRS) - ne2k->stats.send_carrier_errors++; - - if (tsr & TSR_FU) { - ne2k->underruns++; - if (ne2k->underruns < NE2K_ERL) - fprintf(stderr, "%s: FIFO underrun\n", NAME); - } - - if (tsr & TSR_CDH) { - ne2k->stats.send_heartbeat_errors++; - if (ne2k->stats.send_heartbeat_errors < NE2K_ERL) - fprintf(stderr, "%s: CD heartbeat failure\n", NAME); - } - - if (tsr & TSR_OWC) - ne2k->stats.send_window_errors++; - } - - fibril_mutex_lock(&ne2k->sq_mutex); - - if (ne2k->sq.dirty) { - /* Prepare the buffer for next packet */ - ne2k->sq.dirty = false; - ne2k->sq.size = 0; - - /* Signal a next frame to be sent */ - fibril_condvar_broadcast(&ne2k->sq_cv); - } else { - ne2k->misses++; - if (ne2k->misses < NE2K_ERL) - fprintf(stderr, "%s: Spurious PTX interrupt\n", NAME); - } - - fibril_mutex_unlock(&ne2k->sq_mutex); - } - - if (isr & ISR_RXE) - ne2k->stats.receive_errors++; - - if (isr & ISR_CNT) { - ne2k->stats.receive_crc_errors += - pio_read_8(ne2k->port + DP_CNTR0); - ne2k->stats.receive_frame_errors += - pio_read_8(ne2k->port + DP_CNTR1); - ne2k->stats.receive_missed_errors += - pio_read_8(ne2k->port + DP_CNTR2); - } - - if (isr & ISR_PRX) - frames = ne2k_receive(ne2k); - - if (isr & ISR_RST) { - /* - * The chip is stopped, and all arrived - * frames are delivered. - */ - ne2k_reset(ne2k); - } - - /* Unmask interrupts to be processed in the next round */ - pio_write_8(ne2k->port + DP_IMR, - IMR_PRXE | IMR_PTXE | IMR_RXEE | IMR_TXEE | IMR_OVWE | IMR_CNTE); - - return frames; -} - -/** @} - */ Index: pace/srv/hw/netif/dp8390/dp8390.h =================================================================== --- uspace/srv/hw/netif/dp8390/dp8390.h (revision 597c948125ea3c675750b1739ef29f8ddbcc8b74) +++ (revision ) @@ -1,248 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * Copyright (c) 2011 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * This code is based upon the NE2000 driver for MINIX, - * distributed according to a BSD-style license. - * - * Copyright (c) 1987, 1997, 2006 Vrije Universiteit - * Copyright (c) 1992, 1994 Philip Homburg - * Copyright (c) 1996 G. Falzoni - * - */ - -/** @addtogroup ne2000 - * @{ - */ - -/** @file - * DP8390 network interface definitions. - */ - -#ifndef __NET_NETIF_DP8390_H__ -#define __NET_NETIF_DP8390_H__ - -#include -#include -#include -#include - -/** Module name */ -#define NAME "ne2000" - -/** Input/output size */ -#define NE2K_IO_SIZE 0x0020 - -/** Ethernet address length */ -#define ETH_ADDR 6 - -/* National Semiconductor DP8390 Network Interface Controller. */ - -/** Page 0, for reading */ -#define DP_CR 0x00 /**< Command Register */ -#define DP_CLDA0 0x01 /**< Current Local DMA Address 0 */ -#define DP_CLDA1 0x02 /**< Current Local DMA Address 1 */ -#define DP_BNRY 0x03 /**< Boundary Pointer */ -#define DP_TSR 0x04 /**< Transmit Status Register */ -#define DP_NCR 0x05 /**< Number of Collisions Register */ -#define DP_FIFO 0x06 /**< FIFO */ -#define DP_ISR 0x07 /**< Interrupt Status Register */ -#define DP_CRDA0 0x08 /**< Current Remote DMA Address 0 */ -#define DP_CRDA1 0x09 /**< Current Remote DMA Address 1 */ -#define DP_RSR 0x0c /**< Receive Status Register */ -#define DP_CNTR0 0x0d /**< Tally Counter 0 */ -#define DP_CNTR1 0x0e /**< Tally Counter 1 */ -#define DP_CNTR2 0x0f /**< Tally Counter 2 */ - -/** Page 0, for writing */ -#define DP_PSTART 0x01 /**< Page Start Register*/ -#define DP_PSTOP 0x02 /**< Page Stop Register */ -#define DP_TPSR 0x04 /**< Transmit Page Start Register */ -#define DP_TBCR0 0x05 /**< Transmit Byte Count Register 0 */ -#define DP_TBCR1 0x06 /**< Transmit Byte Count Register 1 */ -#define DP_RSAR0 0x08 /**< Remote Start Address Register 0 */ -#define DP_RSAR1 0x09 /**< Remote Start Address Register 1 */ -#define DP_RBCR0 0x0a /**< Remote Byte Count Register 0 */ -#define DP_RBCR1 0x0b /**< Remote Byte Count Register 1 */ -#define DP_RCR 0x0c /**< Receive Configuration Register */ -#define DP_TCR 0x0d /**< Transmit Configuration Register */ -#define DP_DCR 0x0e /**< Data Configuration Register */ -#define DP_IMR 0x0f /**< Interrupt Mask Register */ - -/** Page 1, read/write */ -#define DP_PAR0 0x01 /**< Physical Address Register 0 */ -#define DP_PAR1 0x02 /**< Physical Address Register 1 */ -#define DP_PAR2 0x03 /**< Physical Address Register 2 */ -#define DP_PAR3 0x04 /**< Physical Address Register 3 */ -#define DP_PAR4 0x05 /**< Physical Address Register 4 */ -#define DP_PAR5 0x06 /**< Physical Address Register 5 */ -#define DP_CURR 0x07 /**< Current Page Register */ -#define DP_MAR0 0x08 /**< Multicast Address Register 0 */ -#define DP_MAR1 0x09 /**< Multicast Address Register 1 */ -#define DP_MAR2 0x0a /**< Multicast Address Register 2 */ -#define DP_MAR3 0x0b /**< Multicast Address Register 3 */ -#define DP_MAR4 0x0c /**< Multicast Address Register 4 */ -#define DP_MAR5 0x0d /**< Multicast Address Register 5 */ -#define DP_MAR6 0x0e /**< Multicast Address Register 6 */ -#define DP_MAR7 0x0f /**< Multicast Address Register 7 */ - -/* Bits in Command Register */ -#define CR_STP 0x01 /**< Stop (software reset) */ -#define CR_STA 0x02 /**< Start (activate NIC) */ -#define CR_TXP 0x04 /**< Transmit Packet */ -#define CR_DMA 0x38 /**< Mask for DMA control */ -#define CR_DM_NOP 0x00 /**< DMA: No Operation */ -#define CR_DM_RR 0x08 /**< DMA: Remote Read */ -#define CR_DM_RW 0x10 /**< DMA: Remote Write */ -#define CR_DM_SP 0x18 /**< DMA: Send Packet */ -#define CR_DM_ABORT 0x20 /**< DMA: Abort Remote DMA Operation */ -#define CR_PS 0xc0 /**< Mask for Page Select */ -#define CR_PS_P0 0x00 /**< Register Page 0 */ -#define CR_PS_P1 0x40 /**< Register Page 1 */ -#define CR_PS_P2 0x80 /**< Register Page 2 */ -#define CR_PS_T1 0xc0 /**< Test Mode Register Map */ - -/* Bits in Interrupt State Register */ -#define ISR_PRX 0x01 /**< Packet Received with no errors */ -#define ISR_PTX 0x02 /**< Packet Transmitted with no errors */ -#define ISR_RXE 0x04 /**< Receive Error */ -#define ISR_TXE 0x08 /**< Transmit Error */ -#define ISR_OVW 0x10 /**< Overwrite Warning */ -#define ISR_CNT 0x20 /**< Counter Overflow */ -#define ISR_RDC 0x40 /**< Remote DMA Complete */ -#define ISR_RST 0x80 /**< Reset Status */ - -/* Bits in Interrupt Mask Register */ -#define IMR_PRXE 0x01 /**< Packet Received Interrupt Enable */ -#define IMR_PTXE 0x02 /**< Packet Transmitted Interrupt Enable */ -#define IMR_RXEE 0x04 /**< Receive Error Interrupt Enable */ -#define IMR_TXEE 0x08 /**< Transmit Error Interrupt Enable */ -#define IMR_OVWE 0x10 /**< Overwrite Warning Interrupt Enable */ -#define IMR_CNTE 0x20 /**< Counter Overflow Interrupt Enable */ -#define IMR_RDCE 0x40 /**< DMA Complete Interrupt Enable */ - -/* Bits in Data Configuration Register */ -#define DCR_WTS 0x01 /**< Word Transfer Select */ -#define DCR_BYTEWIDE 0x00 /**< WTS: byte wide transfers */ -#define DCR_WORDWIDE 0x01 /**< WTS: word wide transfers */ -#define DCR_BOS 0x02 /**< Byte Order Select */ -#define DCR_LTLENDIAN 0x00 /**< BOS: Little Endian */ -#define DCR_BIGENDIAN 0x02 /**< BOS: Big Endian */ -#define DCR_LAS 0x04 /**< Long Address Select */ -#define DCR_BMS 0x08 /**< Burst Mode Select */ -#define DCR_AR 0x10 /**< Autoinitialize Remote */ -#define DCR_FTS 0x60 /**< Fifo Threshold Select */ -#define DCR_2BYTES 0x00 /**< 2 bytes */ -#define DCR_4BYTES 0x40 /**< 4 bytes */ -#define DCR_8BYTES 0x20 /**< 8 bytes */ -#define DCR_12BYTES 0x60 /**< 12 bytes */ - -/* Bits in Transmit Configuration Register */ -#define TCR_CRC 0x01 /**< Inhibit CRC */ -#define TCR_ELC 0x06 /**< Encoded Loopback Control */ -#define TCR_NORMAL 0x00 /**< ELC: Normal Operation */ -#define TCR_INTERNAL 0x02 /**< ELC: Internal Loopback */ -#define TCR_0EXTERNAL 0x04 /**< ELC: External Loopback LPBK=0 */ -#define TCR_1EXTERNAL 0x06 /**< ELC: External Loopback LPBK=1 */ -#define TCR_ATD 0x08 /**< Auto Transmit Disable */ -#define TCR_OFST 0x10 /**< Collision Offset Enable (be nice) */ - -/* Bits in Interrupt Status Register */ -#define TSR_PTX 0x01 /**< Packet Transmitted (without error) */ -#define TSR_DFR 0x02 /**< Transmit Deferred (reserved) */ -#define TSR_COL 0x04 /**< Transmit Collided */ -#define TSR_ABT 0x08 /**< Transmit Aborted */ -#define TSR_CRS 0x10 /**< Carrier Sense Lost */ -#define TSR_FU 0x20 /**< FIFO Underrun */ -#define TSR_CDH 0x40 /**< CD Heartbeat */ -#define TSR_OWC 0x80 /**< Out of Window Collision */ - -/* Bits in Receive Configuration Register */ -#define RCR_SEP 0x01 /**< Save Errored Packets */ -#define RCR_AR 0x02 /**< Accept Runt Packets */ -#define RCR_AB 0x04 /**< Accept Broadcast */ -#define RCR_AM 0x08 /**< Accept Multicast */ -#define RCR_PRO 0x10 /**< Physical Promiscuous */ -#define RCR_MON 0x20 /**< Monitor Mode */ - -/* Bits in Receive Status Register */ -#define RSR_PRX 0x01 /**< Packet Received Intact */ -#define RSR_CRC 0x02 /**< CRC Error */ -#define RSR_FAE 0x04 /**< Frame Alignment Error */ -#define RSR_FO 0x08 /**< FIFO Overrun */ -#define RSR_MPA 0x10 /**< Missed Packet */ -#define RSR_PHY 0x20 /**< Multicast Address Match */ -#define RSR_DIS 0x40 /**< Receiver Disabled */ -#define RSR_DFR 0x80 /**< In later manuals: Deferring */ - -typedef struct { - /* Device configuration */ - void *port; - void *data_port; - int irq; - uint8_t mac[ETH_ADDR]; - - uint8_t start_page; /**< Ring buffer start page */ - uint8_t stop_page; /**< Ring buffer stop page */ - - /* Send queue */ - struct { - bool dirty; /**< Buffer contains a packet */ - size_t size; /**< Packet size */ - uint8_t page; /**< Starting page of the buffer */ - } sq; - fibril_mutex_t sq_mutex; - fibril_condvar_t sq_cv; - - /* Driver run-time variables */ - bool probed; - bool up; - - /* Device statistics */ - device_stats_t stats; - uint64_t misses; /**< Receive frame misses */ - uint64_t underruns; /**< FIFO underruns */ - uint64_t overruns; /**< FIFO overruns */ -} ne2k_t; - -typedef struct { - link_t link; - packet_t *packet; -} frame_t; - -extern int ne2k_probe(ne2k_t *, void *, int); -extern int ne2k_up(ne2k_t *); -extern void ne2k_down(ne2k_t *); -extern void ne2k_send(ne2k_t *, packet_t *); -extern link_t *ne2k_interrupt(ne2k_t *, uint8_t, uint8_t); - -#endif - -/** @} - */ Index: pace/srv/hw/netif/dp8390/ne2000.c =================================================================== --- uspace/srv/hw/netif/dp8390/ne2000.c (revision 597c948125ea3c675750b1739ef29f8ddbcc8b74) +++ (revision ) @@ -1,410 +1,0 @@ -/* - * Copyright (c) 2009 Lukas Mejdrech - * Copyright (c) 2011 Martin Decky - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/** @addtogroup ne2000 - * @{ - */ - -/** @file - * NE2000 network interface implementation. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "dp8390.h" - -/** Return the device from the interrupt call. - * - * @param[in] call The interrupt call. - * - */ -#define IRQ_GET_DEVICE(call) ((device_id_t) IPC_GET_IMETHOD(call)) - -/** Return the ISR from the interrupt call. - * - * @param[in] call The interrupt call. - * - */ -#define IRQ_GET_ISR(call) ((int) IPC_GET_ARG2(call)) - -/** Return the TSR from the interrupt call. - * - * @param[in] call The interrupt call. - * - */ -#define IRQ_GET_TSR(call) ((int) IPC_GET_ARG3(call)) - -static int irc_service = 0; -static int irc_phone = -1; - -/** DP8390 kernel interrupt command sequence. - * - */ -static irq_cmd_t ne2k_cmds[] = { - { - /* Read Interrupt Status Register */ - .cmd = CMD_PIO_READ_8, - .addr = NULL, - .dstarg = 2 - }, - { - /* Mask supported interrupt causes */ - .cmd = CMD_BTEST, - .value = (ISR_PRX | ISR_PTX | ISR_RXE | ISR_TXE | ISR_OVW | - ISR_CNT | ISR_RDC), - .srcarg = 2, - .dstarg = 3, - }, - { - /* Predicate for accepting the interrupt */ - .cmd = CMD_PREDICATE, - .value = 4, - .srcarg = 3 - }, - { - /* - * Mask future interrupts via - * Interrupt Mask Register - */ - .cmd = CMD_PIO_WRITE_8, - .addr = NULL, - .value = 0 - }, - { - /* Acknowledge the current interrupt */ - .cmd = CMD_PIO_WRITE_A_8, - .addr = NULL, - .srcarg = 3 - }, - { - /* Read Transmit Status Register */ - .cmd = CMD_PIO_READ_8, - .addr = NULL, - .dstarg = 3 - }, - { - .cmd = CMD_ACCEPT - } -}; - -/** DP8390 kernel interrupt code. - * - */ -static irq_code_t ne2k_code = { - sizeof(ne2k_cmds) / sizeof(irq_cmd_t), - ne2k_cmds -}; - -/** Handle the interrupt notification. - * - * This is the interrupt notification function. It is quarantied - * that there is only a single instance of this notification - * function running at one time until the return from the - * ne2k_interrupt() function (where the interrupts are unmasked - * again). - * - * @param[in] iid Interrupt notification identifier. - * @param[in] call Interrupt notification. - * - */ -static void irq_handler(ipc_callid_t iid, ipc_call_t *call) -{ - device_id_t device_id = IRQ_GET_DEVICE(*call); - netif_device_t *device; - int nil_phone; - ne2k_t *ne2k; - - fibril_rwlock_read_lock(&netif_globals.lock); - - if (find_device(device_id, &device) == EOK) { - nil_phone = device->nil_phone; - ne2k = (ne2k_t *) device->specific; - } else - ne2k = NULL; - - fibril_rwlock_read_unlock(&netif_globals.lock); - - if (ne2k != NULL) { - link_t *frames = - ne2k_interrupt(ne2k, IRQ_GET_ISR(*call), IRQ_GET_TSR(*call)); - - if (frames != NULL) { - while (!list_empty(frames)) { - frame_t *frame = - list_get_instance(frames->next, frame_t, link); - - list_remove(&frame->link); - nil_received_msg(nil_phone, device_id, frame->packet, - SERVICE_NONE); - free(frame); - } - - free(frames); - } - } -} - -/** Change the network interface state. - * - * @param[in,out] device Network interface. - * @param[in] state New state. - * - */ -static void change_state(netif_device_t *device, device_state_t state) -{ - if (device->state != state) { - device->state = state; - - const char *desc; - switch (state) { - case NETIF_ACTIVE: - desc = "active"; - break; - case NETIF_STOPPED: - desc = "stopped"; - break; - default: - desc = "unknown"; - } - - printf("%s: State changed to %s\n", NAME, desc); - } -} - -int netif_specific_message(ipc_callid_t callid, ipc_call_t *call, - ipc_call_t *answer, size_t *count) -{ - return ENOTSUP; -} - -int netif_get_device_stats(device_id_t device_id, device_stats_t *stats) -{ - if (!stats) - return EBADMEM; - - netif_device_t *device; - int rc = find_device(device_id, &device); - if (rc != EOK) - return rc; - - ne2k_t *ne2k = (ne2k_t *) device->specific; - - memcpy(stats, &ne2k->stats, sizeof(device_stats_t)); - return EOK; -} - -int netif_get_addr_message(device_id_t device_id, measured_string_t *address) -{ - if (!address) - return EBADMEM; - - netif_device_t *device; - int rc = find_device(device_id, &device); - if (rc != EOK) - return rc; - - ne2k_t *ne2k = (ne2k_t *) device->specific; - - address->value = ne2k->mac; - address->length = ETH_ADDR; - return EOK; -} - -int netif_probe_message(device_id_t device_id, int irq, void *io) -{ - netif_device_t *device = - (netif_device_t *) malloc(sizeof(netif_device_t)); - if (!device) - return ENOMEM; - - ne2k_t *ne2k = (ne2k_t *) malloc(sizeof(ne2k_t)); - if (!ne2k) { - free(device); - return ENOMEM; - } - - void *port; - int rc = pio_enable((void *) io, NE2K_IO_SIZE, &port); - if (rc != EOK) { - free(ne2k); - free(device); - return rc; - } - - bzero(device, sizeof(netif_device_t)); - bzero(ne2k, sizeof(ne2k_t)); - - device->device_id = device_id; - device->nil_phone = -1; - device->specific = (void *) ne2k; - device->state = NETIF_STOPPED; - - rc = ne2k_probe(ne2k, port, irq); - if (rc != EOK) { - printf("%s: No ethernet card found at I/O address %p\n", - NAME, port); - free(ne2k); - free(device); - return rc; - } - - rc = netif_device_map_add(&netif_globals.device_map, device->device_id, device); - if (rc != EOK) { - free(ne2k); - free(device); - return rc; - } - - printf("%s: Ethernet card at I/O address %p, IRQ %d, MAC ", - NAME, port, irq); - - unsigned int i; - for (i = 0; i < ETH_ADDR; i++) - printf("%02x%c", ne2k->mac[i], i < 5 ? ':' : '\n'); - - return EOK; -} - -int netif_start_message(netif_device_t *device) -{ - if (device->state != NETIF_ACTIVE) { - ne2k_t *ne2k = (ne2k_t *) device->specific; - - ne2k_cmds[0].addr = ne2k->port + DP_ISR; - ne2k_cmds[3].addr = ne2k->port + DP_IMR; - ne2k_cmds[4].addr = ne2k_cmds[0].addr; - ne2k_cmds[5].addr = ne2k->port + DP_TSR; - - int rc = ipc_register_irq(ne2k->irq, device->device_id, - device->device_id, &ne2k_code); - if (rc != EOK) - return rc; - - rc = ne2k_up(ne2k); - if (rc != EOK) { - ipc_unregister_irq(ne2k->irq, device->device_id); - return rc; - } - - change_state(device, NETIF_ACTIVE); - - if (irc_service) - async_msg_1(irc_phone, IRC_ENABLE_INTERRUPT, ne2k->irq); - } - - return device->state; -} - -int netif_stop_message(netif_device_t *device) -{ - if (device->state != NETIF_STOPPED) { - ne2k_t *ne2k = (ne2k_t *) device->specific; - - ne2k_down(ne2k); - ipc_unregister_irq(ne2k->irq, device->device_id); - change_state(device, NETIF_STOPPED); - } - - return EOK; -} - -int netif_send_message(device_id_t device_id, packet_t *packet, - services_t sender) -{ - netif_device_t *device; - int rc = find_device(device_id, &device); - if (rc != EOK) - return rc; - - if (device->state != NETIF_ACTIVE) { - netif_pq_release(packet_get_id(packet)); - return EFORWARD; - } - - ne2k_t *ne2k = (ne2k_t *) device->specific; - - /* - * Process the packet queue - */ - - do { - packet_t *next = pq_detach(packet); - ne2k_send(ne2k, packet); - netif_pq_release(packet_get_id(packet)); - packet = next; - } while (packet); - - return EOK; -} - -int netif_initialize(void) -{ - sysarg_t apic; - sysarg_t i8259; - - if ((sysinfo_get_value("apic", &apic) == EOK) && (apic)) - irc_service = SERVICE_APIC; - else if ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259)) - irc_service = SERVICE_I8259; - - if (irc_service) { - while (irc_phone < 0) { - irc_phone = ipc_connect_me_to_blocking(PHONE_NS, irc_service, - 0, 0); - } - } - - async_set_interrupt_received(irq_handler); - - sysarg_t phonehash; - return ipc_connect_to_me(PHONE_NS, SERVICE_DP8390, 0, 0, &phonehash); -} - -int main(int argc, char *argv[]) -{ - /* Start the module */ - return netif_module_start(); -} - -/** @} - */ Index: uspace/srv/hw/netif/ne2000/Makefile =================================================================== --- uspace/srv/hw/netif/ne2000/Makefile (revision f902d362683090a4d4d8714b068ea5f2987efb8c) +++ uspace/srv/hw/netif/ne2000/Makefile (revision f902d362683090a4d4d8714b068ea5f2987efb8c) @@ -0,0 +1,47 @@ +# +# Copyright (c) 2005 Martin Decky +# Copyright (c) 2007 Jakub Jermar +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# - Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# - Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# - The name of the author may not be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# + +USPACE_PREFIX = ../../../.. +ROOT_PATH = $(USPACE_PREFIX)/.. +LIBS = $(LIBNET_PREFIX)/libnet.a +EXTRA_CFLAGS = -I$(LIBNET_PREFIX)/include + +COMMON_MAKEFILE = $(ROOT_PATH)/Makefile.common +CONFIG_MAKEFILE = $(ROOT_PATH)/Makefile.config + +-include $(COMMON_MAKEFILE) +-include $(CONFIG_MAKEFILE) + +BINARY = ne2000 + +SOURCES = \ + dp8390.c \ + ne2000.c + +include $(USPACE_PREFIX)/Makefile.common Index: uspace/srv/hw/netif/ne2000/dp8390.c =================================================================== --- uspace/srv/hw/netif/ne2000/dp8390.c (revision f902d362683090a4d4d8714b068ea5f2987efb8c) +++ uspace/srv/hw/netif/ne2000/dp8390.c (revision f902d362683090a4d4d8714b068ea5f2987efb8c) @@ -0,0 +1,653 @@ +/* + * Copyright (c) 2009 Lukas Mejdrech + * Copyright (c) 2011 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * This code is based upon the NE2000 driver for MINIX, + * distributed according to a BSD-style license. + * + * Copyright (c) 1987, 1997, 2006 Vrije Universiteit + * Copyright (c) 1992, 1994 Philip Homburg + * Copyright (c) 1996 G. Falzoni + * + */ + +/** @addtogroup ne2000 + * @{ + */ + +/** @file + * + * NE2000 (based on DP8390) network interface core implementation. + * Only the basic NE2000 PIO (ISA) interface is supported, remote + * DMA is completely absent from this code for simplicity. + * + */ + +#include +#include +#include +#include +#include +#include +#include "dp8390.h" + +/** Page size */ +#define DP_PAGE 256 + +/** 6 * DP_PAGE >= 1514 bytes */ +#define SQ_PAGES 6 + +/* NE2000 implementation. */ + +/** NE2000 Data Register */ +#define NE2K_DATA 0x0010 + +/** NE2000 Reset register */ +#define NE2K_RESET 0x001f + +/** NE2000 data start */ +#define NE2K_START 0x4000 + +/** NE2000 data size */ +#define NE2K_SIZE 0x4000 + +/** NE2000 retry count */ +#define NE2K_RETRY 0x1000 + +/** NE2000 error messages rate limiting */ +#define NE2K_ERL 10 + +/** Minimum Ethernet packet size in bytes */ +#define ETH_MIN_PACK_SIZE 60 + +/** Maximum Ethernet packet size in bytes */ +#define ETH_MAX_PACK_SIZE_TAGGED 1518 + +/** Type definition of the receive header + * + */ +typedef struct { + /** Copy of RSR */ + uint8_t status; + + /** Pointer to next packet */ + uint8_t next; + + /** Receive Byte Count Low */ + uint8_t rbcl; + + /** Receive Byte Count High */ + uint8_t rbch; +} recv_header_t; + +/** Read a memory block word by word. + * + * @param[in] port Source address. + * @param[out] buf Destination buffer. + * @param[in] size Memory block size in bytes. + * + */ +static void pio_read_buf_16(void *port, void *buf, size_t size) +{ + size_t i; + + for (i = 0; (i << 1) < size; i++) + *((uint16_t *) buf + i) = pio_read_16((ioport16_t *) (port)); +} + +/** Write a memory block word by word. + * + * @param[in] port Destination address. + * @param[in] buf Source buffer. + * @param[in] size Memory block size in bytes. + * + */ +static void pio_write_buf_16(void *port, void *buf, size_t size) +{ + size_t i; + + for (i = 0; (i << 1) < size; i++) + pio_write_16((ioport16_t *) port, *((uint16_t *) buf + i)); +} + +static void ne2k_download(ne2k_t *ne2k, void *buf, size_t addr, size_t size) +{ + size_t esize = size & ~1; + + pio_write_8(ne2k->port + DP_RBCR0, esize & 0xff); + pio_write_8(ne2k->port + DP_RBCR1, (esize >> 8) & 0xff); + pio_write_8(ne2k->port + DP_RSAR0, addr & 0xff); + pio_write_8(ne2k->port + DP_RSAR1, (addr >> 8) & 0xff); + pio_write_8(ne2k->port + DP_CR, CR_DM_RR | CR_PS_P0 | CR_STA); + + if (esize != 0) { + pio_read_buf_16(ne2k->data_port, buf, esize); + size -= esize; + buf += esize; + } + + if (size) { + assert(size == 1); + + uint16_t word = pio_read_16(ne2k->data_port); + memcpy(buf, &word, 1); + } +} + +static void ne2k_upload(ne2k_t *ne2k, void *buf, size_t addr, size_t size) +{ + size_t esize = size & ~1; + + pio_write_8(ne2k->port + DP_RBCR0, esize & 0xff); + pio_write_8(ne2k->port + DP_RBCR1, (esize >> 8) & 0xff); + pio_write_8(ne2k->port + DP_RSAR0, addr & 0xff); + pio_write_8(ne2k->port + DP_RSAR1, (addr >> 8) & 0xff); + pio_write_8(ne2k->port + DP_CR, CR_DM_RW | CR_PS_P0 | CR_STA); + + if (esize != 0) { + pio_write_buf_16(ne2k->data_port, buf, esize); + size -= esize; + buf += esize; + } + + if (size) { + assert(size == 1); + + uint16_t word = 0; + + memcpy(&word, buf, 1); + pio_write_16(ne2k->data_port, word); + } +} + +static void ne2k_init(ne2k_t *ne2k) +{ + unsigned int i; + + /* Reset the ethernet card */ + uint8_t val = pio_read_8(ne2k->port + NE2K_RESET); + usleep(2000); + pio_write_8(ne2k->port + NE2K_RESET, val); + usleep(2000); + + /* Reset the DP8390 */ + pio_write_8(ne2k->port + DP_CR, CR_STP | CR_DM_ABORT); + for (i = 0; i < NE2K_RETRY; i++) { + if (pio_read_8(ne2k->port + DP_ISR) != 0) + break; + } +} + +/** Probe and initialize the network interface. + * + * @param[in,out] ne2k Network interface structure. + * @param[in] port Device address. + * @param[in] irq Device interrupt vector. + * + * @return EOK on success. + * @return EXDEV if the network interface was not recognized. + * + */ +int ne2k_probe(ne2k_t *ne2k, void *port, int irq) +{ + unsigned int i; + + /* General initialization */ + ne2k->port = port; + ne2k->data_port = ne2k->port + NE2K_DATA; + ne2k->irq = irq; + ne2k->probed = false; + ne2k->up = false; + + ne2k_init(ne2k); + + /* Check if the DP8390 is really there */ + uint8_t val = pio_read_8(ne2k->port + DP_CR); + if ((val & (CR_STP | CR_DM_ABORT)) != (CR_STP | CR_DM_ABORT)) + return EXDEV; + + /* Disable the receiver and init TCR and DCR */ + pio_write_8(ne2k->port + DP_RCR, RCR_MON); + pio_write_8(ne2k->port + DP_TCR, TCR_NORMAL); + pio_write_8(ne2k->port + DP_DCR, DCR_WORDWIDE | DCR_8BYTES | DCR_BMS); + + /* Setup a transfer to get the MAC address */ + pio_write_8(ne2k->port + DP_RBCR0, ETH_ADDR << 1); + pio_write_8(ne2k->port + DP_RBCR1, 0); + pio_write_8(ne2k->port + DP_RSAR0, 0); + pio_write_8(ne2k->port + DP_RSAR1, 0); + pio_write_8(ne2k->port + DP_CR, CR_DM_RR | CR_PS_P0 | CR_STA); + + for (i = 0; i < ETH_ADDR; i++) + ne2k->mac[i] = pio_read_16(ne2k->data_port); + + ne2k->probed = true; + return EOK; +} + +/** Start the network interface. + * + * @param[in,out] ne2k Network interface structure. + * + * @return EOK on success. + * @return EXDEV if the network interface is disabled. + * + */ +int ne2k_up(ne2k_t *ne2k) +{ + if (!ne2k->probed) + return EXDEV; + + ne2k_init(ne2k); + + /* + * Setup send queue. Use the first + * SQ_PAGES of NE2000 memory for the send + * buffer. + */ + ne2k->sq.dirty = false; + ne2k->sq.page = NE2K_START / DP_PAGE; + fibril_mutex_initialize(&ne2k->sq_mutex); + fibril_condvar_initialize(&ne2k->sq_cv); + + /* + * Setup receive ring buffer. Use all the rest + * of the NE2000 memory (except the first SQ_PAGES + * reserved for the send buffer) for the receive + * ring buffer. + */ + ne2k->start_page = ne2k->sq.page + SQ_PAGES; + ne2k->stop_page = ne2k->sq.page + NE2K_SIZE / DP_PAGE; + + /* + * Initialization of the DP8390 following the mandatory procedure + * in reference manual ("DP8390D/NS32490D NIC Network Interface + * Controller", National Semiconductor, July 1995, Page 29). + */ + + /* Step 1: */ + pio_write_8(ne2k->port + DP_CR, CR_PS_P0 | CR_STP | CR_DM_ABORT); + + /* Step 2: */ + pio_write_8(ne2k->port + DP_DCR, DCR_WORDWIDE | DCR_8BYTES | DCR_BMS); + + /* Step 3: */ + pio_write_8(ne2k->port + DP_RBCR0, 0); + pio_write_8(ne2k->port + DP_RBCR1, 0); + + /* Step 4: */ + pio_write_8(ne2k->port + DP_RCR, RCR_AB); + + /* Step 5: */ + pio_write_8(ne2k->port + DP_TCR, TCR_INTERNAL); + + /* Step 6: */ + pio_write_8(ne2k->port + DP_BNRY, ne2k->start_page); + pio_write_8(ne2k->port + DP_PSTART, ne2k->start_page); + pio_write_8(ne2k->port + DP_PSTOP, ne2k->stop_page); + + /* Step 7: */ + pio_write_8(ne2k->port + DP_ISR, 0xff); + + /* Step 8: */ + pio_write_8(ne2k->port + DP_IMR, + IMR_PRXE | IMR_PTXE | IMR_RXEE | IMR_TXEE | IMR_OVWE | IMR_CNTE); + + /* Step 9: */ + pio_write_8(ne2k->port + DP_CR, CR_PS_P1 | CR_DM_ABORT | CR_STP); + + pio_write_8(ne2k->port + DP_PAR0, ne2k->mac[0]); + pio_write_8(ne2k->port + DP_PAR1, ne2k->mac[1]); + pio_write_8(ne2k->port + DP_PAR2, ne2k->mac[2]); + pio_write_8(ne2k->port + DP_PAR3, ne2k->mac[3]); + pio_write_8(ne2k->port + DP_PAR4, ne2k->mac[4]); + pio_write_8(ne2k->port + DP_PAR5, ne2k->mac[5]); + + pio_write_8(ne2k->port + DP_MAR0, 0xff); + pio_write_8(ne2k->port + DP_MAR1, 0xff); + pio_write_8(ne2k->port + DP_MAR2, 0xff); + pio_write_8(ne2k->port + DP_MAR3, 0xff); + pio_write_8(ne2k->port + DP_MAR4, 0xff); + pio_write_8(ne2k->port + DP_MAR5, 0xff); + pio_write_8(ne2k->port + DP_MAR6, 0xff); + pio_write_8(ne2k->port + DP_MAR7, 0xff); + + pio_write_8(ne2k->port + DP_CURR, ne2k->start_page + 1); + + /* Step 10: */ + pio_write_8(ne2k->port + DP_CR, CR_PS_P0 | CR_DM_ABORT | CR_STA); + + /* Step 11: */ + pio_write_8(ne2k->port + DP_TCR, TCR_NORMAL); + + /* Reset counters by reading */ + pio_read_8(ne2k->port + DP_CNTR0); + pio_read_8(ne2k->port + DP_CNTR1); + pio_read_8(ne2k->port + DP_CNTR2); + + /* Finish the initialization */ + ne2k->up = true; + return EOK; +} + +/** Stop the network interface. + * + * @param[in,out] ne2k Network interface structure. + * + */ +void ne2k_down(ne2k_t *ne2k) +{ + if ((ne2k->probed) && (ne2k->up)) { + pio_write_8(ne2k->port + DP_CR, CR_STP | CR_DM_ABORT); + ne2k_init(ne2k); + ne2k->up = false; + } +} + +/** Send a frame. + * + * @param[in,out] ne2k Network interface structure. + * @param[in] packet Frame to be sent. + * + */ +void ne2k_send(ne2k_t *ne2k, packet_t *packet) +{ + assert(ne2k->probed); + assert(ne2k->up); + + fibril_mutex_lock(&ne2k->sq_mutex); + + while (ne2k->sq.dirty) + fibril_condvar_wait(&ne2k->sq_cv, &ne2k->sq_mutex); + + void *buf = packet_get_data(packet); + size_t size = packet_get_data_length(packet); + + if ((size < ETH_MIN_PACK_SIZE) || (size > ETH_MAX_PACK_SIZE_TAGGED)) { + fprintf(stderr, "%s: Frame dropped (invalid size %zu bytes)\n", + NAME, size); + return; + } + + /* Upload the frame to the ethernet card */ + ne2k_upload(ne2k, buf, ne2k->sq.page * DP_PAGE, size); + ne2k->sq.dirty = true; + ne2k->sq.size = size; + + /* Initialize the transfer */ + pio_write_8(ne2k->port + DP_TPSR, ne2k->sq.page); + pio_write_8(ne2k->port + DP_TBCR0, size & 0xff); + pio_write_8(ne2k->port + DP_TBCR1, (size >> 8) & 0xff); + pio_write_8(ne2k->port + DP_CR, CR_TXP | CR_STA); + + fibril_mutex_unlock(&ne2k->sq_mutex); +} + +static void ne2k_reset(ne2k_t *ne2k) +{ + unsigned int i; + + /* Stop the chip */ + pio_write_8(ne2k->port + DP_CR, CR_STP | CR_DM_ABORT); + pio_write_8(ne2k->port + DP_RBCR0, 0); + pio_write_8(ne2k->port + DP_RBCR1, 0); + + for (i = 0; i < NE2K_RETRY; i++) { + if ((pio_read_8(ne2k->port + DP_ISR) & ISR_RST) != 0) + break; + } + + pio_write_8(ne2k->port + DP_TCR, TCR_1EXTERNAL | TCR_OFST); + pio_write_8(ne2k->port + DP_CR, CR_STA | CR_DM_ABORT); + pio_write_8(ne2k->port + DP_TCR, TCR_NORMAL); + + /* Acknowledge the ISR_RDC (remote DMA) interrupt */ + for (i = 0; i < NE2K_RETRY; i++) { + if ((pio_read_8(ne2k->port + DP_ISR) & ISR_RDC) != 0) + break; + } + + uint8_t val = pio_read_8(ne2k->port + DP_ISR); + pio_write_8(ne2k->port + DP_ISR, val & ~ISR_RDC); + + /* + * Reset the transmit ring. If we were transmitting a frame, + * we pretend that the packet is processed. Higher layers will + * retransmit if the packet wasn't actually sent. + */ + fibril_mutex_lock(&ne2k->sq_mutex); + ne2k->sq.dirty = false; + fibril_mutex_unlock(&ne2k->sq_mutex); +} + +static frame_t *ne2k_receive_frame(ne2k_t *ne2k, uint8_t page, size_t length) +{ + frame_t *frame = (frame_t *) malloc(sizeof(frame_t)); + if (frame == NULL) + return NULL; + + link_initialize(&frame->link); + + frame->packet = netif_packet_get_1(length); + if (frame->packet == NULL) { + free(frame); + return NULL; + } + + void *buf = packet_suffix(frame->packet, length); + bzero(buf, length); + uint8_t last = page + length / DP_PAGE; + + if (last >= ne2k->stop_page) { + size_t left = (ne2k->stop_page - page) * DP_PAGE + - sizeof(recv_header_t); + + ne2k_download(ne2k, buf, page * DP_PAGE + sizeof(recv_header_t), + left); + ne2k_download(ne2k, buf + left, ne2k->start_page * DP_PAGE, + length - left); + } else + ne2k_download(ne2k, buf, page * DP_PAGE + sizeof(recv_header_t), + length); + + ne2k->stats.receive_packets++; + return frame; +} + +static link_t *ne2k_receive(ne2k_t *ne2k) +{ + /* + * Allocate memory for the list of received frames. + * If the allocation fails here we still receive the + * frames from the network, but they will be lost. + */ + link_t *frames = (link_t *) malloc(sizeof(link_t)); + if (frames != NULL) + list_initialize(frames); + + while (true) { + uint8_t boundary = pio_read_8(ne2k->port + DP_BNRY) + 1; + + if (boundary == ne2k->stop_page) + boundary = ne2k->start_page; + + pio_write_8(ne2k->port + DP_CR, CR_PS_P1 | CR_STA); + uint8_t current = pio_read_8(ne2k->port + DP_CURR); + pio_write_8(ne2k->port + DP_CR, CR_PS_P0 | CR_STA); + + if (current == boundary) + /* No more frames to process */ + break; + + recv_header_t header; + size_t size = sizeof(header); + size_t offset = boundary * DP_PAGE; + + /* Get the frame header */ + pio_write_8(ne2k->port + DP_RBCR0, size & 0xff); + pio_write_8(ne2k->port + DP_RBCR1, (size >> 8) & 0xff); + pio_write_8(ne2k->port + DP_RSAR0, offset & 0xff); + pio_write_8(ne2k->port + DP_RSAR1, (offset >> 8) & 0xff); + pio_write_8(ne2k->port + DP_CR, CR_DM_RR | CR_PS_P0 | CR_STA); + + pio_read_buf_16(ne2k->data_port, (void *) &header, size); + + size_t length = + (((size_t) header.rbcl) | (((size_t) header.rbch) << 8)) - size; + uint8_t next = header.next; + + if ((length < ETH_MIN_PACK_SIZE) + || (length > ETH_MAX_PACK_SIZE_TAGGED)) { + fprintf(stderr, "%s: Rant frame (%zu bytes)\n", NAME, length); + next = current; + } else if ((header.next < ne2k->start_page) + || (header.next > ne2k->stop_page)) { + fprintf(stderr, "%s: Malformed next frame %u\n", NAME, + header.next); + next = current; + } else if (header.status & RSR_FO) { + /* + * This is very serious, so we issue a warning and + * reset the buffers. + */ + fprintf(stderr, "%s: FIFO overrun\n", NAME); + ne2k->overruns++; + next = current; + } else if ((header.status & RSR_PRX) && (ne2k->up)) { + if (frames != NULL) { + frame_t *frame = ne2k_receive_frame(ne2k, boundary, length); + if (frame != NULL) + list_append(&frame->link, frames); + } + } + + /* + * Update the boundary pointer + * to the value of the page + * prior to the next packet to + * be processed. + */ + if (next == ne2k->start_page) + next = ne2k->stop_page - 1; + else + next--; + + pio_write_8(ne2k->port + DP_BNRY, next); + } + + return frames; +} + +link_t *ne2k_interrupt(ne2k_t *ne2k, uint8_t isr, uint8_t tsr) +{ + /* List of received frames */ + link_t *frames = NULL; + + if (isr & (ISR_PTX | ISR_TXE)) { + if (isr & ISR_TXE) + ne2k->stats.send_errors++; + else { + if (tsr & TSR_PTX) + ne2k->stats.send_packets++; + + if (tsr & TSR_COL) + ne2k->stats.collisions++; + + if (tsr & TSR_ABT) + ne2k->stats.send_aborted_errors++; + + if (tsr & TSR_CRS) + ne2k->stats.send_carrier_errors++; + + if (tsr & TSR_FU) { + ne2k->underruns++; + if (ne2k->underruns < NE2K_ERL) + fprintf(stderr, "%s: FIFO underrun\n", NAME); + } + + if (tsr & TSR_CDH) { + ne2k->stats.send_heartbeat_errors++; + if (ne2k->stats.send_heartbeat_errors < NE2K_ERL) + fprintf(stderr, "%s: CD heartbeat failure\n", NAME); + } + + if (tsr & TSR_OWC) + ne2k->stats.send_window_errors++; + } + + fibril_mutex_lock(&ne2k->sq_mutex); + + if (ne2k->sq.dirty) { + /* Prepare the buffer for next packet */ + ne2k->sq.dirty = false; + ne2k->sq.size = 0; + + /* Signal a next frame to be sent */ + fibril_condvar_broadcast(&ne2k->sq_cv); + } else { + ne2k->misses++; + if (ne2k->misses < NE2K_ERL) + fprintf(stderr, "%s: Spurious PTX interrupt\n", NAME); + } + + fibril_mutex_unlock(&ne2k->sq_mutex); + } + + if (isr & ISR_RXE) + ne2k->stats.receive_errors++; + + if (isr & ISR_CNT) { + ne2k->stats.receive_crc_errors += + pio_read_8(ne2k->port + DP_CNTR0); + ne2k->stats.receive_frame_errors += + pio_read_8(ne2k->port + DP_CNTR1); + ne2k->stats.receive_missed_errors += + pio_read_8(ne2k->port + DP_CNTR2); + } + + if (isr & ISR_PRX) + frames = ne2k_receive(ne2k); + + if (isr & ISR_RST) { + /* + * The chip is stopped, and all arrived + * frames are delivered. + */ + ne2k_reset(ne2k); + } + + /* Unmask interrupts to be processed in the next round */ + pio_write_8(ne2k->port + DP_IMR, + IMR_PRXE | IMR_PTXE | IMR_RXEE | IMR_TXEE | IMR_OVWE | IMR_CNTE); + + return frames; +} + +/** @} + */ Index: uspace/srv/hw/netif/ne2000/dp8390.h =================================================================== --- uspace/srv/hw/netif/ne2000/dp8390.h (revision f902d362683090a4d4d8714b068ea5f2987efb8c) +++ uspace/srv/hw/netif/ne2000/dp8390.h (revision f902d362683090a4d4d8714b068ea5f2987efb8c) @@ -0,0 +1,248 @@ +/* + * Copyright (c) 2009 Lukas Mejdrech + * Copyright (c) 2011 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* + * This code is based upon the NE2000 driver for MINIX, + * distributed according to a BSD-style license. + * + * Copyright (c) 1987, 1997, 2006 Vrije Universiteit + * Copyright (c) 1992, 1994 Philip Homburg + * Copyright (c) 1996 G. Falzoni + * + */ + +/** @addtogroup ne2000 + * @{ + */ + +/** @file + * DP8390 network interface definitions. + */ + +#ifndef __NET_NETIF_DP8390_H__ +#define __NET_NETIF_DP8390_H__ + +#include +#include +#include +#include + +/** Module name */ +#define NAME "ne2000" + +/** Input/output size */ +#define NE2K_IO_SIZE 0x0020 + +/** Ethernet address length */ +#define ETH_ADDR 6 + +/* National Semiconductor DP8390 Network Interface Controller. */ + +/** Page 0, for reading */ +#define DP_CR 0x00 /**< Command Register */ +#define DP_CLDA0 0x01 /**< Current Local DMA Address 0 */ +#define DP_CLDA1 0x02 /**< Current Local DMA Address 1 */ +#define DP_BNRY 0x03 /**< Boundary Pointer */ +#define DP_TSR 0x04 /**< Transmit Status Register */ +#define DP_NCR 0x05 /**< Number of Collisions Register */ +#define DP_FIFO 0x06 /**< FIFO */ +#define DP_ISR 0x07 /**< Interrupt Status Register */ +#define DP_CRDA0 0x08 /**< Current Remote DMA Address 0 */ +#define DP_CRDA1 0x09 /**< Current Remote DMA Address 1 */ +#define DP_RSR 0x0c /**< Receive Status Register */ +#define DP_CNTR0 0x0d /**< Tally Counter 0 */ +#define DP_CNTR1 0x0e /**< Tally Counter 1 */ +#define DP_CNTR2 0x0f /**< Tally Counter 2 */ + +/** Page 0, for writing */ +#define DP_PSTART 0x01 /**< Page Start Register*/ +#define DP_PSTOP 0x02 /**< Page Stop Register */ +#define DP_TPSR 0x04 /**< Transmit Page Start Register */ +#define DP_TBCR0 0x05 /**< Transmit Byte Count Register 0 */ +#define DP_TBCR1 0x06 /**< Transmit Byte Count Register 1 */ +#define DP_RSAR0 0x08 /**< Remote Start Address Register 0 */ +#define DP_RSAR1 0x09 /**< Remote Start Address Register 1 */ +#define DP_RBCR0 0x0a /**< Remote Byte Count Register 0 */ +#define DP_RBCR1 0x0b /**< Remote Byte Count Register 1 */ +#define DP_RCR 0x0c /**< Receive Configuration Register */ +#define DP_TCR 0x0d /**< Transmit Configuration Register */ +#define DP_DCR 0x0e /**< Data Configuration Register */ +#define DP_IMR 0x0f /**< Interrupt Mask Register */ + +/** Page 1, read/write */ +#define DP_PAR0 0x01 /**< Physical Address Register 0 */ +#define DP_PAR1 0x02 /**< Physical Address Register 1 */ +#define DP_PAR2 0x03 /**< Physical Address Register 2 */ +#define DP_PAR3 0x04 /**< Physical Address Register 3 */ +#define DP_PAR4 0x05 /**< Physical Address Register 4 */ +#define DP_PAR5 0x06 /**< Physical Address Register 5 */ +#define DP_CURR 0x07 /**< Current Page Register */ +#define DP_MAR0 0x08 /**< Multicast Address Register 0 */ +#define DP_MAR1 0x09 /**< Multicast Address Register 1 */ +#define DP_MAR2 0x0a /**< Multicast Address Register 2 */ +#define DP_MAR3 0x0b /**< Multicast Address Register 3 */ +#define DP_MAR4 0x0c /**< Multicast Address Register 4 */ +#define DP_MAR5 0x0d /**< Multicast Address Register 5 */ +#define DP_MAR6 0x0e /**< Multicast Address Register 6 */ +#define DP_MAR7 0x0f /**< Multicast Address Register 7 */ + +/* Bits in Command Register */ +#define CR_STP 0x01 /**< Stop (software reset) */ +#define CR_STA 0x02 /**< Start (activate NIC) */ +#define CR_TXP 0x04 /**< Transmit Packet */ +#define CR_DMA 0x38 /**< Mask for DMA control */ +#define CR_DM_NOP 0x00 /**< DMA: No Operation */ +#define CR_DM_RR 0x08 /**< DMA: Remote Read */ +#define CR_DM_RW 0x10 /**< DMA: Remote Write */ +#define CR_DM_SP 0x18 /**< DMA: Send Packet */ +#define CR_DM_ABORT 0x20 /**< DMA: Abort Remote DMA Operation */ +#define CR_PS 0xc0 /**< Mask for Page Select */ +#define CR_PS_P0 0x00 /**< Register Page 0 */ +#define CR_PS_P1 0x40 /**< Register Page 1 */ +#define CR_PS_P2 0x80 /**< Register Page 2 */ +#define CR_PS_T1 0xc0 /**< Test Mode Register Map */ + +/* Bits in Interrupt State Register */ +#define ISR_PRX 0x01 /**< Packet Received with no errors */ +#define ISR_PTX 0x02 /**< Packet Transmitted with no errors */ +#define ISR_RXE 0x04 /**< Receive Error */ +#define ISR_TXE 0x08 /**< Transmit Error */ +#define ISR_OVW 0x10 /**< Overwrite Warning */ +#define ISR_CNT 0x20 /**< Counter Overflow */ +#define ISR_RDC 0x40 /**< Remote DMA Complete */ +#define ISR_RST 0x80 /**< Reset Status */ + +/* Bits in Interrupt Mask Register */ +#define IMR_PRXE 0x01 /**< Packet Received Interrupt Enable */ +#define IMR_PTXE 0x02 /**< Packet Transmitted Interrupt Enable */ +#define IMR_RXEE 0x04 /**< Receive Error Interrupt Enable */ +#define IMR_TXEE 0x08 /**< Transmit Error Interrupt Enable */ +#define IMR_OVWE 0x10 /**< Overwrite Warning Interrupt Enable */ +#define IMR_CNTE 0x20 /**< Counter Overflow Interrupt Enable */ +#define IMR_RDCE 0x40 /**< DMA Complete Interrupt Enable */ + +/* Bits in Data Configuration Register */ +#define DCR_WTS 0x01 /**< Word Transfer Select */ +#define DCR_BYTEWIDE 0x00 /**< WTS: byte wide transfers */ +#define DCR_WORDWIDE 0x01 /**< WTS: word wide transfers */ +#define DCR_BOS 0x02 /**< Byte Order Select */ +#define DCR_LTLENDIAN 0x00 /**< BOS: Little Endian */ +#define DCR_BIGENDIAN 0x02 /**< BOS: Big Endian */ +#define DCR_LAS 0x04 /**< Long Address Select */ +#define DCR_BMS 0x08 /**< Burst Mode Select */ +#define DCR_AR 0x10 /**< Autoinitialize Remote */ +#define DCR_FTS 0x60 /**< Fifo Threshold Select */ +#define DCR_2BYTES 0x00 /**< 2 bytes */ +#define DCR_4BYTES 0x40 /**< 4 bytes */ +#define DCR_8BYTES 0x20 /**< 8 bytes */ +#define DCR_12BYTES 0x60 /**< 12 bytes */ + +/* Bits in Transmit Configuration Register */ +#define TCR_CRC 0x01 /**< Inhibit CRC */ +#define TCR_ELC 0x06 /**< Encoded Loopback Control */ +#define TCR_NORMAL 0x00 /**< ELC: Normal Operation */ +#define TCR_INTERNAL 0x02 /**< ELC: Internal Loopback */ +#define TCR_0EXTERNAL 0x04 /**< ELC: External Loopback LPBK=0 */ +#define TCR_1EXTERNAL 0x06 /**< ELC: External Loopback LPBK=1 */ +#define TCR_ATD 0x08 /**< Auto Transmit Disable */ +#define TCR_OFST 0x10 /**< Collision Offset Enable (be nice) */ + +/* Bits in Interrupt Status Register */ +#define TSR_PTX 0x01 /**< Packet Transmitted (without error) */ +#define TSR_DFR 0x02 /**< Transmit Deferred (reserved) */ +#define TSR_COL 0x04 /**< Transmit Collided */ +#define TSR_ABT 0x08 /**< Transmit Aborted */ +#define TSR_CRS 0x10 /**< Carrier Sense Lost */ +#define TSR_FU 0x20 /**< FIFO Underrun */ +#define TSR_CDH 0x40 /**< CD Heartbeat */ +#define TSR_OWC 0x80 /**< Out of Window Collision */ + +/* Bits in Receive Configuration Register */ +#define RCR_SEP 0x01 /**< Save Errored Packets */ +#define RCR_AR 0x02 /**< Accept Runt Packets */ +#define RCR_AB 0x04 /**< Accept Broadcast */ +#define RCR_AM 0x08 /**< Accept Multicast */ +#define RCR_PRO 0x10 /**< Physical Promiscuous */ +#define RCR_MON 0x20 /**< Monitor Mode */ + +/* Bits in Receive Status Register */ +#define RSR_PRX 0x01 /**< Packet Received Intact */ +#define RSR_CRC 0x02 /**< CRC Error */ +#define RSR_FAE 0x04 /**< Frame Alignment Error */ +#define RSR_FO 0x08 /**< FIFO Overrun */ +#define RSR_MPA 0x10 /**< Missed Packet */ +#define RSR_PHY 0x20 /**< Multicast Address Match */ +#define RSR_DIS 0x40 /**< Receiver Disabled */ +#define RSR_DFR 0x80 /**< In later manuals: Deferring */ + +typedef struct { + /* Device configuration */ + void *port; + void *data_port; + int irq; + uint8_t mac[ETH_ADDR]; + + uint8_t start_page; /**< Ring buffer start page */ + uint8_t stop_page; /**< Ring buffer stop page */ + + /* Send queue */ + struct { + bool dirty; /**< Buffer contains a packet */ + size_t size; /**< Packet size */ + uint8_t page; /**< Starting page of the buffer */ + } sq; + fibril_mutex_t sq_mutex; + fibril_condvar_t sq_cv; + + /* Driver run-time variables */ + bool probed; + bool up; + + /* Device statistics */ + device_stats_t stats; + uint64_t misses; /**< Receive frame misses */ + uint64_t underruns; /**< FIFO underruns */ + uint64_t overruns; /**< FIFO overruns */ +} ne2k_t; + +typedef struct { + link_t link; + packet_t *packet; +} frame_t; + +extern int ne2k_probe(ne2k_t *, void *, int); +extern int ne2k_up(ne2k_t *); +extern void ne2k_down(ne2k_t *); +extern void ne2k_send(ne2k_t *, packet_t *); +extern link_t *ne2k_interrupt(ne2k_t *, uint8_t, uint8_t); + +#endif + +/** @} + */ Index: uspace/srv/hw/netif/ne2000/ne2000.c =================================================================== --- uspace/srv/hw/netif/ne2000/ne2000.c (revision f902d362683090a4d4d8714b068ea5f2987efb8c) +++ uspace/srv/hw/netif/ne2000/ne2000.c (revision f902d362683090a4d4d8714b068ea5f2987efb8c) @@ -0,0 +1,410 @@ +/* + * Copyright (c) 2009 Lukas Mejdrech + * Copyright (c) 2011 Martin Decky + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * - Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * - The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/** @addtogroup ne2000 + * @{ + */ + +/** @file + * NE2000 network interface implementation. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "dp8390.h" + +/** Return the device from the interrupt call. + * + * @param[in] call The interrupt call. + * + */ +#define IRQ_GET_DEVICE(call) ((device_id_t) IPC_GET_IMETHOD(call)) + +/** Return the ISR from the interrupt call. + * + * @param[in] call The interrupt call. + * + */ +#define IRQ_GET_ISR(call) ((int) IPC_GET_ARG2(call)) + +/** Return the TSR from the interrupt call. + * + * @param[in] call The interrupt call. + * + */ +#define IRQ_GET_TSR(call) ((int) IPC_GET_ARG3(call)) + +static int irc_service = 0; +static int irc_phone = -1; + +/** NE2000 kernel interrupt command sequence. + * + */ +static irq_cmd_t ne2k_cmds[] = { + { + /* Read Interrupt Status Register */ + .cmd = CMD_PIO_READ_8, + .addr = NULL, + .dstarg = 2 + }, + { + /* Mask supported interrupt causes */ + .cmd = CMD_BTEST, + .value = (ISR_PRX | ISR_PTX | ISR_RXE | ISR_TXE | ISR_OVW | + ISR_CNT | ISR_RDC), + .srcarg = 2, + .dstarg = 3, + }, + { + /* Predicate for accepting the interrupt */ + .cmd = CMD_PREDICATE, + .value = 4, + .srcarg = 3 + }, + { + /* + * Mask future interrupts via + * Interrupt Mask Register + */ + .cmd = CMD_PIO_WRITE_8, + .addr = NULL, + .value = 0 + }, + { + /* Acknowledge the current interrupt */ + .cmd = CMD_PIO_WRITE_A_8, + .addr = NULL, + .srcarg = 3 + }, + { + /* Read Transmit Status Register */ + .cmd = CMD_PIO_READ_8, + .addr = NULL, + .dstarg = 3 + }, + { + .cmd = CMD_ACCEPT + } +}; + +/** NE2000 kernel interrupt code. + * + */ +static irq_code_t ne2k_code = { + sizeof(ne2k_cmds) / sizeof(irq_cmd_t), + ne2k_cmds +}; + +/** Handle the interrupt notification. + * + * This is the interrupt notification function. It is quarantied + * that there is only a single instance of this notification + * function running at one time until the return from the + * ne2k_interrupt() function (where the interrupts are unmasked + * again). + * + * @param[in] iid Interrupt notification identifier. + * @param[in] call Interrupt notification. + * + */ +static void irq_handler(ipc_callid_t iid, ipc_call_t *call) +{ + device_id_t device_id = IRQ_GET_DEVICE(*call); + netif_device_t *device; + int nil_phone; + ne2k_t *ne2k; + + fibril_rwlock_read_lock(&netif_globals.lock); + + if (find_device(device_id, &device) == EOK) { + nil_phone = device->nil_phone; + ne2k = (ne2k_t *) device->specific; + } else + ne2k = NULL; + + fibril_rwlock_read_unlock(&netif_globals.lock); + + if (ne2k != NULL) { + link_t *frames = + ne2k_interrupt(ne2k, IRQ_GET_ISR(*call), IRQ_GET_TSR(*call)); + + if (frames != NULL) { + while (!list_empty(frames)) { + frame_t *frame = + list_get_instance(frames->next, frame_t, link); + + list_remove(&frame->link); + nil_received_msg(nil_phone, device_id, frame->packet, + SERVICE_NONE); + free(frame); + } + + free(frames); + } + } +} + +/** Change the network interface state. + * + * @param[in,out] device Network interface. + * @param[in] state New state. + * + */ +static void change_state(netif_device_t *device, device_state_t state) +{ + if (device->state != state) { + device->state = state; + + const char *desc; + switch (state) { + case NETIF_ACTIVE: + desc = "active"; + break; + case NETIF_STOPPED: + desc = "stopped"; + break; + default: + desc = "unknown"; + } + + printf("%s: State changed to %s\n", NAME, desc); + } +} + +int netif_specific_message(ipc_callid_t callid, ipc_call_t *call, + ipc_call_t *answer, size_t *count) +{ + return ENOTSUP; +} + +int netif_get_device_stats(device_id_t device_id, device_stats_t *stats) +{ + if (!stats) + return EBADMEM; + + netif_device_t *device; + int rc = find_device(device_id, &device); + if (rc != EOK) + return rc; + + ne2k_t *ne2k = (ne2k_t *) device->specific; + + memcpy(stats, &ne2k->stats, sizeof(device_stats_t)); + return EOK; +} + +int netif_get_addr_message(device_id_t device_id, measured_string_t *address) +{ + if (!address) + return EBADMEM; + + netif_device_t *device; + int rc = find_device(device_id, &device); + if (rc != EOK) + return rc; + + ne2k_t *ne2k = (ne2k_t *) device->specific; + + address->value = ne2k->mac; + address->length = ETH_ADDR; + return EOK; +} + +int netif_probe_message(device_id_t device_id, int irq, void *io) +{ + netif_device_t *device = + (netif_device_t *) malloc(sizeof(netif_device_t)); + if (!device) + return ENOMEM; + + ne2k_t *ne2k = (ne2k_t *) malloc(sizeof(ne2k_t)); + if (!ne2k) { + free(device); + return ENOMEM; + } + + void *port; + int rc = pio_enable((void *) io, NE2K_IO_SIZE, &port); + if (rc != EOK) { + free(ne2k); + free(device); + return rc; + } + + bzero(device, sizeof(netif_device_t)); + bzero(ne2k, sizeof(ne2k_t)); + + device->device_id = device_id; + device->nil_phone = -1; + device->specific = (void *) ne2k; + device->state = NETIF_STOPPED; + + rc = ne2k_probe(ne2k, port, irq); + if (rc != EOK) { + printf("%s: No ethernet card found at I/O address %p\n", + NAME, port); + free(ne2k); + free(device); + return rc; + } + + rc = netif_device_map_add(&netif_globals.device_map, device->device_id, device); + if (rc != EOK) { + free(ne2k); + free(device); + return rc; + } + + printf("%s: Ethernet card at I/O address %p, IRQ %d, MAC ", + NAME, port, irq); + + unsigned int i; + for (i = 0; i < ETH_ADDR; i++) + printf("%02x%c", ne2k->mac[i], i < 5 ? ':' : '\n'); + + return EOK; +} + +int netif_start_message(netif_device_t *device) +{ + if (device->state != NETIF_ACTIVE) { + ne2k_t *ne2k = (ne2k_t *) device->specific; + + ne2k_cmds[0].addr = ne2k->port + DP_ISR; + ne2k_cmds[3].addr = ne2k->port + DP_IMR; + ne2k_cmds[4].addr = ne2k_cmds[0].addr; + ne2k_cmds[5].addr = ne2k->port + DP_TSR; + + int rc = ipc_register_irq(ne2k->irq, device->device_id, + device->device_id, &ne2k_code); + if (rc != EOK) + return rc; + + rc = ne2k_up(ne2k); + if (rc != EOK) { + ipc_unregister_irq(ne2k->irq, device->device_id); + return rc; + } + + change_state(device, NETIF_ACTIVE); + + if (irc_service) + async_msg_1(irc_phone, IRC_ENABLE_INTERRUPT, ne2k->irq); + } + + return device->state; +} + +int netif_stop_message(netif_device_t *device) +{ + if (device->state != NETIF_STOPPED) { + ne2k_t *ne2k = (ne2k_t *) device->specific; + + ne2k_down(ne2k); + ipc_unregister_irq(ne2k->irq, device->device_id); + change_state(device, NETIF_STOPPED); + } + + return EOK; +} + +int netif_send_message(device_id_t device_id, packet_t *packet, + services_t sender) +{ + netif_device_t *device; + int rc = find_device(device_id, &device); + if (rc != EOK) + return rc; + + if (device->state != NETIF_ACTIVE) { + netif_pq_release(packet_get_id(packet)); + return EFORWARD; + } + + ne2k_t *ne2k = (ne2k_t *) device->specific; + + /* + * Process the packet queue + */ + + do { + packet_t *next = pq_detach(packet); + ne2k_send(ne2k, packet); + netif_pq_release(packet_get_id(packet)); + packet = next; + } while (packet); + + return EOK; +} + +int netif_initialize(void) +{ + sysarg_t apic; + sysarg_t i8259; + + if ((sysinfo_get_value("apic", &apic) == EOK) && (apic)) + irc_service = SERVICE_APIC; + else if ((sysinfo_get_value("i8259", &i8259) == EOK) && (i8259)) + irc_service = SERVICE_I8259; + + if (irc_service) { + while (irc_phone < 0) { + irc_phone = ipc_connect_me_to_blocking(PHONE_NS, irc_service, + 0, 0); + } + } + + async_set_interrupt_received(irq_handler); + + sysarg_t phonehash; + return ipc_connect_to_me(PHONE_NS, SERVICE_NE2000, 0, 0, &phonehash); +} + +int main(int argc, char *argv[]) +{ + /* Start the module */ + return netif_module_start(); +} + +/** @} + */ Index: uspace/srv/net/cfg/ne2k =================================================================== --- uspace/srv/net/cfg/ne2k (revision 597c948125ea3c675750b1739ef29f8ddbcc8b74) +++ uspace/srv/net/cfg/ne2k (revision f902d362683090a4d4d8714b068ea5f2987efb8c) @@ -1,7 +1,7 @@ -# DP8390 (NE2k) configuration +# NE2000 configuration NAME=ne2k -NETIF=dp8390 +NETIF=ne2000 NIL=eth IL=ip @@ -15,9 +15,9 @@ IP_CONFIG=static -IP_ADDR=10.0.2.15 +IP_ADDR=10.10.16.86 IP_ROUTING=yes -IP_NETMASK=255.255.255.240 -IP_BROADCAST=10.0.2.255 -IP_GATEWAY=10.0.2.2 +IP_NETMASK=255.255.255.0 +IP_BROADCAST=10.10.16.255 +IP_GATEWAY=10.10.16.1 ARP=arp Index: uspace/srv/net/net/net.c =================================================================== --- uspace/srv/net/net/net.c (revision 597c948125ea3c675750b1739ef29f8ddbcc8b74) +++ uspace/srv/net/net/net.c (revision f902d362683090a4d4d8714b068ea5f2987efb8c) @@ -288,6 +288,6 @@ if (rc != EOK) return rc; - rc = add_module(NULL, &net_globals.modules, (uint8_t *) DP8390_NAME, - (uint8_t *) DP8390_FILENAME, SERVICE_DP8390, 0, connect_to_service); + rc = add_module(NULL, &net_globals.modules, (uint8_t *) NE2000_NAME, + (uint8_t *) NE2000_FILENAME, SERVICE_NE2000, 0, connect_to_service); if (rc != EOK) return rc; Index: uspace/srv/net/net/net.h =================================================================== --- uspace/srv/net/net/net.h (revision 597c948125ea3c675750b1739ef29f8ddbcc8b74) +++ uspace/srv/net/net/net.h (revision f902d362683090a4d4d8714b068ea5f2987efb8c) @@ -52,6 +52,6 @@ */ -#define DP8390_FILENAME "/srv/dp8390" -#define DP8390_NAME "dp8390" +#define NE2000_FILENAME "/srv/ne2000" +#define NE2000_NAME "ne2000" #define ETHERNET_FILENAME "/srv/eth"