tree-wide: fix assorted typos all over the place
[linux-2.6.git] / drivers / net / mlx4 / en_rx.c
index 5a14899..829b9ec 100644 (file)
 
 #include "mlx4_en.h"
 
-static void *get_wqe(struct mlx4_en_rx_ring *ring, int n)
-{
-       int offset = n << ring->srq.wqe_shift;
-       return ring->buf + offset;
-}
-
-static void mlx4_en_srq_event(struct mlx4_srq *srq, enum mlx4_event type)
-{
-       return;
-}
 
 static int mlx4_en_get_frag_header(struct skb_frag_struct *frags, void **mac_hdr,
                                   void **ip_hdr, void **tcpudp_hdr,
@@ -154,9 +144,6 @@ static void mlx4_en_init_rx_desc(struct mlx4_en_priv *priv,
        int possible_frags;
        int i;
 
-       /* Pre-link descriptor */
-       rx_desc->next.next_wqe_index = cpu_to_be16((index + 1) & ring->size_mask);
-
        /* Set size and memtype fields */
        for (i = 0; i < priv->num_frags; i++) {
                skb_frags[i].size = priv->frag_info[i].frag_size;
@@ -217,7 +204,7 @@ static void mlx4_en_free_rx_desc(struct mlx4_en_priv *priv,
                en_dbg(DRV, priv, "Freeing fragment:%d\n", nr);
                dma = be64_to_cpu(rx_desc->data[nr].addr);
 
-               en_dbg(DRV, priv, "Unmaping buffer at dma:0x%llx\n", (u64) dma);
+               en_dbg(DRV, priv, "Unmapping buffer at dma:0x%llx\n", (u64) dma);
                pci_unmap_single(mdev->pdev, dma, skb_frags[nr].size,
                                 PCI_DMA_FROMDEVICE);
                put_page(skb_frags[nr].page);
@@ -269,31 +256,6 @@ reduce_rings:
        return 0;
 }
 
-static int mlx4_en_fill_rx_buf(struct net_device *dev,
-                              struct mlx4_en_rx_ring *ring)
-{
-       struct mlx4_en_priv *priv = netdev_priv(dev);
-       int num = 0;
-       int err;
-
-       while ((u32) (ring->prod - ring->cons) < ring->actual_size) {
-               err = mlx4_en_prepare_rx_desc(priv, ring, ring->prod &
-                                             ring->size_mask);
-               if (err) {
-                       if (netif_msg_rx_err(priv))
-                               en_warn(priv, "Failed preparing rx descriptor\n");
-                       priv->port_stats.rx_alloc_failed++;
-                       break;
-               }
-               ++num;
-               ++ring->prod;
-       }
-       if ((u32) (ring->prod - ring->cons) == ring->actual_size)
-               ring->full = 1;
-
-       return num;
-}
-
 static void mlx4_en_free_rx_buf(struct mlx4_en_priv *priv,
                                struct mlx4_en_rx_ring *ring)
 {
@@ -312,42 +274,6 @@ static void mlx4_en_free_rx_buf(struct mlx4_en_priv *priv,
        }
 }
 
-
-void mlx4_en_rx_refill(struct work_struct *work)
-{
-       struct delayed_work *delay = to_delayed_work(work);
-       struct mlx4_en_priv *priv = container_of(delay, struct mlx4_en_priv,
-                                                refill_task);
-       struct mlx4_en_dev *mdev = priv->mdev;
-       struct net_device *dev = priv->dev;
-       struct mlx4_en_rx_ring *ring;
-       int need_refill = 0;
-       int i;
-
-       mutex_lock(&mdev->state_lock);
-       if (!mdev->device_up || !priv->port_up)
-               goto out;
-
-       /* We only get here if there are no receive buffers, so we can't race
-        * with Rx interrupts while filling buffers */
-       for (i = 0; i < priv->rx_ring_num; i++) {
-               ring = &priv->rx_ring[i];
-               if (ring->need_refill) {
-                       if (mlx4_en_fill_rx_buf(dev, ring)) {
-                               ring->need_refill = 0;
-                               mlx4_en_update_rx_prod_db(ring);
-                       } else
-                               need_refill = 1;
-               }
-       }
-       if (need_refill)
-               queue_delayed_work(mdev->workqueue, &priv->refill_task, HZ);
-
-out:
-       mutex_unlock(&mdev->state_lock);
-}
-
-
 int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv,
                           struct mlx4_en_rx_ring *ring, u32 size, u16 stride)
 {
@@ -355,9 +281,6 @@ int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv,
        int err;
        int tmp;
 
-       /* Sanity check SRQ size before proceeding */
-       if (size >= mdev->dev->caps.max_srq_wqes)
-               return -EINVAL;
 
        ring->prod = 0;
        ring->cons = 0;
@@ -365,7 +288,7 @@ int mlx4_en_create_rx_ring(struct mlx4_en_priv *priv,
        ring->size_mask = size - 1;
        ring->stride = stride;
        ring->log_stride = ffs(ring->stride) - 1;
-       ring->buf_size = ring->size * ring->stride;
+       ring->buf_size = ring->size * ring->stride + TXBB_SIZE;
 
        tmp = size * roundup_pow_of_two(MLX4_EN_MAX_RX_FRAGS *
                                        sizeof(struct skb_frag_struct));
@@ -421,15 +344,12 @@ err_ring:
 
 int mlx4_en_activate_rx_rings(struct mlx4_en_priv *priv)
 {
-       struct mlx4_en_dev *mdev = priv->mdev;
-       struct mlx4_wqe_srq_next_seg *next;
        struct mlx4_en_rx_ring *ring;
        int i;
        int ring_ind;
        int err;
        int stride = roundup_pow_of_two(sizeof(struct mlx4_en_rx_desc) +
                                        DS_SIZE * priv->num_frags);
-       int max_gs = (stride - sizeof(struct mlx4_wqe_srq_next_seg)) / DS_SIZE;
 
        for (ring_ind = 0; ring_ind < priv->rx_ring_num; ring_ind++) {
                ring = &priv->rx_ring[ring_ind];
@@ -440,6 +360,9 @@ int mlx4_en_activate_rx_rings(struct mlx4_en_priv *priv)
                ring->cqn = priv->rx_cq[ring_ind].mcq.cqn;
 
                ring->stride = stride;
+               if (ring->stride <= TXBB_SIZE)
+                       ring->buf += TXBB_SIZE;
+
                ring->log_stride = ffs(ring->stride) - 1;
                ring->buf_size = ring->size * ring->stride;
 
@@ -457,9 +380,6 @@ int mlx4_en_activate_rx_rings(struct mlx4_en_priv *priv)
                        ring_ind--;
                        goto err_allocator;
                }
-
-               /* Fill Rx buffers */
-               ring->full = 0;
        }
        err = mlx4_en_fill_rx_buffers(priv);
        if (err)
@@ -469,37 +389,10 @@ int mlx4_en_activate_rx_rings(struct mlx4_en_priv *priv)
                ring = &priv->rx_ring[ring_ind];
 
                mlx4_en_update_rx_prod_db(ring);
-
-               /* Configure SRQ representing the ring */
-               ring->srq.max    = ring->actual_size;
-               ring->srq.max_gs = max_gs;
-               ring->srq.wqe_shift = ilog2(ring->stride);
-
-               for (i = 0; i < ring->srq.max; ++i) {
-                       next = get_wqe(ring, i);
-                       next->next_wqe_index =
-                       cpu_to_be16((i + 1) & (ring->srq.max - 1));
-               }
-
-               err = mlx4_srq_alloc(mdev->dev, mdev->priv_pdn, &ring->wqres.mtt,
-                                    ring->wqres.db.dma, &ring->srq);
-               if (err){
-                       en_err(priv, "Failed to allocate srq\n");
-                       ring_ind--;
-                       goto err_srq;
-               }
-               ring->srq.event = mlx4_en_srq_event;
        }
 
        return 0;
 
-err_srq:
-       while (ring_ind >= 0) {
-               ring = &priv->rx_ring[ring_ind];
-               mlx4_srq_free(mdev->dev, &ring->srq);
-               ring_ind--;
-       }
-
 err_buffers:
        for (ring_ind = 0; ring_ind < priv->rx_ring_num; ring_ind++)
                mlx4_en_free_rx_buf(priv, &priv->rx_ring[ring_ind]);
@@ -520,7 +413,7 @@ void mlx4_en_destroy_rx_ring(struct mlx4_en_priv *priv,
 
        kfree(ring->lro.lro_arr);
        mlx4_en_unmap_buffer(&ring->wqres.buf);
-       mlx4_free_hwq_res(mdev->dev, &ring->wqres, ring->buf_size);
+       mlx4_free_hwq_res(mdev->dev, &ring->wqres, ring->buf_size + TXBB_SIZE);
        vfree(ring->rx_info);
        ring->rx_info = NULL;
 }
@@ -528,10 +421,9 @@ void mlx4_en_destroy_rx_ring(struct mlx4_en_priv *priv,
 void mlx4_en_deactivate_rx_ring(struct mlx4_en_priv *priv,
                                struct mlx4_en_rx_ring *ring)
 {
-       struct mlx4_en_dev *mdev = priv->mdev;
-
-       mlx4_srq_free(mdev->dev, &ring->srq);
        mlx4_en_free_rx_buf(priv, ring);
+       if (ring->stride <= TXBB_SIZE)
+               ring->buf -= TXBB_SIZE;
        mlx4_en_destroy_allocator(priv, ring);
 }
 
@@ -570,8 +462,9 @@ static int mlx4_en_complete_rx_desc(struct mlx4_en_priv *priv,
                                 PCI_DMA_FROMDEVICE);
        }
        /* Adjust size of last fragment to match actual length */
-       skb_frags_rx[nr - 1].size = length -
-               priv->frag_info[nr - 1].frag_prefix_size;
+       if (nr > 0)
+               skb_frags_rx[nr - 1].size = length -
+                       priv->frag_info[nr - 1].frag_prefix_size;
        return nr;
 
 fail:
@@ -647,33 +540,6 @@ static struct sk_buff *mlx4_en_rx_skb(struct mlx4_en_priv *priv,
        return skb;
 }
 
-static void mlx4_en_copy_desc(struct mlx4_en_priv *priv,
-                             struct mlx4_en_rx_ring *ring,
-                             int from, int to, int num)
-{
-       struct skb_frag_struct *skb_frags_from;
-       struct skb_frag_struct *skb_frags_to;
-       struct mlx4_en_rx_desc *rx_desc_from;
-       struct mlx4_en_rx_desc *rx_desc_to;
-       int from_index, to_index;
-       int nr, i;
-
-       for (i = 0; i < num; i++) {
-               from_index = (from + i) & ring->size_mask;
-               to_index = (to + i) & ring->size_mask;
-               skb_frags_from = ring->rx_info + (from_index << priv->log_rx_info);
-               skb_frags_to = ring->rx_info + (to_index << priv->log_rx_info);
-               rx_desc_from = ring->buf + (from_index << ring->log_stride);
-               rx_desc_to = ring->buf + (to_index << ring->log_stride);
-
-               for (nr = 0; nr < priv->num_frags; nr++) {
-                       skb_frags_to[nr].page = skb_frags_from[nr].page;
-                       skb_frags_to[nr].page_offset = skb_frags_from[nr].page_offset;
-                       rx_desc_to->data[nr].addr = rx_desc_from->data[nr].addr;
-               }
-       }
-}
-
 
 int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int budget)
 {
@@ -821,11 +687,6 @@ out:
        wmb(); /* ensure HW sees CQ consumer before we post new buffers */
        ring->cons = cq->mcq.cons_index;
        ring->prod += polled; /* Polled descriptors were realocated in place */
-       if (unlikely(!ring->full)) {
-               mlx4_en_copy_desc(priv, ring, ring->cons - polled,
-                                 ring->prod - polled, polled);
-               mlx4_en_fill_rx_buf(dev, ring);
-       }
        mlx4_en_update_rx_prod_db(ring);
        return polled;
 }
@@ -931,25 +792,8 @@ void mlx4_en_calc_rx_buf(struct net_device *dev)
 
 /* RSS related functions */
 
-/* Calculate rss size and map each entry in rss table to rx ring */
-void mlx4_en_set_default_rss_map(struct mlx4_en_priv *priv,
-                                struct mlx4_en_rss_map *rss_map,
-                                int num_entries, int num_rings)
-{
-       int i;
-
-       rss_map->size = roundup_pow_of_two(num_entries);
-       en_dbg(DRV, priv, "Setting default RSS map of %d entires\n",
-              rss_map->size);
-
-       for (i = 0; i < rss_map->size; i++) {
-               rss_map->map[i] = i % num_rings;
-               en_dbg(DRV, priv, "Entry %d ---> ring %d\n", i, rss_map->map[i]);
-       }
-}
-
-static int mlx4_en_config_rss_qp(struct mlx4_en_priv *priv,
-                                int qpn, int srqn, int cqn,
+static int mlx4_en_config_rss_qp(struct mlx4_en_priv *priv, int qpn,
+                                struct mlx4_en_rx_ring *ring,
                                 enum mlx4_qp_state *state,
                                 struct mlx4_qp *qp)
 {
@@ -971,13 +815,16 @@ static int mlx4_en_config_rss_qp(struct mlx4_en_priv *priv,
        qp->event = mlx4_en_sqp_event;
 
        memset(context, 0, sizeof *context);
-       mlx4_en_fill_qp_context(priv, 0, 0, 0, 0, qpn, cqn, srqn, context);
+       mlx4_en_fill_qp_context(priv, ring->size, ring->stride, 0, 0,
+                               qpn, ring->cqn, context);
+       context->db_rec_addr = cpu_to_be64(ring->wqres.db.dma);
 
-       err = mlx4_qp_to_ready(mdev->dev, &priv->res.mtt, context, qp, state);
+       err = mlx4_qp_to_ready(mdev->dev, &ring->wqres.mtt, context, qp, state);
        if (err) {
                mlx4_qp_remove(mdev->dev, qp);
                mlx4_qp_free(mdev->dev, qp);
        }
+       mlx4_en_update_rx_prod_db(ring);
 out:
        kfree(context);
        return err;
@@ -993,23 +840,22 @@ int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv)
        void *ptr;
        int rss_xor = mdev->profile.rss_xor;
        u8 rss_mask = mdev->profile.rss_mask;
-       int i, srqn, qpn, cqn;
+       int i, qpn;
        int err = 0;
        int good_qps = 0;
 
        en_dbg(DRV, priv, "Configuring rss steering\n");
-       err = mlx4_qp_reserve_range(mdev->dev, rss_map->size,
-                                   rss_map->size, &rss_map->base_qpn);
+       err = mlx4_qp_reserve_range(mdev->dev, priv->rx_ring_num,
+                                   priv->rx_ring_num,
+                                   &rss_map->base_qpn);
        if (err) {
-               en_err(priv, "Failed reserving %d qps\n", rss_map->size);
+               en_err(priv, "Failed reserving %d qps\n", priv->rx_ring_num);
                return err;
        }
 
-       for (i = 0; i < rss_map->size; i++) {
-               cqn = priv->rx_ring[rss_map->map[i]].cqn;
-               srqn = priv->rx_ring[rss_map->map[i]].srq.srqn;
+       for (i = 0; i < priv->rx_ring_num; i++) {
                qpn = rss_map->base_qpn + i;
-               err = mlx4_en_config_rss_qp(priv, qpn, srqn, cqn,
+               err = mlx4_en_config_rss_qp(priv, qpn, &priv->rx_ring[i],
                                            &rss_map->state[i],
                                            &rss_map->qps[i]);
                if (err)
@@ -1032,11 +878,11 @@ int mlx4_en_config_rss_steer(struct mlx4_en_priv *priv)
        }
        rss_map->indir_qp.event = mlx4_en_sqp_event;
        mlx4_en_fill_qp_context(priv, 0, 0, 0, 1, priv->base_qpn,
-                               priv->rx_ring[0].cqn, 0, &context);
+                               priv->rx_ring[0].cqn, &context);
 
        ptr = ((void *) &context) + 0x3c;
        rss_context = (struct mlx4_en_rss_context *) ptr;
-       rss_context->base_qpn = cpu_to_be32(ilog2(rss_map->size) << 24 |
+       rss_context->base_qpn = cpu_to_be32(ilog2(priv->rx_ring_num) << 24 |
                                            (rss_map->base_qpn));
        rss_context->default_qpn = cpu_to_be32(rss_map->base_qpn);
        rss_context->hash_fn = rss_xor & 0x3;
@@ -1063,7 +909,7 @@ rss_err:
                mlx4_qp_remove(mdev->dev, &rss_map->qps[i]);
                mlx4_qp_free(mdev->dev, &rss_map->qps[i]);
        }
-       mlx4_qp_release_range(mdev->dev, rss_map->base_qpn, rss_map->size);
+       mlx4_qp_release_range(mdev->dev, rss_map->base_qpn, priv->rx_ring_num);
        return err;
 }
 
@@ -1079,13 +925,13 @@ void mlx4_en_release_rss_steer(struct mlx4_en_priv *priv)
        mlx4_qp_free(mdev->dev, &rss_map->indir_qp);
        mlx4_qp_release_range(mdev->dev, priv->base_qpn, 1);
 
-       for (i = 0; i < rss_map->size; i++) {
+       for (i = 0; i < priv->rx_ring_num; i++) {
                mlx4_qp_modify(mdev->dev, NULL, rss_map->state[i],
                               MLX4_QP_STATE_RST, NULL, 0, 0, &rss_map->qps[i]);
                mlx4_qp_remove(mdev->dev, &rss_map->qps[i]);
                mlx4_qp_free(mdev->dev, &rss_map->qps[i]);
        }
-       mlx4_qp_release_range(mdev->dev, rss_map->base_qpn, rss_map->size);
+       mlx4_qp_release_range(mdev->dev, rss_map->base_qpn, priv->rx_ring_num);
 }