Ignore:
File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/drv/nic/rtl8139/driver.c

    re86b8f0 r6d8455d  
    3939#include <io/log.h>
    4040#include <nic.h>
     41#include <packet_client.h>
    4142#include <device/pci.h>
    4243
    … …  
    151152}
    152153
    153 /** Update the mask of accepted frames in the RCR register according to
     154/** Update the mask of accepted packets in the RCR register according to
    154155 * rcr_accept_mode value in rtl8139_t
    155156 *
    … …  
    169170}
    170171
    171 /** Fill the mask of accepted multicast frames in the card registers
     172/** Fill the mask of accepted multicast packets in the card registers
    172173 *
    173174 *  @param rtl8139  The rtl8139 private data
    … …  
    393394#define rtl8139_tbuf_busy(tsd) ((pio_read_32(tsd) & TSD_OWN) == 0)
    394395
    395 /** Send frame with the hardware
     396/** Send packet with the hardware
    396397 *
    397398 * note: the main_lock is locked when framework calls this function
    … …  
    411412        ddf_msg(LVL_DEBUG, "Sending frame");
    412413
    413         if (size > RTL8139_FRAME_MAX_LENGTH) {
     414        if (size > RTL8139_PACKET_MAX_LENGTH) {
    414415                ddf_msg(LVL_ERROR, "Send frame: frame too long, %zu bytes",
    415416                    size);
    … …  
    436437        fibril_mutex_unlock(&rtl8139->tx_lock);
    437438
    438         /* Get address of the buffer descriptor and frame data */
     439        /* Get address of the buffer descriptor and packet data */
    439440        void *tsd = rtl8139->io_port + TSD0 + tx_curr * 4;
    440441        void *buf_addr = rtl8139->tx_buff[tx_curr];
    … …  
    504505}
    505506
    506 /** Create frame structure from the buffer data
     507/** Create packet structure from the buffer data
    507508 *
    508509 * @param nic_data      NIC driver data
    509510 * @param rx_buffer     The receiver buffer
    510511 * @param rx_size       The buffer size
    511  * @param frame_start   The offset where packet data start
    512  * @param frame_size    The size of the frame data
    513  *
    514  * @return The frame list node (not connected)
    515  */
    516 static nic_frame_t *rtl8139_read_frame(nic_t *nic_data,
    517     void *rx_buffer, size_t rx_size, size_t frame_start, size_t frame_size)
    518 {
    519         nic_frame_t *frame = nic_alloc_frame(nic_data, frame_size);
     512 * @param packet_start  The offset where packet data start
     513 * @param packet_size   The size of the packet data
     514 *
     515 * @return The packet  list node (not connected)
     516 */
     517static nic_frame_t *rtl8139_read_packet(nic_t *nic_data,
     518    void *rx_buffer, size_t rx_size, size_t packet_start, size_t packet_size)
     519{
     520        nic_frame_t *frame = nic_alloc_frame(nic_data, packet_size);
    520521        if (! frame) {
    521                 ddf_msg(LVL_ERROR, "Can not allocate frame for received frame.");
     522                ddf_msg(LVL_ERROR, "Can not allocate frame for received packet.");
    522523                return NULL;
    523524        }
    524525
    525         void *ret = rtl8139_memcpy_wrapped(frame->data, rx_buffer, frame_start,
    526             RxBUF_SIZE, frame_size);
     526        void *packet_data = packet_suffix(frame->packet, packet_size);
     527        if (!packet_data) {
     528                ddf_msg(LVL_ERROR, "Can not get the packet suffix.");
     529                nic_release_frame(nic_data, frame);
     530                return NULL;
     531        }
     532
     533        void *ret = rtl8139_memcpy_wrapped(packet_data, rx_buffer, packet_start,
     534            RxBUF_SIZE, packet_size);
    527535        if (ret == NULL) {
    528536                nic_release_frame(nic_data, frame);
    … …  
    560568}
    561569
    562 /** Receive all frames in queue
     570/** Receive all packets in queue
    563571 *
    564572 *  @param nic_data  The controller data
    565  *  @return The linked list of nic_frame_list_t nodes, each containing one frame
    566  */
    567 static nic_frame_list_t *rtl8139_frame_receive(nic_t *nic_data)
     573 *  @return The linked list of packet_list_t nodes, each containing one packet
     574 */
     575static nic_frame_list_t *rtl8139_packet_receive(nic_t *nic_data)
    568576{
    569577        rtl8139_t *rtl8139 = nic_get_specific(nic_data);
    … …  
    573581        nic_frame_list_t *frames = nic_alloc_frame_list();
    574582        if (!frames)
    575                 ddf_msg(LVL_ERROR, "Can not allocate frame list for received frames.");
     583                ddf_msg(LVL_ERROR, "Can not allocate frame list for received packets.");
    576584
    577585        void *rx_buffer = rtl8139->rx_buff_virt;
    … …  
    597605        while (!rtl8139_hw_buffer_empty(rtl8139)) {
    598606                void *rx_ptr = rx_buffer + rx_offset % RxBUF_SIZE;
    599                 uint32_t frame_header = uint32_t_le2host( *((uint32_t*)rx_ptr) );
    600                 uint16_t size = frame_header >> 16;
    601                 uint16_t frame_size = size - RTL8139_CRC_SIZE;
    602                 /* received frame flags in frame header */
    603                 uint16_t rcs = (uint16_t) frame_header;
     607                uint32_t packet_header = uint32_t_le2host( *((uint32_t*)rx_ptr) );
     608                uint16_t size = packet_header >> 16;
     609                uint16_t packet_size = size - RTL8139_CRC_SIZE;
     610                /* received packet flags in packet header */
     611                uint16_t rcs = (uint16_t) packet_header;
    604612
    605613                if (size == RTL8139_EARLY_SIZE) {
    606                         /* The frame copying is still in progress, break receiving */
     614                        /* The packet copying is still in progress, break receiving */
    607615                        ddf_msg(LVL_DEBUG, "Early threshold reached, not completely coppied");
    608616                        break;
    … …  
    610618
    611619                /* Check if the header is valid, otherwise we are lost in the buffer */
    612                 if (size == 0 || size > RTL8139_FRAME_MAX_LENGTH) {
     620                if (size == 0 || size > RTL8139_PACKET_MAX_LENGTH) {
    613621                        ddf_msg(LVL_ERROR, "Receiver error -> receiver reset (size: %4"PRIu16", "
    614                             "header 0x%4"PRIx16". Offset: %zu)", size, frame_header,
     622                            "header 0x%4"PRIx16". Offset: %zu)", size, packet_header,
    615623                            rx_offset);
    616624                        goto rx_err;
    … …  
    621629                }
    622630
    623                 cur_read += size + RTL_FRAME_HEADER_SIZE;
     631                cur_read += size + RTL_PACKET_HEADER_SIZE;
    624632                if (cur_read > max_read)
    625633                        break;
    626634
    627635                if (frames) {
    628                         nic_frame_t *frame = rtl8139_read_frame(nic_data, rx_buffer,
    629                             RxBUF_SIZE, rx_offset + RTL_FRAME_HEADER_SIZE, frame_size);
     636                        nic_frame_t *frame = rtl8139_read_packet(nic_data, rx_buffer,
     637                            RxBUF_SIZE, rx_offset + RTL_PACKET_HEADER_SIZE, packet_size);
    630638
    631639                        if (frame)
    … …  
    634642
    635643                /* Update offset */
    636                 rx_offset = ALIGN_UP(rx_offset + size + RTL_FRAME_HEADER_SIZE, 4);
    637 
    638                 /* Write lesser value to prevent overflow into unread frame
     644                rx_offset = ALIGN_UP(rx_offset + size + RTL_PACKET_HEADER_SIZE, 4);
     645
     646                /* Write lesser value to prevent overflow into unread packet
    639647                 * (the recomendation from the RealTech rtl8139 programming guide)
    640648                 */
    … …  
    719727                tx_used++;
    720728
    721                 /* If the frame was sent */
     729                /* If the packet was sent */
    722730                if (tsd_value & TSD_TOK) {
    723731                        size_t size = REG_GET_VAL(tsd_value, TSD_SIZE);
    … …  
    749757}
    750758
    751 /** Receive all frames from the buffer
     759/** Receive all packets from the buffer
    752760 *
    753761 *  @param rtl8139  driver private data
    754762 */
    755 static void rtl8139_receive_frames(nic_t *nic_data)
     763static void rtl8139_receive_packets(nic_t *nic_data)
    756764{
    757765        assert(nic_data);
    … …  
    761769
    762770        fibril_mutex_lock(&rtl8139->rx_lock);
    763         nic_frame_list_t *frames = rtl8139_frame_receive(nic_data);
     771        nic_frame_list_t *frames = rtl8139_packet_receive(nic_data);
    764772        fibril_mutex_unlock(&rtl8139->rx_lock);
    765773
    … …  
    817825        }
    818826
    819         /* Check transmittion interrupts first to allow transmit next frames
     827        /* Check transmittion interrupts first to allow transmit next packets
    820828         * sooner
    821829         */
    … …  
    824832        }
    825833        if (isr & INT_ROK) {
    826                 rtl8139_receive_frames(nic_data);
     834                rtl8139_receive_packets(nic_data);
    827835        }
    828836        if (isr & (INT_RER | INT_RXOVW | INT_FIFOOVW)) {
    … …  
    925933}
    926934
    927 /** Activate the device to receive and transmit frames
     935/** Activate the device to receive and transmit packets
    928936 *
    929937 *  @param nic_data  The nic driver data
    … …  
    12051213                goto failed;
    12061214
    1207         /* Set default frame acceptance */
     1215        /* Set default packet acceptance */
    12081216        rtl8139->rcr_data.ucast_mask = RTL8139_RCR_UCAST_DEFAULT;
    12091217        rtl8139->rcr_data.mcast_mask = RTL8139_RCR_MCAST_DEFAULT;
    12101218        rtl8139->rcr_data.bcast_mask = RTL8139_RCR_BCAST_DEFAULT;
    12111219        rtl8139->rcr_data.defect_mask = RTL8139_RCR_DEFECT_DEFAULT;
    1212         /* Set receiver early treshold to 8/16 of frame length */
     1220        /* Set receiver early treshold to 8/16 of packet length */
    12131221        rtl8139->rcr_data.rcr_base = (0x8 << RCR_ERTH_SHIFT);
    12141222
    … …  
    12801288int rtl8139_dev_add(ddf_dev_t *dev)
    12811289{
    1282         ddf_fun_t *fun;
    1283 
    12841290        assert(dev);
    12851291        ddf_msg(LVL_NOTE, "RTL8139_dev_add %s (handle = %d)", dev->name, dev->handle);
    … …  
    13181324        }
    13191325
    1320         fun = ddf_fun_create(nic_get_ddf_dev(nic_data), fun_exposed, "port0");
    1321         if (fun == NULL) {
    1322                 ddf_msg(LVL_ERROR, "Failed creating device function");
    1323                 goto err_srv;
    1324         }
    1325         nic_set_ddf_fun(nic_data, fun);
    1326         fun->ops = &rtl8139_dev_ops;
    1327         fun->driver_data = nic_data;
    1328 
    1329         rc = ddf_fun_bind(fun);
     1326        rc = nic_register_as_ddf_fun(nic_data, &rtl8139_dev_ops);
    13301327        if (rc != EOK) {
    1331                 ddf_msg(LVL_ERROR, "Failed binding device function");
    1332                 goto err_fun_create;
    1333         }
    1334         rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
    1335         if (rc != EOK) {
    1336                 ddf_msg(LVL_ERROR, "Failed adding function to category");
    1337                 goto err_fun_bind;
     1328                ddf_msg(LVL_ERROR, "Failed to register as DDF function - error %d", rc);
     1329                goto err_irq;
    13381330        }
    13391331
    … …  
    13431335        return EOK;
    13441336
    1345 err_fun_bind:
    1346         ddf_fun_unbind(fun);
    1347 err_fun_create:
    1348         ddf_fun_destroy(fun);
    1349 err_srv:
    1350         /* XXX Disconnect from services */
    13511337err_irq:
    13521338        unregister_interrupt_handler(dev, rtl8139->irq);
    … …  
    14911477};
    14921478
    1493 /** Check if pause frame operations are valid in current situation
     1479/** Check if pause packet operations are valid in current situation
    14941480 *
    14951481 *  @param rtl8139  RTL8139 private structure
    … …  
    15161502}
    15171503
    1518 /** Get current pause frame configuration
     1504/** Get current pause packet configuration
    15191505 *
    15201506 *  Values are filled with NIC_RESULT_NOT_AVAILABLE if the value has no sense in
    … …  
    15221508 *
    15231509 *  @param[in]  fun         The DDF structure of the RTL8139
    1524  *  @param[out] we_send     Sign if local constroller sends pause frame
    1525  *  @param[out] we_receive  Sign if local constroller receives pause frame
    1526  *  @param[out] time        Time filled in pause frames. 0xFFFF in rtl8139
     1510 *  @param[out] we_send     Sign if local constroller sends pause packets
     1511 *  @param[out] we_receive  Sign if local constroller receives pause packets
     1512 *  @param[out] time        Time filled in pause packets. 0xFFFF in rtl8139
    15271513 *
    15281514 *  @return EOK if succeed
    … …  
    15541540};
    15551541
    1556 /** Set current pause frame configuration
     1542/** Set current pause packet configuration
    15571543 *
    15581544 *  @param fun            The DDF structure of the RTL8139
    1559  *  @param allow_send     Sign if local constroller sends pause frame
    1560  *  @param allow_receive  Sign if local constroller receives pause frames
     1545 *  @param allow_send     Sign if local constroller sends pause packets
     1546 *  @param allow_receive  Sign if local constroller receives pause packets
    15611547 *  @param time           Time to use, ignored (not supported by device)
    15621548 *
    1563  *  @return EOK if succeed, INVAL if the pause frame has no sence
     1549 *  @return EOK if succeed, INVAL if the pause packet has no sence
    15641550 */
    15651551static int rtl8139_pause_set(ddf_fun_t *fun, int allow_send, int allow_receive,
    … …  
    18101796}
    18111797
    1812 /** Set unicast frames acceptance mode
     1798/** Set unicast packets acceptance mode
    18131799 *
    18141800 *  @param nic_data  The nic device to update
    … …  
    18681854}
    18691855
    1870 /** Set multicast frames acceptance mode
     1856/** Set multicast packets acceptance mode
    18711857 *
    18721858 *  @param nic_data  The nic device to update
    … …  
    19131899}
    19141900
    1915 /** Set broadcast frames acceptance mode
     1901/** Set broadcast packets acceptance mode
    19161902 *
    19171903 *  @param nic_data  The nic device to update
    … …  
    19431929}
    19441930
    1945 /** Get state of acceptance of weird frames
     1931/** Get state of acceptance of weird packets
    19461932 *
    19471933 *  @param[in]  device  The device to check
    … …  
    19651951};
    19661952
    1967 /** Set acceptance of weird frames
     1953/** Set acceptance of weird packets
    19681954 *
    19691955 *  @param device  The device to update
    … …  
    21412127}
    21422128
    2143 /** Force receiving all frames in the receive buffer
     2129/** Force receiving all packets in the receive buffer
    21442130 *
    21452131 *  @param device  The device to receive
Note: See TracChangeset for help on using the changeset viewer.