ixgbe: use known user priority for FCoE when DCB is enabled

Store the user priority for FCoE and use it directly for outgoing
FCoE traffic when DCB is enabled.

Signed-off-by: Yi Zou <yi.zou@intel.com>
Acked-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@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 edecdc853c14f53419d6a388301c56f79787f2e6..da32a108a7b4fcf0fc5506a3459975dbac35f7f9 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_fcoe.c
+++ b/drivers/net/ixgbe/ixgbe_fcoe.c
@@ -499,6 +499,10 @@ void ixgbe_configure_fcoe(struct ixgbe_adapter *adapter)
        struct ixgbe_hw *hw = &adapter->hw;
        struct ixgbe_fcoe *fcoe = &adapter->fcoe;
        struct ixgbe_ring_feature *f = &adapter->ring_feature[RING_F_FCOE];
+#ifdef CONFIG_IXGBE_DCB
+       u8 tc;
+       u32 up2tc;
+#endif
 
        /* create the pool for ddp if not created yet */
        if (!fcoe->pool) {
@@ -540,6 +544,17 @@ void ixgbe_configure_fcoe(struct ixgbe_adapter *adapter)
                        IXGBE_FCRXCTRL_FCOELLI |
                        IXGBE_FCRXCTRL_FCCRCBO |
                        (FC_FCOE_VER << IXGBE_FCRXCTRL_FCOEVER_SHIFT));
+#ifdef CONFIG_IXGBE_DCB
+       up2tc = IXGBE_READ_REG(&adapter->hw, IXGBE_RTTUP2TC);
+       for (i = 0; i < MAX_USER_PRIORITY; i++) {
+               tc = (u8)(up2tc >> (i * IXGBE_RTTUP2TC_UP_SHIFT));
+               tc &= (MAX_TRAFFIC_CLASS - 1);
+               if (fcoe->tc == tc) {
+                       fcoe->up = i;
+                       break;
+               }
+       }
+#endif
 }
 
 /**
@@ -671,19 +686,7 @@ out_disable:
  */
 u8 ixgbe_fcoe_getapp(struct ixgbe_adapter *adapter)
 {
-       int i;
-       u8 tc;
-       u32 up2tc;
-
-       up2tc = IXGBE_READ_REG(&adapter->hw, IXGBE_RTTUP2TC);
-       for (i = 0; i < MAX_USER_PRIORITY; i++) {
-               tc = (u8)(up2tc >> (i * IXGBE_RTTUP2TC_UP_SHIFT));
-               tc &= (MAX_TRAFFIC_CLASS - 1);
-               if (adapter->fcoe.tc == tc)
-                       return 1 << i;
-       }
-
-       return 0;
+       return 1 << adapter->fcoe.up;
 }
 
 /**
@@ -710,6 +713,7 @@ u8 ixgbe_fcoe_setapp(struct ixgbe_adapter *adapter, u8 up)
                                up2tc >>= (i * IXGBE_RTTUP2TC_UP_SHIFT);
                                up2tc &= (MAX_TRAFFIC_CLASS - 1);
                                adapter->fcoe.tc = (u8)up2tc;
+                               adapter->fcoe.up = i;
                                return 0;
                        }
                }

diff --git a/drivers/net/ixgbe/ixgbe_fcoe.h b/drivers/net/ixgbe/ixgbe_fcoe.h
index b5dee7b3ef1c40114a052e57ffdb1268e8481547..de8ff53187daf28724885794c63103423180f3ad 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_fcoe.h
+++ b/drivers/net/ixgbe/ixgbe_fcoe.h
@@ -62,7 +62,10 @@ struct ixgbe_fcoe_ddp {
 };
 
 struct ixgbe_fcoe {
+#ifdef CONFIG_IXGBE_DCB
        u8 tc;
+       u8 up;
+#endif
        spinlock_t lock;
        struct pci_pool *pool;
        struct ixgbe_fcoe_ddp ddp[IXGBE_FCOE_DDP_MAX];

diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 9ba506f6ef2975f058919420321e729c76dcaef5..09990ed105f63d6097b0d65867b7aef1de30423a 100644 (file)
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -3958,8 +3958,10 @@ static int __devinit ixgbe_sw_init(struct ixgbe_adapter *adapter)
                adapter->flags |= IXGBE_FLAG_FCOE_CAPABLE;
                adapter->flags &= ~IXGBE_FLAG_FCOE_ENABLED;
                adapter->ring_feature[RING_F_FCOE].indices = 0;
+#ifdef CONFIG_IXGBE_DCB
                /* Default traffic class to use for FCoE */
                adapter->fcoe.tc = IXGBE_FCOE_DEFTC;
+#endif
 #endif /* IXGBE_FCOE */
        }
 
@@ -5332,6 +5334,12 @@ static netdev_tx_t ixgbe_xmit_frame(struct sk_buff *skb,
            (skb->protocol == htons(ETH_P_FCOE))) {
                tx_flags |= IXGBE_TX_FLAGS_FCOE;
 #ifdef IXGBE_FCOE
+#ifdef CONFIG_IXGBE_DCB
+               tx_flags &= ~(IXGBE_TX_FLAGS_VLAN_PRIO_MASK
+                             << IXGBE_TX_FLAGS_VLAN_SHIFT);
+               tx_flags |= ((adapter->fcoe.up << 13)
+                             << IXGBE_TX_FLAGS_VLAN_SHIFT);
+#endif
                r_idx = smp_processor_id();
                r_idx &= (adapter->ring_feature[RING_F_FCOE].indices - 1);
                r_idx += adapter->ring_feature[RING_F_FCOE].mask;