Changeset cfb79747 in mainline for uspace/drv/nic/rtl8139/driver.c


Ignore:
Timestamp:
2012-02-14T22:06:15Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a31aad1
Parents:
199112e4 (diff), e10d41a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge mainline changes.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r199112e4 rcfb79747  
    3939#include <io/log.h>
    4040#include <nic.h>
    41 #include <packet_client.h>
    4241#include <device/pci.h>
    4342
    … …  
    5655/** Global mutex for work with shared irq structure */
    5756FIBRIL_MUTEX_INITIALIZE(irq_reg_lock);
     57
    5858/** Lock interrupt structure mutex */
    59 #define RTL8139_IRQ_STRUCT_LOCK() fibril_mutex_lock(&irq_reg_lock)
     59#define RTL8139_IRQ_STRUCT_LOCK() \
     60        fibril_mutex_lock(&irq_reg_lock)
     61
    6062/** Unlock interrupt structure mutex */
    61 #define RTL8139_IRQ_STRUCT_UNLOCK() fibril_mutex_unlock(&irq_reg_lock)
     63#define RTL8139_IRQ_STRUCT_UNLOCK() \
     64        fibril_mutex_unlock(&irq_reg_lock)
    6265
    6366/** PCI clock frequency in kHz */
    64 #define RTL8139_PCI_FREQ_KHZ 33000
    65 
    66 #define RTL8139_AUTONEG_CAPS (ETH_AUTONEG_10BASE_T_HALF \
    67     | ETH_AUTONEG_10BASE_T_FULL | ETH_AUTONEG_100BASE_TX_HALF \
    68     | ETH_AUTONEG_100BASE_TX_FULL | ETH_AUTONEG_PAUSE_SYMETRIC)
     67#define RTL8139_PCI_FREQ_KHZ  33000
     68
     69#define RTL8139_AUTONEG_CAPS (ETH_AUTONEG_10BASE_T_HALF | \
     70        ETH_AUTONEG_10BASE_T_FULL | ETH_AUTONEG_100BASE_TX_HALF | \
     71        ETH_AUTONEG_100BASE_TX_FULL | ETH_AUTONEG_PAUSE_SYMETRIC)
    6972
    7073/** Lock transmitter and receiver data
    71  *  This function shall be called whenever both transmitter and receiver locking
    72  *  to force safe lock ordering (deadlock prevention)
    73  *
    74  *  @param rtl8139  RTL8139 private data
     74 *
     75 * This function shall be called whenever
     76 * both transmitter and receiver locking
     77 * to force safe lock ordering (deadlock prevention)
     78 *
     79 * @param rtl8139 RTL8139 private data
     80 *
    7581 */
    7682inline static void rtl8139_lock_all(rtl8139_t *rtl8139)
    … …  
    8389/** Unlock transmitter and receiver data
    8490 *
    85  *  @param rtl8139  RTL8139 private data
     91 * @param rtl8139 RTL8139 private data
     92 *
    8693 */
    8794inline static void rtl8139_unlock_all(rtl8139_t *rtl8139)
    … …  
    152159}
    153160
    154 /** Update the mask of accepted packets in the RCR register according to
     161/** Update the mask of accepted frames in the RCR register according to
    155162 * rcr_accept_mode value in rtl8139_t
    156163 *
    … …  
    170177}
    171178
    172 /** Fill the mask of accepted multicast packets in the card registers
     179/** Fill the mask of accepted multicast frames in the card registers
    173180 *
    174181 *  @param rtl8139  The rtl8139 private data
    … …  
    394401#define rtl8139_tbuf_busy(tsd) ((pio_read_32(tsd) & TSD_OWN) == 0)
    395402
    396 /** Send packet with the hardware
     403/** Send frame with the hardware
    397404 *
    398405 * note: the main_lock is locked when framework calls this function
    … …  
    412419        ddf_msg(LVL_DEBUG, "Sending frame");
    413420
    414         if (size > RTL8139_PACKET_MAX_LENGTH) {
     421        if (size > RTL8139_FRAME_MAX_LENGTH) {
    415422                ddf_msg(LVL_ERROR, "Send frame: frame too long, %zu bytes",
    416423                    size);
    … …  
    437444        fibril_mutex_unlock(&rtl8139->tx_lock);
    438445
    439         /* Get address of the buffer descriptor and packet data */
     446        /* Get address of the buffer descriptor and frame data */
    440447        void *tsd = rtl8139->io_port + TSD0 + tx_curr * 4;
    441448        void *buf_addr = rtl8139->tx_buff[tx_curr];
    … …  
    458465        pio_write_32(tsd, tsd_value);
    459466        return;
    460 
     467       
    461468err_busy_no_inc:
    462469err_size:
    … …  
    505512}
    506513
    507 /** Create packet structure from the buffer data
     514/** Create frame structure from the buffer data
    508515 *
    509516 * @param nic_data      NIC driver data
    510517 * @param rx_buffer     The receiver buffer
    511518 * @param rx_size       The buffer 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  */
    517 static 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);
     519 * @param frame_start   The offset where packet data start
     520 * @param frame_size    The size of the frame data
     521 *
     522 * @return The frame list node (not connected)
     523 *
     524 */
     525static nic_frame_t *rtl8139_read_frame(nic_t *nic_data,
     526    void *rx_buffer, size_t rx_size, size_t frame_start, size_t frame_size)
     527{
     528        nic_frame_t *frame = nic_alloc_frame(nic_data, frame_size);
    521529        if (! frame) {
    522                 ddf_msg(LVL_ERROR, "Can not allocate frame for received packet.");
     530                ddf_msg(LVL_ERROR, "Can not allocate frame for received frame.");
    523531                return NULL;
    524532        }
    525533
    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);
     534        void *ret = rtl8139_memcpy_wrapped(frame->data, rx_buffer, frame_start,
     535            RxBUF_SIZE, frame_size);
    535536        if (ret == NULL) {
    536537                nic_release_frame(nic_data, frame);
    … …  
    568569}
    569570
    570 /** Receive all packets in queue
     571/** Receive all frames in queue
    571572 *
    572573 *  @param nic_data  The controller data
    573  *  @return The linked list of packet_list_t nodes, each containing one packet
    574  */
    575 static nic_frame_list_t *rtl8139_packet_receive(nic_t *nic_data)
     574 *  @return The linked list of nic_frame_list_t nodes, each containing one frame
     575 */
     576static nic_frame_list_t *rtl8139_frame_receive(nic_t *nic_data)
    576577{
    577578        rtl8139_t *rtl8139 = nic_get_specific(nic_data);
    … …  
    581582        nic_frame_list_t *frames = nic_alloc_frame_list();
    582583        if (!frames)
    583                 ddf_msg(LVL_ERROR, "Can not allocate frame list for received packets.");
     584                ddf_msg(LVL_ERROR, "Can not allocate frame list for received frames.");
    584585
    585586        void *rx_buffer = rtl8139->rx_buff_virt;
    … …  
    605606        while (!rtl8139_hw_buffer_empty(rtl8139)) {
    606607                void *rx_ptr = rx_buffer + rx_offset % RxBUF_SIZE;
    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;
     608                uint32_t frame_header = uint32_t_le2host( *((uint32_t*)rx_ptr) );
     609                uint16_t size = frame_header >> 16;
     610                uint16_t frame_size = size - RTL8139_CRC_SIZE;
     611                /* received frame flags in frame header */
     612                uint16_t rcs = (uint16_t) frame_header;
    612613
    613614                if (size == RTL8139_EARLY_SIZE) {
    614                         /* The packet copying is still in progress, break receiving */
     615                        /* The frame copying is still in progress, break receiving */
    615616                        ddf_msg(LVL_DEBUG, "Early threshold reached, not completely coppied");
    616617                        break;
    … …  
    618619
    619620                /* Check if the header is valid, otherwise we are lost in the buffer */
    620                 if (size == 0 || size > RTL8139_PACKET_MAX_LENGTH) {
     621                if (size == 0 || size > RTL8139_FRAME_MAX_LENGTH) {
    621622                        ddf_msg(LVL_ERROR, "Receiver error -> receiver reset (size: %4"PRIu16", "
    622                             "header 0x%4"PRIx16". Offset: %zu)", size, packet_header,
     623                            "header 0x%4"PRIx16". Offset: %zu)", size, frame_header,
    623624                            rx_offset);
    624625                        goto rx_err;
    … …  
    629630                }
    630631
    631                 cur_read += size + RTL_PACKET_HEADER_SIZE;
     632                cur_read += size + RTL_FRAME_HEADER_SIZE;
    632633                if (cur_read > max_read)
    633634                        break;
    634635
    635636                if (frames) {
    636                         nic_frame_t *frame = rtl8139_read_packet(nic_data, rx_buffer,
    637                             RxBUF_SIZE, rx_offset + RTL_PACKET_HEADER_SIZE, packet_size);
     637                        nic_frame_t *frame = rtl8139_read_frame(nic_data, rx_buffer,
     638                            RxBUF_SIZE, rx_offset + RTL_FRAME_HEADER_SIZE, frame_size);
    638639
    639640                        if (frame)
    … …  
    642643
    643644                /* Update offset */
    644                 rx_offset = ALIGN_UP(rx_offset + size + RTL_PACKET_HEADER_SIZE, 4);
    645 
    646                 /* Write lesser value to prevent overflow into unread packet
     645                rx_offset = ALIGN_UP(rx_offset + size + RTL_FRAME_HEADER_SIZE, 4);
     646
     647                /* Write lesser value to prevent overflow into unread frame
    647648                 * (the recomendation from the RealTech rtl8139 programming guide)
    648649                 */
    … …  
    735736                tx_used++;
    736737
    737                 /* If the packet was sent */
     738                /* If the frame was sent */
    738739                if (tsd_value & TSD_TOK) {
    739740                        size_t size = REG_GET_VAL(tsd_value, TSD_SIZE);
    … …  
    765766}
    766767
    767 /** Receive all packets from the buffer
     768/** Receive all frames from the buffer
    768769 *
    769770 *  @param rtl8139  driver private data
    770771 */
    771 static void rtl8139_receive_packets(nic_t *nic_data)
     772static void rtl8139_receive_frames(nic_t *nic_data)
    772773{
    773774        assert(nic_data);
    … …  
    777778
    778779        fibril_mutex_lock(&rtl8139->rx_lock);
    779         nic_frame_list_t *frames = rtl8139_packet_receive(nic_data);
     780        nic_frame_list_t *frames = rtl8139_frame_receive(nic_data);
    780781        fibril_mutex_unlock(&rtl8139->rx_lock);
    781782
    … …  
    833834        }
    834835
    835         /* Check transmittion interrupts first to allow transmit next packets
     836        /* Check transmittion interrupts first to allow transmit next frames
    836837         * sooner
    837838         */
    … …  
    840841        }
    841842        if (isr & INT_ROK) {
    842                 rtl8139_receive_packets(nic_data);
     843                rtl8139_receive_frames(nic_data);
    843844        }
    844845        if (isr & (INT_RER | INT_RXOVW | INT_FIFOOVW)) {
    … …  
    942943}
    943944
    944 /** Activate the device to receive and transmit packets
     945/** Activate the device to receive and transmit frames
    945946 *
    946947 *  @param nic_data  The nic driver data
    … …  
    12221223                goto failed;
    12231224
    1224         /* Set default packet acceptance */
     1225        /* Set default frame acceptance */
    12251226        rtl8139->rcr_data.ucast_mask = RTL8139_RCR_UCAST_DEFAULT;
    12261227        rtl8139->rcr_data.mcast_mask = RTL8139_RCR_MCAST_DEFAULT;
    12271228        rtl8139->rcr_data.bcast_mask = RTL8139_RCR_BCAST_DEFAULT;
    12281229        rtl8139->rcr_data.defect_mask = RTL8139_RCR_DEFECT_DEFAULT;
    1229         /* Set receiver early treshold to 8/16 of packet length */
     1230        /* Set receiver early treshold to 8/16 of frame length */
    12301231        rtl8139->rcr_data.rcr_base = (0x8 << RCR_ERTH_SHIFT);
    12311232
    12321233        ddf_msg(LVL_DEBUG, "The device is initialized");
    12331234        return ret;
    1234 
     1235       
    12351236failed:
    12361237        ddf_msg(LVL_ERROR, "The device initialization failed");
    … …  
    12971298int rtl8139_dev_add(ddf_dev_t *dev)
    12981299{
     1300        ddf_fun_t *fun;
     1301
    12991302        assert(dev);
    13001303        ddf_msg(LVL_NOTE, "RTL8139_dev_add %s (handle = %d)", dev->name, dev->handle);
    … …  
    13331336        }
    13341337
    1335         rc = nic_register_as_ddf_fun(nic_data, &rtl8139_dev_ops);
     1338        fun = ddf_fun_create(nic_get_ddf_dev(nic_data), fun_exposed, "port0");
     1339        if (fun == NULL) {
     1340                ddf_msg(LVL_ERROR, "Failed creating device function");
     1341                goto err_srv;
     1342        }
     1343        nic_set_ddf_fun(nic_data, fun);
     1344        fun->ops = &rtl8139_dev_ops;
     1345        fun->driver_data = nic_data;
     1346
     1347        rc = ddf_fun_bind(fun);
    13361348        if (rc != EOK) {
    1337                 ddf_msg(LVL_ERROR, "Failed to register as DDF function - error %d", rc);
    1338                 goto err_irq;
     1349                ddf_msg(LVL_ERROR, "Failed binding device function");
     1350                goto err_fun_create;
     1351        }
     1352        rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
     1353        if (rc != EOK) {
     1354                ddf_msg(LVL_ERROR, "Failed adding function to category");
     1355                goto err_fun_bind;
    13391356        }
    13401357
    … …  
    13431360
    13441361        return EOK;
    1345 
     1362       
     1363err_fun_bind:
     1364        ddf_fun_unbind(fun);
     1365err_fun_create:
     1366        ddf_fun_destroy(fun);
     1367err_srv:
     1368        /* XXX Disconnect from services */
    13461369err_irq:
    13471370        unregister_interrupt_handler(dev, rtl8139->irq);
    … …  
    14861509};
    14871510
    1488 /** Check if pause packet operations are valid in current situation
     1511/** Check if pause frame operations are valid in current situation
    14891512 *
    14901513 *  @param rtl8139  RTL8139 private structure
    … …  
    15111534}
    15121535
    1513 /** Get current pause packet configuration
     1536/** Get current pause frame configuration
    15141537 *
    15151538 *  Values are filled with NIC_RESULT_NOT_AVAILABLE if the value has no sense in
    … …  
    15171540 *
    15181541 *  @param[in]  fun         The DDF structure of the RTL8139
    1519  *  @param[out] we_send     Sign if local constroller sends pause packets
    1520  *  @param[out] we_receive  Sign if local constroller receives pause packets
    1521  *  @param[out] time        Time filled in pause packets. 0xFFFF in rtl8139
     1542 *  @param[out] we_send     Sign if local constroller sends pause frame
     1543 *  @param[out] we_receive  Sign if local constroller receives pause frame
     1544 *  @param[out] time        Time filled in pause frames. 0xFFFF in rtl8139
    15221545 *
    15231546 *  @return EOK if succeed
    … …  
    15491572};
    15501573
    1551 /** Set current pause packet configuration
     1574/** Set current pause frame configuration
    15521575 *
    15531576 *  @param fun            The DDF structure of the RTL8139
    1554  *  @param allow_send     Sign if local constroller sends pause packets
    1555  *  @param allow_receive  Sign if local constroller receives pause packets
     1577 *  @param allow_send     Sign if local constroller sends pause frame
     1578 *  @param allow_receive  Sign if local constroller receives pause frames
    15561579 *  @param time           Time to use, ignored (not supported by device)
    15571580 *
    1558  *  @return EOK if succeed, INVAL if the pause packet has no sence
     1581 *  @return EOK if succeed, INVAL if the pause frame has no sence
    15591582 */
    15601583static int rtl8139_pause_set(ddf_fun_t *fun, int allow_send, int allow_receive,
    … …  
    18051828}
    18061829
    1807 /** Set unicast packets acceptance mode
     1830/** Set unicast frames acceptance mode
    18081831 *
    18091832 *  @param nic_data  The nic device to update
    … …  
    18631886}
    18641887
    1865 /** Set multicast packets acceptance mode
     1888/** Set multicast frames acceptance mode
    18661889 *
    18671890 *  @param nic_data  The nic device to update
    … …  
    19081931}
    19091932
    1910 /** Set broadcast packets acceptance mode
     1933/** Set broadcast frames acceptance mode
    19111934 *
    19121935 *  @param nic_data  The nic device to update
    … …  
    19381961}
    19391962
    1940 /** Get state of acceptance of weird packets
     1963/** Get state of acceptance of weird frames
    19411964 *
    19421965 *  @param[in]  device  The device to check
    … …  
    19601983};
    19611984
    1962 /** Set acceptance of weird packets
     1985/** Set acceptance of weird frames
    19631986 *
    19641987 *  @param device  The device to update
    … …  
    21362159}
    21372160
    2138 /** Force receiving all packets in the receive buffer
     2161/** Force receiving all frames in the receive buffer
    21392162 *
    21402163 *  @param device  The device to receive
Note: See TracChangeset for help on using the changeset viewer.