be2net: don't report EVB for older chipsets when SR-IOV is disabled

[cascardo/linux.git] / drivers / net / ethernet / emulex / benet / be_main.c

diff --git a/drivers/net/ethernet/emulex/benet/be_main.c b/drivers/net/ethernet/emulex/benet/be_main.c
index d5286d3..88f427c 100644 (file)
--- a/drivers/net/ethernet/emulex/benet/be_main.c
+++ b/drivers/net/ethernet/emulex/benet/be_main.c
@@ -1917,8 +1917,7 @@ static u32 be_get_eq_delay_mult_enc(struct be_eq_obj *eqo)
        if (!aic->enable)
                return 0;
 
-       if (time_before_eq(now, aic->jiffies) ||
-           jiffies_to_msecs(now - aic->jiffies) < 1)
+       if (jiffies_to_msecs(now - aic->jiffies) < 1)
                eqd = aic->prev_eqd;
        else
                eqd = be_get_new_eqd(eqo);
@@ -3366,6 +3365,7 @@ done:
 
 static void be_rx_qs_destroy(struct be_adapter *adapter)
 {
+       struct rss_info *rss = &adapter->rss_info;
        struct be_queue_info *q;
        struct be_rx_obj *rxo;
        int i;
@@ -3392,6 +3392,12 @@ static void be_rx_qs_destroy(struct be_adapter *adapter)
                }
                be_queue_free(adapter, q);
        }
+
+       if (rss->rss_flags) {
+               rss->rss_flags = RSS_ENABLE_NONE;
+               be_cmd_rss_config(adapter, rss->rsstable, rss->rss_flags,
+                                 128, rss->rss_hkey);
+       }
 }
 
 static void be_disable_if_filters(struct be_adapter *adapter)
@@ -3512,20 +3518,21 @@ static int be_rx_qs_create(struct be_adapter *adapter)
                if (!BEx_chip(adapter))
                        rss->rss_flags |= RSS_ENABLE_UDP_IPV4 |
                                RSS_ENABLE_UDP_IPV6;
+
+               netdev_rss_key_fill(rss_key, RSS_HASH_KEY_LEN);
+               rc = be_cmd_rss_config(adapter, rss->rsstable, rss->rss_flags,
+                                      RSS_INDIR_TABLE_LEN, rss_key);
+               if (rc) {
+                       rss->rss_flags = RSS_ENABLE_NONE;
+                       return rc;
+               }
+
+               memcpy(rss->rss_hkey, rss_key, RSS_HASH_KEY_LEN);
        } else {
                /* Disable RSS, if only default RX Q is created */
                rss->rss_flags = RSS_ENABLE_NONE;
        }
 
-       netdev_rss_key_fill(rss_key, RSS_HASH_KEY_LEN);
-       rc = be_cmd_rss_config(adapter, rss->rsstable, rss->rss_flags,
-                              RSS_INDIR_TABLE_LEN, rss_key);
-       if (rc) {
-               rss->rss_flags = RSS_ENABLE_NONE;
-               return rc;
-       }
-
-       memcpy(rss->rss_hkey, rss_key, RSS_HASH_KEY_LEN);
 
        /* Post 1 less than RXQ-len to avoid head being equal to tail,
         * which is a queue empty condition
@@ -4082,6 +4089,7 @@ static void be_setup_init(struct be_adapter *adapter)
        adapter->if_handle = -1;
        adapter->be3_native = false;
        adapter->if_flags = 0;
+       adapter->phy_state = BE_UNKNOWN_PHY_STATE;
        if (be_physfn(adapter))
                adapter->cmd_privileges = MAX_PRIVILEGES;
        else
@@ -4307,6 +4315,23 @@ err:
        return status;
 }
 
+static int be_if_create(struct be_adapter *adapter)
+{
+       u32 en_flags = BE_IF_FLAGS_RSS | BE_IF_FLAGS_DEFQ_RSS;
+       u32 cap_flags = be_if_cap_flags(adapter);
+       int status;
+
+       if (adapter->cfg_num_qs == 1)
+               cap_flags &= ~(BE_IF_FLAGS_DEFQ_RSS | BE_IF_FLAGS_RSS);
+
+       en_flags &= cap_flags;
+       /* will enable all the needed filter flags in be_open() */
+       status = be_cmd_if_create(adapter, be_if_cap_flags(adapter), en_flags,
+                                 &adapter->if_handle, 0);
+
+       return status;
+}
+
 int be_update_queues(struct be_adapter *adapter)
 {
        struct net_device *netdev = adapter->netdev;
@@ -4324,6 +4349,9 @@ int be_update_queues(struct be_adapter *adapter)
                be_msix_disable(adapter);
 
        be_clear_queues(adapter);
+       status = be_cmd_if_destroy(adapter, adapter->if_handle,  0);
+       if (status)
+               return status;
 
        if (!msix_enabled(adapter)) {
                status = be_msix_enable(adapter);
@@ -4331,6 +4359,10 @@ int be_update_queues(struct be_adapter *adapter)
                        return status;
        }
 
+       status = be_if_create(adapter);
+       if (status)
+               return status;
+
        status = be_setup_queues(adapter);
        if (status)
                return status;
@@ -4395,7 +4427,6 @@ static int be_func_init(struct be_adapter *adapter)
 static int be_setup(struct be_adapter *adapter)
 {
        struct device *dev = &adapter->pdev->dev;
-       u32 en_flags;
        int status;
 
        status = be_func_init(adapter);
@@ -4428,10 +4459,7 @@ static int be_setup(struct be_adapter *adapter)
                goto err;
 
        /* will enable all the needed filter flags in be_open() */
-       en_flags = BE_IF_FLAGS_RSS | BE_IF_FLAGS_DEFQ_RSS;
-       en_flags = en_flags & be_if_cap_flags(adapter);
-       status = be_cmd_if_create(adapter, be_if_cap_flags(adapter), en_flags,
-                                 &adapter->if_handle, 0);
+       status = be_if_create(adapter);
        if (status)
                goto err;
 
@@ -4589,6 +4617,9 @@ static int be_ndo_bridge_getlink(struct sk_buff *skb, u32 pid, u32 seq,
 
        /* BE and Lancer chips support VEB mode only */
        if (BEx_chip(adapter) || lancer_chip(adapter)) {
+               /* VEB is disabled in non-SR-IOV profiles on BE3/Lancer */
+               if (!pci_sriov_get_totalvfs(adapter->pdev))
+                       return 0;
                hsw_mode = PORT_FWD_TYPE_VEB;
        } else {
                status = be_cmd_get_hsw_config(adapter, NULL, 0,
@@ -4804,7 +4835,7 @@ static void be_netdev_init(struct net_device *netdev)
        netdev->hw_features |= NETIF_F_SG | NETIF_F_TSO | NETIF_F_TSO6 |
                NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM |
                NETIF_F_HW_VLAN_CTAG_TX;
-       if (be_multi_rxq(adapter))
+       if ((be_if_cap_flags(adapter) & BE_IF_FLAGS_RSS))
                netdev->hw_features |= NETIF_F_RXHASH;
 
        netdev->features |= netdev->hw_features |
@@ -4934,11 +4965,13 @@ static void be_log_sfp_info(struct be_adapter *adapter)
        status = be_cmd_query_sfp_info(adapter);
        if (!status) {
                dev_err(&adapter->pdev->dev,
-                       "Unqualified SFP+ detected on %c from %s part no: %s",
-                       adapter->port_name, adapter->phy.vendor_name,
+                       "Port %c: %s Vendor: %s part no: %s",
+                       adapter->port_name,
+                       be_misconfig_evt_port_state[adapter->phy_state],
+                       adapter->phy.vendor_name,
                        adapter->phy.vendor_pn);
        }
-       adapter->flags &= ~BE_FLAGS_EVT_INCOMPATIBLE_SFP;
+       adapter->flags &= ~BE_FLAGS_PHY_MISCONFIGURED;
 }
 
 static void be_worker(struct work_struct *work)
@@ -4982,7 +5015,7 @@ static void be_worker(struct work_struct *work)
        if (!skyhawk_chip(adapter))
                be_eqd_update(adapter, false);
 
-       if (adapter->flags & BE_FLAGS_EVT_INCOMPATIBLE_SFP)
+       if (adapter->flags & BE_FLAGS_PHY_MISCONFIGURED)
                be_log_sfp_info(adapter);
 
 reschedule: