Index: uspace/drv/nic/e1k/e1k.c =================================================================== --- uspace/drv/nic/e1k/e1k.c (revision ec527526a4e0798cdc0203a96d7b8ca06b441364) +++ uspace/drv/nic/e1k/e1k.c (revision c01bb5f96a155bdec60146b151e214e7cd17f2c4) @@ -52,7 +52,4 @@ #include #include -#include -#include -#include #include "e1k.h" @@ -62,13 +59,13 @@ /* Must be power of 8 */ -#define E1000_RX_PACKETS_COUNT 128 -#define E1000_TX_PACKETS_COUNT 128 +#define E1000_RX_FRAME_COUNT 128 +#define E1000_TX_FRAME_COUNT 128 #define E1000_RECEIVE_ADDRESS 16 -/** Maximum sending packet size */ +/** Maximum sending frame size */ #define E1000_MAX_SEND_FRAME_SIZE 2048 -/** Maximum receiving packet size */ -#define E1000_MAX_RECEIVE_PACKET_SIZE 2048 +/** Maximum receiving frame size */ +#define E1000_MAX_RECEIVE_FRAME_SIZE 2048 /** nic_driver_data_t* -> e1000_t* cast */ @@ -137,11 +134,13 @@ void *rx_ring_virt; - /** Packets in rx ring */ - packet_t **rx_ring_packets; + /** Ring of RX frames, physical address */ + void **rx_frame_phys; + /** Ring of RX frames, virtual address */ + void **rx_frame_virt; /** VLAN tag */ uint16_t vlan_tag; - /** Add VLAN tag to packet */ + /** Add VLAN tag to frame */ bool vlan_tag_add; @@ -488,5 +487,5 @@ } -/** Get state of acceptance of weird packets +/** Get state of acceptance of weird frames * * @param device Device to check @@ -506,5 +505,5 @@ }; -/** Set acceptance of weird packets +/** Set acceptance of weird frames * * @param device Device to update @@ -690,5 +689,5 @@ } -/** Disable receiving packets for default address +/** Disable receiving frames for default address * * @param e1000 E1000 data structure @@ -702,5 +701,5 @@ } -/** Enable receiving packets for default address +/** Enable receiving frames for default address * * @param e1000 E1000 data structure @@ -762,5 +761,5 @@ } -/** Enable accepting of broadcast packets +/** Enable accepting of broadcast frames * * @param e1000 E1000 data structure @@ -774,5 +773,5 @@ } -/** Disable accepting of broadcast packets +/** Disable accepting of broadcast frames * * @param e1000 E1000 data structure @@ -810,5 +809,5 @@ } -/** Set multicast packets acceptance mode +/** Set multicast frames acceptance mode * * @param nic NIC device to update @@ -864,5 +863,5 @@ } -/** Set unicast packets acceptance mode +/** Set unicast frames acceptance mode * * @param nic NIC device to update @@ -922,5 +921,5 @@ } -/** Set broadcast packets acceptance mode +/** Set broadcast frames acceptance mode * * @param nic NIC device to update @@ -1007,5 +1006,5 @@ if (vlan_mask) { /* - * Disable receiving, so that packet matching + * Disable receiving, so that frame matching * partially written VLAN is not received. */ @@ -1074,7 +1073,7 @@ } -/** Fill receive descriptor with new empty packet - * - * Store packet in e1000->rx_ring_packets +/** Fill receive descriptor with new empty buffer + * + * Store frame in e1000->rx_frame_phys * * @param nic NIC data stricture @@ -1085,22 +1084,9 @@ { e1000_t *e1000 = DRIVER_DATA_NIC(nic); - packet_t *packet = - nic_alloc_packet(nic, E1000_MAX_RECEIVE_PACKET_SIZE); - - assert(packet); - - *(e1000->rx_ring_packets + offset) = packet; + e1000_rx_descriptor_t *rx_descriptor = (e1000_rx_descriptor_t *) (e1000->rx_ring_virt + offset * sizeof(e1000_rx_descriptor_t)); - void *phys; - int rc = - nic_dma_lock_packet(packet, E1000_MAX_RECEIVE_PACKET_SIZE, &phys); - - if (rc == EOK) - rx_descriptor->phys_addr = PTR_TO_U64(phys + packet->data_start); - else - rx_descriptor->phys_addr = 0; - + rx_descriptor->phys_addr = PTR_TO_U64(e1000->rx_frame_phys[offset]); rx_descriptor->length = 0; rx_descriptor->checksum = 0; @@ -1166,10 +1152,10 @@ } -/** Receive packets +/** Receive frames * * @param nic NIC data * */ -static void e1000_receive_packets(nic_t *nic) +static void e1000_receive_frames(nic_t *nic) { e1000_t *e1000 = DRIVER_DATA_NIC(nic); @@ -1178,5 +1164,5 @@ uint32_t *tail_addr = E1000_REG_ADDR(e1000, E1000_RDT); - uint32_t next_tail = e1000_inc_tail(*tail_addr, E1000_RX_PACKETS_COUNT); + uint32_t next_tail = e1000_inc_tail(*tail_addr, E1000_RX_FRAME_COUNT); e1000_rx_descriptor_t *rx_descriptor = (e1000_rx_descriptor_t *) @@ -1184,16 +1170,18 @@ while (rx_descriptor->status & 0x01) { - uint32_t packet_size = rx_descriptor->length - E1000_CRC_SIZE; + uint32_t frame_size = rx_descriptor->length - E1000_CRC_SIZE; - packet_t *packet = *(e1000->rx_ring_packets + next_tail); - packet_suffix(packet, packet_size); - - nic_dma_unlock_packet(packet, E1000_MAX_RECEIVE_PACKET_SIZE); - nic_received_packet(nic, packet); + nic_frame_t *frame = nic_alloc_frame(nic, frame_size); + if (frame != NULL) { + memcpy(frame->data, e1000->rx_frame_virt[next_tail], frame_size); + nic_received_frame(nic, frame); + } else { + ddf_msg(LVL_ERROR, "Memory allocation failed. Frame dropped."); + } e1000_fill_new_rx_descriptor(nic, next_tail); - *tail_addr = e1000_inc_tail(*tail_addr, E1000_RX_PACKETS_COUNT); - next_tail = e1000_inc_tail(*tail_addr, E1000_RX_PACKETS_COUNT); + *tail_addr = e1000_inc_tail(*tail_addr, E1000_RX_FRAME_COUNT); + next_tail = e1000_inc_tail(*tail_addr, E1000_RX_FRAME_COUNT); rx_descriptor = (e1000_rx_descriptor_t *) @@ -1236,5 +1224,5 @@ { if (icr & ICR_RXT0) - e1000_receive_packets(nic); + e1000_receive_frames(nic); } @@ -1286,5 +1274,5 @@ } -/** Force receiving all packets in the receive buffer +/** Force receiving all frames in the receive buffer * * @param nic NIC data @@ -1359,9 +1347,9 @@ static void e1000_initialize_rx_registers(e1000_t *e1000) { - E1000_REG_WRITE(e1000, E1000_RDLEN, E1000_RX_PACKETS_COUNT * 16); + E1000_REG_WRITE(e1000, E1000_RDLEN, E1000_RX_FRAME_COUNT * 16); E1000_REG_WRITE(e1000, E1000_RDH, 0); /* It is not posible to let HW use all descriptors */ - E1000_REG_WRITE(e1000, E1000_RDT, E1000_RX_PACKETS_COUNT - 1); + E1000_REG_WRITE(e1000, E1000_RDT, E1000_RX_FRAME_COUNT - 1); /* Set Broadcast Enable Bit */ @@ -1383,5 +1371,5 @@ int rc = dmamem_map_anonymous( - E1000_RX_PACKETS_COUNT * sizeof(e1000_rx_descriptor_t), + E1000_RX_FRAME_COUNT * sizeof(e1000_rx_descriptor_t), AS_AREA_READ | AS_AREA_WRITE, 0, &e1000->rx_ring_phys, &e1000->rx_ring_virt); @@ -1394,52 +1382,92 @@ (uint32_t) PTR_TO_U64(e1000->rx_ring_phys)); - e1000->rx_ring_packets = - malloc(E1000_RX_PACKETS_COUNT * sizeof(packet_t *)); - // FIXME: Check return value - + e1000->rx_frame_phys = + calloc(E1000_RX_FRAME_COUNT, sizeof(void *)); + e1000->rx_frame_virt = + calloc(E1000_RX_FRAME_COUNT, sizeof(void *)); + if (e1000->rx_frame_phys == NULL || e1000->rx_frame_virt == NULL) { + rc = ENOMEM; + goto error; + } + + size_t i; + void *frame_virt; + void *frame_phys; + + for (i = 0; i < E1000_RX_FRAME_COUNT; i++) { + rc = dmamem_map_anonymous( + E1000_MAX_SEND_FRAME_SIZE, AS_AREA_READ | AS_AREA_WRITE, + 0, &frame_phys, &frame_virt); + if (rc != EOK) + goto error; + + e1000->rx_frame_virt[i] = frame_virt; + e1000->rx_frame_phys[i] = frame_phys; + } + + /* Write descriptor */ + for (i = 0; i < E1000_RX_FRAME_COUNT; i++) + e1000_fill_new_rx_descriptor(nic, i); + + e1000_initialize_rx_registers(e1000); + + fibril_mutex_unlock(&e1000->rx_lock); + return EOK; + +error: + for (i = 0; i < E1000_RX_FRAME_COUNT; i++) { + if (e1000->rx_frame_virt[i] != NULL) { + dmamem_unmap_anonymous(e1000->rx_frame_virt[i]); + e1000->rx_frame_virt[i] = NULL; + e1000->rx_frame_phys[i] = NULL; + } + } + + if (e1000->rx_frame_phys != NULL) { + free(e1000->rx_frame_phys); + e1000->rx_frame_phys = NULL; + } + + if (e1000->rx_frame_virt != NULL) { + free(e1000->rx_frame_virt); + e1000->rx_frame_phys = NULL; + } + + return rc; +} + +/** Uninitialize receive structure + * + * @param nic NIC data + * + */ +static void e1000_uninitialize_rx_structure(nic_t *nic) +{ + e1000_t *e1000 = DRIVER_DATA_NIC(nic); + + /* Write descriptor */ + for (unsigned int offset = 0; offset < E1000_RX_FRAME_COUNT; offset++) { + dmamem_unmap_anonymous(e1000->rx_frame_virt[offset]); + e1000->rx_frame_virt[offset] = NULL; + e1000->rx_frame_phys[offset] = NULL; + } + + free(e1000->rx_frame_virt); + free(e1000->rx_frame_phys); + e1000->rx_frame_virt = NULL; + e1000->rx_frame_phys = NULL; + dmamem_unmap_anonymous(e1000->rx_ring_virt); +} + +/** Clear receive descriptor ring + * + * @param e1000 E1000 data + * + */ +static void e1000_clear_rx_ring(e1000_t *e1000) +{ /* Write descriptor */ for (unsigned int offset = 0; - offset < E1000_RX_PACKETS_COUNT; - offset++) - e1000_fill_new_rx_descriptor(nic, offset); - - e1000_initialize_rx_registers(e1000); - - fibril_mutex_unlock(&e1000->rx_lock); - return EOK; -} - -/** Uninitialize receive structure - * - * @param nic NIC data - * - */ -static void e1000_uninitialize_rx_structure(nic_t *nic) -{ - e1000_t *e1000 = DRIVER_DATA_NIC(nic); - - /* Write descriptor */ - for (unsigned int offset = 0; - offset < E1000_RX_PACKETS_COUNT; - offset++) { - packet_t *packet = *(e1000->rx_ring_packets + offset); - nic_dma_unlock_packet(packet, E1000_MAX_RECEIVE_PACKET_SIZE); - nic_release_packet(nic, packet); - } - - free(e1000->rx_ring_packets); - dmamem_unmap_anonymous(e1000->rx_ring_virt); -} - -/** Clear receive descriptor ring - * - * @param e1000 E1000 data - * - */ -static void e1000_clear_rx_ring(e1000_t *e1000) -{ - /* Write descriptor */ - for (unsigned int offset = 0; - offset < E1000_RX_PACKETS_COUNT; + offset < E1000_RX_FRAME_COUNT; offset++) e1000_clear_rx_descriptor(e1000, offset); @@ -1510,5 +1538,5 @@ static void e1000_initialize_tx_registers(e1000_t *e1000) { - E1000_REG_WRITE(e1000, E1000_TDLEN, E1000_TX_PACKETS_COUNT * 16); + E1000_REG_WRITE(e1000, E1000_TDLEN, E1000_TX_FRAME_COUNT * 16); E1000_REG_WRITE(e1000, E1000_TDH, 0); E1000_REG_WRITE(e1000, E1000_TDT, 0); @@ -1542,5 +1570,5 @@ int rc = dmamem_map_anonymous( - E1000_TX_PACKETS_COUNT * sizeof(e1000_tx_descriptor_t), + E1000_TX_FRAME_COUNT * sizeof(e1000_tx_descriptor_t), AS_AREA_READ | AS_AREA_WRITE, 0, &e1000->tx_ring_phys, &e1000->tx_ring_virt); @@ -1549,8 +1577,8 @@ bzero(e1000->tx_ring_virt, - E1000_TX_PACKETS_COUNT * sizeof(e1000_tx_descriptor_t)); - - e1000->tx_frame_phys = calloc(E1000_TX_PACKETS_COUNT, sizeof(void *)); - e1000->tx_frame_virt = calloc(E1000_TX_PACKETS_COUNT, sizeof(void *)); + E1000_TX_FRAME_COUNT * sizeof(e1000_tx_descriptor_t)); + + e1000->tx_frame_phys = calloc(E1000_TX_FRAME_COUNT, sizeof(void *)); + e1000->tx_frame_virt = calloc(E1000_TX_FRAME_COUNT, sizeof(void *)); if (e1000->tx_frame_phys == NULL || e1000->tx_frame_virt == NULL) { @@ -1559,5 +1587,5 @@ } - for (i = 0; i < E1000_TX_PACKETS_COUNT; i++) { + for (i = 0; i < E1000_TX_FRAME_COUNT; i++) { rc = dmamem_map_anonymous( E1000_MAX_SEND_FRAME_SIZE, AS_AREA_READ | AS_AREA_WRITE, @@ -1584,5 +1612,5 @@ if (e1000->tx_frame_phys != NULL && e1000->tx_frame_virt != NULL) { - for (i = 0; i < E1000_TX_PACKETS_COUNT; i++) { + for (i = 0; i < E1000_TX_FRAME_COUNT; i++) { if (e1000->tx_frame_virt[i] != NULL) { dmamem_unmap_anonymous(e1000->tx_frame_virt[i]); @@ -1615,5 +1643,5 @@ size_t i; - for (i = 0; i < E1000_TX_PACKETS_COUNT; i++) { + for (i = 0; i < E1000_TX_FRAME_COUNT; i++) { dmamem_unmap_anonymous(e1000->tx_frame_virt[i]); e1000->tx_frame_virt[i] = NULL; @@ -1630,4 +1658,5 @@ e1000->tx_frame_phys = NULL; } + dmamem_unmap_anonymous(e1000->tx_ring_virt); } @@ -1642,5 +1671,5 @@ /* Write descriptor */ for (unsigned int offset = 0; - offset < E1000_TX_PACKETS_COUNT; + offset < E1000_TX_FRAME_COUNT; offset++) e1000_clear_tx_descriptor(nic, offset); @@ -1699,5 +1728,5 @@ } -/** Activate the device to receive and transmit packets +/** Activate the device to receive and transmit frames * * @param nic NIC driver data @@ -2040,5 +2069,4 @@ case E1000_82545: case E1000_82546: - case E1000_82572: e1000->info.eerd_start = 0x01; e1000->info.eerd_done = 0x10; @@ -2047,4 +2075,5 @@ break; case E1000_82547: + case E1000_82572: case E1000_80003ES2: e1000->info.eerd_start = 0x01; @@ -2085,4 +2114,5 @@ int e1000_dev_add(ddf_dev_t *dev) { + ddf_fun_t *fun; assert(dev); @@ -2115,11 +2145,14 @@ e1000_initialize_vlan(e1000); - rc = nic_register_as_ddf_fun(nic, &e1000_dev_ops); - if (rc != EOK) + fun = ddf_fun_create(nic_get_ddf_dev(nic), fun_exposed, "port0"); + if (fun == NULL) goto err_tx_structure; + nic_set_ddf_fun(nic, fun); + fun->ops = &e1000_dev_ops; + fun->driver_data = nic; rc = e1000_register_int_handler(nic); if (rc != EOK) - goto err_tx_structure; + goto err_fun_create; rc = nic_connect_to_services(nic); @@ -2144,10 +2177,24 @@ goto err_rx_structure; + rc = ddf_fun_bind(fun); + if (rc != EOK) + goto err_fun_bind; + + rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC); + if (rc != EOK) + goto err_add_to_cat; + return EOK; +err_add_to_cat: + ddf_fun_unbind(fun); +err_fun_bind: err_rx_structure: e1000_uninitialize_rx_structure(nic); err_irq: unregister_interrupt_handler(dev, DRIVER_DATA_DEV(dev)->irq); +err_fun_create: + ddf_fun_destroy(fun); + nic_set_ddf_fun(nic, NULL); err_tx_structure: e1000_uninitialize_tx_structure(e1000); @@ -2295,5 +2342,5 @@ if (!descriptor_available) { - /* Packet lost */ + /* Frame lost */ fibril_mutex_unlock(&e1000->tx_lock); return; @@ -2324,5 +2371,5 @@ tdt++; - if (tdt == E1000_TX_PACKETS_COUNT) + if (tdt == E1000_TX_FRAME_COUNT) tdt = 0; Index: uspace/drv/nic/e1k/e1k.h =================================================================== --- uspace/drv/nic/e1k/e1k.h (revision ec527526a4e0798cdc0203a96d7b8ca06b441364) +++ uspace/drv/nic/e1k/e1k.h (revision c01bb5f96a155bdec60146b151e214e7cd17f2c4) @@ -39,5 +39,5 @@ #include -/** Ethernet CRC size after packet received in rx_descriptor */ +/** Ethernet CRC size after frame received in rx_descriptor */ #define E1000_CRC_SIZE 4 @@ -109,5 +109,5 @@ /** Transmit descriptor COMMAND field bits */ typedef enum { - TXDESCRIPTOR_COMMAND_VLE = (1 << 6), /**< VLAN Packet Enable */ + TXDESCRIPTOR_COMMAND_VLE = (1 << 6), /**< VLAN frame Enable */ TXDESCRIPTOR_COMMAND_RS = (1 << 3), /**< Report Status */ TXDESCRIPTOR_COMMAND_IFCS = (1 << 1), /**< Insert FCS */