ixgbe: Enable FCoE redirection table feature in 82599

Enable using FCoE redirection table feature in 82599. The FCoE
redirection table has maximum of eight entries, corresponding
to maximum of eight receive queues to be used for distributing
incoming FCoE packets. This patch sets up the FCoE redirection
table when multiple receive queues are available for FCoE.

Signed-off-by: Yi Zou <yi.zou@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ixgbe/ixgbe_fcoe.c b/drivers/net/ixgbe/ixgbe_fcoe.c
index a11c6207b7482e1b0a6a32e7cd0f9052d1548f59..d5939de8ba285d0c0690434d64c2fd76aa622d85 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_fcoe.c
+++ b/drivers/net/ixgbe/ixgbe_fcoe.c
@@ -482,8 +482,10 @@ int ixgbe_fso(struct ixgbe_adapter *adapter,
  */
 void ixgbe_configure_fcoe(struct ixgbe_adapter *adapter)
 {
+       int i, fcoe_q, fcoe_i;
        struct ixgbe_hw *hw = &adapter->hw;
        struct ixgbe_fcoe *fcoe = &adapter->fcoe;
+       struct ixgbe_ring_feature *f = &adapter->ring_feature[RING_F_FCOE];
 
        /* create the pool for ddp if not created yet */
        if (!fcoe->pool) {
@@ -497,12 +499,30 @@ void ixgbe_configure_fcoe(struct ixgbe_adapter *adapter)
 
                spin_lock_init(&fcoe->lock);
        }
-       /* L2 filter for FCoE: default to queue 0 */
+
+       /* Enable L2 eth type filter for FCoE */
        IXGBE_WRITE_REG(hw, IXGBE_ETQF(IXGBE_ETQF_FILTER_FCOE),
                        (ETH_P_FCOE | IXGBE_ETQF_FCOE | IXGBE_ETQF_FILTER_EN));
-       IXGBE_WRITE_REG(hw, IXGBE_FCRECTL, 0);
-       IXGBE_WRITE_REG(hw, IXGBE_ETQS(IXGBE_ETQF_FILTER_FCOE),
-                       IXGBE_ETQS_QUEUE_EN);
+       if (adapter->ring_feature[RING_F_FCOE].indices) {
+               /* Use multiple rx queues for FCoE by redirection table */
+               for (i = 0; i < IXGBE_FCRETA_SIZE; i++) {
+                       fcoe_i = f->mask + i % f->indices;
+                       fcoe_i &= IXGBE_FCRETA_ENTRY_MASK;
+                       fcoe_q = adapter->rx_ring[fcoe_i].reg_idx;
+                       IXGBE_WRITE_REG(hw, IXGBE_FCRETA(i), fcoe_q);
+               }
+               IXGBE_WRITE_REG(hw, IXGBE_FCRECTL, IXGBE_FCRECTL_ENA);
+               IXGBE_WRITE_REG(hw, IXGBE_ETQS(IXGBE_ETQF_FILTER_FCOE), 0);
+       } else  {
+               /* Use single rx queue for FCoE */
+               fcoe_i = f->mask;
+               fcoe_q = adapter->rx_ring[fcoe_i].reg_idx;
+               IXGBE_WRITE_REG(hw, IXGBE_FCRECTL, 0);
+               IXGBE_WRITE_REG(hw, IXGBE_ETQS(IXGBE_ETQF_FILTER_FCOE),
+                               IXGBE_ETQS_QUEUE_EN |
+                               (fcoe_q << IXGBE_ETQS_RX_QUEUE_SHIFT));
+       }
+
        IXGBE_WRITE_REG(hw, IXGBE_FCRXCTRL,
                        IXGBE_FCRXCTRL_FCOELLI |
                        IXGBE_FCRXCTRL_FCCRCBO |