net/bnx2x: get cache line size from build configuration

[dpdk.git] / drivers / net / cxgbe / sge.c

diff --git a/drivers/net/cxgbe/sge.c b/drivers/net/cxgbe/sge.c
index b1d0ea6..736f08c 100644 (file)
--- a/drivers/net/cxgbe/sge.c
+++ b/drivers/net/cxgbe/sge.c
@@ -247,6 +247,29 @@ static inline bool fl_starving(const struct adapter *adapter,
        return fl->avail - fl->pend_cred <= s->fl_starve_thres;
 }
 
+static inline unsigned int get_buf_size(struct adapter *adapter,
+                                       const struct rx_sw_desc *d)
+{
+       unsigned int rx_buf_size_idx = d->dma_addr & RX_BUF_SIZE;
+       unsigned int buf_size = 0;
+
+       switch (rx_buf_size_idx) {
+       case RX_SMALL_MTU_BUF:
+               buf_size = FL_MTU_SMALL_BUFSIZE(adapter);
+               break;
+
+       case RX_LARGE_MTU_BUF:
+               buf_size = FL_MTU_LARGE_BUFSIZE(adapter);
+               break;
+
+       default:
+               BUG_ON(1);
+               /* NOT REACHED */
+       }
+
+       return buf_size;
+}
+
 /**
  * free_rx_bufs - free the Rx buffers on an SGE free list
  * @q: the SGE free list to free buffers from
@@ -362,6 +385,14 @@ static unsigned int refill_fl_usembufs(struct adapter *adap, struct sge_fl *q,
        unsigned int buf_size_idx = RX_SMALL_MTU_BUF;
        struct rte_mbuf *buf_bulk[n];
        int ret, i;
+       struct rte_pktmbuf_pool_private *mbp_priv;
+       u8 jumbo_en = rxq->rspq.eth_dev->data->dev_conf.rxmode.jumbo_frame;
+
+       /* Use jumbo mtu buffers iff mbuf data room size can fit jumbo data. */
+       mbp_priv = rte_mempool_get_priv(rxq->rspq.mb_pool);
+       if (jumbo_en &&
+           ((mbp_priv->mbuf_data_room_size - RTE_PKTMBUF_HEADROOM) >= 9000))
+               buf_size_idx = RX_LARGE_MTU_BUF;
 
        ret = rte_mempool_get_bulk(rxq->rspq.mb_pool, (void *)buf_bulk, n);
        if (unlikely(ret != 0)) {
@@ -777,20 +808,23 @@ static void tx_timer_cb(void *data)
        struct adapter *adap = (struct adapter *)data;
        struct sge_eth_txq *txq = &adap->sge.ethtxq[0];
        int i;
+       unsigned int coal_idx;
 
        /* monitor any pending tx */
        for (i = 0; i < adap->sge.max_ethqsets; i++, txq++) {
-               t4_os_lock(&txq->txq_lock);
-               if (txq->q.coalesce.idx) {
-                       if (txq->q.coalesce.idx == txq->q.last_coal_idx &&
-                           txq->q.pidx == txq->q.last_pidx) {
-                               ship_tx_pkt_coalesce_wr(adap, txq);
-                       } else {
-                               txq->q.last_coal_idx = txq->q.coalesce.idx;
-                               txq->q.last_pidx = txq->q.pidx;
+               if (t4_os_trylock(&txq->txq_lock)) {
+                       coal_idx = txq->q.coalesce.idx;
+                       if (coal_idx) {
+                               if (coal_idx == txq->q.last_coal_idx &&
+                                   txq->q.pidx == txq->q.last_pidx) {
+                                       ship_tx_pkt_coalesce_wr(adap, txq);
+                               } else {
+                                       txq->q.last_coal_idx = coal_idx;
+                                       txq->q.last_pidx = txq->q.pidx;
+                               }
                        }
+                       t4_os_unlock(&txq->txq_lock);
                }
-               t4_os_unlock(&txq->txq_lock);
        }
        rte_eal_alarm_set(50, tx_timer_cb, (void *)adap);
 }
@@ -1298,9 +1332,6 @@ static struct rte_mbuf *t4_pktgl_to_mbuf(const struct pkt_gl *gl)
        return t4_pktgl_to_mbuf_usembufs(gl);
 }
 
-#define RTE_MBUF_DATA_DMA_ADDR_DEFAULT(mb) \
-       ((dma_addr_t) ((mb)->buf_physaddr + (mb)->data_off))
-
 /**
  * t4_ethrx_handler - process an ingress ethernet packet
  * @q: the response queue that received the packet
@@ -1432,14 +1463,31 @@ static int process_responses(struct sge_rspq *q, int budget,
                        const struct cpl_rx_pkt *cpl =
                                                (const void *)&q->cur_desc[1];
                        bool csum_ok = cpl->csum_calc && !cpl->err_vec;
-                       struct rte_mbuf *pkt;
-                       u32 len = ntohl(rc->pldbuflen_qid);
+                       struct rte_mbuf *pkt, *npkt;
+                       u32 len, bufsz;
 
+                       len = ntohl(rc->pldbuflen_qid);
                        BUG_ON(!(len & F_RSPD_NEWBUF));
                        pkt = rsd->buf;
-                       pkt->data_len = G_RSPD_LEN(len);
-                       pkt->pkt_len = pkt->data_len;
-                       unmap_rx_buf(&rxq->fl);
+                       npkt = pkt;
+                       len = G_RSPD_LEN(len);
+                       pkt->pkt_len = len;
+
+                       /* Chain mbufs into len if necessary */
+                       while (len) {
+                               struct rte_mbuf *new_pkt = rsd->buf;
+
+                               bufsz = min(get_buf_size(q->adapter, rsd), len);
+                               new_pkt->data_len = bufsz;
+                               unmap_rx_buf(&rxq->fl);
+                               len -= bufsz;
+                               npkt->next = new_pkt;
+                               npkt = new_pkt;
+                               pkt->nb_segs++;
+                               rsd = &rxq->fl.sdesc[rxq->fl.cidx];
+                       }
+                       npkt->next = NULL;
+                       pkt->nb_segs--;
 
                        if (cpl->l2info & htonl(F_RXF_IP)) {
                                pkt->packet_type = RTE_PTYPE_L3_IPV4;
@@ -1597,7 +1645,8 @@ int t4_sge_alloc_rxq(struct adapter *adap, struct sge_rspq *iq, bool fwevtq,
        iq->size = cxgbe_roundup(iq->size, 16);
 
        snprintf(z_name, sizeof(z_name), "%s_%s_%d_%d",
-                eth_dev->driver->pci_drv.name, fwevtq ? "fwq_ring" : "rx_ring",
+                eth_dev->driver->pci_drv.driver.name,
+                fwevtq ? "fwq_ring" : "rx_ring",
                 eth_dev->data->port_id, queue_id);
        snprintf(z_name_sw, sizeof(z_name_sw), "%s_sw_ring", z_name);
 
@@ -1649,7 +1698,7 @@ int t4_sge_alloc_rxq(struct adapter *adap, struct sge_rspq *iq, bool fwevtq,
                fl->size = cxgbe_roundup(fl->size, 8);
 
                snprintf(z_name, sizeof(z_name), "%s_%s_%d_%d",
-                        eth_dev->driver->pci_drv.name,
+                        eth_dev->driver->pci_drv.driver.name,
                         fwevtq ? "fwq_ring" : "fl_ring",
                         eth_dev->data->port_id, queue_id);
                snprintf(z_name_sw, sizeof(z_name_sw), "%s_sw_ring", z_name);
@@ -1772,7 +1821,7 @@ int t4_sge_alloc_rxq(struct adapter *adap, struct sge_rspq *iq, bool fwevtq,
 
 refill_fl_err:
        t4_iq_free(adap, adap->mbox, adap->pf, 0, FW_IQ_TYPE_FL_INT_CAP,
-                  iq->cntxt_id, fl ? fl->cntxt_id : 0xffff, 0xffff);
+                  iq->cntxt_id, fl->cntxt_id, 0xffff);
 fl_nomem:
        ret = -ENOMEM;
 err:
@@ -1845,7 +1894,7 @@ int t4_sge_alloc_eth_txq(struct adapter *adap, struct sge_eth_txq *txq,
        nentries = txq->q.size + s->stat_len / sizeof(struct tx_desc);
 
        snprintf(z_name, sizeof(z_name), "%s_%s_%d_%d",
-                eth_dev->driver->pci_drv.name, "tx_ring",
+                eth_dev->driver->pci_drv.driver.name, "tx_ring",
                 eth_dev->data->port_id, queue_id);
        snprintf(z_name_sw, sizeof(z_name_sw), "%s_sw_ring", z_name);